Merge branch 'caribou' into greenkeeper-nock-8.0.0

bin/semantic-release.js

@@ -52,6 +52,7 @@ npmconf.load({}, function (err, conf) {
     auth: {
       token: env.NPM_TOKEN
     },
+    cafile: conf.get('cafile'),
     loglevel: conf.get('loglevel'),
     registry: require('../src/lib/get-registry')(pkg, conf),
     tag: (pkg.publishConfig || {}).tag || conf.get('tag') || 'latest'
@@ -159,6 +160,6 @@ npmconf.load({}, function (err, conf) {
       log.verbose('post', (published ? 'Published' : 'Generated') + ' release notes.', release)
     })
   } else {
-    log.error('post', 'Command "' + options.argv.remain[0] + '" not recognized. User either "pre" or "post"')
+    log.error('post', 'Command "' + options.argv.remain[0] + '" not recognized. Use either "pre" or "post"')
   }
 })

package.json

@@ -28,7 +28,7 @@
     "npmconf": "^2.1.2",
     "npmlog": "^2.0.0",
     "require-relative": "^0.8.7",
-    "run-auto": "^1.1.2",
+    "run-auto": "^2.0.0",
     "run-series": "^1.1.3",
     "semver": "^5.0.3"
   },
@@ -42,7 +42,7 @@
     "nyc": "^6.1.1",
     "proxyquire": "^1.7.3",
     "rimraf": "^2.5.0",
-    "standard": "^6.0.3",
+    "standard": "^7.0.1",
     "tap": "^5.0.0"
   },
   "engines": {

src/pre.js

@@ -10,13 +10,13 @@ module.exports = function (config, cb) {
 
   auto({
     lastRelease: plugins.getLastRelease.bind(null, config),
-    commits: ['lastRelease', function (cb, results) {
+    commits: ['lastRelease', function (results, cb) {
       getCommits(_.assign({
         lastRelease: results.lastRelease
       }, config),
       cb)
     }],
-    type: ['commits', 'lastRelease', function (cb, results) {
+    type: ['commits', 'lastRelease', function (results, cb) {
       getType(_.assign({
         commits: results.commits,
         lastRelease: results.lastRelease