Merge branch 'lord12-cut-create-next'

fix #12
This commit is contained in:
Yanick Champoux 2023-05-18 12:53:10 -04:00
commit d826b4191d
6 changed files with 91 additions and 45 deletions

View File

@ -8,7 +8,11 @@ releases:
changes: changes:
- add `git-gather` command - add `git-gather` command
- type: feat - type: feat
desc: add 'next' to alias to 'upcoming' desc: " add 'next' to alias to 'upcoming'"
commit: 363c195477231a6b3b770e74ebfe316296ec5af2
- type: feat
desc: cutting a release also add a new NEXT release
commit: 167f631d1fe4eadba3ed5fdadbe378b8255d4ad2
- version: 0.1.0 - version: 0.1.0
changes: changes:
- port the core of the Perl changelord to JavaScript. - port the core of the Perl changelord to JavaScript.

View File

@ -36,6 +36,7 @@
}, },
"devDependencies": { "devDependencies": {
"prettier": "^2.8.8", "prettier": "^2.8.8",
"typescript": "^5.0.4",
"vitest": "^0.31.0" "vitest": "^0.31.0"
} }
} }

View File

@ -7,6 +7,7 @@ import yaml from "yaml";
import fs from "fs-extra"; import fs from "fs-extra";
import consola from "consola"; import consola from "consola";
import u from "@yanick/updeep-remeda"; import u from "@yanick/updeep-remeda";
import { once } from "remeda";
import print from "./command/print.js"; import print from "./command/print.js";
import init from "./command/init.js"; import init from "./command/init.js";
@ -22,8 +23,13 @@ consola.raw = (...args) => console.log(...args);
yargs(hideBin(process.argv)) yargs(hideBin(process.argv))
.middleware((config) => { .middleware((config) => {
config.consola = consola; config.consola = consola;
config.changelog = () => config.changelog = once(() =>
fs.readFile(config.source, "utf-8").then(yaml.parse); fs.readFile(config.source, "utf-8").then(yaml.parse)
);
config.save_changelog = async (changelog) => {
if (!changelog) changelog = await config.changelog();
return fs.writeFile(config.source, yaml.stringify(changelog));
};
config.next_release = next_release.bind(config); config.next_release = next_release.bind(config);
config.latest_version = latest_version.bind(config); config.latest_version = latest_version.bind(config);
return config; return config;

View File

@ -4,6 +4,8 @@ import u from "@yanick/updeep-remeda";
import semverInc from "semver/functions/inc.js"; import semverInc from "semver/functions/inc.js";
import { simpleGit } from "simple-git"; import { simpleGit } from "simple-git";
import { base_next_version } from "../utils.js";
const code_churn = async (previous_version) => { const code_churn = async (previous_version) => {
previous_version = previous_version previous_version = previous_version
? "v" + previous_version.version ? "v" + previous_version.version
@ -14,7 +16,8 @@ const code_churn = async (previous_version) => {
const handler = async (config) => { const handler = async (config) => {
config.consola.start("cutting the next version..."); config.consola.start("cutting the next version...");
const changelog = yaml.parse(await fs.readFile(config.source, "utf-8"));
const changelog = await config.changelog();
const next = changelog.releases.find(u.matches({ version: "NEXT" })); const next = changelog.releases.find(u.matches({ version: "NEXT" }));
@ -40,7 +43,7 @@ const handler = async (config) => {
next.changes.map(({ type }) => type_to_level(type)) next.changes.map(({ type }) => type_to_level(type))
); );
if (changelog.project.with_stats) { if (changelog.project?.with_stats) {
next.changes.push({ next.changes.push({
type: "stats", type: "stats",
desc: "code churn:" + (await code_churn(previous_version)), desc: "code churn:" + (await code_churn(previous_version)),
@ -52,10 +55,13 @@ const handler = async (config) => {
bumper bumper
); );
// add a new NEXT
changelog.releases.unshift(base_next_version);
if (config.dry) { if (config.dry) {
config.consola.info("running in dry mode, not saving\n", next); config.consola.info("running in dry mode, not saving\n", next);
} else { } else {
await fs.writeFile(config.source, yaml.stringify(changelog)); await config.save_changelog(changelog);
} }
config.consola.success(`version ${next.version} is cut!`); config.consola.success(`version ${next.version} is cut!`);

23
src/command/cut.test.js Normal file
View File

@ -0,0 +1,23 @@
import { test, expect, vi } from "vitest";
import cut from "./cut.js";
test("add a new NEXT", async () => {
const changelog = {
releases: [{ version: "NEXT", changes: [] }, { version: "1.0.0" }],
};
const noop = () => {};
const config = {
consola: {
start: noop,
success: noop,
},
changelog: () => changelog,
save_changelog: noop,
};
await cut.handler(config);
expect(changelog.releases[0].version).toBe("NEXT");
expect(changelog.releases).toHaveLength(3);
});

6
src/utils.js Normal file
View File

@ -0,0 +1,6 @@
export const base_next_version = {
version: "NEXT",
changes: [],
};
Object.freeze(base_next_version);