@cmflow/cli 0.65.4 → 0.66.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmflow/cli",
-  "version": "0.65.4",
+  "version": "0.66.0",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",
@@ -85,5 +85,11 @@
       "eslint -c .eslintrc --fix",
       "git add"
     ]
+  },
+  "flow": {
+    "branch": {
+      "develop": "master",
+      "production": "master"
+    }
   }
 }

package/src/commands/merge.js

@@ -1,21 +1,20 @@
 import chalk from 'chalk'
 import figures from 'figures'
 import { mergeBranch } from './tasks/merge-branch'
-import { getConfig, git } from '../common'
+import { configureGitWorkspace, git } from '../common'
 
 export class Merge {
-  mapContext (commander, context) {
-    return {
-      ...context,
-      config: getConfig()
-    }
-  }
-
   getTasks (context) {
     const { RELEASE_CANDIDATE_TAG } = context
     this.lastCommitMessage = git.getLastCommitMsg()
     if (this.lastCommitMessage.includes(RELEASE_CANDIDATE_TAG)) {
-      return [mergeBranch(context)]
+      return [
+        {
+          title: 'Configure workspace',
+          task: () => configureGitWorkspace(context)
+        },
+        mergeBranch(context)
+      ]
     }
     return []
   }
@@ -23,13 +22,10 @@ export class Merge {
   success (context) {
     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}`)
+      context.logger.info(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`)
-      // eslint-disable-next-line no-console
-      console.log(chalk.green(figures.tick), 'Last commit message : ', chalk.green(this.lastCommitMessage), `does not contains  ${RELEASE_CANDIDATE_TAG}`)
+      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,31 +23,31 @@ 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) {

package/src/commands/tasks/run-test.js

@@ -1,6 +1,12 @@
 import { git, npm, yarn } from '../../common'
 
-export const runTest = ({ useYarn, skipTest, skipUnit, skipE2E }) => {
+export const runTest = ({
+  E2E_CMD,
+  useYarn,
+  skipTest,
+  skipUnit,
+  skipE2E
+}) => {
   const manager = useYarn ? yarn : npm
 
   return [
@@ -12,7 +18,7 @@ export const runTest = ({ useYarn, skipTest, skipUnit, skipE2E }) => {
     {
       title: 'E2E test',
       skip: () => skipTest || skipE2E,
-      task: () => manager.run('test_e2e')
+      task: () => manager.run(E2E_CMD || 'test_e2e')
     },
     {
       title: 'Reset changes',

package/src/common/cli/npm.js

@@ -26,7 +26,7 @@ class NpmCli extends Cli {
    * @returns {Promise<unknown>}
    */
   restore () {
-    return super.run('install', '--no-package-lock', '--no-production')
+    return super.run('ci')
   }
 }
 

package/src/common/cli/yarn.js

@@ -26,7 +26,7 @@ class YarnCli extends Cli {
    * @returns {Promise<unknown>}
    */
   restore () {
-    return super.run('install', '--frozen-lockfile', '--production=false')
+    return super.run('install', '--immutable')
   }
 }
 

package/src/common/get-config.js

@@ -92,12 +92,15 @@ export function getConfig () {
     GIT_USER_EMAIL
   } = process.env
 
+  const e2eCmd = pkg.scripts.test_e2e ? 'test_e2e' : pkg.scripts['test:e2e'] ? 'test:e2e' : undefined
+
   return {
     PROJECT_NAME: PROJECT_NAME || projectName,
     HAS_YARN: hasYarn(),
     HAS_LERNA: pkg.dependencies.lerna || pkg.devDependencies.lerna,
     HAS_BUILD: pkg.scripts.build,
-    HAS_E2E: pkg.scripts.test_e2e,
+    HAS_E2E: !!e2eCmd,
+    E2E_CMD: e2eCmd,
     HAS_BUILD_CHANGELOG: pkg.scripts.build_changelog,
     get DEPLOY_ON_DOCKER () {
       return toBool(process.env.DEPLOY_ON_DOCKER) && DOCKER_HUB_ID && DOCKER_HUB_PWD
@@ -107,10 +110,10 @@ export function getConfig () {
     RELEASE_CANDIDATE_TAG: '[MEP]',
     ORIGIN: 'origin',
     get PRODUCTION_BRANCH () {
-      return process.env.PRODUCTION_BRANCH || 'production'
+      return get('flow.branch.production') || process.env.PRODUCTION_BRANCH || 'production'
     },
     get DEVELOP_BRANCH () {
-      return process.env.DEVELOP_BRANCH || 'master'
+      return get('flow.branch.develop') || process.env.DEVELOP_BRANCH || 'master'
     },
     get OWNER () {
       return process.env.OWNER || owner

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
     }