git-stack-cli 1.2.1 → 1.2.3

package/dist/cjs/index.cjs

@@ -34295,7 +34295,11 @@ async function command() {
         type: "string",
         choices: [Rebase["git-revise"], Rebase["cherry-pick"]],
         default: Rebase["git-revise"],
-        description: `Rebase implementation, "${Rebase["git-revise"]}" by default to perform in-memory rebase. "${Rebase["cherry-pick"]}" can be used to use disk and incrementally rebase each commit`,
+        description: [
+            "Strategy used for syncing branches",
+            `${Rebase["git-revise"]}: perform faster in-memory rebase`,
+            `${Rebase["cherry-pick"]}: use disk and incrementally rebase each commit`,
+        ].join(" | "),
     })
         .option("verbose", {
         type: "boolean",
@@ -34312,7 +34316,7 @@ async function command() {
         .option("branch", {
         type: "string",
         alias: ["b"],
-        description: `Set the master branch name, defaults to "master" (or "main" if "master" is not found)`,
+        description: 'Set the master branch name, defaults to "master" (or "main" if "master" is not found)',
     })
         .option("write-state-json", {
         hidden: true,
@@ -34326,13 +34330,13 @@ async function command() {
         default: false,
         description: "Mock local store metadata for testing",
     })
-        // do not wrap to 80 columns (yargs default)
-        // 140 seems to look decent so lets do that instead
+        // yargs default wraps to 80 columns
         // passing null will wrap to terminal width
-        .wrap(140)
+        // value below if what seems to look decent
+        .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.2.1" )
+        .version("1.2.3" )
         .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.2.1",
+  "version": "1.2.3",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/scripts/release-brew.ts

@@ -56,6 +56,13 @@ await file.write_text(
 
 process.chdir(PROJECT_DIR);
 
+// download github asset and calculate sha256
+// prettier-ignore
+await spawn.sync(["gh", "release", "download", version, "-p", `git-stack-cli-${version}.tgz`]);
+// prettier-ignore
+const tarball_asset = await create_asset(`git-stack-cli-${version}.tgz`, { version });
+await file.rm(tarball_asset.filepath);
+
 await spawn(`npm run build:standalone`);
 
 process.chdir(STANDALONE_DIR);
@@ -86,12 +93,6 @@ await file.write_text(path.join("Formula", "git-stack.rb"), tap);
 
 // homebrew/core formula (build from source)
 
-// download github asset and calculate sha256
-// prettier-ignore
-await spawn.sync(`gh release download ${version} -p "git-stack-cli-${version}.tgz"`);
-// prettier-ignore
-const tarball_asset = await create_asset(`git-stack-cli-${version}.tgz`, { version });
-
 let core = await file.read_text(
   path.join("templates", "git-stack.core.rb.template")
 );
@@ -101,8 +102,6 @@ core = core.replace(re_token("tarball_sha256"), tarball_asset.sha256);
 
 await file.write_text(path.join("Formula", "git-stack.core.rb"), core);
 
-await file.rm(tarball_asset.filepath);
-
 // finally upload the assets to the github release
 process.chdir(STANDALONE_DIR);
 await spawn.sync(`gh release upload ${version} ${linux_asset.filepath}`);
@@ -117,13 +116,8 @@ 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}`,
-]);
+// prettier-ignore
+await spawn.sync(["git", "commit", "-a", "-m", `homebrew-git-stack ${version}`]);
 await spawn.sync(`git push`);
 
 console.debug();

package/src/command.ts

@@ -35,7 +35,11 @@ export async function command() {
         type: "string",
         choices: [Rebase["git-revise"], Rebase["cherry-pick"]],
         default: Rebase["git-revise"],
-        description: `Rebase implementation, "${Rebase["git-revise"]}" by default to perform in-memory rebase. "${Rebase["cherry-pick"]}" can be used to use disk and incrementally rebase each commit`,
+        description: [
+          "Strategy used for syncing branches",
+          `${Rebase["git-revise"]}: perform faster in-memory rebase`,
+          `${Rebase["cherry-pick"]}: use disk and incrementally rebase each commit`,
+        ].join(" | "),
       })
 
       .option("verbose", {
@@ -55,7 +59,8 @@ export async function command() {
       .option("branch", {
         type: "string",
         alias: ["b"],
-        description: `Set the master branch name, defaults to "master" (or "main" if "master" is not found)`,
+        description:
+          'Set the master branch name, defaults to "master" (or "main" if "master" is not found)',
       })
 
       .option("write-state-json", {
@@ -72,10 +77,10 @@ export async function command() {
         description: "Mock local store metadata for testing",
       })
 
-      // do not wrap to 80 columns (yargs default)
-      // 140 seems to look decent so lets do that instead
+      // yargs default wraps to 80 columns
       // passing null will wrap to terminal width
-      .wrap(140)
+      // value below if what seems to look decent
+      .wrap(123)
 
       // disallow unknown options
       .strict()