glob@6.0.4

3 files changed, 40 insertions, 22 deletions

diff --git a/node_modules/glob/README.md b/node_modules/glob/README.md
index 92066834c..6960483ba 100644
--- a/node_modules/glob/README.md
+++ b/node_modules/glob/README.md
@@ -1,9 +1,9 @@
-[![Build Status](https://travis-ci.org/isaacs/node-glob.svg?branch=master)](https://travis-ci.org/isaacs/node-glob/) [![Dependency Status](https://david-dm.org/isaacs/node-glob.svg)](https://david-dm.org/isaacs/node-glob) [![devDependency Status](https://david-dm.org/isaacs/node-glob/dev-status.svg)](https://david-dm.org/isaacs/node-glob#info=devDependencies) [![optionalDependency Status](https://david-dm.org/isaacs/node-glob/optional-status.svg)](https://david-dm.org/isaacs/node-glob#info=optionalDependencies)
-
 # Glob
 
 Match files using the patterns the shell uses, like stars and stuff.
 
+[![Build Status](https://travis-ci.org/isaacs/node-glob.svg?branch=master)](https://travis-ci.org/isaacs/node-glob/) [![Build Status](https://ci.appveyor.com/api/projects/status/kd7f3yftf7unxlsx?svg=true)](https://ci.appveyor.com/project/isaacs/node-glob) [![Coverage Status](https://coveralls.io/repos/isaacs/node-glob/badge.svg?branch=master&service=github)](https://coveralls.io/github/isaacs/node-glob?branch=master)
+
 This is a glob implementation in JavaScript.  It uses the `minimatch`
 library to do its matching.
 
diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js
index 022d2ac8c..a62da27eb 100644
--- a/node_modules/glob/glob.js
+++ b/node_modules/glob/glob.js
@@ -80,8 +80,21 @@ var GlobSync = glob.GlobSync = globSync.GlobSync
 // old api surface
 glob.glob = glob
 
+function extend (origin, add) {
+  if (add === null || typeof add !== 'object') {
+    return origin
+  }
+
+  var keys = Object.keys(add)
+  var i = keys.length
+  while (i--) {
+    origin[keys[i]] = add[keys[i]]
+  }
+  return origin
+}
+
 glob.hasMagic = function (pattern, options_) {
-  var options = util._extend({}, options_)
+  var options = extend({}, options_)
   options.noprocess = true
 
   var g = new Glob(pattern, options)
diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json
index 57af461d6..c7094df7f 100644
--- a/node_modules/glob/package.json
+++ b/node_modules/glob/package.json
@@ -1,12 +1,12 @@
 {
   "_args": [
     [
-      "glob@6.0.3",
-      "/Users/rebecca/code/npm"
+      "glob@latest",
+      "/Users/zkat/Documents/code/npm"
     ]
   ],
-  "_from": "glob@6.0.3",
-  "_id": "glob@6.0.3",
+  "_from": "glob@latest",
+  "_id": "glob@6.0.4",
   "_inCache": true,
   "_installable": true,
   "_location": "/glob",
@@ -15,24 +15,29 @@
     "email": "i@izs.me",
     "name": "isaacs"
   },
-  "_npmVersion": "3.3.2",
+  "_npmVersion": "2.14.15",
   "_phantomChildren": {},
   "_requested": {
     "name": "glob",
-    "raw": "glob@6.0.3",
-    "rawSpec": "6.0.3",
+    "raw": "glob@latest",
+    "rawSpec": "latest",
     "scope": null,
-    "spec": "6.0.3",
-    "type": "version"
+    "spec": "latest",
+    "type": "tag"
   },
   "_requiredBy": [
-    "/"
+    "/",
+    "/init-package-json",
+    "/read-package-json",
+    "/tap",
+    "/tap/nyc",
+    "/tap/tap-mocha-reporter"
   ],
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-6.0.3.tgz",
-  "_shasum": "5f02cd89587ce58b154ae0855de02a2e63986fca",
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+  "_shasum": "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22",
   "_shrinkwrap": null,
-  "_spec": "glob@6.0.3",
-  "_where": "/Users/rebecca/code/npm",
+  "_spec": "glob@latest",
+  "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
@@ -52,13 +57,13 @@
   "devDependencies": {
     "mkdirp": "0",
     "rimraf": "^2.2.8",
-    "tap": "^1.1.4",
+    "tap": "^5.0.0",
     "tick": "0.0.6"
   },
   "directories": {},
   "dist": {
-    "shasum": "5f02cd89587ce58b154ae0855de02a2e63986fca",
-    "tarball": "http://registry.npmjs.org/glob/-/glob-6.0.3.tgz"
+    "shasum": "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22",
+    "tarball": "http://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
   },
   "engines": {
     "node": "*"
@@ -68,7 +73,7 @@
     "glob.js",
     "sync.js"
   ],
-  "gitHead": "dd5b255ff9b161d23f81c4d0a381ca46a97d049a",
+  "gitHead": "3bd419c538737e56fda7e21c21ff52ca0c198df6",
   "homepage": "https://github.com/isaacs/node-glob#readme",
   "license": "ISC",
   "main": "glob.js",
@@ -94,5 +99,5 @@
     "test": "tap test/*.js --cov",
     "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js"
   },
-  "version": "6.0.3"
+  "version": "6.0.4"
 }