@eclipse-docks/cli 0.7.114 → 0.7.118

package/README.md

@@ -9,6 +9,7 @@ npx @eclipse-docks/cli release                       # bump patch, prompt for re
 npx @eclipse-docks/cli release minor                 # bump minor
 npx @eclipse-docks/cli release major -m "notes"      # bump major with inline release notes
 npx @eclipse-docks/cli release v1.2.3                # explicit version
+npx @eclipse-docks/cli release --since v1.2.0        # notes from that version (bump still from latest)
 npx @eclipse-docks/cli release --dry-run             # print what would be committed
 npx @eclipse-docks/cli release --no-push             # commit locally without pushing
 ```
@@ -20,7 +21,10 @@ Pair this with a CI workflow that tags/releases on that commit subject (see
 [`.github/workflows/app-release.yml`](../../.github/workflows/app-release.yml) for a
 reusable one) — the commit body becomes the release notes.
 
+The last version is taken from the most recent commit whose subject is exactly `vX.Y.Z`
+or the legacy form `Release: vX.Y.Z`. That drives the default bump.
+
 If no release notes are given via `-m`, an end-user-facing summary is generated from the
-commits since the last version, grouped under **Features**, **Fixes**, **Docs**, and
-**Chore/Refactor**, and offered as the default (press Enter on an empty first line to
-accept it).
+commits since that version (or since `--since vX.Y.Z` when set), grouped under
+**Features**, **Fixes**, **Docs**, and **Chore/Refactor**, and offered as the default
+(press Enter on an empty first line to accept it).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-docks/cli",
-  "version": "0.7.114",
+  "version": "0.7.118",
   "description": "Developer CLI for Eclipse Docks apps (release automation and more)",
   "type": "module",
   "bin": {

package/src/commands/release.js

@@ -1,7 +1,10 @@
 import { spawnSync } from 'node:child_process';
 import { createInterface } from 'node:readline/promises';
 
+/** CLI arg / new release commit subject: exact `vX.Y.Z`. */
 const VERSION_RE = /^v\d+\.\d+\.\d+$/;
+/** Discover last release from exact `vX.Y.Z` or legacy `Release: vX.Y.Z`. */
+const VERSION_IN_SUBJECT_RE = /^(?:Release:\s*)?(v\d+\.\d+\.\d+)$/i;
 
 function git(args, cwd) {
   const result = spawnSync('git', args, { cwd, encoding: 'utf8' });
@@ -16,8 +19,18 @@ function gitOrNull(args, cwd) {
   return result.status === 0 ? result.stdout.trim() : null;
 }
 
+function parseVersionSubject(subject) {
+  const m = subject.trim().match(VERSION_IN_SUBJECT_RE);
+  if (!m) return null;
+  return `v${m[1].slice(1)}`;
+}
+
+function usage() {
+  return 'Usage: docks release [major|minor|patch|vX.Y.Z] [-m "release notes"] [--since vX.Y.Z] [--dry-run] [--no-push]';
+}
+
 function parseArgs(argv) {
-  const opts = { bump: 'patch', version: '', notes: '', dryRun: false, push: true };
+  const opts = { bump: 'patch', version: '', since: '', notes: '', dryRun: false, push: true };
 
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
@@ -25,6 +38,12 @@ function parseArgs(argv) {
       opts.bump = arg;
     } else if (VERSION_RE.test(arg)) {
       opts.version = arg;
+    } else if (arg === '--since') {
+      const value = argv[++i] ?? '';
+      if (!VERSION_RE.test(value)) {
+        throw new Error(`--since requires a version like v1.2.3\n${usage()}`);
+      }
+      opts.since = value;
     } else if (arg === '-m' || arg === '--message') {
       opts.notes = argv[++i] ?? '';
     } else if (arg === '-n' || arg === '--dry-run') {
@@ -34,9 +53,7 @@ function parseArgs(argv) {
     } else if (arg === '--no-push') {
       opts.push = false;
     } else {
-      throw new Error(
-        `Unknown argument: ${arg}\nUsage: docks release [major|minor|patch|vX.Y.Z] [-m "release notes"] [--dry-run] [--no-push]`,
-      );
+      throw new Error(`Unknown argument: ${arg}\n${usage()}`);
     }
   }
 
@@ -47,11 +64,20 @@ function findLastVersion(cwd) {
   const log = gitOrNull(['log', '--pretty=%s'], cwd);
   if (!log) return null;
   for (const subject of log.split('\n')) {
-    if (VERSION_RE.test(subject)) return subject;
+    const version = parseVersionSubject(subject);
+    if (version) return version;
   }
   return null;
 }
 
+function findVersionCommit(cwd, version) {
+  const escaped = version.replace(/\./g, '\\.');
+  return gitOrNull(
+    ['log', '-E', '-i', '--pretty=%H', '-1', `--grep=^(Release:[[:space:]]*)?${escaped}$`],
+    cwd,
+  );
+}
+
 function bumpVersion(last, bump) {
   const [major, minor, patch] = last.slice(1).split('.').map(Number);
   switch (bump) {
@@ -64,16 +90,18 @@ function bumpVersion(last, bump) {
   }
 }
 
-function generateSummary(cwd, last) {
-  // find the commit whose subject *is* the last version, not a tag (tags may not exist locally)
-  const lastCommit = last ? gitOrNull(['log', '-E', '--pretty=%H', '-1', `--grep=^${last}$`], cwd) : null;
-  const range = lastCommit ? `${lastCommit}..HEAD` : 'HEAD';
+function generateSummary(cwd, since) {
+  const sinceCommit = since ? findVersionCommit(cwd, since) : null;
+  if (since && !sinceCommit) {
+    throw new Error(`No commit found for --since ${since} (expected subject "${since}" or "Release: ${since}").`);
+  }
+  const range = sinceCommit ? `${sinceCommit}..HEAD` : 'HEAD';
 
   const log = gitOrNull(['log', range, '--no-merges', '--pretty=%s'], cwd) ?? '';
   const buckets = { features: [], fixes: [], docs: [], chores: [] };
 
   for (const subject of log.split('\n')) {
-    if (!subject || VERSION_RE.test(subject)) continue;
+    if (!subject || parseVersionSubject(subject)) continue;
 
     const stripped = subject.includes(': ') ? subject.slice(subject.indexOf(': ') + 2) : subject;
     const text = stripped.charAt(0).toUpperCase() + stripped.slice(1);
@@ -135,7 +163,9 @@ export async function release(argv, cwd = process.cwd()) {
 
   let notes = opts.notes;
   if (!notes) {
-    const summary = generateSummary(cwd, last);
+    const since = opts.since || last;
+    if (opts.since) console.log(`Summarizing commits since ${opts.since}`);
+    const summary = generateSummary(cwd, since);
     notes = await promptNotes(version, summary);
   }