update fstream-npm to 0.0.5

3 files changed, 24 insertions, 9 deletions

diff --git a/node_modules/fstream-npm/fstream-npm.js b/node_modules/fstream-npm/fstream-npm.js
index 4ad001253..baa53c9af 100644
--- a/node_modules/fstream-npm/fstream-npm.js
+++ b/node_modules/fstream-npm/fstream-npm.js
@@ -171,7 +171,17 @@ Packer.prototype.readRules = function (buf, e) {
     return Ignore.prototype.readRules.call(this, buf, e)
   }
 
-  var p = this.package = JSON.parse(buf.toString())
+  buf = buf.toString().trim()
+
+  if (buf.length === 0) return
+
+  try {
+    var p = this.package = JSON.parse(buf)
+  } catch (er) {
+    er.file = path.resolve(this.path, e)
+    this.error(er)
+    return
+  }
 
   if (this === this.root) {
     this.bundleLinks = this.bundleLinks || {}
@@ -262,7 +272,9 @@ Packer.prototype.emitEntry = function (entry) {
   }
 
   // all *.gyp files are renamed to binding.gyp for node-gyp
-  if (entry.basename.match(/\.gyp$/)) {
+  // but only when they are in the same folder as a package.json file.
+  if (entry.basename.match(/\.gyp$/) &&
+      this.entries.indexOf("package.json") !== -1) {
     entry.basename = "binding.gyp"
     entry.path = path.resolve(entry.dirname, entry.basename)
   }
diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/package.json b/node_modules/fstream-npm/node_modules/fstream-ignore/package.json
index cc8cde03f..ec7e6a3f2 100644
--- a/node_modules/fstream-npm/node_modules/fstream-ignore/package.json
+++ b/node_modules/fstream-npm/node_modules/fstream-ignore/package.json
@@ -35,8 +35,11 @@
     "node": "*"
   },
   "_engineSupported": true,
-  "_npmVersion": "1.1.13",
-  "_nodeVersion": "v0.7.7-pre",
+  "_npmVersion": "1.1.16",
+  "_nodeVersion": "v0.6.15",
   "_defaultsLoaded": true,
+  "dist": {
+    "shasum": "054e6efb613bad5f71a7a5c031e15a6a9c8f075c"
+  },
   "_from": "fstream-ignore@~0.0.5"
 }
diff --git a/node_modules/fstream-npm/package.json b/node_modules/fstream-npm/package.json
index 66dc93290..9b5a9876d 100644
--- a/node_modules/fstream-npm/package.json
+++ b/node_modules/fstream-npm/package.json
@@ -6,7 +6,7 @@
   },
   "name": "fstream-npm",
   "description": "fstream class for creating npm packages",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/fstream-npm.git"
@@ -20,15 +20,15 @@
     "name": "isaacs",
     "email": "i@izs.me"
   },
-  "_id": "fstream-npm@0.0.4",
+  "_id": "fstream-npm@0.0.5",
   "devDependencies": {},
   "optionalDependencies": {},
   "engines": {
     "node": "*"
   },
   "_engineSupported": true,
-  "_npmVersion": "1.1.13",
-  "_nodeVersion": "v0.7.7-pre",
+  "_npmVersion": "1.1.16",
+  "_nodeVersion": "v0.6.15",
   "_defaultsLoaded": true,
-  "_from": "fstream-npm@0 >=0.0.3"
+  "_from": "fstream-npm@0 >=0.0.4"
 }