@cmflow/cli 0.65.2 → 0.65.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmflow/cli",
-  "version": "0.65.2",
+  "version": "0.65.3",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",

package/src/commands/merge.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk'
 import figures from 'figures'
 import { mergeBranch } from './tasks/merge-branch'
-import { getConfig } from '../common'
+import { getConfig, git } from '../common'
 
 export class Merge {
   mapContext (commander, context) {
@@ -12,13 +12,22 @@ export class Merge {
   }
 
   getTasks (context) {
-    return [
-      mergeBranch(context)
-    ]
+    const { RELEASE_CANDIDATE_TAG } = context
+    this.lastCommitMessage = git.getLastCommitMsg()
+    if (this.lastCommitMessage.includes(RELEASE_CANDIDATE_TAG)) {
+      return [mergeBranch(context)]
+    }
+    return []
   }
 
   success (context) {
-    // eslint-disable-next-line no-console
-    console.log(chalk.green(figures.tick), 'Branch', chalk.green(context.BRANCH_NAME), `merged into ${context.PRODUCTION_BRANCH} if necessary`)
+    const { RELEASE_CANDIDATE_TAG } = context
+    if (this.lastCommitMessage.includes(RELEASE_CANDIDATE_TAG)) {
+      // eslint-disable-next-line no-console
+      console.log(chalk.green(figures.tick), 'Branch', chalk.green(context.BRANCH_NAME), `merged into ${context.PRODUCTION_BRANCH}`)
+    } else {
+      // eslint-disable-next-line no-console
+      console.log(chalk.green(figures.tick), 'Merge branch', chalk.green(context.BRANCH_NAME), `into ${context.PRODUCTION_BRANCH} not required`)
+    }
   }
 }

package/src/commands/tasks/merge-branch.js

@@ -51,14 +51,11 @@ async function gitMep (context) {
 }
 
 export function mergeBranch (context) {
-  const { BRANCH_NAME, RELEASE_CANDIDATE_TAG, PRODUCTION_BRANCH } = context
+  const { BRANCH_NAME, PRODUCTION_BRANCH } = context
   return ({
-    title: `Merge ${BRANCH_NAME} into ${PRODUCTION_BRANCH} if necessary`,
+    title: `Merge ${BRANCH_NAME} into ${PRODUCTION_BRANCH}`,
     task: async () => {
-      const lastCommitMessage = git.getLastCommitMsg()
-      if (lastCommitMessage.includes(RELEASE_CANDIDATE_TAG)) {
-        await gitMep(context)
-      }
+      await gitMep(context)
     }
   })
 }