14 Commits

5 changed files with 97 additions and 12 deletions

View File

@@ -2,6 +2,25 @@
Generation of this changelog is based on commits Generation of this changelog is based on commits
## v1.3.0
### Features
- [755da3bb5] - **commands**: add ability to write a footer
- [9311be80b] - **commands**: add commit message validation command (#4)
## v1.2.0
### Features
- [46a52ddeb] - **commands**: add the ability to sign conventional commits (#2)
## v1.1.3
### Fixes
- [d3cf78aac] - **commands**: incorrect formatting of changelog hashes
## v1.1.2 ## v1.1.2
### Miscellaneous ### Miscellaneous
@@ -18,7 +37,11 @@ Generation of this changelog is based on commits
### Features ### Features
- [`8e5158726`] - **commands**: add release and changelog commands - [8e5158726] - **commands**: add release and changelog commands
### Miscellaneous
- [b05591a31] - **release**: v1.1.0
## v1.0.0 ## v1.0.0
@@ -34,8 +57,8 @@ Generation of this changelog is based on commits
### Features ### Features
- [`b5ca3152c`] - add support for body (#1) - [b5ca3152c] - add support for body (#1)
- [`ce0c01347`] - initial commit - [ce0c01347] - initial commit
### Fixes ### Fixes

View File

@@ -17,6 +17,7 @@ Resultium commit standardization library
1. Make changes to your git initialized project 1. Make changes to your git initialized project
2. Run `rcz commit` in the root directory 2. Run `rcz commit` in the root directory
- if you wish to sign your commit use `--sign` option
3. Answer all the questions 3. Answer all the questions
4. Push to remote 4. Push to remote

View File

@@ -4,6 +4,8 @@
"dictionaryDefinitions": [], "dictionaryDefinitions": [],
"dictionaries": [], "dictionaries": [],
"words": [ "words": [
"Acked",
"johndoe",
"outro", "outro",
"rczrc" "rczrc"
], ],

View File

@@ -1,6 +1,6 @@
{ {
"name": "@resultium/rcz", "name": "@resultium/rcz",
"version": "1.1.3", "version": "1.4.0",
"description": "Resultium commit standardization library, based on conventional commits", "description": "Resultium commit standardization library, based on conventional commits",
"main": "./dist/index.js", "main": "./dist/index.js",
"bin": { "bin": {

View File

@@ -33,12 +33,15 @@ const program = new Command();
program program
.name("rcz") .name("rcz")
.description("Resultium commit standardization command-line interface") .description("Resultium commit standardization command-line interface")
.version("1.0.0"); .version("1.4.0");
program program
.command("commit") .command("commit")
.description("Create a conventional commit") .description("Create a conventional commit")
.action(async () => { .option("-S, --sign", "sign the commit")
.action(async (options) => {
const sign = options.sign ? true : false;
const config = await GetConfig(); const config = await GetConfig();
intro("Creating a conventional commit"); intro("Creating a conventional commit");
@@ -142,6 +145,15 @@ program
process.exit(0); process.exit(0);
} }
const footer = await text({
message: `Insert commit footer, can be left empty, e.g. Acked-by: @johndoe`,
});
if (isCancel(footer)) {
cancel("Commit creation cancelled");
process.exit(0);
}
const isBreaking = await confirm({ const isBreaking = await confirm({
message: "Does this commit have breaking changes?", message: "Does this commit have breaking changes?",
initialValue: false, initialValue: false,
@@ -175,12 +187,14 @@ program
scope ? `(${scope.toString()})` : `` scope ? `(${scope.toString()})` : ``
}${isBreaking ? "!" : ""}: ${message.toString()}${ }${isBreaking ? "!" : ""}: ${message.toString()}${
resolvesIssue ? ` (${issue?.toString()})` : `` resolvesIssue ? ` (${issue?.toString()})` : ``
}${body ? `\n\n${body}` : ``}`; }${body ? `\n\n${body}` : ``}${footer ? `\n\n${footer}` : ``}`;
if (stageAll) { if (stageAll) {
await simpleGit().add(".").commit(commitMessage); await simpleGit()
.add(".")
.commit(commitMessage, sign ? ["-S"] : []);
} else { } else {
await simpleGit().commit(commitMessage); await simpleGit().commit(commitMessage, sign ? ["-S"] : []);
} }
note(commitMessage); note(commitMessage);
@@ -372,7 +386,9 @@ program
"Changes package.json version and creates a new commit with a tag" "Changes package.json version and creates a new commit with a tag"
) )
.argument("<version>", "new version formatted in SemVer") .argument("<version>", "new version formatted in SemVer")
.action(async (string: string) => { .option("-S, --sign", "sign the release commit and tag")
.action(async (string: string, options) => {
const sign = options.sign ? true : false;
const version = string.replace("v", ""); const version = string.replace("v", "");
const packageFile = JSON.parse( const packageFile = JSON.parse(
( (
@@ -392,8 +408,51 @@ program
await simpleGit() await simpleGit()
.add(".") .add(".")
.commit(`chore(release): v${version}`) .commit(`chore(release): v${version}`, sign ? ["-S"] : [])
.addTag(`v${version}`); .tag(
sign
? [`-s`, `v${version}`, `-m`, `"Version ${version}"`]
: [`-a`, `v${version}`, `-m`, `"Version ${version}"`]
);
});
program
.command("validate")
.description("Validate whether a string fits given commit conventions")
.argument("[message]", "string for validation")
.option("-C, --code-only", "return code only")
.action(async (string: string, options) => {
try {
const message = string || fs.readFileSync(0, "utf-8");
const codeOnly = options.codeOnly ? true : false;
const config = await GetConfig();
// Regex for testing:
// /(build|feat|docs)(\((commands|changelog)\))?!?: .* ?(\(..*\))?((\n\n..*)?(\n\n..*)?)?/gm
const testRegex = new RegExp(
`(${
config?.types?.map((type) => type.value).join("|") ||
"feat|fix|build|ci|docs|perf|refactor"
})(\\((${
config?.scopes?.join("|") || "..*"
})\\))?!?: .* ?(\\(..*\\))?((\n\n..*)?(\n\n..*)?)?`,
"gm"
);
if (codeOnly) {
console.log(testRegex.test(message) ? 0 : 1);
} else {
console.log(
testRegex.test(message)
? "[rcz]: valid message"
: "[rcz]: invalid message"
);
}
} catch (err) {
console.log("[rcz]: no stdin found");
}
}); });
program.parse(); program.parse();