git-stack-cli 1.0.3 → 1.0.5

package/dist/cjs/index.cjs

@@ -26826,7 +26826,7 @@ function Url(props) {
 }
 
 function is_command_available(command) {
-    const PATH = process.env["PATH"];
+    const PATH = process.env.PATH;
     invariant(PATH, "PATH env must exist");
     const path_list = PATH.split(path.delimiter);
     for (const dir of path_list) {
@@ -28680,7 +28680,7 @@ function RebaseCheck(props) {
             patch({ status });
         }
         catch (err) {
-            actions.error("Unable to check for rebase.");
+            actions.error("Must be run from within a git repository.");
             if (err instanceof Error) {
                 if (actions.isDebug()) {
                     actions.error(err.message);
@@ -34080,7 +34080,7 @@ async function command() {
         .wrap(null)
         // disallow unknown options
         .strict()
-        .version("1.0.3" )
+        .version("1.0.5" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`").argv);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -23,9 +23,11 @@
   "scripts": {
     "dev": "npm run build -- --watch",
     "build": "rollup -c rollup.config.mjs",
-    "build:standalone": "bun run scripts/prepare-standalone.ts",
-    "release:brew": "bun run scripts/release-brew.ts",
+    "build:standalone": "bun run scripts/build-standalone.ts",
     "release:npm": "bun run scripts/release-npm.ts",
+    "release:github": "bun run scripts/release-github.ts",
+    "release:brew": "bun run scripts/release-brew.ts",
+    "release": "npm run release:npm && npm run release:github && npm run release:brew",
     "lint:check": "eslint . --cache",
     "lint": "npm run lint:check -- --fix",
     "prettier:check": "prettier ./src --check --cache",

package/scripts/{prepare-standalone.ts → build-standalone.ts}

@@ -5,13 +5,23 @@ import * as file from "~/core/file";
 import { spawn } from "~/core/spawn";
 
 // get paths relative to this script
-const SCRIPT_DIR = path.dirname(new URL(import.meta.url).pathname);
+const SCRIPT_DIR = import.meta.dir;
 const PROJECT_DIR = path.join(SCRIPT_DIR, "..");
 const NODE_MODULES_BIN = path.join(PROJECT_DIR, "node_modules", ".bin");
 const DIST_DIR = path.join(PROJECT_DIR, "dist");
 const CJS_DIR = path.join(DIST_DIR, "cjs");
 const STANDALONE_DIR = path.join(DIST_DIR, "standalone");
 
+const ARG_LIST = process.argv.slice(2);
+const [maybe_target] = ARG_LIST;
+
+let TARGET = "node18-linux-x64,node18-macos-x64,node18-win-x64";
+if (maybe_target) {
+  TARGET = maybe_target;
+}
+
+console.debug(`Building for target [${TARGET}]`);
+
 // clear entire dist output directory
 await fs.rmdir(DIST_DIR, { recursive: true });
 await fs.mkdir(DIST_DIR, { recursive: true });
@@ -43,7 +53,7 @@ await file.write_json(
 
 process.chdir(PROJECT_DIR);
 
-Bun.env["NODE_ENV"] = "production";
+process.env.NODE_ENV = "production";
 
 // run typescript build to generate module output
 await spawn("npm run build");
@@ -56,4 +66,8 @@ await fs.cp(
 process.chdir(STANDALONE_DIR);
 
 // run pkg to build standalone executable
-await spawn(`${path.join(NODE_MODULES_BIN, "pkg")} package.json`);
+await spawn([
+  path.join(NODE_MODULES_BIN, "pkg"),
+  "package.json",
+  `--targets=${TARGET}`,
+]);

package/scripts/core/create_asset.ts

@@ -0,0 +1,21 @@
+import { spawn } from "~/core/spawn";
+
+// https://github.com/magus/git-stack-cli/releases/download/0.8.9/git-stack-cli-linux
+export async function create_asset(filepath: string, options: Options) {
+  const sha256_cmd = await spawn.sync(`shasum -a 256 ${filepath}`);
+  const match = sha256_cmd.stdout.match(/(?<sha256>[^\s]+)/i);
+
+  if (!match?.groups) {
+    throw new Error(`unable to get sha256 for ${filepath}`);
+  }
+
+  const sha256 = match.groups.sha256;
+
+  const url = `https://github.com/magus/git-stack-cli/releases/download/${options.version}/${filepath}`;
+
+  return { filepath, sha256, url };
+}
+
+type Options = {
+  version: string;
+};

package/scripts/core/file.ts

@@ -30,3 +30,11 @@ export async function exists(filepath: string) {
     return false;
   }
 }
+
+export async function rm(filepath: string) {
+  return fs.rm(filepath);
+}
+
+export async function mv(source: string, destination: string) {
+  return fs.rename(source, destination);
+}

package/scripts/core/spawn.ts

@@ -1,9 +1,11 @@
-export async function spawn(cmd: string) {
+export async function spawn(unsafe_cmd: CommandLike) {
+  const cmd = get_cmd(unsafe_cmd);
+
   console.debug();
-  console.debug("[spawn]", cmd);
+  console.debug("[spawn]", cmd.str);
 
   const env = process.env;
-  const proc = await Bun.spawn(cmd.split(" "), {
+  const proc = await Bun.spawn(cmd.parts, {
     env,
     stdout: "inherit",
     stderr: "inherit",
@@ -12,30 +14,49 @@ export async function spawn(cmd: string) {
   await proc.exited;
 
   if (proc.exitCode) {
-    console.error(`(${proc.exitCode})`, cmd);
+    console.error(`(${proc.exitCode})`, cmd.str);
 
     if (!process.env.GS_NO_CHECK) {
       process.exit(proc.exitCode);
     }
   }
 
-  console.debug("[end]", cmd);
+  console.debug("[end]", cmd.str);
 
   return { proc };
 }
 
-spawn.sync = async function spawnSync(cmd: string) {
+spawn.sync = async function spawnSync(unsafe_cmd: CommandLike) {
+  const cmd = get_cmd(unsafe_cmd);
+
   console.debug();
-  console.debug("[spawn.sync]", cmd);
+  console.debug("[spawn.sync]", cmd.str);
 
   const env = process.env;
-  const proc = await Bun.spawnSync(cmd.split(" "), { env });
+  const proc = await Bun.spawnSync(cmd.parts, { env });
 
   const stdout = String(proc.stdout).trim();
   const stderr = String(proc.stderr).trim();
 
-  console.debug("[end]", cmd);
+  console.debug("[end]", cmd.str);
   console.debug({ stdout, stderr });
 
   return { proc, stdout, stderr };
 };
+
+type CommandLike = string | Array<string>;
+
+function get_cmd(unsafe_cmd: CommandLike) {
+  let str;
+  let parts;
+
+  if (Array.isArray(unsafe_cmd)) {
+    parts = unsafe_cmd;
+    str = unsafe_cmd.join(" ");
+  } else {
+    parts = unsafe_cmd.split(" ");
+    str = unsafe_cmd;
+  }
+
+  return { parts, str };
+}

package/scripts/npm-prepublishOnly.ts

@@ -1,7 +1,7 @@
 // simply check for flag set by `scripts/release-npm`
 // ensure we are publishing through the custom script
 
-if (!process.env["GS_RELEASE_NPM"]) {
+if (!process.env.GS_RELEASE_NPM) {
   console.error("Must publish using `npm run release:npm`");
   console.error();
   process.exit(10);

package/scripts/release-brew.ts

@@ -1,15 +1,11 @@
 import path from "node:path";
 
+import { create_asset } from "~/core/create_asset";
 import * as file from "~/core/file";
 import { spawn } from "~/core/spawn";
 
-// cli args
-const args = process.argv.slice(2);
-const NO_CHECK = args.includes("--no-check");
-const COMMIT = args.includes("--commit");
-
 // get paths relative to this script
-const SCRIPT_DIR = path.dirname(new URL(import.meta.url).pathname);
+const SCRIPT_DIR = import.meta.dir;
 const PROJECT_DIR = path.join(SCRIPT_DIR, "..");
 const DIST_DIR = path.join(PROJECT_DIR, "dist");
 const STANDALONE_DIR = path.join(DIST_DIR, "standalone");
@@ -21,11 +17,52 @@ const package_json = await file.read_json(
 
 const version = package_json.version;
 
+process.chdir(HOMEBREW_DIR);
+
+// before creating new formula, mv the previous into a versioned formula name
+const previous_formula_path = path.join(
+  HOMEBREW_DIR,
+  "Formula",
+  "git-stack.rb"
+);
+
+// match either version format from core or tap formula
+//
+//   version "1.0.4"
+//   version = "1.0.4"
+//
+let previous_formula = await file.read_text(previous_formula_path);
+const re_version = /version(?: =)? "(?<version>\d+\.\d+\.\d+)"/m;
+const previous_version_match = previous_formula.match(re_version);
+
+if (!previous_version_match?.groups) {
+  console.error("previous version missing in formula", previous_formula_path);
+  process.exit(3);
+}
+
+const previous_version = previous_version_match.groups.version;
+// convert `1.0.4` to `104`
+const not_dot_version = previous_version.replace(/\./g, "");
+const previous_class = `GitStackAt${not_dot_version}`;
+previous_formula = previous_formula.replace(
+  "class GitStack",
+  `class ${previous_class}`
+);
+
+await file.write_text(
+  path.join(HOMEBREW_DIR, "Formula", `git-stack@${previous_version}`),
+  previous_formula
+);
+
+process.chdir(PROJECT_DIR);
+
+await spawn(`npm run build:standalone`);
+
 process.chdir(STANDALONE_DIR);
 
-const linux_asset = await create_asset("git-stack-cli-linux");
-const macos_asset = await create_asset("git-stack-cli-macos");
-const win_asset = await create_asset("git-stack-cli-win.exe");
+const linux_asset = await create_asset("git-stack-cli-linux", { version });
+const macos_asset = await create_asset("git-stack-cli-macos", { version });
+const win_asset = await create_asset("git-stack-cli-win.exe", { version });
 
 console.debug({ linux_asset, macos_asset, win_asset });
 
@@ -33,73 +70,49 @@ const re_token = (name: string) => new RegExp(`{{ ${name} }}`, "g");
 
 process.chdir(HOMEBREW_DIR);
 
-let formula = await file.read_text("git-stack.rb.template");
-
-formula = formula.replace(re_token("version"), version);
-formula = formula.replace(re_token("mac_bin"), macos_asset.name);
-formula = formula.replace(re_token("mac_sha256"), macos_asset.sha256);
-formula = formula.replace(re_token("linux_bin"), linux_asset.name);
-formula = formula.replace(re_token("linux_sha256"), linux_asset.sha256);
-
-await file.write_text("git-stack.rb", formula);
+let tap = await file.read_text(
+  path.join("templates", "git-stack.tap.rb.template")
+);
 
-if (COMMIT) {
-  await spawn.sync(`git commit -a -m ${version}`);
-  await spawn.sync(`git push`);
-}
+tap = tap.replace(re_token("version"), version);
+tap = tap.replace(re_token("mac_bin"), macos_asset.filepath);
+tap = tap.replace(re_token("mac_sha256"), macos_asset.sha256);
+tap = tap.replace(re_token("linux_bin"), linux_asset.filepath);
+tap = tap.replace(re_token("linux_sha256"), linux_asset.sha256);
 
-process.chdir(PROJECT_DIR);
+await file.write_text(path.join("Formula", "git-stack.rb"), tap);
 
-await spawn(`npm i`);
+let core = await file.read_text(
+  path.join("templates", "git-stack.core.rb.template")
+);
 
-if (COMMIT) {
-  await spawn.sync(`git commit -a -m ${version}`);
-  await spawn.sync(`git push`);
-}
+core = core.replace(re_token("version"), version);
+core = core.replace(re_token("mac_bin"), macos_asset.filepath);
+core = core.replace(re_token("mac_sha256"), macos_asset.sha256);
+core = core.replace(re_token("linux_bin"), linux_asset.filepath);
+core = core.replace(re_token("linux_sha256"), linux_asset.sha256);
 
-// -a: create tag on last commit
-// -m: message
-if (COMMIT) {
-  await spawn.sync(`git tag -a ${version} -m ${version}`);
-  await spawn.sync(`git push origin ${version}`);
+await file.write_text(path.join("Formula", "git-stack.core.rb"), core);
 
-  await spawn.sync(
-    `gh release create ${version} -t ${version} --generate-notes`
-  );
+// // commit homebrew repo changes
+// await spawn.sync(`git commit -a -m ${version}`);
+// await spawn.sync(`git push`);
 
-  process.chdir(STANDALONE_DIR);
+// // commmit changes to main repo
+// process.chdir(PROJECT_DIR);
+// await spawn.sync(`git commit -a -m "homebrew-git-stack ${version}"`);
+// await spawn.sync(`git push`);
 
-  await spawn.sync(`gh release upload ${version} ${linux_asset.name}`);
-  await spawn.sync(`gh release upload ${version} ${macos_asset.name}`);
-  await spawn.sync(`gh release upload ${version} ${win_asset.name}`);
-}
+// // finally upload the assets to the github release
+// process.chdir(STANDALONE_DIR);
+// await spawn.sync(`gh release upload ${version} ${linux_asset.filepath}`);
+// await spawn.sync(`gh release upload ${version} ${macos_asset.filepath}`);
+// await spawn.sync(`gh release upload ${version} ${win_asset.filepath}`);
 
 console.debug();
 console.debug("✅", "published", version);
-console.debug("  COMMIT", COMMIT);
-console.debug("  NO_CHECK", NO_CHECK);
 console.debug();
-console.debug("  https://github.com/magus/git-stack-cli/releases");
-console.debug();
-
+console.debug("https://github.com/magus/homebrew-git-stack");
 console.debug();
-console.debug("Don't forget to run `npm publish` to update the NPM registry!");
+console.debug("https://github.com/magus/git-stack-cli/releases");
 console.debug();
-console.debug("  npm publish");
-console.debug();
-
-// https://github.com/magus/git-stack-cli/releases/download/0.8.9/git-stack-cli-linux
-async function create_asset(name: string) {
-  const sha256_cmd = await spawn.sync(`shasum -a 256 ${name}`);
-  const match = sha256_cmd.stdout.match(/(?<sha256>[^\s]+)/i);
-
-  if (!match?.groups) {
-    throw new Error(`unable to get sha256 for ${name}`);
-  }
-
-  const sha256 = match.groups.sha256;
-
-  const url = `https://github.com/magus/git-stack-cli/releases/download/${version}/${name}`;
-
-  return { name, sha256, url };
-}

package/scripts/release-github.ts

@@ -0,0 +1,34 @@
+import path from "node:path";
+
+import { create_asset } from "~/core/create_asset";
+import * as file from "~/core/file";
+import { spawn } from "~/core/spawn";
+
+// get paths relative to this script
+const SCRIPT_DIR = import.meta.dir;
+const PROJECT_DIR = path.join(SCRIPT_DIR, "..");
+
+const package_json = await file.read_json(
+  path.join(PROJECT_DIR, "package.json")
+);
+
+const version = package_json.version;
+
+await spawn("npm pack");
+
+// prettier-ignore
+const tarball_asset = (
+  await create_asset(`git-stack-cli-${version}.tgz`, { version })
+);
+
+await spawn.sync(`gh release create ${version} -t ${version} --generate-notes`);
+
+await spawn.sync(`gh release upload ${version} ${tarball_asset.filepath}`);
+
+await file.rm(tarball_asset.filepath);
+
+console.debug();
+console.debug("✅", "published", version);
+console.debug();
+console.debug("https://github.com/magus/git-stack-cli/releases");
+console.debug();

package/scripts/release-npm.ts

@@ -7,7 +7,7 @@ import { spawn } from "~/core/spawn";
 process.env.NODE_ENV = "production";
 
 // get paths relative to this script
-const SCRIPT_DIR = path.dirname(new URL(import.meta.url).pathname);
+const SCRIPT_DIR = import.meta.dir;
 const PROJECT_DIR = path.join(SCRIPT_DIR, "..");
 const DIST_DIR = path.join(PROJECT_DIR, "dist");
 
@@ -49,7 +49,7 @@ for (const filepath of package_json.files) {
   }
 }
 
-process.env["GS_RELEASE_NPM"] = "true";
+process.env.GS_RELEASE_NPM = "true";
 console.info("Publishing to NPM requires a one-time password");
 const otp = await input("Enter OTP: ");
 await spawn(`npm publish --otp=${otp}`);
@@ -67,7 +67,7 @@ await spawn.sync(`git push origin ${version}`);
 console.debug();
 console.debug("✅", "published", version);
 console.debug();
-console.debug("  https://github.com/magus/git-stack-cli/releases");
+console.debug("https://www.npmjs.com/package/git-stack-cli");
 console.debug();
 
 // // https://github.com/magus/git-stack-cli/releases/download/0.8.9/git-stack-cli-linux

package/src/app/RebaseCheck.tsx

@@ -82,7 +82,7 @@ export function RebaseCheck(props: Props) {
       const status = is_rebase ? "prompt" : "done";
       patch({ status });
     } catch (err) {
-      actions.error("Unable to check for rebase.");
+      actions.error("Must be run from within a git repository.");
 
       if (err instanceof Error) {
         if (actions.isDebug()) {

package/src/core/is_command_available.ts

@@ -4,7 +4,7 @@ import path from "node:path";
 import { invariant } from "~/core/invariant";
 
 export function is_command_available(command: string) {
-  const PATH = process.env["PATH"];
+  const PATH = process.env.PATH;
 
   invariant(PATH, "PATH env must exist");