Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow for commit prefix #160

Open
wants to merge 16 commits into
base: dev
Choose a base branch
from
Open

Conversation

amyu98
Copy link

@amyu98 amyu98 commented May 4, 2023

A new configuration option called "prefix" has been added. This option allows you to set a default prefix for each commit. It also supports regular expressions (regex) to match the prefix against the branch name.

Here is a simple example of using the prefix option:

oc config set prefix amyu98-commit:

This will result in:

amyu98-commit: Some lovely AI commit content

Below is an example of using a basic regex with the prefix option:

oc config set prefix /^([a-zA-Z]+-\d+)/

For the local branch "DEV-12345-commit-prefix", this will result in:

DEV-12345: Some lovely AI commit content

amyu98 added 4 commits May 4, 2023 16:37
… generated message

feat(config.ts): add prefix configuration option to be used in the generated message. Add validation to ensure prefix is not empty.
…x and message content

fix(config.ts): fix config validation for prefix to allow non-empty values
…egex pattern in git branch name

feat(api.ts): add support for generating commit message prefix from git branch name if regex pattern is not provided
feat(api.ts): add getCurrentGitBranch function to get current git branch name
feat(api.ts): add generatePrefixFromRegex function to generate prefix from regex pattern in git branch name
@amyu98 amyu98 changed the base branch from master to dev May 4, 2023 16:39
@amyu98
Copy link
Author

amyu98 commented May 4, 2023

resolve: #152

src/api.ts Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
amyu98 and others added 2 commits May 7, 2023 12:15
Improve generatePrefixFromRegex function to handle capturing groups

Co-authored-by: Takuya Ono <takuya-o@users.osdn.me>
…c to improve security and reliability

refactor(api.ts): simplify prefix generation logic by checking if prefix is defined and not empty before using it
fix(api.ts): fix conditional statement in generatePrefixFromRegex to return undefined when no match is found
fix(api.ts): catch error in getCurrentGitBranch and log it to console instead of throwing it
@amyu98
Copy link
Author

amyu98 commented May 7, 2023

@takuya-o Thanks, added suggestion and changed to execa (+ minor change in handling undefined prefix)

@amyu98 amyu98 requested a review from takuya-o May 7, 2023 12:07
@snirbenyosef
Copy link

@amyu98 Amazing, waiting for it to be released.

Copy link
Contributor

@takuya-o takuya-o left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed that it has changed to execa

@czlowiek488
Copy link

Any updates on this feature?
I really want to use this package but without this feature it is not usable for me 😞

@AmitayKaufmamn
Copy link

@czlowiek488 Not quite sure who is supposed to push this towards merge. Do I need to do anything?

Copy link
Owner

@di-sukharev di-sukharev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, sorry foe being late, have you tested the code?

To test you run: npm run build && npm run start inside the repo, so it runs actual build files and not oc which is installed globally

[CONFIG_KEYS.prefix](value: any) {
validateConfig(
CONFIG_KEYS.prefix,
true,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true is not validating anything here :) we should validate the config input with a function or expression which return Boolean

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@di-sukharev Do you have an idea what can we validate?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you somehow need to confirm that the value is the exact format you expect, if your format is ^(*) and not /^(*)/ — make sure you don't have /s in the value, you may also do multiple validations like !a && b && !c

Copy link
Owner

@di-sukharev di-sukharev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, sorry for being late :) Great work!

have you tested the code?

To test you run: npm run build && npm run start inside the repo, so it runs actual build files and not oc which is installed globally

and there are some conflicts to be fixed

@tomups
Copy link

tomups commented May 24, 2023

Any news on getting this merged? Would be awesome 🚀

@di-sukharev
Copy link
Owner

di-sukharev commented May 26, 2023

@tomtastico i hope soon, we need to make validateConfig() actually validate something #160 (comment)

cc @amyu98

…variable name

feat(config.ts): add validation for OCO_PREFIX environment variable to ensure it is a valid string or regex pattern
…g regex instead of startsWith and endsWith methods
…o a separate function to improve readability and maintainability

feat(api.ts): add prefix to the message returned by getOpenCommitLatestVersion function to improve semantics and consistency with other functions
@amyu98
Copy link
Author

amyu98 commented May 27, 2023

@di-sukharev
All set up and ready to go

@amyu98
Copy link
Author

amyu98 commented Jun 7, 2023

@di-sukharev Do we want anything else done?

@czlowiek488
Copy link

How is this PR going? @di-sukharev Do we need something more?

@mreduar
Copy link

mreduar commented Jun 27, 2023

@di-sukharev

@di-sukharev
Copy link
Owner

going to merge now, finally, sorry, was reallyy busy :)

btw we won GitHub 2023 hackathon with the OpenCommit, congrats <3

src/commands/config.ts Outdated Show resolved Hide resolved

function getCurrentGitBranch(): string | undefined {
try {
const branchName = execaCommandSync('git symbolic-ref --short HEAD').stdout.trim()
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this going to add the full branch name in the commit like: #234-some-branch-name commit message text goes here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it will take a regex out of the name. See my first commit on this PR.
Very cool to hear about the hackathon!

@di-sukharev
Copy link
Owner

added 1 comment, could you also pls take a look at this PR, isn't it what you want here, but less code and more agile?

@amyu98
Copy link
Author

amyu98 commented Jul 5, 2023

Hmm the other PR might do the trick 😓 @di-sukharev

@mreduar
Copy link

mreduar commented Jul 5, 2023

But the other PR does not extract the number automatically. You would have to pass the placeholder each time a commit is made.

@github-actions
Copy link

Stale pull request message

@inguelcartful
Copy link

Any news on getting this merged?

@di-sukharev
Copy link
Owner

managing to merge this today, i need to fix the conflicts first

@di-sukharev
Copy link
Owner

@amyu98 if you have time today, maybe it would be faster for you to solve the conflicts :)

im managing other PRs at the same time, if you chill today as we all should—will fix myself, not sure if i have so much time, there is lots of work to do..

@amyu98
Copy link
Author

amyu98 commented Sep 3, 2023 via email

@github-actions
Copy link

Stale pull request message

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants