use --scope to map scope to registry

1 files changed, 89 insertions, 61 deletions

diff --git a/lib/owner.js b/lib/owner.js
index 34dbbc247..1f9d79b25 100644
--- a/lib/owner.js
+++ b/lib/owner.js
@@ -15,51 +15,65 @@ owner.completion = function (opts, cb) {
     return cb(null, subs)
   }
   var un = encodeURIComponent(npm.config.get("username"))
-  var theUser, uri
+  var byUser, theUser
   switch (argv[2]) {
     case "ls":
       if (argv.length > 3) return cb()
-      uri = url.resolve(npm.config.get("registry"), "-/short")
-      return registry.get(uri, null, cb)
+      return mapToRegistry("-/short", npm.config, function (er, uri) {
+        if (er) return cb(er)
+
+        registry.get(uri, null, cb)
+      })
 
     case "rm":
       if (argv.length > 3) {
         theUser = encodeURIComponent(argv[3])
-        uri = url.resolve(npm.config.get("registry"), "-/by-user/"+theUser+"|"+un)
-        console.error(uri)
-        return registry.get(uri, null, function (er, d) {
+        byUser = "-/by-user/" + theUser + "|" + un
+        return mapToRegistry(byUser, npm.config, function (er, uri) {
           if (er) return cb(er)
-          // return the intersection
-          return cb(null, d[theUser].filter(function (p) {
-            // kludge for server adminery.
-            return un === "isaacs" || d[un].indexOf(p) === -1
-          }))
+
+          console.error(uri)
+          registry.get(uri, null, function (er, d) {
+            if (er) return cb(er)
+            // return the intersection
+            return cb(null, d[theUser].filter(function (p) {
+              // kludge for server adminery.
+              return un === "isaacs" || d[un].indexOf(p) === -1
+            }))
+          })
         })
       }
       // else fallthrough
     case "add":
       if (argv.length > 3) {
         theUser = encodeURIComponent(argv[3])
-        uri = url.resolve(npm.config.get("registry"), "-/by-user/"+theUser+"|"+un)
-        console.error(uri)
-        return registry.get(uri, null, function (er, d) {
-          console.error(uri, er || d)
-          // return mine that they're not already on.
+        byUser = "-/by-user/"+theUser+"|"+un
+        return mapToRegistry(byUser, npm.config, function (er, uri) {
           if (er) return cb(er)
-          var mine = d[un] || []
-            , theirs = d[theUser] || []
-          return cb(null, mine.filter(function (p) {
-            return theirs.indexOf(p) === -1
-          }))
+
+          console.error(uri)
+          registry.get(uri, null, function (er, d) {
+            console.error(uri, er || d)
+            // return mine that they're not already on.
+            if (er) return cb(er)
+            var mine = d[un] || []
+              , theirs = d[theUser] || []
+            return cb(null, mine.filter(function (p) {
+              return theirs.indexOf(p) === -1
+            }))
+          })
         })
       }
       // just list all users who aren't me.
-      uri = url.resolve(npm.config.get("registry"), "-/users")
-      return registry.get(uri, null, function (er, list) {
-        if (er) return cb()
-        return cb(null, Object.keys(list).filter(function (n) {
-          return n !== un
-        }))
+      return mapToRegistry("-/users", npm.config, function (er, uri) {
+        if (er) return cb(er)
+
+        registry.get(uri, null, function (er, list) {
+          if (er) return cb()
+          return cb(null, Object.keys(list).filter(function (n) {
+            return n !== un
+          }))
+        })
       })
 
     default:
@@ -71,7 +85,7 @@ var npm = require("./npm.js")
   , registry = npm.registry
   , log = require("npmlog")
   , readJson = require("read-package-json")
-  , url = require("url")
+  , mapToRegistry = require("./utils/map-to-registry.js")
 
 function owner (args, cb) {
   var action = args.shift()
@@ -90,18 +104,21 @@ function ls (pkg, cb) {
     ls(pkg, cb)
   })
 
-  var uri = url.resolve(npm.config.get("registry"), pkg)
-  registry.get(uri, null, function (er, data) {
-    var msg = ""
-    if (er) {
-      log.error("owner ls", "Couldn't get owner data", pkg)
-      return cb(er)
-    }
-    var owners = data.maintainers
-    if (!owners || !owners.length) msg = "admin party!"
-    else msg = owners.map(function (o) { return o.name +" <"+o.email+">" }).join("\n")
-    console.log(msg)
-    cb(er, owners)
+  mapToRegistry(pkg, npm.config, function (er, uri) {
+    if (er) return cb(er)
+
+    registry.get(uri, null, function (er, data) {
+      var msg = ""
+      if (er) {
+        log.error("owner ls", "Couldn't get owner data", pkg)
+        return cb(er)
+      }
+      var owners = data.maintainers
+      if (!owners || !owners.length) msg = "admin party!"
+      else msg = owners.map(function (o) { return o.name +" <"+o.email+">" }).join("\n")
+      console.log(msg)
+      cb(er, owners)
+    })
   })
 }
 
@@ -156,8 +173,12 @@ function rm (user, pkg, cb) {
 
 function mutate (pkg, user, mutation, cb) {
   if (user) {
-    var uri = url.resolve(npm.config.get("registry"), "-/user/org.couchdb.user:"+user)
-    registry.get(uri, null, mutate_)
+    var byUser = "-/user/org.couchdb.user:" + user
+    mapToRegistry(byUser, npm.config, function (er, uri) {
+      if (er) return cb(er)
+
+      registry.get(uri, null, mutate_)
+    })
   } else {
     mutate_(null, null)
   }
@@ -172,27 +193,34 @@ function mutate (pkg, user, mutation, cb) {
     }
 
     if (u) u = { "name" : u.name, "email" : u.email }
-    var uri = url.resolve(npm.config.get("registry"), pkg)
-    registry.get(uri, null, function (er, data) {
-      if (er) {
-        log.error("owner mutate", "Error getting package data for %s", pkg)
-        return cb(er)
-      }
-      var m = mutation(u, data.maintainers)
-      if (!m) return cb() // handled
-      if (m instanceof Error) return cb(m) // error
-      data = { _id : data._id
-             , _rev : data._rev
-             , maintainers : m
-             }
-      var uri = url.resolve(npm.config.get("registry"), pkg+"/-rev/"+data._rev)
-      registry.request("PUT", uri, { body : data }, function (er, data) {
-        if (!er && data.error) er = new Error(
-          "Failed to update package metadata: "+JSON.stringify(data))
+    mapToRegistry(pkg, npm.config, function (er, uri) {
+      if (er) return cb(er)
+
+      registry.get(uri, null, function (er, data) {
         if (er) {
-          log.error("owner mutate", "Failed to update package metadata")
+          log.error("owner mutate", "Error getting package data for %s", pkg)
+          return cb(er)
         }
-        cb(er, data)
+        var m = mutation(u, data.maintainers)
+        if (!m) return cb() // handled
+        if (m instanceof Error) return cb(m) // error
+        data = { _id : data._id
+               , _rev : data._rev
+               , maintainers : m
+               }
+        var dataPath = pkg + "/-rev/" + data._rev
+        mapToRegistry(dataPath, npm.config, function (er, uri) {
+          if (er) return cb(er)
+
+          registry.request("PUT", uri, { body : data }, function (er, data) {
+            if (!er && data.error) er = new Error(
+              "Failed to update package metadata: "+JSON.stringify(data))
+            if (er) {
+              log.error("owner mutate", "Failed to update package metadata")
+            }
+            cb(er, data)
+          })
+        })
       })
     })
   }