package.json

@@ -1,6 +1,6 @@
 {
   "name": "versiona",
-  "version": "4.1.0",
+  "version": "4.6.0",
   "description": "NPM auto publisher tool for Travis CI + Git tags commiting new package version",
   "main": "dist",
   "author": "Alex Castells",
@@ -48,7 +48,7 @@
     "extends": "./node_modules/@s-ui/lint/stylelint.config.js"
   },
   "dependencies": {
-    "logda": "^1.0.0",
-    "shelljs": "^0.8.3"
+    "logda": "1",
+    "shelljs": "0.8.3"
   }
 }

src/main/versiona.js

@@ -7,24 +7,29 @@ const versiona = ({
   repoOrg,
   repoName,
   host = 'github.com',
-  publish = 'npm publish',
+  publish = NPM_PUBLISH,
+  masterCommand = MASTER_COMMAND,
   test = false
 } = {}) => {
   const packageJSONPath = path.resolve(process.cwd(), PACKAGE_JSON)
   const packageJSON = require(packageJSONPath)
 
+  if (process.env.TRAVIS_COMMIT_MESSAGE.startsWith(SKIP_TRAVIS_PREFIX)) {
+    console.log(process.env.TRAVIS_COMMIT_MESSAGE + ' >> skipping versiona')
+    return false
+  }
+
   if (!repoOrg || !repoName) {
     log.error(() => 'repoOrg and repoName are required')
     quit()
   }
+
+  const isMaster =
+    process.env.TRAVIS_BRANCH === 'master' &&
+    process.env.TRAVIS_PULL_REQUEST === 'false'
+
   const travisTag = process.env.TRAVIS_TAG
-  if (!travisTag) {
-    log.info(
-      () => 'TRAVIS_TAG is not present in process.env, stopping versiona'
-    )
-    return false
-  }
-  if (!REGEX.test(travisTag)) {
+  if (travisTag && !REGEX.test(travisTag)) {
     log.info(() => [
       'TRAVIS_TAG is not a semver format tag, stopping versiona',
       {
@@ -34,53 +39,78 @@ const versiona = ({
     ])
     return false
   }
-  const ghToken = process.env.GH_TOKEN
-  if (!ghToken) {
-    log.error(() => 'GH_TOKEN is not in process env')
-    quit()
+
+  let environment = travisTag ? 'pro' : 'pre'
+  const addMasterCommand = () => {
+    const command =
+      typeof masterCommand === 'function'
+        ? masterCommand(environment)
+        : `VERSIONA_ENV=${environment} ${masterCommand}`
+    masterCommand && addShell(command)
   }
 
-  const releaseVersion = travisTag.replace('v', '')
+  if (travisTag) {
+    const ghToken = process.env.GH_TOKEN || process.env.GITHUB_TOKEN
+    if (!ghToken) {
+      log.error(() => 'GH_TOKEN neiter GITHUB_TOKEN in process env')
+      quit()
+    }
 
-  const repoURL = `https://${ghToken}@${host}/${repoOrg}/${repoName}.git`
-  const message = `[skip travis] Update version to: ${releaseVersion}`
+    const releaseVersion = travisTag.replace('v', '')
 
-  const isBeta = releaseVersion.indexOf('-beta.') > -1
+    const repoURL = `https://${ghToken}@${host}/${repoOrg}/${repoName}.git`
+    const message = `${SKIP_TRAVIS_PREFIX} Update version to: ${releaseVersion}`
 
-  const toBranch = isBeta
-    ? `develop/v${releaseVersion.replace(/\.[0-9]+\.[0-9]+-beta\.[0-9]+/, '')}`
-    : 'master'
+    const isBeta = releaseVersion.indexOf('-beta.') > -1
 
-  const oldVersion = packageJSON.version
+    isBeta && (environment = 'dev')
 
-  packageJSON.version = releaseVersion
-  const updatedJSON = JSON.stringify(packageJSON, null, 2)
+    const toBranch = isBeta
+      ? `develop/v${releaseVersion.replace(
+          /\.[0-9]+\.[0-9]+-beta\.[0-9]+/,
+          ''
+        )}`
+      : 'master'
 
-  log.info(() => [
-    'Updating...',
-    {
-      repoOrg,
-      repoName,
-      host,
-      travisTag,
-      isBeta,
-      toBranch,
-      oldversion: oldVersion,
-      newVersion: releaseVersion,
-      publish
-    }
-  ])
-
-  addShell(`git remote rm origin`)
-  addShell(`git remote add origin ${repoURL}`)
-  addShell(`git checkout -b ${toBranch}`)
-  addFunction(`Update package.json to ${releaseVersion}`, () =>
-    fs.writeFileSync(packageJSONPath, updatedJSON)
-  )
-  addShell(`git add package.json`)
-  addShell(`git commit -m "${message}"`)
-  publish && addShell(`npm publish${isBeta ? ' --tag beta' : ''}`)
-  addShell(`git push --repo=${repoURL} origin ${toBranch} --quiet`)
+    const oldVersion = packageJSON.version
+
+    packageJSON.version = releaseVersion
+    const updatedJSON = `${JSON.stringify(packageJSON, null, 2)}`
+
+    log.info(() => [
+      'Updating...',
+      {
+        repoOrg,
+        repoName,
+        host,
+        travisTag,
+        isBeta,
+        toBranch,
+        oldversion: oldVersion,
+        newVersion: releaseVersion,
+        publish
+      }
+    ])
+
+    addShell(`git remote rm origin`)
+    addShell(`git remote add origin ${repoURL}`)
+    addShell(`git checkout -b ${toBranch}`)
+    addFunction(`Update package.json to ${releaseVersion}`, () =>
+      fs.writeFileSync(packageJSONPath, updatedJSON)
+    )
+    addShell(`git add package.json`)
+    addShell(`git commit -m "${message}"`)
+    publish &&
+      addShell(
+        NPM_PUBLISH === publish
+          ? `${publish}${isBeta ? ' --tag beta' : ''}`
+          : publish
+      )
+    addMasterCommand()
+    addShell(`git push --repo=${repoURL} origin ${toBranch} --quiet`)
+  } else if (isMaster) {
+    addMasterCommand()
+  }
 
   if (test) {
     log.info(() => 'Test finished')
@@ -90,8 +120,11 @@ const versiona = ({
   return true
 }
 
+const NPM_PUBLISH = 'npm publish'
+const MASTER_COMMAND = 'echo Running on master'
 const PACKAGE_JSON = 'package.json'
 const REGEX_PATTERN = '^v[0-9]+.[0-9]+.[0-9]+(-beta.[0-9]+)?$'
 const REGEX = new RegExp(REGEX_PATTERN)
+const SKIP_TRAVIS_PREFIX = '[skip travis]'
 
 export {versiona}