node-gyp@3.0.3

5 files changed, 52 insertions, 13 deletions

diff --git a/node_modules/node-gyp/CHANGELOG.md b/node_modules/node-gyp/CHANGELOG.md
index 0c88cbfa1..4c8cc3678 100644
--- a/node_modules/node-gyp/CHANGELOG.md
+++ b/node_modules/node-gyp/CHANGELOG.md
@@ -1,3 +1,12 @@
+v3.0.3 2015-09-14
+
+* [[`ad827cda30`](https://github.com/nodejs/node-gyp/commit/ad827cda30)] - tarballUrl global and && when checking for iojs (Lars-Magnus Skog) [#729](https://github.com/nodejs/node-gyp/pull/729)
+
+v3.0.2 2015-09-12
+
+* [[`6e8c3bf3c6`](https://github.com/nodejs/node-gyp/commit/6e8c3bf3c6)] - add back support for passing additional cmdline args (Rod Vagg) [#723](https://github.com/nodejs/node-gyp/pull/723)
+* [[`ff82f2f3b9`](https://github.com/nodejs/node-gyp/commit/ff82f2f3b9)] - fixed broken link in docs to Visual Studio 2013 download (simon-p-r) [#722](https://github.com/nodejs/node-gyp/pull/722)
+
 v3.0.1 2015-09-08
 
 * [[`846337e36b`](https://github.com/nodejs/node-gyp/commit/846337e36b)] - normalise versions for target == this comparison (Rod Vagg) [#716](https://github.com/nodejs/node-gyp/pull/716)
diff --git a/node_modules/node-gyp/README.md b/node_modules/node-gyp/README.md
index 71f1f6bd2..779dc6adc 100644
--- a/node_modules/node-gyp/README.md
+++ b/node_modules/node-gyp/README.md
@@ -187,6 +187,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 [windows-python]: http://www.python.org/getit/windows
 [windows-python-v2.7.3]: http://www.python.org/download/releases/2.7.3#download
-[msvc2013]: http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs
+[msvc2013]: http://www.microsoft.com/en-gb/download/details.aspx?id=44914
 [win7sdk]: http://www.microsoft.com/en-us/download/details.aspx?id=8279
 [compiler update for the Windows SDK 7.1]: http://www.microsoft.com/en-us/download/details.aspx?id=4422
diff --git a/node_modules/node-gyp/lib/process-release.js b/node_modules/node-gyp/lib/process-release.js
index 2da45eba8..0836ce73e 100644
--- a/node_modules/node-gyp/lib/process-release.js
+++ b/node_modules/node-gyp/lib/process-release.js
@@ -6,11 +6,11 @@ var semver = require('semver')
   , bitsreV3 = /\/win-(x86|ia32|x64)\// // io.js v3.x.x shipped with "ia32" but should
                                         // have been "x86"
 
-// Captures all the logic required to determine download URLs, local directory and
+// Captures all the logic required to determine download URLs, local directory and 
 // file names. Inputs come from command-line switches (--target, --dist-url),
 // `process.version` and `process.release` where it exists.
 function processRelease (argv, gyp, defaultVersion, defaultRelease) {
-  var version = argv[0] || gyp.opts.target || defaultVersion
+  var version = (semver.valid(argv[0]) && argv[0]) || gyp.opts.target || defaultVersion
     , versionSemver = semver.parse(version)
     , overrideDistUrl = gyp.opts['dist-url'] || gyp.opts.disturl
     , isDefaultVersion
@@ -20,6 +20,7 @@ function processRelease (argv, gyp, defaultVersion, defaultRelease) {
     , baseUrl
     , libUrl32
     , libUrl64
+    , tarballUrl
 
   if (!versionSemver) {
     // not a valid semver string, nothing we can do
@@ -42,7 +43,7 @@ function processRelease (argv, gyp, defaultVersion, defaultRelease) {
   } else {
     // old node or alternative --target=
     // semver.satisfies() doesn't like prerelease tags so test major directly
-    isIojs = versionSemver.major >= 1 & versionSemver.major < 4
+    isIojs = versionSemver.major >= 1 && versionSemver.major < 4
     name = isIojs ? 'iojs' : 'node'
   }
 
diff --git a/node_modules/node-gyp/package.json b/node_modules/node-gyp/package.json
index b89152c70..6b0bef6e6 100644
--- a/node_modules/node-gyp/package.json
+++ b/node_modules/node-gyp/package.json
@@ -6,10 +6,10 @@
     ]
   ],
   "_from": "node-gyp@>=3.0.1 <3.1.0",
-  "_id": "node-gyp@3.0.1",
+  "_id": "node-gyp@3.0.3",
   "_inCache": true,
   "_location": "/node-gyp",
-  "_nodeVersion": "4.0.0-rc.4",
+  "_nodeVersion": "4.0.0",
   "_npmUser": {
     "email": "rod@vagg.org",
     "name": "rvagg"
@@ -18,7 +18,7 @@
   "_phantomChildren": {
     "block-stream": "0.0.8",
     "brace-expansion": "1.1.0",
-    "fstream": "1.0.7",
+    "fstream": "1.0.8",
     "inflight": "1.0.4",
     "inherits": "2.0.1",
     "lru-cache": "2.6.5",
@@ -36,8 +36,8 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.1.tgz",
-  "_shasum": "597a2069786a443add5eecffc160f5d6c7045cd7",
+  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz",
+  "_shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
   "_shrinkwrap": null,
   "_spec": "node-gyp@~3.0.1",
   "_where": "/Users/rebecca/code/npm",
@@ -74,13 +74,13 @@
   },
   "directories": {},
   "dist": {
-    "shasum": "597a2069786a443add5eecffc160f5d6c7045cd7",
-    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-3.0.1.tgz"
+    "shasum": "9b004219f4fa9efbfd78c5fc674aa12e58fb8694",
+    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-3.0.3.tgz"
   },
   "engines": {
     "node": ">= 0.8.0"
   },
-  "gitHead": "112afb4466eafe8bf9d7c72cfac94222d952c370",
+  "gitHead": "d6b03851d366c7fa78e7d2f57c61bb074ea45ea3",
   "homepage": "https://github.com/nodejs/node-gyp",
   "installVersion": 9,
   "installable": true,
@@ -127,5 +127,5 @@
   "scripts": {
     "test": "tape test/test-*"
   },
-  "version": "3.0.1"
+  "version": "3.0.3"
 }
diff --git a/node_modules/node-gyp/test/test-process-release.js b/node_modules/node-gyp/test/test-process-release.js
index b584f04c2..bc39aafa7 100644
--- a/node_modules/node-gyp/test/test-process-release.js
+++ b/node_modules/node-gyp/test/test-process-release.js
@@ -420,3 +420,32 @@ test('test process release - process.release ~ node@4.0.0-rc.4 passed as argv[0]
     libPath64: 'win-x64/node.lib'
   })
 })
+
+
+test('test process release - process.release ~ node@4.0.0-rc.4 - bogus string passed as argv[0]', function (t) {
+  t.plan(2)
+
+  // additional arguments can be passed in on the commandline that should be ignored if they
+  // are not specifying a valid version @ position 0
+  var release = processRelease([ 'this is no version!' ], { opts: {} }, 'v4.0.0-rc.4', {
+    name: 'node',
+    headersUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz'
+  })
+
+  t.equal(release.semver.version, '4.0.0-rc.4')
+  delete release.semver
+
+  t.deepEqual(release, {
+    version: '4.0.0-rc.4',
+    name: 'node',
+    baseUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/',
+    tarballUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/node-v4.0.0-rc.4-headers.tar.gz',
+    shasumsUrl: 'https://nodejs.org/download/rc/v4.0.0-rc.4/SHASUMS256.txt',
+    versionDir: '4.0.0-rc.4',
+    libUrl32: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x86/node.lib',
+    libUrl64: 'https://nodejs.org/download/rc/v4.0.0-rc.4/win-x64/node.lib',
+    libPath32: 'win-x86/node.lib',
+    libPath64: 'win-x64/node.lib'
+  })
+})
+