git-stack-cli 1.0.5 → 1.0.7

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

@@ -26287,10 +26287,21 @@ const BaseStore = createStore()(immer((set, get) => ({
             if (!id) {
                 return;
             }
+            // set `withoutTimestamp` to skip <LogTimestamp> for all subsequent pending outputs
+            // we only want to timestamp for the first part (when we initialize the [])
+            // if we have many incremental outputs on the same line we do not want multiple timestamps
+            //
+            // await Promise.all([
+            //   cli(`for i in $(seq 1 5); do echo $i; sleep 1; done`),
+            //   cli(`for i in $(seq 5 1); do printf "$i "; sleep 1; done; echo`),
+            // ]);
+            //
+            let withoutTimestamp = true;
             if (!state.pending_output[id]) {
+                withoutTimestamp = false;
                 state.pending_output[id] = [];
             }
-            const renderOutput = renderOutputArgs(args);
+            const renderOutput = renderOutputArgs({ ...args, withoutTimestamp });
             state.pending_output[id].push(renderOutput);
         },
         end_pending_output(state, id) {
@@ -26313,7 +26324,7 @@ function renderOutputArgs(args) {
     }
     if (args.debug) {
         return (reactExports.createElement(reactExports.Fragment, null,
-            reactExports.createElement(LogTimestamp, null),
+            args.withoutTimestamp ? null : reactExports.createElement(LogTimestamp, null),
             output));
     }
     return output;
@@ -26846,6 +26857,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 +26938,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 +26959,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 +34115,7 @@ async function command() {
         .wrap(null)
         // disallow unknown options
         .strict()
-        .version("1.0.5" )
+        .version("1.0.7" )
         .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.5",
+  "version": "1.0.7",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/scripts/release-brew.ts

@@ -50,7 +50,7 @@ previous_formula = previous_formula.replace(
 );
 
 await file.write_text(
-  path.join(HOMEBREW_DIR, "Formula", `git-stack@${previous_version}`),
+  path.join(HOMEBREW_DIR, "Formula", `git-stack@${previous_version}.rb`),
   previous_formula
 );
 
@@ -94,20 +94,28 @@ core = core.replace(re_token("linux_sha256"), linux_asset.sha256);
 
 await file.write_text(path.join("Formula", "git-stack.core.rb"), core);
 
-// // commit homebrew repo changes
-// await spawn.sync(`git commit -a -m ${version}`);
-// await spawn.sync(`git push`);
+// 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}`);
 
-// // 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`);
+// 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`);
 
-// // 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}`);
+// 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);

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/app/Store.tsx

@@ -21,6 +21,7 @@ type MutateOutputArgs = {
   node: React.ReactNode;
   id?: string;
   debug?: boolean;
+  withoutTimestamp?: boolean;
 };
 
 export type State = {
@@ -194,11 +195,22 @@ const BaseStore = createStore<State>()(
           return;
         }
 
+        // set `withoutTimestamp` to skip <LogTimestamp> for all subsequent pending outputs
+        // we only want to timestamp for the first part (when we initialize the [])
+        // if we have many incremental outputs on the same line we do not want multiple timestamps
+        //
+        // await Promise.all([
+        //   cli(`for i in $(seq 1 5); do echo $i; sleep 1; done`),
+        //   cli(`for i in $(seq 5 1); do printf "$i "; sleep 1; done; echo`),
+        // ]);
+        //
+        let withoutTimestamp = true;
         if (!state.pending_output[id]) {
+          withoutTimestamp = false;
           state.pending_output[id] = [];
         }
 
-        const renderOutput = renderOutputArgs(args);
+        const renderOutput = renderOutputArgs({ ...args, withoutTimestamp });
         state.pending_output[id].push(renderOutput);
       },
 
@@ -228,7 +240,7 @@ function renderOutputArgs(args: MutateOutputArgs) {
   if (args.debug) {
     return (
       <React.Fragment>
-        <LogTimestamp />
+        {args.withoutTimestamp ? null : <LogTimestamp />}
         {output}
       </React.Fragment>
     );

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]+)/,
+};