git-stack-cli 1.0.4 → 1.0.6

package/README.md

@@ -44,7 +44,7 @@ Often pushing all your commits to a single pull request is the simplest and fast
 This comes at a price, your teammates have to review larger, less related pieces of code and you will lose some of your atomic commit history if you "Squash and merge".
 
 When you decide to break changes up into multiple diffs that depend on one another this process is commonly referred to as **[stacked diffs](https://graphite.dev/guides/stacked-diffs)** (pull requests that depend on other pull requests).
-This appraoch is popular at many major comparnies such as Twitter, Facebook, etc.
+This approach is popular at many major companies such as Twitter, Facebook, etc.
 Managing stacked diffs manually involves managing multiple local branches, jumping between them, rebasing, etc.
 This process gets even more complicated when you start getting feedback in code review and have to update individual branches.
 Managing even a few stacked diffs requires a relatively strong knowledge of `git`, even with tricks like [`--update-refs`](https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---update-refs).

package/dist/cjs/index.cjs

@@ -26846,6 +26846,30 @@ function match_group(value, re, group) {
     invariant(result, `match.groups must contain [${group}] ${debug}`);
     return result;
 }
+match_group.safe = (value, re, group) => {
+    try {
+        return match_group(value, re, group);
+    }
+    catch (err) {
+        return null;
+    }
+};
+
+function auth_status(output) {
+    let username;
+    username = match_group.safe(output, RE$4.logged_in_as, "username");
+    if (username)
+        return username;
+    username = match_group.safe(output, RE$4.logged_in_account, "username");
+    if (username)
+        return username;
+    return null;
+}
+const RE$4 = {
+    // Logged in to github.com as magus
+    logged_in_as: /Logged in to github.com as (?<username>[^\s]+)/,
+    logged_in_account: /Logged in to github.com account (?<username>[^\s]+)/,
+};
 
 function DependencyCheck(props) {
     const actions = Store.useActions();
@@ -26903,15 +26927,19 @@ function DependencyCheck(props) {
                             "Checking ",
                             reactExports.createElement(Command, null, "gh auth status"),
                             "...")), function: async () => {
-                        const auth_status = await cli(`gh auth status`, {
-                            ignoreExitCode: true,
-                        });
-                        if (auth_status.code === 0) {
-                            const username = match_group(auth_status.stdout, RE$4.auth_username, "username");
-                            actions.set((state) => {
-                                state.username = username;
-                            });
-                            return;
+                        const options = { ignoreExitCode: true };
+                        const auth_status$1 = await cli(`gh auth status`, options);
+                        if (auth_status$1.code === 0) {
+                            const username = auth_status(auth_status$1.stdout);
+                            if (username) {
+                                actions.set((state) => {
+                                    state.username = username;
+                                });
+                                return;
+                            }
+                        }
+                        if (actions.isDebug()) {
+                            actions.error("gh auth status could not find username");
                         }
                         actions.output(reactExports.createElement(Text, { color: colors.yellow },
                             reactExports.createElement(Command, null, "gh"),
@@ -26920,10 +26948,6 @@ function DependencyCheck(props) {
                         actions.exit(4);
                     } }, props.children)))));
 }
-const RE$4 = {
-    // Logged in to github.com as magus
-    auth_username: /Logged in to github.com as (?<username>[^\s]+)/,
-};
 
 function GatherMetadata(props) {
     const argv = Store.useState((state) => state.argv);
@@ -34080,7 +34104,7 @@ async function command() {
         .wrap(null)
         // disallow unknown options
         .strict()
-        .version("1.0.4" )
+        .version("1.0.6" )
         .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.4",
+  "version": "1.0.6",
   "description": "",
   "author": "magus",
   "license": "MIT",
@@ -27,6 +27,7 @@
     "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/core/file.ts

@@ -32,5 +32,9 @@ export async function exists(filepath: string) {
 }
 
 export async function rm(filepath: string) {
-  await fs.rm(filepath);
+  return fs.rm(filepath);
+}
+
+export async function mv(source: string, destination: string) {
+  return fs.rename(source, destination);
 }

package/scripts/release-brew.ts

@@ -17,6 +17,47 @@ 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}.rb`),
+  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", { version });
@@ -29,41 +70,51 @@ 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.filepath);
-formula = formula.replace(re_token("mac_sha256"), macos_asset.sha256);
-formula = formula.replace(re_token("linux_bin"), linux_asset.filepath);
-formula = formula.replace(re_token("linux_sha256"), linux_asset.sha256);
-
-await file.write_text("git-stack.rb", formula);
-
-await spawn.sync(`git commit -a -m ${version}`);
-await spawn.sync(`git push`);
+let tap = await file.read_text(
+  path.join("templates", "git-stack.tap.rb.template")
+);
 
-process.chdir(PROJECT_DIR);
+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);
 
-await spawn(`npm i`);
+await file.write_text(path.join("Formula", "git-stack.rb"), tap);
 
-await spawn.sync(`git commit -a -m ${version}`);
-await spawn.sync(`git push`);
+let core = await file.read_text(
+  path.join("templates", "git-stack.core.rb.template")
+);
 
-// -a: create tag on last commit
-// -m: message
-await spawn.sync(`git tag -a ${version} -m ${version}`);
-await spawn.sync(`git push origin ${version}`);
+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);
 
-await spawn.sync(`gh release create ${version} -t ${version} --generate-notes`);
+await file.write_text(path.join("Formula", "git-stack.core.rb"), core);
 
+// 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}`);
 
+// commit homebrew repo changes
+process.chdir(HOMEBREW_DIR);
+await spawn.sync(`git add .`);
+await spawn.sync(`git commit -m ${version}`);
+await spawn.sync(`git push`);
+
+// 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`);
+
 console.debug();
 console.debug("✅", "published", version);
 console.debug();
 console.debug("https://github.com/magus/homebrew-git-stack");
 console.debug();
+console.debug("https://github.com/magus/git-stack-cli/releases");
+console.debug();

package/src/app/DependencyCheck.tsx

@@ -10,8 +10,8 @@ import { Url } from "~/app/Url";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
 import { is_command_available } from "~/core/is_command_available";
-import { match_group } from "~/core/match_group";
 import { semver_compare } from "~/core/semver_compare";
+import * as gh from "~/github/gh";
 
 type Props = {
   children: React.ReactNode;
@@ -112,22 +112,23 @@ export function DependencyCheck(props: Props) {
               </Ink.Text>
             }
             function={async () => {
-              const auth_status = await cli(`gh auth status`, {
-                ignoreExitCode: true,
-              });
+              const options = { ignoreExitCode: true };
+              const auth_status = await cli(`gh auth status`, options);
 
               if (auth_status.code === 0) {
-                const username = match_group(
-                  auth_status.stdout,
-                  RE.auth_username,
-                  "username"
-                );
+                const username = gh.auth_status(auth_status.stdout);
 
-                actions.set((state) => {
-                  state.username = username;
-                });
+                if (username) {
+                  actions.set((state) => {
+                    state.username = username;
+                  });
 
-                return;
+                  return;
+                }
+              }
+
+              if (actions.isDebug()) {
+                actions.error("gh auth status could not find username");
               }
 
               actions.output(
@@ -148,8 +149,3 @@ export function DependencyCheck(props: Props) {
     </Await>
   );
 }
-
-const RE = {
-  // Logged in to github.com as magus
-  auth_username: /Logged in to github.com as (?<username>[^\s]+)/,
-};

package/src/core/match_group.ts

@@ -8,3 +8,11 @@ export function match_group(value: string, re: RegExp, group: string) {
   invariant(result, `match.groups must contain [${group}] ${debug}`);
   return result;
 }
+
+match_group.safe = (value: string, re: RegExp, group: string) => {
+  try {
+    return match_group(value, re, group);
+  } catch (err) {
+    return null;
+  }
+};

package/src/github/gh.auth_status.test.ts

@@ -0,0 +1,24 @@
+import { test, expect } from "bun:test";
+
+import * as gh from "./gh";
+
+test("logged in as", () => {
+  const username = gh.auth_status(
+    "  ✓ Logged in to github.com as magus (keyring)\n"
+  );
+
+  expect(username).toBe("magus");
+});
+
+test("logged in without as", () => {
+  const username = gh.auth_status(
+    "✓ Logged in to github.com account xoxohorses (keyring)"
+  );
+
+  expect(username).toBe("xoxohorses");
+});
+
+test("returns null when no match is found", () => {
+  const username = gh.auth_status("this should not match anything");
+  expect(username).toBe(null);
+});

package/src/github/gh.ts

@@ -0,0 +1,19 @@
+import { match_group } from "~/core/match_group";
+
+export function auth_status(output: string) {
+  let username;
+
+  username = match_group.safe(output, RE.logged_in_as, "username");
+  if (username) return username;
+
+  username = match_group.safe(output, RE.logged_in_account, "username");
+  if (username) return username;
+
+  return null;
+}
+
+const RE = {
+  // Logged in to github.com as magus
+  logged_in_as: /Logged in to github.com as (?<username>[^\s]+)/,
+  logged_in_account: /Logged in to github.com account (?<username>[^\s]+)/,
+};