climaybe 3.0.4 → 3.0.5

package/bin/version.txt

@@ -1 +1 @@
-3.0.4
+3.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "Shopify CLI by Electric Maybe for theme CI/CD workflows, branch orchestration, app setup, and dev tooling",
   "type": "module",
   "bin": {

package/src/commands/ensure-branches.js

@@ -6,6 +6,8 @@ import {
   currentBranch,
   ensureStagingBranch,
   createStoreBranches,
+  hasOriginRemote,
+  pushBranchesToOrigin,
 } from '../lib/git.js';
 
 /**
@@ -36,15 +38,26 @@ export async function ensureBranchesCommand() {
   console.log(pc.dim(`  Mode: ${mode}-store (${aliases.length} store(s))\n`));
 
   ensureStagingBranch();
+  const branchesToPush = ['staging'];
   for (const alias of aliases) {
     createStoreBranches(alias);
+    branchesToPush.push(`staging-${alias}`, `live-${alias}`);
   }
 
   console.log(pc.bold(pc.green('\n  Branches ensured.\n')));
-  console.log(pc.dim('  Push them so CI can run:'));
-  console.log(pc.dim('    git push origin staging'));
-  for (const alias of aliases) {
-    console.log(pc.dim(`    git push origin staging-${alias} live-${alias}`));
+  if (hasOriginRemote()) {
+    try {
+      pushBranchesToOrigin(branchesToPush);
+      console.log(pc.green('  Pushed ensured branches to origin.\n'));
+    } catch (err) {
+      console.log(pc.yellow(`  Could not push branches automatically: ${err.message}`));
+      console.log(pc.dim('  Push them manually so CI can run:'));
+      console.log(pc.dim('    git push origin --all\n'));
+    }
+  } else {
+    console.log(pc.dim('  No origin remote found.'));
+    console.log(pc.dim('  Push them after adding a remote so CI can run:'));
+    console.log(pc.dim('    git remote add origin <url>'));
+    console.log(pc.dim('    git push origin --all\n'));
   }
-  console.log(pc.dim('  Or push all at once: git push origin --all\n'));
 }

package/src/lib/git.js

@@ -107,6 +107,28 @@ export function ensureGitRepo(cwd = process.cwd()) {
   }
 }
 
+/**
+ * Check if origin remote exists.
+ */
+export function hasOriginRemote(cwd = process.cwd()) {
+  try {
+    exec('git remote get-url origin', cwd);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Push branches to origin if remote exists.
+ */
+export function pushBranchesToOrigin(branches = [], cwd = process.cwd()) {
+  if (!branches.length) return true;
+  const unique = [...new Set(branches)];
+  exec(`git push origin ${unique.join(' ')}`, cwd);
+  return true;
+}
+
 /**
  * Get the latest tag version (e.g. "1.2.3") from v* tags, or null if none.
  * Sorts by version so v2.0.0 > v1.9.9.