git-stack-cli 2.5.1 → 2.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/App.tsx

@@ -19,6 +19,7 @@ import { VerboseDebugInfo } from "~/app/VerboseDebugInfo";
 import { Fixup } from "~/commands/Fixup";
 import { Log } from "~/commands/Log";
 import { Rebase } from "~/commands/Rebase";
+import { Update } from "~/commands/Update";
 import { ErrorBoundary } from "~/components/ErrorBoundary";
 import { ExitingGate } from "~/components/ExitingGate";
 
@@ -28,7 +29,7 @@ export function App() {
   const ink = Store.useState((state) => state.ink);
   const argv = Store.useState((state) => state.argv);
 
-  if (!ink || !argv) {
+  if (!ink || !argv || !argv.$0) {
     return null;
   }
 
@@ -42,6 +43,9 @@ export function App() {
   //   </React.Fragment>
   // );
 
+  const positional_list = new Set(argv["_"]);
+  const is_update = positional_list.has("update") || positional_list.has("upgrade");
+
   return (
     <Providers>
       <ErrorBoundary>
@@ -51,11 +55,12 @@ export function App() {
         <ExitingGate>
           <AutoUpdate
             name="git-stack-cli"
-            verbose={argv.verbose || argv.update}
-            timeoutMs={argv.update ? 30 * 1000 : 2 * 1000}
+            verbose={argv.verbose}
+            force={is_update}
+            timeoutMs={is_update ? 30 * 1000 : 2 * 1000}
             onOutput={actions.output}
             onDone={() => {
-              if (argv.update) {
+              if (is_update) {
                 actions.exit(0);
               }
             }}
@@ -84,13 +89,19 @@ function MaybeMain() {
     return <Fixup />;
   } else if (positional_list.has("log")) {
     return <Log />;
+  } else if (positional_list.has("update")) {
+    return <Update />;
   } else if (positional_list.has("rebase")) {
     return (
-      <GatherMetadata>
-        <LocalCommitStatus>
-          <Rebase />
-        </LocalCommitStatus>
-      </GatherMetadata>
+      <DependencyCheck>
+        <DirtyCheck>
+          <GatherMetadata>
+            <LocalCommitStatus>
+              <Rebase />
+            </LocalCommitStatus>
+          </GatherMetadata>
+        </DirtyCheck>
+      </DependencyCheck>
     );
   }
 
@@ -99,15 +110,15 @@ function MaybeMain() {
       {!argv.verbose ? null : <GithubApiError />}
 
       <DependencyCheck>
-        <GatherMetadata>
-          <DirtyCheck>
+        <DirtyCheck>
+          <GatherMetadata>
             <LocalCommitStatus>
               <DetectInitialPR>
                 <Main />
               </DetectInitialPR>
             </LocalCommitStatus>
-          </DirtyCheck>
-        </GatherMetadata>
+          </GatherMetadata>
+        </DirtyCheck>
       </DependencyCheck>
     </React.Fragment>
   );

package/src/app/AutoUpdate.tsx

@@ -1,18 +1,15 @@
 import * as React from "react";
 
-import fs from "node:fs/promises";
-import path from "node:path";
-
 import * as Ink from "ink-cjs";
 
 import { Brackets } from "~/app/Brackets";
+import { Command } from "~/app/Command";
 import { FormatText } from "~/app/FormatText";
 import { YesNoPrompt } from "~/app/YesNoPrompt";
 import { cli } from "~/core/cli";
 import { colors } from "~/core/colors";
 import { fetch_json } from "~/core/fetch_json";
 import { is_finite_value } from "~/core/is_finite_value";
-import { read_json } from "~/core/read_json";
 import { semver_compare } from "~/core/semver_compare";
 import { sleep } from "~/core/sleep";
 
@@ -20,6 +17,7 @@ type Props = {
   name: string;
   children: React.ReactNode;
   verbose?: boolean;
+  force?: boolean;
   timeoutMs?: number;
   onError?: (error: Error) => void;
   onOutput?: (output: React.ReactNode) => void;
@@ -31,6 +29,7 @@ type State = {
   local_version: null | string;
   latest_version: null | string;
   status: "init" | "prompt" | "install" | "done" | "exit";
+  is_brew_bun_standalone: boolean;
 };
 
 function reducer(state: State, patch: Partial<State>) {
@@ -48,6 +47,7 @@ export function AutoUpdate(props: Props) {
     local_version: null,
     latest_version: null,
     status: "init",
+    is_brew_bun_standalone: false,
   });
 
   function handle_output(node: React.ReactNode) {
@@ -62,11 +62,18 @@ export function AutoUpdate(props: Props) {
 
   React.useEffect(() => {
     let status: State["status"] = "done";
-    let local_version: string | null = null;
     let latest_version: string | null = null;
+    let is_brew_bun_standalone = false;
+
+    const local_version = process.env.CLI_VERSION;
+    const is_output = props_ref.current.verbose || props_ref.current.force;
 
     async function auto_update() {
-      if (props_ref.current.verbose) {
+      if (!local_version) {
+        throw new Error("Auto update requires process.env.CLI_VERSION to be set");
+      }
+
+      if (is_output) {
         handle_output(<Ink.Text key="init">Checking for latest version...</Ink.Text>);
       }
 
@@ -86,22 +93,24 @@ export function AutoUpdate(props: Props) {
         throw new Error("Unable to retrieve latest version from npm");
       }
 
-      const script_path = await fs.realpath(process.argv[1]);
-      const script_dir = path.dirname(script_path);
+      const binary_path = process.argv[1];
 
-      // dist/ts/index.js
-      const package_json_path = path.join(script_dir, "..", "..", "package.json");
+      if (props_ref.current.verbose) {
+        handle_output(<Ink.Text dimColor>{JSON.stringify({ binary_path })}</Ink.Text>);
+      }
 
-      type PackageJson = { version: string };
-      const package_json = await read_json<PackageJson>(package_json_path);
+      is_brew_bun_standalone = binary_path.startsWith("/$bunfs");
 
-      if (!package_json) {
-        // unable to find read package.json, skip auto update
-        throw new Error(`Unable to read package.json [${package_json_path}]`);
+      if (props_ref.current.verbose) {
+        if (is_brew_bun_standalone) {
+          handle_output(
+            <Ink.Text dimColor>brew install detected (compiled bun standalone)</Ink.Text>,
+          );
+        } else {
+          handle_output(<Ink.Text dimColor>npm install detected</Ink.Text>);
+        }
       }
 
-      local_version = package_json.version;
-
       if (props_ref.current.verbose) {
         handle_output(
           <FormatText
@@ -119,6 +128,13 @@ export function AutoUpdate(props: Props) {
       const semver_result = semver_compare(latest_version, local_version);
 
       if (semver_result === 0) {
+        if (is_output) {
+          handle_output(
+            <Ink.Text>
+              ✅ Everything up to date. <Brackets>{latest_version}</Brackets>
+            </Ink.Text>,
+          );
+        }
         return;
       }
 
@@ -137,10 +153,10 @@ export function AutoUpdate(props: Props) {
 
     auto_update()
       .then(() => {
-        patch({ status, local_version, latest_version });
+        patch({ status, local_version, latest_version, is_brew_bun_standalone });
       })
       .catch((error) => {
-        patch({ status, error, local_version, latest_version });
+        patch({ status, error, local_version, latest_version, is_brew_bun_standalone });
         onError(error);
 
         if (props_ref.current.verbose) {
@@ -161,13 +177,36 @@ export function AutoUpdate(props: Props) {
       case "init":
         return null;
 
-      case "prompt":
+      case "prompt": {
+        let install_command = "";
+        if (state.is_brew_bun_standalone) {
+          install_command = `npm install -g ${props.name}@latest`;
+        } else {
+          install_command = "brew upgrade magus/git-stack/git-stack";
+        }
+
         return (
           <YesNoPrompt
             message={
-              <Ink.Text color={colors.yellow}>
-                New version available, would you like to update?
-              </Ink.Text>
+              <Ink.Box flexDirection="column">
+                <Ink.Text color={colors.yellow}>
+                  <FormatText
+                    wrapper={<Ink.Text />}
+                    message="New version available {latest_version}, would you like to update?"
+                    values={{
+                      latest_version: <Brackets>{state.latest_version}</Brackets>,
+                    }}
+                  />
+                  ,
+                </Ink.Text>
+                <Ink.Text> </Ink.Text>
+                <Command>{install_command}</Command>
+                <Ink.Text> </Ink.Text>
+                <FormatText
+                  wrapper={<Ink.Text color={colors.yellow} />}
+                  message="Would you like to run the above command to update?"
+                />
+              </Ink.Box>
             }
             onYes={async () => {
               handle_output(
@@ -184,7 +223,7 @@ export function AutoUpdate(props: Props) {
 
               patch({ status: "install" });
 
-              await cli(`npm install -g ${props.name}@latest`);
+              await cli(install_command);
 
               patch({ status: "exit" });
 
@@ -195,6 +234,7 @@ export function AutoUpdate(props: Props) {
             }}
           />
         );
+      }
 
       case "install":
         return null;

package/src/command.ts

@@ -30,6 +30,12 @@ export async function command() {
         (yargs) => yargs,
       )
 
+      .command(
+        ["update", "upgrade"],
+        "Check and install the latest version of git stack",
+        (yargs) => yargs,
+      )
+
       .option("verbose", GlobalOptions.verbose)
 
       // yargs default wraps to 80 columns
@@ -86,13 +92,6 @@ const DefaultOptions = {
     ].join("\n"),
   },
 
-  "update": {
-    type: "boolean",
-    alias: ["u", "upgrade"],
-    default: false,
-    description: "Check and install the latest version",
-  },
-
   "branch": {
     type: "string",
     alias: ["b"],

package/src/commands/Update.tsx

@@ -0,0 +1,15 @@
+import * as React from "react";
+
+import { Await } from "~/app/Await";
+import { Store } from "~/app/Store";
+
+export function Update() {
+  return <Await fallback={null} function={run} />;
+}
+
+async function run() {
+  const state = Store.getState();
+  const actions = state.actions;
+
+  actions.exit(0);
+}

package/src/core/GitReviseTodo.test.ts

@@ -67,10 +67,10 @@ test("git-revise-todo handles double quotes in commit message", () => {
     [
       //force line break
       "++ pick f143d03c723c",
-      '[new] invalid \\"by me\\" quotes',
+      '[new] invalid "by me" quotes',
       "",
       "git-stack-id: 6Ak-qn+5Z",
-      'git-stack-title: [new] invalid \\"by me\\" quotes',
+      'git-stack-title: [new] invalid "by me" quotes',
     ].join("\n"),
   );
 });

package/src/core/Metadata.test.ts

@@ -129,10 +129,10 @@ test("write handles double quotes", () => {
   expect(Metadata.write(body, metadata)).toEqual(
     [
       // force line break
-      'Revert \\"[abc / 123] subject (#1234)\\"',
+      'Revert "[abc / 123] subject (#1234)"',
       "",
       "git-stack-id: abc123",
-      'git-stack-title: Revert \\"[abc / 123] subject (#1234)\\"',
+      'git-stack-title: Revert "[abc / 123] subject (#1234)"',
     ].join("\n"),
   );
 });