@cmflow/cli 0.65.1 → 0.65.2

package/bin/cm-merge.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
+
+commander
+  .usage('cmmerge')
+  .alias('cm merge')
+  .option('-v, --verbose', 'Enable verbose log', (v, t) => t + 1, 0)
+  .parse(process.argv)
+
+runCommand(commands.Merge, commander)

package/bin/cm.js

@@ -14,6 +14,7 @@ commander
   .command('publish-pages', 'Publish github pages')
   .command('deploy', 'Deploy app on docker hub/Heroku')
   .command('rebase', 'Rebase the current branch from production')
+  .command('merge', 'Merge current branch into PRODUCTION_BRANCH')
   .command('fetch', 'Download objects and refs from repository (--all and --prune)')
   .command('clean', 'Clean deployed docker image on Docker hub')
   .command('config', 'Configure git workspace with expected information')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmflow/cli",
-  "version": "0.65.1",
+  "version": "0.65.2",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",
@@ -21,6 +21,7 @@
     "cmstart": "bin/cm-start.js",
     "checkfeatures": "./bin/checkfeatures.sh",
     "cmrelease": "./bin/cmrelease.js",
+    "cmmerge": "./bin/cm-merge.js",
     "cmchangelog": "bin/cm-changelog.js",
     "cmconfig": "bin/cm-config.js"
   },

package/src/commands/index.js

@@ -8,3 +8,4 @@ export * from './rebase'
 export * from './publish-pages'
 export * from './clean'
 export * from './deploy'
+export * from './merge'

package/src/commands/merge.js

@@ -0,0 +1,24 @@
+import chalk from 'chalk'
+import figures from 'figures'
+import { mergeBranch } from './tasks/merge-branch'
+import { getConfig } from '../common'
+
+export class Merge {
+  mapContext (commander, context) {
+    return {
+      ...context,
+      config: getConfig()
+    }
+  }
+
+  getTasks (context) {
+    return [
+      mergeBranch(context)
+    ]
+  }
+
+  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`)
+  }
+}

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

@@ -0,0 +1,64 @@
+import { git } from '../../common'
+
+function setGHToken (context) {
+  const {
+    logger,
+    config: { GH_TOKEN, REPOSITORY_URL, ORIGIN }
+  } = context
+
+  if (GH_TOKEN) {
+    const repository = REPOSITORY_URL.replace('https://', '')
+
+    logger.info(`Configure remote repository ${repository}`)
+    git.remote('remove', ORIGIN).sync()
+    git.remote('add', ORIGIN, `https://${GH_TOKEN}@${repository}`).sync()
+  }
+}
+
+async function gitMep (context) {
+  const { logger, branch, config: { PRODUCTION_BRANCH, ORIGIN } } = context
+
+  logger.info(`Branch ${branch.name} is candidate to MEP`)
+
+  git.reset('--hard')
+  git.clean('-f', '-d').sync()
+
+  logger.start('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}`)
+
+  const building = git.getLastCommitMsg()
+  logger.info('Last commit message on production', building)
+
+  logger.start(`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`)
+
+  setGHToken(context)
+
+  logger.start(`Push ${PRODUCTION_BRANCH} branch`)
+  await git.push(ORIGIN, PRODUCTION_BRANCH)
+  logger.success(`${PRODUCTION_BRANCH} branch pushed`)
+
+  logger.start(`Remove ${ORIGIN}/${branch.name} branch`)
+  await git.push(ORIGIN, ':' + branch.name)
+  logger.success(`${ORIGIN}/${branch.name} branch correctly removed`)
+}
+
+export function mergeBranch (context) {
+  const { BRANCH_NAME, RELEASE_CANDIDATE_TAG, PRODUCTION_BRANCH } = context
+  return ({
+    title: `Merge ${BRANCH_NAME} into ${PRODUCTION_BRANCH} if necessary`,
+    task: async () => {
+      const lastCommitMessage = git.getLastCommitMsg()
+      if (lastCommitMessage.includes(RELEASE_CANDIDATE_TAG)) {
+        await gitMep(context)
+      }
+    }
+  })
+}

package/src/semantic-release/actions/prepare.js

@@ -1,41 +1,6 @@
 import { dockerPublish } from '../utils/docker-publish'
 import { git, lerna, npm, yarn, configureGitWorkspace } from '../../common'
 
-async function gitMep (context) {
-  const { logger, branch, config: { PRODUCTION_BRANCH, ORIGIN } } = context
-
-  logger.info(`Branch ${branch.name} is candidate to MEP`)
-
-  git.reset('--hard')
-  git.clean('-f', '-d').sync()
-
-  logger.start('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}`)
-
-  const building = git.getLastCommitMsg()
-  logger.info('Last commit message on production', building)
-
-  logger.start(`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`)
-
-  configureGitWorkspace(context)
-
-  logger.start(`Push ${PRODUCTION_BRANCH} branch`)
-  await git.push(ORIGIN, PRODUCTION_BRANCH)
-  logger.success(`${PRODUCTION_BRANCH} branch pushed`)
-
-  logger.start(`Remove ${ORIGIN}/${branch.name} branch`)
-  await git.push(ORIGIN, ':' + branch.name)
-  logger.success(`${ORIGIN}/${branch.name} branch correctly removed`)
-}
-
 async function gitPrepareRelease (pluginConfig, context) {
   const { logger, config: { CI_NAME, BUILD_NUMBER } } = context
 
@@ -85,10 +50,8 @@ export async function prepare (pluginConfig, context) {
     }
 
     const lastCommitMessage = git.getLastCommitMsg()
-
     logger.info('Last commit message:', lastCommitMessage)
     if (lastCommitMessage.includes(RELEASE_CANDIDATE_TAG)) {
-      await gitMep(context)
       process.exit(0)
     }
   }