Fix npm repo error for unnormalized shorthand urls

New npm versions are supporting the shorthand username/repo in the repository field of the package.json - but sometimes people with old npm versions are publishing them and they do not get normalized. Fixes #3952
npm · Oct 24, 2013 · e790ae9 · e790ae9
1 parent cdaed24
commit e790ae9
Show file tree

Hide file tree

Showing 9 changed files with 134 additions and 3 deletions.
diff --git a/lib/repo.js b/lib/repo.js
@@ -15,6 +15,7 @@ var npm = require("./npm.js")
   , log = require("npmlog")
   , opener = require("opener")
   , github = require('github-url-from-git')
+  , githubUserRepo = require("github-url-from-username-repo")
 
 function repo (args, cb) {
   if (!args.length) return cb(repo.usage)
@@ -23,7 +24,14 @@ function repo (args, cb) {
     if (er) return cb(er)
     var r = d.repository;
     if (!r) return cb(new Error('no repository'));
-    var url = github(r.url);
+    // XXX remove this when npm@v1.3.10 from node 0.10 is deprecated
+    // from https://github.com/isaacs/npm-www/issues/418
+    if (githubUserRepo(r.url))
+      r.url = githubUserRepo(r.url)
+
+    var url = github(r.url)
+    if (!url)
+      return cb(new Error('no repository: could not get url'))
     opener(url, { command: npm.config.get("browser") }, cb)
   })
 }
diff --git a/node_modules/github-url-from-username-repo/.npmignore b/node_modules/github-url-from-username-repo/.npmignore
diff --git a/node_modules/github-url-from-username-repo/.travis.yml b/node_modules/github-url-from-username-repo/.travis.yml
diff --git a/node_modules/github-url-from-username-repo/LICENSE b/node_modules/github-url-from-username-repo/LICENSE
diff --git a/node_modules/github-url-from-username-repo/README.md b/node_modules/github-url-from-username-repo/README.md
diff --git a/node_modules/github-url-from-username-repo/index.js b/node_modules/github-url-from-username-repo/index.js
diff --git a/node_modules/github-url-from-username-repo/package.json b/node_modules/github-url-from-username-repo/package.json
diff --git a/node_modules/github-url-from-username-repo/test/index.js b/node_modules/github-url-from-username-repo/test/index.js
diff --git a/package.json b/package.json
@@ -74,7 +74,8 @@
     "editor": "0.0.5",
     "child-process-close": "~0.1.1",
     "npm-user-validate": "0.0.3",
-    "github-url-from-git": "1.1.1"
+    "github-url-from-git": "1.1.1",
+    "github-url-from-username-repo": "0.0.2"
   },
   "bundleDependencies": [
     "semver",
@@ -118,7 +119,8 @@
     "child-process-close",
     "editor",
     "npm-user-validate",
-    "github-url-from-git"
+    "github-url-from-git",
+    "github-url-from-username-repo"
   ],
   "devDependencies": {
     "ronn": "~0.3.6",