Merge pull request #227 from aquavitae/caribou

Expose cafile from npm config

README.md

@@ -77,7 +77,7 @@ This removes the immediate connection between human emotions and version numbers
 
 ## How does it work?
 
-Instead of writing [meaningless commit messages](http://whatthecommit.com/), we can take our time to think about the changes in the codebase and write them down. Following formalized conventions it this then possible to generate a helpful changelog and to derive the next semantic version number from them.
+Instead of writing [meaningless commit messages](http://whatthecommit.com/), we can take our time to think about the changes in the codebase and write them down. Following formalized conventions it is then possible to generate a helpful changelog and to derive the next semantic version number from them.
 
 When `semantic-release` got setup it will do that after every successful continuous integration build of your master branch (or any other branch you specify) and publish the new version for you. That way no human is directly involved in the release process and your releases are guaranteed to be [unromantic and unsentimental](http://sentimentalversioning.org/).
 
@@ -96,7 +96,7 @@ _Note:_ The current release/tag implementation is tied to GitHub, but could be o
 This module ships with the [AngularJS Commit Message Conventions](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit) and changelog generator, but you can [define your own](#plugins) style.
 
 Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
-format that includes a **type**, a **scope** and a **subject** ([full explanation](https://github.com/ajoslin/conventional-changelog/blob/master/conventions/angular.md)):
+format that includes a **type**, a **scope** and a **subject** ([full explanation](https://github.com/stevemao/conventional-changelog-angular/blob/master/convention.md)):
 
 ```
 <type>(<scope>): <subject>
@@ -157,6 +157,7 @@ These options are currently available:
 - `debug`: If true doesn’t actually publish to npm or write things to file. Default: `!process.env.CI`
 - `githubToken`: The token used to authenticate with GitHub. Default: `process.env.GH_TOKEN`
 - `githubUrl`: Optional. Pass your GitHub Enterprise endpoint.
+- `githubApiPathPrefix`: Optional. The path prefix for your GitHub Enterprise API.
 
 _A few notes on `npm` config_:
 1. The `npm` token can only be defined in the environment as `NPM_TOKEN`, because that’s where `npm` itself is going to read it from.

bin/semantic-release.js

@@ -13,6 +13,7 @@ var normalizeData = require('normalize-package-data')
 log.heading = 'semantic-release'
 var env = process.env
 var pkg = JSON.parse(fs.readFileSync('./package.json'))
+var originalPkg = _.cloneDeep(pkg)
 normalizeData(pkg)
 var knownOptions = {
   branch: String,
@@ -51,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'
@@ -138,7 +140,7 @@ npmconf.load({}, function (err, conf) {
             log.silly('pre', 'Couldn\'t find npm-shrinkwrap.json.')
           }
 
-          fs.writeFileSync('./package.json', JSON.stringify(_.assign(pkg, {
+          fs.writeFileSync('./package.json', JSON.stringify(_.assign(originalPkg, {
             version: release.version
           }), null, 2))
 
@@ -158,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

@@ -36,13 +36,13 @@
     "coveralls": "^2.11.4",
     "cz-conventional-changelog": "^1.1.4",
     "mkdirp": "^0.5.1",
-    "nixt": "^0.4.1",
-    "nock": "^5.2.1",
+    "nixt": "^0.5.0",
+    "nock": "^7.0.1",
     "npm-registry-couchapp": "^2.6.11",
-    "nyc": "^5.0.0",
+    "nyc": "^6.1.1",
     "proxyquire": "^1.7.3",
     "rimraf": "^2.5.0",
-    "standard": "^5.3.0",
+    "standard": "^7.0.1",
     "tap": "^5.0.0"
   },
   "engines": {

src/lib/verify.js

@@ -1,5 +1,3 @@
-var parseSlug = require('@bahmutov/parse-github-repo-url')
-
 var SemanticReleaseError = require('@semantic-release/error')
 
 module.exports = function (config) {
@@ -20,11 +18,6 @@ module.exports = function (config) {
       'No "repository" found in package.json.',
       'ENOPKGREPO'
     ))
-  } else if (!parseSlug(pkg.repository.url)) {
-    errors.push(new SemanticReleaseError(
-      'The "repository" field in the package.json is malformed.',
-      'EMALFORMEDPKGREPO'
-    ))
   }
 
   if (options.debug) return errors

src/post.js

@@ -14,7 +14,8 @@ module.exports = function (config, cb) {
     version: '3.0.0',
     port: ghConfig.port,
     protocol: (ghConfig.protocol || '').split(':')[0] || null,
-    host: ghConfig.hostname
+    host: ghConfig.hostname,
+    pathPrefix: options.githubApiPathPrefix || null
   })
 
   plugins.generateNotes(config, function (err, log) {

test/specs/verify.js

@@ -25,19 +25,6 @@ test('verify pkg, options and env', function (t) {
     tt.is(errors[0].code, 'ENOPKGNAME')
     tt.is(errors[1].code, 'ENOPKGREPO')
 
-    var errors2 = verify({
-      options: {debug: true},
-      pkg: {
-        name: 'package',
-        repository: {
-          url: 'lol'
-        }
-      }
-    })
-
-    tt.is(errors2.length, 1)
-    tt.is(errors2[0].code, 'EMALFORMEDPKGREPO')
-
     tt.end()
   })