fix(registry): be better at using the correct registry (relevant for npme)

Closes #53

README.md

@@ -1,16 +1,15 @@
 # semantic-release
 
-
-[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://github.com/feross/standard)
-[![Join the chat at https://gitter.im/semantic-release/semantic-release](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/semantic-release/semantic-release?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 [![Build Status](https://travis-ci.org/semantic-release/semantic-release.svg?branch=next)](https://travis-ci.org/semantic-release/semantic-release)
 [![Coverage Status](https://coveralls.io/repos/semantic-release/semantic-release/badge.svg?branch=next&service=github)](https://coveralls.io/github/semantic-release/semantic-release?branch=next)
 
 [![Dependency Status](https://david-dm.org/semantic-release/semantic-release/next.svg)](https://david-dm.org/semantic-release/semantic-release/next)
 [![devDependency Status](https://david-dm.org/semantic-release/semantic-release/next/dev-status.svg)](https://david-dm.org/semantic-release/semantic-release/next#info=devDependencies)
 
+[![Join the chat at https://gitter.im/semantic-release/semantic-release](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/semantic-release/semantic-release?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://github.com/feross/standard)
+
 `semantic-release` builds upon a set of conventions to give you **fully automated, semver-compliant package publishing**. It's mostly about _commit-messages_, but you can define more _heuristics_.
 
   | Commands | Comment
@@ -147,10 +146,14 @@ This plugin is responsible for generating release notes. Call the callback with
 
 This plugins is responsible for verifying that a release should happen in the first place. For example, the [default implementation](https://github.com/semantic-release/condition-travis/) verifies that the publish is happening on Travis, that it's the right branch, and that all other build jobs succeeded. There are more use cases for this, e.g. verifying that test coverage is above a certain threshold or that there are no [vulnerabilities](https://nodesecurity.io/) in your dependencies. Be creative.
 
+Passing an array of plugins will run them in series.
+
 ### `verifyRelease`
 
 This plugin is responsible for verifying a release that was determined before and is about to be published. There is no default implementation. It additionally receives `nextRelease`, `lastRelease` and `commits` inside `config`. While `commits` is the same as with analyzeCommits, `nextRelease` contains a `type` (e.g. `'major'`) and the new version (e.g. `'1.0.0'`) and `lastRelease` contains the old `version`, the `gitHead` at the time of the release and the npm dist-`tag` (e.g. `'latest'`). Using this information you could [detect breaking changes](https://github.com/semantic-release/cracks) or hold back certain types of releases. Again: Be creative.
 
+Passing an array of plugins will run them in series.
+
 ### `getLastRelease`
 
 This plugin is responsible for determining a package's last release version. The [default implementation](https://github.com/semantic-release/last-release-npm) uses the last published version on a npm registry.

package.json

@@ -24,7 +24,7 @@
     "@semantic-release/commit-analyzer": "^2.0.0",
     "@semantic-release/condition-travis": "^4.0.0",
     "@semantic-release/error": "^1.0.0",
-    "@semantic-release/last-release-npm": "^1.1.1",
+    "@semantic-release/last-release-npm": "^1.2.1",
     "@semantic-release/release-notes-generator": "^2.0.0",
     "git-head": "^1.2.1",
     "github": "^0.2.4",
@@ -36,6 +36,7 @@
     "parse-github-repo-url": "^1.0.0",
     "require-relative": "^0.8.7",
     "run-auto": "^1.1.2",
+    "run-series": "^1.1.2",
     "semver": "^5.0.1"
   },
   "devDependencies": {

src/index.js

@@ -1,12 +1,13 @@
 const { readFileSync, writeFileSync } = require('fs')
 const path = require('path')
+const url = require('url')
 
 const _ = require('lodash')
 const log = require('npmlog')
 const nopt = require('nopt')
 const npmconf = require('npmconf')
 
-const PREFIX = 'semantic-release'
+log.heading = 'semantic-release'
 const env = process.env
 const pkg = JSON.parse(readFileSync('./package.json'))
 const knownOptions = {
@@ -24,6 +25,9 @@ const options = _.defaults(
   pkg.release,
   {
     branch: 'master',
+    fallbackTags: {
+      next: 'latest'
+    },
     debug: !env.CI,
     githubToken: env.GH_TOKEN || env.GITHUB_TOKEN,
     githubUrl: env.GH_URL
@@ -33,7 +37,7 @@ const plugins = require('./lib/plugins')(options)
 
 npmconf.load({}, (err, conf) => {
   if (err) {
-    log.error(PREFIX, 'Failed to load npm config.', err)
+    log.error('init', 'Failed to load npm config.', err)
     process.exit(1)
   }
 
@@ -42,33 +46,34 @@ npmconf.load({}, (err, conf) => {
       token: env.NPM_TOKEN
     },
     loglevel: conf.get('loglevel'),
-    registry: conf.get('registry'),
+    registry: require('./lib/get-registry')(pkg, conf),
     tag: (pkg.publishConfig || {}).tag || conf.get('tag') || 'latest'
   }
 
-  if (npm.registry[npm.registry.length - 1] !== '/') npm.registry += '/'
+  // normalize trailing slash
+  npm.registry = url.format(url.parse(npm.registry))
 
   log.level = npm.loglevel
 
-  const config = {PREFIX, log, env, pkg, options, plugins, npm}
+  const config = {env, pkg, options, plugins, npm}
 
   let hide = {}
   if (options.githubToken) hide.githubToken = '***'
 
-  log.verbose(PREFIX, 'options:', _.assign({}, options, hide))
-  log.verbose(PREFIX, 'Verifying config.')
+  log.verbose('init', 'options:', _.assign({}, options, hide))
+  log.verbose('init', 'Verifying config.')
 
   const errors = require('./lib/verify')(config)
-  errors.forEach((err) => log.error(PREFIX, `${err.message} ${err.code}`))
+  errors.forEach((err) => log.error('init', `${err.message} ${err.code}`))
   if (errors.length) process.exit(1)
 
   if (options.argv.remain[0] === 'pre') {
-    log.verbose(PREFIX, 'Running pre-script.')
-    log.verbose(PREFIX, 'Veriying conditions.')
+    log.verbose('pre', 'Running pre-script.')
+    log.verbose('pre', 'Veriying conditions.')
 
     plugins.verifyConditions(config, (err) => {
       if (err) {
-        log[options.debug ? 'warn' : 'error'](PREFIX, err.message)
+        log[options.debug ? 'warn' : 'error']('pre', err.message)
         if (!options.debug) process.exit(1)
       }
 
@@ -87,15 +92,15 @@ npmconf.load({}, (err, conf) => {
       }
 
       conf.save('project', (err) => {
-        if (err) return log.error(PREFIX, 'Failed to save npm config.', err)
+        if (err) return log.error('pre', 'Failed to save npm config.', err)
 
-        if (wroteNpmRc) log.verbose(PREFIX, 'Wrote authToken to .npmrc.')
+        if (wroteNpmRc) log.verbose('pre', 'Wrote authToken to .npmrc.')
 
         require('./pre')(config, (err, release) => {
           if (err) {
-            log.error(PREFIX, 'Failed to determine new version.')
+            log.error('pre', 'Failed to determine new version.')
 
-            const args = [PREFIX, (err.code ? `${err.code} ` : '') + err.message]
+            const args = ['pre', (err.code ? `${err.code} ` : '') + err.message]
             if (err.stack) args.push(err.stack)
             log.error(...args)
             process.exit(1)
@@ -103,10 +108,10 @@ npmconf.load({}, (err, conf) => {
 
           const message = `Determined version ${release.version} as "${npm.tag}".`
 
-          log.verbose(PREFIX, message)
+          log.verbose('pre', message)
 
           if (options.debug) {
-            log.error(PREFIX, `${message} Not publishing in debug mode.`, release)
+            log.error('pre', `${message} Not publishing in debug mode.`, release)
             process.exit(1)
           }
 
@@ -114,22 +119,22 @@ npmconf.load({}, (err, conf) => {
             version: release.version
           }), null, 2))
 
-          log.verbose(PREFIX, `Wrote version ${release.version} to package.json.`)
+          log.verbose('pre', `Wrote version ${release.version} to package.json.`)
         })
       })
     })
   } else if (options.argv.remain[0] === 'post') {
-    log.verbose(PREFIX, 'Running post-script.')
+    log.verbose('post', 'Running post-script.')
 
     require('./post')(config, (err, published, release) => {
       if (err) {
-        log.error(PREFIX, 'Failed to publish release notes.', err)
+        log.error('post', 'Failed to publish release notes.', err)
         process.exit(1)
       }
 
-      log.verbose(PREFIX, `${published ? 'Published' : 'Generated'} release notes.`, release)
+      log.verbose('post', `${published ? 'Published' : 'Generated'} release notes.`, release)
     })
   } else {
-    log.error(PREFIX, `Command "${options.argv.remain[0]}" not recognized. User either "pre" or "post"`)
+    log.error('post', `Command "${options.argv.remain[0]}" not recognized. User either "pre" or "post"`)
   }
 })

src/lib/commits.js

@@ -1,25 +1,65 @@
 const { exec } = require('child_process')
 
-module.exports = function ({lastRelease}, cb) {
+const log = require('npmlog')
+
+const SemanticReleaseError = require('@semantic-release/error')
+
+module.exports = function ({lastRelease, options}, cb) {
+  const branch = options.branch
   const from = lastRelease.gitHead
   const range = (from ? from + '..' : '') + 'HEAD'
 
-  exec(
-    `git log -E --format=%H==SPLIT==%B==END== ${range}`,
-    (err, stdout) => {
-      if (err) return cb(err)
+  if (!from) return extract()
 
-      cb(null, String(stdout).split('==END==\n')
+  exec(`git branch --contains ${from}`, (err, stdout) => {
+    if (err) return cb(err)
+    let inHistory = false
 
-      .filter((raw) => !!raw.trim())
+    const branches = stdout.split('\n')
+    .map((result) => {
+      if (branch === result.replace('*', '').trim()) {
+        inHistory = true
+        return null
+      }
+      return result.trim()
+    })
+    .filter(branch => !!branch)
 
-      .map((raw) => {
-        const data = raw.split('==SPLIT==')
-        return {
-          hash: data[0],
-          message: data[1]
-        }
-      }))
+    if (!inHistory) {
+      log.error('commits',
+`The commit the last release of this package was derived from is no longer
+in the direct history of the "${branch}" branch.
+This means semantic-release can not extract the commits between now and then.
+This is usually caused by force pushing or releasing from an unrelated branch.
+You can recover from this error by publishing manually or restoring
+the commit "${from}".` + (branches.length ?
+        `\nHere is a list of branches that still contain the commit in question: \n * ${branches.join('\n * ')}` :
+        ''
+      ))
+      return cb(new SemanticReleaseError('Commit not in history', 'ENOTINHISTORY'))
     }
-  )
+
+    extract()
+  })
+
+  function extract () {
+    exec(
+      `git log -E --format=%H==SPLIT==%B==END== ${range}`,
+      (err, stdout) => {
+        if (err) return cb(err)
+
+        cb(null, String(stdout).split('==END==\n')
+
+        .filter((raw) => !!raw.trim())
+
+        .map((raw) => {
+          const data = raw.split('==SPLIT==')
+          return {
+            hash: data[0],
+            message: data[1]
+          }
+        }))
+      }
+    )
+  }
 }

src/lib/get-registry.js

@@ -0,0 +1,12 @@
+module.exports = function (pkg, conf) {
+  if (pkg.publishConfig && pkg.publishConfig.registry) return pkg.publishConfig.registry
+
+  if (pkg.name[0] !== '@') return conf.get('registry') || 'https://registry.npmjs.org/'
+
+  const scope = pkg.name.split('/')[0]
+  const scopedRegistry = conf.get(`${scope}/registry`)
+
+  if (scopedRegistry) return scopedRegistry
+
+  return conf.get('registry') || 'https://registry.npmjs.org/'
+}

src/lib/plugins.js

@@ -1,13 +1,34 @@
 const relative = require('require-relative')
+const series = require('run-series')
 
 let exports = module.exports = function (options) {
-  return {
+  var plugins = {
     analyzeCommits: exports.normalize(options.analyzeCommits, '@semantic-release/commit-analyzer'),
     generateNotes: exports.normalize(options.generateNotes, '@semantic-release/release-notes-generator'),
-    verifyConditions: exports.normalize(options.verifyConditions, '@semantic-release/condition-travis'),
-    verifyRelease: exports.normalize(options.verifyRelease, './plugin-noop'),
     getLastRelease: exports.normalize(options.getLastRelease, '@semantic-release/last-release-npm')
   }
+
+  ;['verifyConditions', 'verifyRelease'].forEach((plugin) => {
+    if (!Array.isArray(options[plugin])) {
+      plugins[plugin] = exports.normalize(
+        options[plugin],
+        plugin === 'verifyConditions' ?
+          '@semantic-release/condition-travis' :
+          './plugin-noop'
+      )
+      return
+    }
+
+    plugins[plugin] = function (pluginOptions, cb) {
+      var tasks = options[plugin].map((step) => {
+        return exports.normalize(step, './plugin-noop').bind(null, pluginOptions)
+      })
+
+      series(tasks, cb)
+    }
+  })
+
+  return plugins
 }
 
 exports.normalize = function (pluginConfig, fallback) {

test/mocks/child-process.js

@@ -5,6 +5,10 @@ const rawCommits = [
 
 module.exports = {
   exec: (command, cb) => {
+    if (/contains/.test(command)) {
+      return cb(null, `whatever\nmaster\n`)
+    }
+
     cb(
       null,
       /\.\.HEAD/.test(command) ?

test/mocks/plugin-error-a.js

@@ -0,0 +1,3 @@
+module.exports = function (config, options, cb) {
+  cb(new Error('a'))
+}

test/mocks/plugin-error-b.js

@@ -0,0 +1,3 @@
+module.exports = function (config, options, cb) {
+  cb(new Error('b'))
+}

test/mocks/plugin-result-a.js

@@ -0,0 +1,3 @@
+module.exports = function (config, options, cb) {
+  cb(null, 'a')
+}

test/mocks/plugin-result-b.js

@@ -0,0 +1,3 @@
+module.exports = function (config, options, cb) {
+  cb(null, 'b')
+}

test/specs/commits.js

@@ -7,7 +7,7 @@ const commits = proxyquire('../../dist/lib/commits', {
 
 test('commits since last release', (t) => {
   t.test('get all commits', (tt) => {
-    commits({lastRelease: {}}, (err, commits) => {
+    commits({lastRelease: {}, options: {branch: 'master'}}, (err, commits) => {
       tt.error(err)
       tt.is(commits.length, 2, 'all commits')
       tt.is(commits[0].hash, 'hash-one', 'parsed hash')
@@ -18,7 +18,7 @@ test('commits since last release', (t) => {
   })
 
   t.test('get commits since hash', (tt) => {
-    commits({lastRelease: {gitHead: 'hash'}}, (err, commits) => {
+    commits({lastRelease: {gitHead: 'hash'}, options: {branch: 'master'}}, (err, commits) => {
       tt.error(err)
       tt.is(commits.length, 1, 'specified commits')
       tt.is(commits[0].hash, 'hash-one', 'parsed hash')
@@ -28,5 +28,13 @@ test('commits since last release', (t) => {
     })
   })
 
+  t.test('get commits since hash', (tt) => {
+    commits({lastRelease: {gitHead: 'notinhistory'}, options: {branch: 'notmaster'}}, (err, commits) => {
+      tt.ok(err)
+      tt.is(err.code, 'ENOTINHISTORY')
+      tt.end()
+    })
+  })
+
   t.end()
 })

test/specs/get-registry.js

@@ -0,0 +1,30 @@
+const test = require('tap').test
+
+const getRegistry = require('../../dist/lib/get-registry')
+
+test('get correct registry', (t) => {
+  t.is(getRegistry({
+    name: 'publish-config',
+    publishConfig: {
+      registry: 'a'
+    }},
+  {}), 'a')
+
+  t.is(getRegistry({name: 'normal'}, {get: () => 'b'}), 'b')
+
+  t.is(getRegistry({name: 'normal'}, {get: () => null}), 'https://registry.npmjs.org/')
+
+  t.is(getRegistry({name: '@scoped/foo'}, {
+    get: (input) => input === '@scoped/registry' ? 'c' : 'd'
+  }), 'c')
+
+  t.is(getRegistry({name: '@scoped/bar'}, {
+    get: () => 'e'
+  }), 'e')
+
+  t.is(getRegistry({name: '@scoped/baz'}, {
+    get: () => null
+  }), 'https://registry.npmjs.org/')
+
+  t.end()
+})

test/specs/plugins.js

@@ -3,7 +3,7 @@ const test = require('tap').test
 const plugins = require('../../dist/lib/plugins')
 
 test('export plugins', (t) => {
-  t.plan(4)
+  t.plan(5)
 
   const defaultPlugins = plugins({})
 
@@ -11,6 +11,59 @@ test('export plugins', (t) => {
   t.is(typeof defaultPlugins.generateNotes, 'function')
   t.is(typeof defaultPlugins.verifyConditions, 'function')
   t.is(typeof defaultPlugins.verifyRelease, 'function')
+  t.is(typeof defaultPlugins.getLastRelease, 'function')
+})
+
+test('plugin pipelines', (t) => {
+  t.plan(3)
+
+  t.test('get all results', (tt) => {
+    const pipelinePlugins = plugins({
+      verifyRelease: [
+        './dist/lib/plugin-noop',
+        './.test/mocks/plugin-result-a',
+        './.test/mocks/plugin-result-b'
+      ]
+    })
+
+    pipelinePlugins.verifyRelease({}, (err, results) => {
+      tt.error(err)
+      tt.same(results, [undefined, 'a', 'b'])
+      tt.end()
+    })
+  })
+
+  t.test('get first error', (tt) => {
+    const pipelinePlugins = plugins({
+      verifyConditions: [
+        './dist/lib/plugin-noop',
+        './.test/mocks/plugin-error-a',
+        './.test/mocks/plugin-error-b'
+      ]
+    })
+
+    pipelinePlugins.verifyConditions({}, (err) => {
+      tt.is(err.message, 'a')
+      tt.end()
+    })
+  })
+
+  t.test('get error and only results before', (tt) => {
+    const pipelinePlugins = plugins({
+      verifyRelease: [
+        './dist/lib/plugin-noop',
+        './.test/mocks/plugin-result-a',
+        './.test/mocks/plugin-error-b',
+        './.test/mocks/plugin-result-b'
+      ]
+    })
+
+    pipelinePlugins.verifyRelease({}, (err, results) => {
+      tt.is(err.message, 'b')
+      tt.same(results, [undefined, 'a', undefined])
+      tt.end()
+    })
+  })
 })
 
 test('normalize and load plugin', (t) => {

test/specs/pre.js

@@ -3,7 +3,9 @@ const proxyquire = require('proxyquire')
 
 require('../mocks/registry')
 const pre = proxyquire('../../dist/pre', {
-  'child_process': require('../mocks/child-process')
+  './lib/commits': proxyquire('../../dist/lib/commits', {
+    'child_process': require('../mocks/child-process')
+  })
 })
 
 const versions = {
@@ -14,14 +16,13 @@ const plugins = {
   verifyRelease: (release, cb) => cb(null, release),
   analyzeCommits: (commits, cb) => cb(null, 'major'),
   getLastRelease: ({ pkg }, cb) => {
-    cb(null, { version: versions[pkg.name] || null, gitHead: 'HEAD' })
+    cb(null, {version: versions[pkg.name] || null, gitHead: 'HEAD'})
   }
 }
 
 const npm = {
   registry: 'http://registry.npmjs.org/',
   tag: 'latest'
-
 }
 
 test('full pre run', (t) => {
@@ -29,6 +30,7 @@ test('full pre run', (t) => {
     tt.plan(3)
 
     pre({
+      options: {branch: 'master'},
       npm,
       pkg: {name: 'available'},
       plugins
@@ -43,6 +45,7 @@ test('full pre run', (t) => {
     tt.plan(3)
 
     pre({
+      options: {branch: 'master'},
       npm,
       pkg: {name: 'unavailable'},
       plugins