glob@4.0.6

Now absolutely requires `graceful-fs`.

5 files changed, 32 insertions, 28 deletions

diff --git a/node_modules/glob/README.md b/node_modules/glob/README.md
index cc6916451..82b7ef6d6 100644
--- a/node_modules/glob/README.md
+++ b/node_modules/glob/README.md
@@ -5,16 +5,7 @@ Match files using the patterns the shell uses, like stars and stuff.
 This is a glob implementation in JavaScript.  It uses the `minimatch`
 library to do its matching.
 
-## Attention: node-glob users!
-
-The API has changed dramatically between 2.x and 3.x. This library is
-now 100% JavaScript, and the integer flags have been replaced with an
-options object.
-
-Also, there's an event emitter class, proper tests, and all the other
-things you've come to expect from node modules.
-
-And best of all, no compilation!
+![](oh-my-glob.gif)
 
 ## Usage
 
diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js
index 6941fc7cf..564f3b121 100644
--- a/node_modules/glob/glob.js
+++ b/node_modules/glob/glob.js
@@ -36,10 +36,8 @@
 
 module.exports = glob
 
-var fs
-try { fs = require("graceful-fs") } catch (e) { fs = require("fs") }
-
-var minimatch = require("minimatch")
+var fs = require("graceful-fs")
+, minimatch = require("minimatch")
 , Minimatch = minimatch.Minimatch
 , inherits = require("inherits")
 , EE = require("events").EventEmitter
diff --git a/node_modules/glob/oh-my-glob.gif b/node_modules/glob/oh-my-glob.gif
new file mode 100644
index 000000000..a1568c13c
--- /dev/null
+++ b/node_modules/glob/oh-my-glob.gif
diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json
index 5905b40cd..6bf85e8df 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.0.5",
+  "version": "4.0.6",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/node-glob.git"
@@ -15,14 +15,11 @@
   "engines": {
     "node": "*"
   },
-  "optionalDependencies": {
-    "graceful-fs": "^3.0.2"
-  },
   "dependencies": {
+    "graceful-fs": "^3.0.2",
     "inherits": "2",
     "minimatch": "^1.0.0",
-    "once": "^1.3.0",
-    "graceful-fs": "^3.0.2"
+    "once": "^1.3.0"
   },
   "devDependencies": {
     "tap": "~0.4.0",
@@ -34,15 +31,16 @@
     "test-regen": "TEST_REGEN=1 node test/00-setup.js"
   },
   "license": "ISC",
-  "gitHead": "a7d85acf4e89fa26d17396ab022ef98fbe1f8a4b",
+  "gitHead": "6825c425e738eaffa315d8cdb1a4c3255ededcb3",
   "bugs": {
     "url": "https://github.com/isaacs/node-glob/issues"
   },
   "homepage": "https://github.com/isaacs/node-glob",
-  "_id": "glob@4.0.5",
-  "_shasum": "95e42c9efdb3ab1f4788fd7793dfded4a3378063",
-  "_from": "glob@latest",
-  "_npmVersion": "1.4.21",
+  "_id": "glob@4.0.6",
+  "_shasum": "695c50bdd4e2fb5c5d370b091f388d3707e291a7",
+  "_from": "glob@>=4.0.6 <5.0.0",
+  "_npmVersion": "2.0.0",
+  "_nodeVersion": "0.10.31",
   "_npmUser": {
     "name": "isaacs",
     "email": "i@izs.me"
@@ -54,9 +52,10 @@
     }
   ],
   "dist": {
-    "shasum": "95e42c9efdb3ab1f4788fd7793dfded4a3378063",
-    "tarball": "http://registry.npmjs.org/glob/-/glob-4.0.5.tgz"
+    "shasum": "695c50bdd4e2fb5c5d370b091f388d3707e291a7",
+    "tarball": "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-4.0.5.tgz"
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/glob/test/negation-test.js b/node_modules/glob/test/negation-test.js
new file mode 100644
index 000000000..fc679e2cf
--- /dev/null
+++ b/node_modules/glob/test/negation-test.js
@@ -0,0 +1,16 @@
+// Negation test
+// Show that glob respect's minimatch's negate flag
+
+var glob = require('../glob.js')
+var test = require('tap').test
+
+test('glob respects minimatch negate flag when activated with leading !', function(t) {
+  var expect = ["abcdef/g", "abcfed/g", "c/d", "cb/e", "symlink/a"]
+  var results = glob("!b**/*", {cwd: 'a'}, function (er, results) {
+    if (er)
+      throw er
+
+    t.same(results, expect)
+    t.end()
+  });
+});