rimraf@2.3.2

Handle globbing paths with valid glob metacharacters in the path.

2 files changed, 32 insertions, 11 deletions

diff --git a/node_modules/rimraf/package.json b/node_modules/rimraf/package.json
index a257986de..9f836e930 100644
--- a/node_modules/rimraf/package.json
+++ b/node_modules/rimraf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rimraf",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "main": "rimraf.js",
   "description": "A deep deletion module for node (like `rm -rf`)",
   "author": {
@@ -31,15 +31,15 @@
     "LICENSE",
     "README.md"
   ],
-  "gitHead": "aa707db2fb5b11c35fc614a1472775373dc9d46c",
+  "gitHead": "9d5ab4a8b6986ec909af04f6d91315e98f5893e8",
   "bugs": {
     "url": "https://github.com/isaacs/rimraf/issues"
   },
   "homepage": "https://github.com/isaacs/rimraf",
-  "_id": "rimraf@2.3.1",
-  "_shasum": "f83df78c168d5daf9f021e8e092e7a165898ee75",
-  "_from": "rimraf@>=2.3.1 <2.4.0",
-  "_npmVersion": "2.6.0",
+  "_id": "rimraf@2.3.2",
+  "_shasum": "7304bd9275c401b89103b106b3531c1ef0c02fe9",
+  "_from": "rimraf@>=2.3.2 <2.4.0",
+  "_npmVersion": "2.7.0",
   "_nodeVersion": "1.4.2",
   "_npmUser": {
     "name": "isaacs",
@@ -52,9 +52,10 @@
     }
   ],
   "dist": {
-    "shasum": "f83df78c168d5daf9f021e8e092e7a165898ee75",
-    "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.3.1.tgz"
+    "shasum": "7304bd9275c401b89103b106b3531c1ef0c02fe9",
+    "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.1.tgz"
+  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/rimraf/rimraf.js b/node_modules/rimraf/rimraf.js
index 6dffdf064..c189d5444 100644
--- a/node_modules/rimraf/rimraf.js
+++ b/node_modules/rimraf/rimraf.js
@@ -54,7 +54,15 @@ function rimraf (p, options, cb) {
   var errState = null
   var n = 0
 
-  glob(p, globOpts, afterGlob)
+  if (!glob.hasMagic(p))
+    return afterGlob(null, [p])
+
+  fs.lstat(p, function (er, stat) {
+    if (!er)
+      return afterGlob(null, [p])
+
+    glob(p, globOpts, afterGlob)
+  })
 
   function next (er) {
     errState = errState || er
@@ -249,7 +257,19 @@ function rimrafSync (p, options) {
   assert(p)
   assert(options)
 
-  var results = glob.sync(p, globOpts)
+  var results
+
+  if (!glob.hasMagic(p)) {
+    results = [p]
+  } else {
+    try {
+      fs.lstatSync(p)
+      results = [p]
+    } catch (er) {
+      results = glob.sync(p, globOpts)
+    }
+  }
+
   if (!results.length)
     return