npm-cache-filename@1.0.2

4 files changed, 31 insertions, 15 deletions

diff --git a/node_modules/npm-cache-filename/index.js b/node_modules/npm-cache-filename/index.js
index 9fd2488d4..50d21792b 100644
--- a/node_modules/npm-cache-filename/index.js
+++ b/node_modules/npm-cache-filename/index.js
@@ -10,8 +10,12 @@ function cf(root, u) {
   u = url.parse(u);;
   var h = u.host.replace(/:/g, '_');;
   // Strip off any /-rev/... or ?rev=... bits
-  var revre = /(\?rev=|\?.*?&rev=|\/-rev\/).*$/
-  var parts = u.path.replace(revre, '').split('/').slice(1)
+  var revre = /(\?rev=|\?.*?&rev=|\/-rev\/).*$/;;
+  var parts = u.path.replace(revre, '').split('/').slice(1);;
+  // Make sure different git references get different folders
+  if (u.hash && u.hash.length > 1) {
+    parts.push(u.hash.slice(1));;
+  };;
   var p = [root, h].concat(parts.map(function(part) {
     return encodeURIComponent(part).replace(/%/g, '_');;
   }));;
diff --git a/node_modules/npm-cache-filename/package.json b/node_modules/npm-cache-filename/package.json
index 6c9120cd9..882017f22 100644
--- a/node_modules/npm-cache-filename/package.json
+++ b/node_modules/npm-cache-filename/package.json
@@ -6,14 +6,15 @@
     ]
   ],
   "_from": "npm-cache-filename@>=1.0.1 <1.1.0",
-  "_id": "npm-cache-filename@1.0.1",
+  "_id": "npm-cache-filename@1.0.2",
   "_inCache": true,
   "_location": "/npm-cache-filename",
+  "_nodeVersion": "2.2.2",
   "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
+    "email": "kat@sykosomatic.org",
+    "name": "zkat"
   },
-  "_npmVersion": "1.4.10",
+  "_npmVersion": "2.12.1",
   "_phantomChildren": {},
   "_requested": {
     "name": "npm-cache-filename",
@@ -26,8 +27,8 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz",
-  "_shasum": "9b640f0c1a5ba1145659685372a9ff71f70c4323",
+  "_resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz",
+  "_shasum": "ded306c5b0bfc870a9e9faf823bc5f283e05ae11",
   "_shrinkwrap": null,
   "_spec": "npm-cache-filename@~1.0.1",
   "_where": "/Users/rebecca/code/npm",
@@ -42,30 +43,39 @@
   "dependencies": {},
   "description": "Given a cache folder and url, return the appropriate cache folder.",
   "devDependencies": {
-    "tap": "^0.4.10"
+    "tap": "^1.2.0"
   },
   "directories": {},
   "dist": {
-    "shasum": "9b640f0c1a5ba1145659685372a9ff71f70c4323",
-    "tarball": "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz"
+    "shasum": "ded306c5b0bfc870a9e9faf823bc5f283e05ae11",
+    "tarball": "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"
   },
+  "gitHead": "b7eef12919fdf544a3b83bba73093f7268c40c1e",
   "homepage": "https://github.com/npm/npm-cache-filename",
   "license": "ISC",
   "main": "index.js",
   "maintainers": [
     {
       "name": "isaacs",
-      "email": "i@izs.me"
+      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "kat",
+      "email": "kat@lua.cz"
+    },
+    {
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
     }
   ],
   "name": "npm-cache-filename",
   "optionalDependencies": {},
   "repository": {
     "type": "git",
-    "url": "git://github.com/npm/npm-cache-filename"
+    "url": "git://github.com/npm/npm-cache-filename.git"
   },
   "scripts": {
     "test": "tap test.js"
   },
-  "version": "1.0.1"
+  "version": "1.0.2"
 }
diff --git a/node_modules/npm-cache-filename/test.js b/node_modules/npm-cache-filename/test.js
index 5faecceb4..bdca80b50 100644
--- a/node_modules/npm-cache-filename/test.js
+++ b/node_modules/npm-cache-filename/test.js
@@ -17,5 +17,7 @@ test('it does the thing it says it does', function(t) {
           '/tmp/foo_134/xyz')
   t.equal(cf("/tmp", "https://foo:134/xyz-rev/baz"),
           '/tmp/foo_134/xyz-rev/baz')
+  t.equal(cf("/tmp", "git://foo:134/xyz-rev/baz.git#master"),
+          '/tmp/foo_134/xyz-rev/baz.git/master')
   t.end();
 });;
diff --git a/package.json b/package.json
index 5236cbcf1..4f205c059 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "nopt": "~3.0.3",
     "normalize-git-url": "~2.0.0",
     "normalize-package-data": "~2.3.0",
-    "npm-cache-filename": "~1.0.1",
+    "npm-cache-filename": "~1.0.2",
     "npm-install-checks": "~1.0.5",
     "npm-package-arg": "~4.0.1",
     "npm-registry-client": "~6.4.0",