feat(start-hotfix): support passing in branch directly via cli

crazyfactory · Jun 25, 2019 · 3543fd9 · 3543fd9
1 parent d89156c
commit 3543fd9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -105,13 +105,14 @@ program
 
 program
   .command('start-hotfix')
+  .arguments('[hotfix-branch]')
   .description('Create new hotfix branch')
-  .action(async () => {
+  .action(async (hotfixBranch) => {
     try {
       await git.bailIfNotGitDirectory();
-      await git.startHotfix();
+      await git.startHotfix(hotfixBranch);
     } catch (e) {
-      console.log(e.message);
+      console.log(e.message, e);
     }
   });
 

diff --git a/lib/git.js b/lib/git.js
@@ -265,7 +265,7 @@ async function startFeature(config) {
   console.log('feature branch created successfully');
 }
 
-async function startHotfix() {
+async function startHotfix(hotfixBranch) {
   if (!await isClean()) {
     const {confirm} = await inquirer.confirmStash();
     if (confirm) {
@@ -274,11 +274,21 @@ async function startHotfix() {
       throw new Error('Operation aborted.');
     }
   }
-  const {hotfix, issueNumber} = await inquirer.askIssueNumberAndHotfix();
-  const refinedHotfix = toDashCase(hotfix);
-  await fetchAll();
+
+  let targetBranch = hotfixBranch ? `hotfix/${hotfixBranch}` : '';
+  const shouldAsk = targetBranch === '' || !/^\d+-./.test(hotfixBranch);
+
+  if (shouldAsk) {
+    if (hotfixBranch) {
+      console.log('invalid hotfix target branch');
+    }
+    const {hotfix, issueNumber} = await inquirer.askIssueNumberAndHotfix();
+    const refinedHotfix = toDashCase(hotfix);
+    targetBranch = `hotfix/${issueNumber}-${refinedHotfix}`;
+  }
+
   const baseBranch = 'master';
-  const targetBranch = `hotfix/${issueNumber}-${refinedHotfix}`;
+  await fetchAll();
   await checkout(baseBranch);
   await resetHardToRemoteBranch(`${DEFAULT_REMOTE}/${baseBranch}`);
   await createAndCheckoutBranch(targetBranch);