git-stack-cli 1.0.6 → 1.1.0

package/{rollup.config.mjs → rollup.config.js}

@@ -12,10 +12,16 @@ import replace from "@rollup/plugin-replace";
 import typescript from "@rollup/plugin-typescript";
 
 const SCRIPT_DIR = path.dirname(url.fileURLToPath(import.meta.url));
+
 const PACKAGE_JSON_PATH = path.join(SCRIPT_DIR, "package.json");
+const PACKAGE_JSON = JSON.parse(await fs.readFile(PACKAGE_JSON_PATH, "utf-8"));
 
-const package_json_str = await fs.readFile(PACKAGE_JSON_PATH, "utf-8");
-const package_json = JSON.parse(package_json_str);
+// prettier-ignore
+const GIT_SEQUENCE_EDITOR_SCRIPT_PATH = path.join(SCRIPT_DIR, "scripts", "git-sequence-editor.sh");
+// prettier-ignore
+const UNSAFE_GIT_SEQUENCE_EDITOR_SCRIPT = await fs.readFile(GIT_SEQUENCE_EDITOR_SCRIPT_PATH, "utf-8");
+// prettier-ignore
+const GIT_SEQUENCE_EDITOR_SCRIPT = UNSAFE_GIT_SEQUENCE_EDITOR_SCRIPT.replace(/`/g, "\\`");
 
 export default {
   input: "src/index.tsx",
@@ -39,7 +45,9 @@ export default {
       preventAssignment: true,
       values: {
         "process.env.NODE_ENV": JSON.stringify("production"),
-        "process.env.CLI_VERSION": JSON.stringify(String(package_json.version)),
+        "process.env.CLI_VERSION": JSON.stringify(String(PACKAGE_JSON.version)),
+        "process.env.GIT_STACK_STANDALONE": process.env.GIT_STACK_STANDALONE,
+        "process.env.GIT_SEQUENCE_EDITOR_SCRIPT": GIT_SEQUENCE_EDITOR_SCRIPT,
       },
     }),
   ],

package/scripts/git-sequence-editor.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# Example
+#
+#   GIT_REVISE_TODO="abc" GIT_EDITOR="$(pwd)/scripts/git-sequence-editor.sh" git revise --edit -i head~4
+#
+#   Note
+#   ----------------
+#   Use `GIT_EDITOR` above instead of `GIT_SEQUENCE_EDITOR` because `git revise` does not use
+#   `GIT_SEQUENCE_EDITOR` when passing the `--edit` flag, but does work without the `--edit` flag
+#
+#
+
+# debug print env variables
+echo "GIT_REVISE_TODO=$GIT_REVISE_TODO"
+echo "CLI=$0 $*"
+echo "PWD=$(pwd)"
+
+# ensure `GIT_REVISE_TODO` is not empty
+if [ -z "$GIT_REVISE_TODO" ]; then
+  echo "🚨 GIT_REVISE_TODO environment variable is empty" >&2
+  exit 1
+fi
+
+# first argument into git sequence editor is git-revise-todo file
+git_revise_todo_path="$1"
+
+# debug print git-revise-todo file passed into command
+echo "$git_revise_todo_path"
+echo "----- START -----"
+cat "$git_revise_todo_path"
+echo "------ END ------"
+
+# write content of `GIT_REVISE_TODO` env variable to `git_revise_todo_path`
+echo "$GIT_REVISE_TODO" > "$git_revise_todo_path"

package/scripts/release-brew.ts

@@ -108,7 +108,13 @@ 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",
+  "commit",
+  "-a",
+  "-m",
+  `homebrew-git-stack ${version}`,
+]);
 await spawn.sync(`git push`);
 
 console.debug();

package/src/app/DependencyCheck.tsx

@@ -10,7 +10,6 @@ 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 { semver_compare } from "~/core/semver_compare";
 import * as gh from "~/github/gh";
 
 type Props = {
@@ -18,6 +17,21 @@ type Props = {
 };
 
 export function DependencyCheck(props: Props) {
+  return (
+    <CheckGit>
+      <CheckGithubCli>
+        <CheckGithubCliAuth>
+          <CheckGitRevise>
+            {/* force line break */}
+            {props.children}
+          </CheckGitRevise>
+        </CheckGithubCliAuth>
+      </CheckGithubCli>
+    </CheckGit>
+  );
+}
+
+function CheckGit(props: Props) {
   const actions = Store.useActions();
 
   return (
@@ -46,106 +60,147 @@ export function DependencyCheck(props: Props) {
         actions.exit(2);
       }}
     >
-      <Await
-        fallback={
-          <Ink.Text color={colors.yellow}>
-            Checking <Command>node</Command> install...
+      {props.children}
+    </Await>
+  );
+}
+
+function CheckGithubCli(props: Props) {
+  const actions = Store.useActions();
+
+  return (
+    <Await
+      fallback={
+        <Ink.Text color={colors.yellow}>
+          <Ink.Text>
+            Checking <Command>gh</Command> install...
           </Ink.Text>
+        </Ink.Text>
+      }
+      function={async () => {
+        if (is_command_available("gh")) {
+          return;
         }
-        function={async () => {
-          const process_version = process.version.substring(1);
-          const semver_result = semver_compare(process_version, "14.0.0");
 
-          if (semver_result >= 0) {
+        actions.output(
+          <Ink.Text color={colors.yellow}>
+            <Command>gh</Command> must be installed.
+          </Ink.Text>
+        );
+
+        actions.output(
+          <Ink.Text color={colors.yellow}>
+            <Ink.Text>{"Visit "}</Ink.Text>
+            <Url>https://cli.github.com</Url>
+            <Ink.Text>{" to install the github cli "}</Ink.Text>
+
+            <Parens>
+              <Command>gh</Command>
+            </Parens>
+          </Ink.Text>
+        );
+
+        actions.exit(3);
+      }}
+    >
+      {props.children}
+    </Await>
+  );
+}
+
+function CheckGithubCliAuth(props: Props) {
+  const actions = Store.useActions();
+
+  return (
+    <Await
+      fallback={
+        <Ink.Text color={colors.yellow}>
+          <Ink.Text>
+            Checking <Command>gh auth status</Command>...
+          </Ink.Text>
+        </Ink.Text>
+      }
+      function={async () => {
+        const options = { ignoreExitCode: true };
+        const auth_status = await cli(`gh auth status`, options);
+
+        if (auth_status.code === 0) {
+          const username = gh.auth_status(auth_status.stdout);
+
+          if (username) {
+            actions.set((state) => {
+              state.username = username;
+            });
+
             return;
           }
+        }
 
-          actions.output(
-            <Ink.Text color={colors.yellow}>
-              <Command>node</Command> must be installed.
-            </Ink.Text>
-          );
-
-          actions.exit(2);
-        }}
-      >
-        <Await
-          fallback={
-            <Ink.Text color={colors.yellow}>
-              <Ink.Text>
-                Checking <Command>gh</Command> install...
-              </Ink.Text>
-            </Ink.Text>
-          }
-          function={async () => {
-            if (is_command_available("gh")) {
-              return;
-            }
-
-            actions.output(
-              <Ink.Text color={colors.yellow}>
-                <Command>gh</Command> must be installed.
-              </Ink.Text>
-            );
-
-            actions.output(
-              <Ink.Text color={colors.yellow}>
-                <Ink.Text>{"Visit "}</Ink.Text>
-                <Url>https://cli.github.com</Url>
-                <Ink.Text>{" to install the github cli "}</Ink.Text>
-
-                <Parens>
-                  <Command>gh</Command>
-                </Parens>
-              </Ink.Text>
-            );
-
-            actions.exit(3);
-          }}
-        >
-          <Await
-            fallback={
-              <Ink.Text color={colors.yellow}>
-                <Ink.Text>
-                  Checking <Command>gh auth status</Command>...
-                </Ink.Text>
-              </Ink.Text>
-            }
-            function={async () => {
-              const options = { ignoreExitCode: true };
-              const auth_status = await cli(`gh auth status`, options);
-
-              if (auth_status.code === 0) {
-                const username = gh.auth_status(auth_status.stdout);
-
-                if (username) {
-                  actions.set((state) => {
-                    state.username = username;
-                  });
-
-                  return;
-                }
-              }
-
-              if (actions.isDebug()) {
-                actions.error("gh auth status could not find username");
-              }
-
-              actions.output(
-                <Ink.Text color={colors.yellow}>
-                  <Command>gh</Command>
-                  <Ink.Text>{" requires login, please run "}</Ink.Text>
-                  <Command>gh auth login</Command>
-                </Ink.Text>
-              );
-
-              actions.exit(4);
-            }}
-          >
-            {props.children}
-          </Await>
-        </Await>
-      </Await>
+        if (actions.isDebug()) {
+          actions.error("gh auth status could not find username");
+        }
+
+        actions.output(
+          <Ink.Text color={colors.yellow}>
+            <Command>gh</Command>
+            <Ink.Text>{" requires login, please run "}</Ink.Text>
+            <Command>gh auth login</Command>
+          </Ink.Text>
+        );
+
+        actions.exit(4);
+      }}
+    >
+      {props.children}
+    </Await>
+  );
+}
+
+function CheckGitRevise(props: Props) {
+  const actions = Store.useActions();
+  const argv = Store.useState((state) => state.argv);
+
+  // skip git revise check when `--git-revise` flag is not present
+  if (!argv?.["git-revise"]) {
+    return props.children;
+  }
+
+  return (
+    <Await
+      fallback={
+        <Ink.Text color={colors.yellow}>
+          <Ink.Text>
+            Checking <Command>git-revise</Command> install...
+          </Ink.Text>
+        </Ink.Text>
+      }
+      function={async () => {
+        if (is_command_available("git-revise")) {
+          return;
+        }
+
+        actions.output(
+          <Ink.Text color={colors.yellow}>
+            <Command>git-revise</Command> must be installed.
+          </Ink.Text>
+        );
+
+        actions.output(
+          <Ink.Text color={colors.yellow}>
+            <Ink.Text>{"Visit "}</Ink.Text>
+            <Url>https://github.com/mystor/git-revise#install</Url>
+            <Ink.Text>{" to install the git revise cli "}</Ink.Text>
+
+            <Parens>
+              <Command>git-revise</Command>
+            </Parens>
+          </Ink.Text>
+        );
+
+        actions.exit(10);
+      }}
+    >
+      {props.children}
     </Await>
   );
 }

package/src/app/LocalMergeRebase.tsx

@@ -112,10 +112,7 @@ async function run() {
 
       let new_message;
       if (commit.branch_id) {
-        new_message = await Metadata.write(
-          commit.full_message,
-          commit.branch_id
-        );
+        new_message = Metadata.write(commit.full_message, commit.branch_id);
       } else {
         new_message = commit.full_message;
       }