@cmflow/cli 0.65.2 → 0.65.5

package/package.json

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

package/src/commands/merge.js

@@ -1,24 +1,31 @@
 import chalk from 'chalk'
 import figures from 'figures'
 import { mergeBranch } from './tasks/merge-branch'
-import { getConfig } from '../common'
+import { configureGitWorkspace, git } from '../common'
 
 export class Merge {
-  mapContext (commander, context) {
-    return {
-      ...context,
-      config: getConfig()
-    }
-  }
-
   getTasks (context) {
-    return [
-      mergeBranch(context)
-    ]
+    const { RELEASE_CANDIDATE_TAG } = context
+    this.lastCommitMessage = git.getLastCommitMsg()
+    if (this.lastCommitMessage.includes(RELEASE_CANDIDATE_TAG)) {
+      return [
+        {
+          title: 'Configure workspace',
+          task: () => configureGitWorkspace(context)
+        },
+        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)) {
+      context.logger.info(chalk.green(figures.tick), 'Branch', chalk.green(context.BRANCH_NAME), `merged into ${context.PRODUCTION_BRANCH}`)
+    } else {
+      context.logger.info(chalk.green(figures.tick), 'Merge branch', chalk.green(context.BRANCH_NAME), `into ${context.PRODUCTION_BRANCH} not required`)
+      context.logger.info(chalk.green(figures.tick), 'Last commit message : ', chalk.green(this.lastCommitMessage), `does not contains  ${RELEASE_CANDIDATE_TAG}`)
+    }
   }
 }

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

@@ -23,42 +23,39 @@ async function gitMep (context) {
   git.reset('--hard')
   git.clean('-f', '-d').sync()
 
-  logger.start('Checkout production branch')
+  logger.info('Checkout production branch')
 
   git.config('--replace-all', 'remote.origin.fetch', '+refs/heads/*:refs/remotes/origin/*')
   git.fetch().sync()
   git.fetch('--tags').sync()
   git.checkout('-qf', PRODUCTION_BRANCH).sync()
 
-  logger.success(`Current branch: ${PRODUCTION_BRANCH}`)
+  logger.info(`Current branch: ${PRODUCTION_BRANCH}`)
 
   const building = git.getLastCommitMsg()
   logger.info('Last commit message on production', building)
 
-  logger.start(`Merge ${branch.name} into ${PRODUCTION_BRANCH} branch`)
+  logger.info(`Merge ${branch.name} into ${PRODUCTION_BRANCH} branch`)
   git.merge('--no-ff', '-m', `${branch.name}`, branch.name)
-  logger.success(`${branch.name} merged into ${PRODUCTION_BRANCH} branch`)
+  logger.info(`${branch.name} merged into ${PRODUCTION_BRANCH} branch`)
 
   setGHToken(context)
 
-  logger.start(`Push ${PRODUCTION_BRANCH} branch`)
+  logger.info(`Push ${PRODUCTION_BRANCH} branch`)
   await git.push(ORIGIN, PRODUCTION_BRANCH)
-  logger.success(`${PRODUCTION_BRANCH} branch pushed`)
+  logger.info(`${PRODUCTION_BRANCH} branch pushed`)
 
-  logger.start(`Remove ${ORIGIN}/${branch.name} branch`)
+  logger.info(`Remove ${ORIGIN}/${branch.name} branch`)
   await git.push(ORIGIN, ':' + branch.name)
-  logger.success(`${ORIGIN}/${branch.name} branch correctly removed`)
+  logger.info(`${ORIGIN}/${branch.name} branch correctly removed`)
 }
 
 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)
     }
   })
 }

package/src/common/run-command.js

@@ -14,9 +14,13 @@ function createTasksRunner (tasks, ctx) {
 
 export async function runCommand (klass, commander) {
   try {
+    const config = getConfig()
     let context = {
       ...getReleaseConfig(),
-      ...getConfig(),
+      ...config,
+      branch: { name: config.BRANCH_NAME },
+      config,
+      logger: console,
       verbose: commander.verbose
     }