glob@4.3.1 / minimatch@2.0.1

Updating glob and minimatch also required doing some tweaking to
fstream-npm and node-gyp, which still require the old versions of glob
and minimatch. But the tests all pass yay hooray.

5 files changed, 19 insertions, 22 deletions

diff --git a/node_modules/glob/README.md b/node_modules/glob/README.md
index 930977b9d..d72bdccbe 100644
--- a/node_modules/glob/README.md
+++ b/node_modules/glob/README.md
@@ -31,12 +31,12 @@ the command line, or put `build/*` in a `.gitignore` file.
 Before parsing the path part patterns, braced sections are expanded
 into a set.  Braced sections start with `{` and end with `}`, with any
 number of comma-delimited sections within.  Braced sections may contain
-slash characters, so `a{/b/c,bcd}` would expand into `a/b/c` and `abc`.
+slash characters, so `a{/b/c,bcd}` would expand into `a/b/c` and `abcd`.
 
 The following characters have special magic meaning when used in a
 path portion:
 
-* `*` Matches 0 or more characters in a sinle path portion
+* `*` Matches 0 or more characters in a single path portion
 * `?` Matches 1 character
 * `[...]` Matches a range of characters, similar to a RegExp range.
   If the first character of the range is `!` or `^` then it matches
@@ -100,7 +100,7 @@ To get the bash-style behavior, set the `nonull:true` in the options.
 * `man 5 gitignore`
 * [minimatch documentation](https://github.com/isaacs/minimatch)
 
-## glob.hasMagic(patter, [options])
+## glob.hasMagic(pattern, [options])
 
 Returns `true` if there are any special characters in the pattern, and
 `false` otherwise.
@@ -131,7 +131,7 @@ Perform a synchronous glob search.
 
 ## Class: glob.Glob
 
-Create a Glob object by instanting the `glob.Glob` class.
+Create a Glob object by instantiating the `glob.Glob` class.
 
 ```javascript
 var Glob = require("glob").Glob
diff --git a/node_modules/glob/common.js b/node_modules/glob/common.js
index 787ebf918..610d1245b 100644
--- a/node_modules/glob/common.js
+++ b/node_modules/glob/common.js
@@ -34,13 +34,11 @@ function absUnix (p) {
 }
 
 function alphasorti (a, b) {
-  a = a.toLowerCase()
-  b = b.toLowerCase()
-  return alphasort(a, b)
+  return a.toLowerCase().localeCompare(b.toLowerCase())
 }
 
 function alphasort (a, b) {
-  return a > b ? 1 : a < b ? -1 : 0
+  return a.localeCompare(b)
 }
 
 
diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js
index fd4332a05..60761fbc3 100644
--- a/node_modules/glob/glob.js
+++ b/node_modules/glob/glob.js
@@ -50,7 +50,6 @@ var assert = require("assert")
 var globSync = require("./sync.js")
 var common = require("./common.js")
 var alphasort = common.alphasort
-var alphasorti = common.alphasorti
 var isAbsolute = common.isAbsolute
 var setopts = common.setopts
 var ownProp = common.ownProp
@@ -450,7 +449,7 @@ function readdirCb (self, abs, cb) {
     if (er)
       self._readdirError(abs, er, cb)
     else
-      self._readdirEntries(abs, entries, cb)
+      self._readdirEntries(abs, entries.sort(alphasort), cb)
   }
 }
 
diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json
index 72d583f1f..14d053236 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.2.1",
+  "version": "4.3.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/node-glob.git"
@@ -23,7 +23,7 @@
   "dependencies": {
     "inflight": "^1.0.4",
     "inherits": "2",
-    "minimatch": "^1.0.0",
+    "minimatch": "^2.0.1",
     "once": "^1.3.0"
   },
   "devDependencies": {
@@ -41,15 +41,15 @@
     "benchclean": "bash benchclean.sh"
   },
   "license": "ISC",
-  "gitHead": "c5313b5e3a5f5227617b40d8914a41d5dfc8c095",
+  "gitHead": "bc6458731a67f8864571a989906bc3d8d6f4dd80",
   "bugs": {
     "url": "https://github.com/isaacs/node-glob/issues"
   },
   "homepage": "https://github.com/isaacs/node-glob",
-  "_id": "glob@4.2.1",
-  "_shasum": "aa04f06cca652ec724bc16c54cbdd42027d5c9f1",
-  "_from": "glob@>=4.2.1 <4.3.0",
-  "_npmVersion": "2.1.9",
+  "_id": "glob@4.3.1",
+  "_shasum": "9d09096f89b4d30949e784e83f312af3ca04ec14",
+  "_from": "glob@>=4.3.1 <4.4.0",
+  "_npmVersion": "2.1.11",
   "_nodeVersion": "0.10.16",
   "_npmUser": {
     "name": "isaacs",
@@ -62,9 +62,10 @@
     }
   ],
   "dist": {
-    "shasum": "aa04f06cca652ec724bc16c54cbdd42027d5c9f1",
-    "tarball": "http://registry.npmjs.org/glob/-/glob-4.2.1.tgz"
+    "shasum": "9d09096f89b4d30949e784e83f312af3ca04ec14",
+    "tarball": "http://registry.npmjs.org/glob/-/glob-4.3.1.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-4.2.1.tgz"
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-4.3.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/glob/sync.js b/node_modules/glob/sync.js
index 18d2d3379..9730ade3c 100644
--- a/node_modules/glob/sync.js
+++ b/node_modules/glob/sync.js
@@ -10,7 +10,6 @@ var path = require("path")
 var assert = require("assert")
 var common = require("./common.js")
 var alphasort = common.alphasort
-var alphasorti = common.alphasorti
 var isAbsolute = common.isAbsolute
 var setopts = common.setopts
 var ownProp = common.ownProp
@@ -236,7 +235,7 @@ GlobSync.prototype._readdir = function (abs, inGlobStar) {
   }
 
   try {
-    return this._readdirEntries(abs, fs.readdirSync(abs))
+    return this._readdirEntries(abs, fs.readdirSync(abs).sort(alphasort))
   } catch (er) {
     this._readdirError(abs, er)
     return null