ekohacks 0.2.0 → 0.3.0

package/dist/cli.js

@@ -106,6 +106,7 @@ if (subcommand === 'ship') {
         changelog,
         pkg,
         gh: GhWrapper.create(),
+        git: GitWrapper.create(),
         npm: NpmWrapper.create(),
         confirm,
         narrate,

package/dist/infrastructure/git.js

@@ -11,12 +11,13 @@ export class GitWrapper {
             return stdout;
         });
     }
-    static createNull({ branch = 'main', dirty = false, behindOrigin = false, existingBranches = [], } = {}) {
+    static createNull({ branch = 'main', dirty = false, behindOrigin = false, existingBranches = [], versionOnMain = '0.0.0', } = {}) {
         const outputs = {
             'rev-parse --abbrev-ref HEAD': `${branch}\n`,
             'status --porcelain': dirty ? ' M some-file.ts\n' : '',
             'rev-parse main': behindOrigin ? 'local\n' : 'shared\n',
             'rev-parse origin/main': 'shared\n',
+            'show origin/main:package.json': `${JSON.stringify({ version: versionOnMain })}\n`,
         };
         for (const existing of existingBranches) {
             outputs[`branch --list ${existing}`] = `  ${existing}\n`;
@@ -38,6 +39,13 @@ export class GitWrapper {
     async branchExists(branch) {
         return (await this.runGit(['branch', '--list', branch])).trim() !== '';
     }
+    // The version main carries on origin, not in this checkout: the Release targets
+    // GitHub's main, so a stale local package.json must not answer for it.
+    async versionOnMain() {
+        await this.runGit(['fetch', 'origin', 'main']);
+        const manifest = await this.runGit(['show', 'origin/main:package.json']);
+        return JSON.parse(manifest).version;
+    }
     async mainInSyncWithOrigin() {
         await this.runGit(['fetch', 'origin', 'main']);
         const local = (await this.runGit(['rev-parse', 'main'])).trim();

package/dist/logic/release.js

@@ -35,6 +35,7 @@ export const release = async ({ version, changelog, lockfile, pkg, git, npm, gh,
         changelog,
         pkg,
         gh,
+        git,
         npm,
         confirm,
         confirmRelease: skippable,

package/dist/logic/ship.js

@@ -1,12 +1,19 @@
 import { setTimeout as delay } from 'node:timers/promises';
 import { changelogEntryFor } from './changelog.js';
 import { GhWrapper } from '../infrastructure/gh.js';
+import { GitWrapper } from '../infrastructure/git.js';
 import { NpmWrapper } from '../infrastructure/npm.js';
-// The tail of RELEASING.md as a policy: cut the GitHub Release, approve the publish
-// gate, follow the run to green, and only report success once the registry serves the
-// version. The one human decision stays human: the gate is never approved without the
-// confirm answering yes.
-export const ship = async ({ version, changelog, pkg, gh, npm, confirm, confirmRelease = () => Promise.resolve(true), narrate, pollDelayMs = 15_000, findRunAttempts = 8, registryAttempts = 20, workflow = 'publish.yml', }) => {
+// The tail of RELEASING.md as a policy: refuse a cut that has not landed on main, cut
+// the GitHub Release, approve the publish gate, follow the run to green, and only
+// report success once the registry serves the version. The one human decision stays
+// human: the gate is never approved without the confirm answering yes.
+export const ship = async ({ version, changelog, pkg, gh, git, npm, confirm, confirmRelease = () => Promise.resolve(true), narrate, pollDelayMs = 15_000, findRunAttempts = 8, registryAttempts = 20, workflow = 'publish.yml', }) => {
+    const onMain = await git.versionOnMain();
+    if (onMain !== version) {
+        return {
+            stopped: `main carries ${onMain ?? 'no version'}, not ${version}: the cut looks unfinished, run ekohacks release cut ${version}`,
+        };
+    }
     const tag = `v${version}`;
     if (!(await confirmRelease(`cut release ${tag}?`))) {
         return { stopped: 'release not approved' };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ekohacks",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "The EkoHacks CLI: our everyday operations, automated one small command at a time.",
   "repository": {
     "type": "git",