amont 1.5.0 → 1.6.0

package/README.md

@@ -18,7 +18,7 @@ write, no runtime to install, nothing to configure before it is useful.
   — a gate pre-commit, lefthook and husky do not have.
 - **Nothing on the commit path but `std`.** The hook binary links no external
   crates, and CI fails any build that changes that.
-- **Leaving is one command.** `amont uninstall` removes exactly the four
+- **Leaving is one command.** `amont uninstall` removes exactly the five
   shims install wrote; a hook you or another tool put there is named and left
   alone.
 
@@ -99,7 +99,7 @@ amont uninstall --binary     # …and remove ~/.local/bin/amont too
 
 Uninstall is listed second on purpose. These hooks can block a commit, so the
 honest question to answer first is how you get out — and the answer is that
-`uninstall` removes our four shims and **nothing else**. A hook you wrote
+`uninstall` removes our five shims and **nothing else**. A hook you wrote
 yourself is left where it is and named in the output, whatever it is; a hook it
 cannot even read is named too rather than passed over in silence. Your
 `hook.skip` and `amont.severity` settings are never touched, because those
@@ -108,7 +108,7 @@ are your statements about your repository.
 This is also why the README does not tell you to run
 `rm $(git rev-parse --git-dir)/hooks/*`. That glob deletes every hook in the
 directory — including ones other tools installed and ones you wrote — to remove
-four files that belong to us.
+five files that belong to us.
 
 To bypass a single run rather than uninstall: `git commit --no-verify`.
 To turn off one check permanently, see [Turning a check off, or down](#turning-a-check-off-or-down).
@@ -136,7 +136,7 @@ pre-push
   ● runs here   ○ inert   ⊘ skipped via hook.skip   ✗ declaration unusable
 ```
 
-Twenty-one built-in checks across four git hooks, plus any your repository declares
+Twenty-one built-in checks across five git hooks, plus any your repository declares
 itself. The full list, with what each one needs before it fires, is in
 [the checks reference](docs/checks.md).
 
@@ -240,7 +240,7 @@ writing cannot go on silently disabling things. More in
 
 ## Making the commit convention yours
 
-`commit-msg` is the one hook `hook.skip` and `--no-verify` cannot reach, so its
+`commit-msg` is the one hook `hook.skip` and `amont.severity` cannot reach, so its
 opinions are adjustable in themselves:
 
 ```sh

package/bin/amont.js

@@ -34,49 +34,57 @@ function candidates() {
 // pnpm does not hoist — the real package sits under `node_modules/.pnpm/` — so a
 // path assembled from `__dirname` is correct under npm and wrong under pnpm and
 // yarn. Node's own resolver knows where the dependency actually is.
-function resolveBinary() {
+function binaryOf(pkg) {
   const exe = process.platform === "win32" ? "amont.exe" : "amont";
-  for (const pkg of candidates()) {
-    try {
-      const p = require.resolve(`${pkg}/bin/${exe}`);
-      if (existsSync(p)) return p;
-    } catch {
-      // Not installed: either the wrong libc for this host, or an
-      // `--ignore-scripts`-style install that skipped optional deps. Try the
-      // next candidate before giving up.
-    }
+  try {
+    const p = require.resolve(`${pkg}/bin/${exe}`);
+    if (existsSync(p)) return p;
+  } catch {
+    // Not installed: either the wrong libc for this host, or an
+    // `--ignore-scripts`-style install that skipped optional deps.
   }
   return null;
 }
 
-const binary = resolveBinary();
-if (!binary) {
-  // Name the platform. "amont binary not found" sends people to reinstall;
-  // "no build for linux/ppc64" tells them the actual answer, which is that they
-  // want `cargo install amont` or the shell installer.
-  const target = `${process.platform}/${process.arch}`;
-  process.stderr.write(
-    `amont: no native binary for ${target}.\n` +
-      `  npm installs one of: ${Object.values(PACKAGES).flat().join(", ")}\n` +
-      `  If your platform is not among them, build from source:\n` +
-      `      cargo install amont\n` +
-      `  If it is, the optional dependency did not install — try:\n` +
-      `      npm install --force amont\n`,
-  );
-  process.exit(1);
+// Existence is not runnability, so the loop is over SPAWNS, not paths. With a
+// package manager that ignores the `libc` field — yarn classic does, and
+// `npm install --force` is this file's own suggested remedy — BOTH linux-x64
+// builds get installed, gnu listed first, and on a musl host the gnu binary
+// fails at exec on the missing glibc loader while the right one sits a
+// candidate later. Only a spawn-level failure (`result.error`) falls through:
+// a binary that ran and exited non-zero has ANSWERED, and its exit code is the
+// whole product of a hook runner.
+const failures = [];
+for (const pkg of candidates()) {
+  const binary = binaryOf(pkg);
+  if (!binary) continue;
+  // `spawnSync` with inherited stdio rather than `execFileSync`: this forwards
+  // the child's exit CODE. It also keeps the child's stdin, which `amont run`
+  // reads.
+  const result = spawnSync(binary, process.argv.slice(2), { stdio: "inherit" });
+  if (result.error) {
+    failures.push(`      ${binary}: ${result.error.message}`);
+    continue;
+  }
+  // A signalled child has a null status. Report it the way a shell does, so
+  // "killed by SIGINT" does not read as a clean exit 0.
+  if (result.status === null && result.signal) {
+    process.exit(128 + (require("node:os").constants.signals[result.signal] ?? 0));
+  }
+  process.exit(result.status ?? 1);
 }
 
-// `spawnSync` with inherited stdio rather than `execFileSync`: this forwards the
-// child's exit CODE, and a hook runner's exit code is the whole product. It also
-// keeps the child's stdin, which `amont run` reads.
-const result = spawnSync(binary, process.argv.slice(2), { stdio: "inherit" });
-if (result.error) {
-  process.stderr.write(`amont: could not run ${binary}: ${result.error.message}\n`);
-  process.exit(1);
-}
-// A signalled child has a null status. Report it the way a shell does, so
-// "killed by SIGINT" does not read as a clean exit 0.
-if (result.status === null && result.signal) {
-  process.exit(128 + (require("node:os").constants.signals[result.signal] ?? 0));
-}
-process.exit(result.status ?? 1);
+// Name the platform. "amont binary not found" sends people to reinstall;
+// "no build for linux/ppc64" tells them the actual answer, which is that they
+// want `cargo install amont` or the shell installer.
+const target = `${process.platform}/${process.arch}`;
+process.stderr.write(
+  `amont: no runnable native binary for ${target}.\n` +
+    (failures.length ? `  Installed but could not run:\n${failures.join("\n")}\n` : "") +
+    `  npm installs one of: ${Object.values(PACKAGES).flat().join(", ")}\n` +
+    `  If your platform is not among them, build from source:\n` +
+    `      cargo install amont\n` +
+    `  If it is, the optional dependency did not install — try:\n` +
+    `      npm install --force amont\n`,
+);
+process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amont",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Opinionated git hooks that judge what you are committing, not what is on disk",
   "keywords": [
     "git",
@@ -31,11 +31,11 @@
     "node": ">=18"
   },
   "optionalDependencies": {
-    "amont-darwin-arm64": "1.5.0",
-    "amont-darwin-x64": "1.5.0",
-    "amont-linux-arm64-gnu": "1.5.0",
-    "amont-linux-x64-gnu": "1.5.0",
-    "amont-linux-x64-musl": "1.5.0",
-    "amont-win32-x64": "1.5.0"
+    "amont-darwin-arm64": "1.6.0",
+    "amont-darwin-x64": "1.6.0",
+    "amont-linux-arm64-gnu": "1.6.0",
+    "amont-linux-x64-gnu": "1.6.0",
+    "amont-linux-x64-musl": "1.6.0",
+    "amont-win32-x64": "1.6.0"
   }
 }