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

Closes #53
chore(package): update last-release-npm to 1.2.1
2015-08-22 23:33:36 +02:00 · 2015-08-22 21:48:16 +02:00 · 2015-08-22 21:43:22 +02:00 · 2015-08-22 20:16:34 +02:00
5 changed files with 51 additions and 13 deletions
@@ -1,10 +1,10 @@
 # semantic-release

-[![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)
+[![Build Status](https://travis-ci.org/semantic-release/semantic-release.svg?branch=master)](https://travis-ci.org/semantic-release/semantic-release)
+[![Coverage Status](https://coveralls.io/repos/semantic-release/semantic-release/badge.svg?branch=master&service=github)](https://coveralls.io/github/semantic-release/semantic-release?branch=master)

-[![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)
+[![Dependency Status](https://david-dm.org/semantic-release/semantic-release/master.svg)](https://david-dm.org/semantic-release/semantic-release/master)
+[![devDependency Status](https://david-dm.org/semantic-release/semantic-release/master/dev-status.svg)](https://david-dm.org/semantic-release/semantic-release/master#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)
@@ -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",
@@ -66,12 +66,6 @@
  ],
  "license": "MIT",
  "main": "dist/index.js",
-  "publishConfig": {
-    "tag": "next"
-  },
-  "release": {
-    "branch": "next"
-  },
  "repository": {
    "type": "git",
    "url": "git+https://github.com/semantic-release/semantic-release.git"
@@ -1,5 +1,6 @@
 const { readFileSync, writeFileSync } = require('fs')
 const path = require('path')
+const url = require('url')

 const _ = require('lodash')
 const log = require('npmlog')
@@ -42,11 +43,12 @@ 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

@@ -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/'
+}
@@ -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()
+})
Author	SHA1	Message	Date
Stephan Bönnemann	03534e51bc	fix(registry): be better at using the correct registry (relevant for npme) Closes #53	2015-08-22 23:33:36 +02:00
Stephan Bönnemann	85b35aaed3	chore(package): update last-release-npm to 1.2.1	2015-08-22 21:48:16 +02:00
Stephan Bönnemann	360a514171	feat: add fallbackTag functionality You can now map dist-tags onto "fallbackTags". E.g. if you want a development channel like "next" and no version is currently published as "next" semantic-release could fallback to "latest" to determine the new "next" version. You can specify your mappings by adding "fallbackTags" to your `package.json`'s "release" field.	2015-08-22 21:43:22 +02:00
Stephan Bönnemann	90174c80a0	chore: adopt things for being back on master/latest	2015-08-22 20:16:34 +02:00