diff options
author | Forrest L Norvell <forrest@npmjs.com> | 2014-12-25 14:07:19 +0300 |
---|---|---|
committer | Forrest L Norvell <forrest@npmjs.com> | 2014-12-25 14:07:19 +0300 |
commit | 9b9de06a99893b40aa23f0335726dec6df7979db (patch) | |
tree | ab93c3d1bc0c7dddc32e905ac5d8c11443495210 | |
parent | 03a9fc43607de0438173f197be2f68aaa4e7ff9d (diff) |
glob@4.3.2
Better handling of trailing slashes.
-rw-r--r-- | node_modules/glob/glob.js | 3 | ||||
-rw-r--r-- | node_modules/glob/package.json | 25 | ||||
-rw-r--r-- | node_modules/glob/sync.js | 3 | ||||
-rw-r--r-- | package.json | 2 |
4 files changed, 20 insertions, 13 deletions
diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js index 60761fbc3..8c9907821 100644 --- a/node_modules/glob/glob.js +++ b/node_modules/glob/glob.js @@ -569,10 +569,13 @@ Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) { return cb() if (prefix && isAbsolute(prefix) && !this.nomount) { + var trail = /[\/\\]$/.test(prefix) if (prefix.charAt(0) === "/") { prefix = path.join(this.root, prefix) } else { prefix = path.resolve(this.root, prefix) + if (trail) + prefix += '/' } } diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json index 14d053236..214a26045 100644 --- a/node_modules/glob/package.json +++ b/node_modules/glob/package.json @@ -6,7 +6,7 @@ }, "name": "glob", "description": "a little globber", - "version": "4.3.1", + "version": "4.3.2", "repository": { "type": "git", "url": "git://github.com/isaacs/node-glob.git" @@ -34,23 +34,24 @@ }, "scripts": { "prepublish": "npm run benchclean", - "test": "rm -f v8.log profile.txt; tap test/*.js", - "test-regen": "rm -f v8.log profile.txt; TEST_REGEN=1 node test/00-setup.js", + "profclean": "rm -f v8.log profile.txt", + "test": "npm run profclean && tap test/*.js", + "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js", "bench": "bash benchmark.sh", "prof": "bash prof.sh && cat profile.txt", "benchclean": "bash benchclean.sh" }, "license": "ISC", - "gitHead": "bc6458731a67f8864571a989906bc3d8d6f4dd80", + "gitHead": "941d53c8ab6216f43a6f5e8e01245364ba90cfe9", "bugs": { "url": "https://github.com/isaacs/node-glob/issues" }, "homepage": "https://github.com/isaacs/node-glob", - "_id": "glob@4.3.1", - "_shasum": "9d09096f89b4d30949e784e83f312af3ca04ec14", - "_from": "glob@>=4.3.1 <4.4.0", - "_npmVersion": "2.1.11", - "_nodeVersion": "0.10.16", + "_id": "glob@4.3.2", + "_shasum": "351ec7dafc29256b253ad86cd6b48c5a3404b76d", + "_from": "glob@>=4.3.2 <4.4.0", + "_npmVersion": "2.1.14", + "_nodeVersion": "0.10.33", "_npmUser": { "name": "isaacs", "email": "i@izs.me" @@ -62,10 +63,10 @@ } ], "dist": { - "shasum": "9d09096f89b4d30949e784e83f312af3ca04ec14", - "tarball": "http://registry.npmjs.org/glob/-/glob-4.3.1.tgz" + "shasum": "351ec7dafc29256b253ad86cd6b48c5a3404b76d", + "tarball": "http://registry.npmjs.org/glob/-/glob-4.3.2.tgz" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/glob/-/glob-4.3.1.tgz", + "_resolved": "https://registry.npmjs.org/glob/-/glob-4.3.2.tgz", "readme": "ERROR: No README data found!" } diff --git a/node_modules/glob/sync.js b/node_modules/glob/sync.js index 9730ade3c..a7f9f52da 100644 --- a/node_modules/glob/sync.js +++ b/node_modules/glob/sync.js @@ -337,10 +337,13 @@ GlobSync.prototype._processSimple = function (prefix, index) { return if (prefix && isAbsolute(prefix) && !this.nomount) { + var trail = /[\/\\]$/.test(prefix) if (prefix.charAt(0) === "/") { prefix = path.join(this.root, prefix) } else { prefix = path.resolve(this.root, prefix) + if (trail) + prefix += '/' } } diff --git a/package.json b/package.json index 533e947e0..c17be9f6f 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "fstream-npm": "~1.0.1", "github-url-from-git": "~1.4.0", "github-url-from-username-repo": "~1.0.2", - "glob": "~4.3.1", + "glob": "~4.3.2", "graceful-fs": "~3.0.5", "inflight": "~1.0.4", "inherits": "~2.0.1", |