Scoped packages

package.json

@@ -17,7 +17,7 @@
     "request": "~2.42.0",
     "parse-json-response": "~1.0.1",
     "rimraf": "~2.2.6",
-    "tap": "*",
+    "tap": "^10.7.3",
     "which": "~1.0.5"
   },
   "repository": {

registry/shows.js

@@ -82,7 +82,7 @@ shows.package = function (doc, req) {
 
       var t = doc.versions[v].dist.tarball
       t = t.replace(/^https?:\/\/[^\/:]+(:[0-9]+)?/, '')
-      var f = t.match(/[^\/]+$/)[0]
+      var f = t.match(/(@[^\/]+\/)?[^\/]+$/)[0]
       var requestedPath = req.requested_path
       if (doc._attachments && doc._attachments[f]) {
         // workaround for old couch versions that didn't
@@ -115,7 +115,7 @@ shows.package = function (doc, req) {
         // .../_rewrite/pkg/-/pkg-version.tgz
         // or: /pkg/-/pkg-version.tgz
         // depending on what requested path is.
-        var tf = [doc.name, '-', t.split('/').pop()]
+        var tf = [doc.name.replace('/','%2f'), '-', f.replace('/','%2f')]
         var i = requestedPath.indexOf('_rewrite')
         if (i !== -1) {
           tf = requestedPath.slice(0, i + 1).concat(tf)

test/01-adduser.js

@@ -6,16 +6,19 @@ var path = require('path')
 var conf = path.resolve(__dirname, 'fixtures', 'npmrc')
 var conf2 = path.resolve(__dirname, 'fixtures', 'npmrc2')
 var conf3 = path.resolve(__dirname, 'fixtures', 'npmrc3')
+var conf4 = path.resolve(__dirname, 'fixtures', 'npmrc4')
 
 var fs = require('fs')
 
 try { fs.unlinkSync(conf) } catch (er) {}
 try { fs.unlinkSync(conf2) } catch (er) {}
 try { fs.unlinkSync(conf3) } catch (er) {}
+try { fs.unlinkSync(conf4) } catch (er) {}
 
 var u = { u: 'user', p: 'pass@:!%\'', e: '[email protected]' }
 var o = { u: 'other', p: 'pass@:!%\'', e: '[email protected]' }
 var t = { u: 'third', p: 'pass@:!%\'', e: '[email protected]' }
+var v = { u: 'admin', p: 'admin', e: '[email protected]' }
 
 test('adduser', fn.bind(null, conf, u))
 test('adduser again', fn.bind(null, conf, u))
@@ -26,6 +29,8 @@ test('adduser 2 again', fn.bind(null, conf2, o))
 test('adduser 3', fn.bind(null, conf3, t))
 test('adduser 3 again', fn.bind(null, conf3, t))
 
+test('adduser admin', fn.bind(null, conf4, v))
+
 function fn(conf, u, t) {
   var c = common.npm([
     '--registry=' + reg,
@@ -38,7 +43,6 @@ function fn(conf, u, t) {
   c.stdout.on('data', function(d) {
     buf += d
     if (buf.match(/: /)) {
-      console.log(buf)
       switch (buf.split(':')[0]) {
         case 'Username':
           c.stdin.write(u.u + '\r\n')

test/01b-user-views.js

@@ -21,6 +21,13 @@ var expect = {
           "other"
         ],
         "value": 1
+      },
+      {
+        "key": [
+          "[email protected]",
+          "admin"
+        ],
+        "value": 1
       }
     ]
   },