node-gyp@2.0.1

Don't barf on non-semver-compliant Python version strings.

6 files changed, 28 insertions, 16 deletions

diff --git a/node_modules/node-gyp/History.md b/node_modules/node-gyp/History.md
index f4d6d9d51..a2af92175 100644
--- a/node_modules/node-gyp/History.md
+++ b/node_modules/node-gyp/History.md
@@ -1,4 +1,10 @@
 
+2.0.1 / 2015-05-28
+==================
+
+  * configure: try/catcht the semver range.test() call
+  * README: update for visual studio 2013 (#510, @samccone)
+
 2.0.0 / 2015-05-24
 ==================
 
diff --git a/node_modules/node-gyp/README.md b/node_modules/node-gyp/README.md
index 57191b4b2..386e54eb8 100644
--- a/node_modules/node-gyp/README.md
+++ b/node_modules/node-gyp/README.md
@@ -40,12 +40,11 @@ You will also need to install:
     * [Python][windows-python] ([`v2.7.3`][windows-python-v2.7.3] recommended, `v3.x.x` is __*not*__ supported)
       * Make sure that you have a PYTHON environment variable, and it is set to drive:\path\to\python.exe not to a folder.
     * Windows XP/Vista/7:
-      * Microsoft Visual Studio C++ 2010 ([Express][msvc2010] version works well)
+      * Microsoft Visual Studio C++ 2013 ([Express][msvc2013] version works well)
         * If the install fails, try uninstalling any C++ 2010 x64&x86 Redistributable that you have installed first.
         * If you get errors that the 64-bit compilers are not installed you may also need the [compiler update for the Windows SDK 7.1]
     * Windows 7/8:
-      * Microsoft Visual Studio C++ 2012 for Windows Desktop ([Express][msvc2012] version works well)
-      * Microsoft Visual Studio C++ 2013 will also work.
+      * Microsoft Visual Studio C++ 2013 for Windows Desktop ([Express][msvc2013] version works well)
     * All Windows Versions
       * For 64-bit builds of node and native modules you will _**also**_ need the [Windows 7 64-bit SDK][win7sdk]
       * You may need to run one of the following commands if your build complains about WindowsSDKDir not being set, and you are sure you have already installed the SDK:
@@ -183,7 +182,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
-[msvc2010]: http://go.microsoft.com/?linkid=9709949
-[msvc2012]: http://go.microsoft.com/?linkid=9816758
+[msvc2013]: http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs
 [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/configure.js b/node_modules/node-gyp/lib/configure.js
index e1118d324..0a33e7008 100644
--- a/node_modules/node-gyp/lib/configure.js
+++ b/node_modules/node-gyp/lib/configure.js
@@ -96,7 +96,13 @@ function configure (gyp, argv, callback) {
         version = version.replace(/rc(.*)$/ig, '')
       }
       var range = semver.Range('>=2.5.0 <3.0.0')
-      if (range.test(version)) {
+      var valid = false
+      try {
+        valid = range.test(version)
+      } catch (e) {
+        log.silly('range.test() error', e)
+      }
+      if (valid) {
         getNodeDir()
       } else {
         failPythonVersion(version)
diff --git a/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json b/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
index 8ed83ab24..6ba9df72c 100644
--- a/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
+++ b/node_modules/node-gyp/node_modules/path-array/node_modules/array-index/package.json
@@ -53,5 +53,6 @@
     "tarball": "http://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz"
+  "_resolved": "https://registry.npmjs.org/array-index/-/array-index-0.1.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/node-gyp/node_modules/path-array/package.json b/node_modules/node-gyp/node_modules/path-array/package.json
index ad8edc9f8..41d25482b 100644
--- a/node_modules/node-gyp/node_modules/path-array/package.json
+++ b/node_modules/node-gyp/node_modules/path-array/package.json
@@ -51,5 +51,6 @@
     "tarball": "http://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz"
+  "_resolved": "https://registry.npmjs.org/path-array/-/path-array-1.0.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
diff --git a/node_modules/node-gyp/package.json b/node_modules/node-gyp/package.json
index fc0ba266c..98e08d504 100644
--- a/node_modules/node-gyp/package.json
+++ b/node_modules/node-gyp/package.json
@@ -11,7 +11,7 @@
     "bindings",
     "gyp"
   ],
-  "version": "2.0.0",
+  "version": "2.0.1",
   "installVersion": 9,
   "author": {
     "name": "Nathan Rajlich",
@@ -46,15 +46,15 @@
   "engines": {
     "node": ">= 0.8.0"
   },
-  "gitHead": "4587ae35ae0079b18f8e7ed2129c31c7e623644a",
+  "gitHead": "0b9790ab6b885e2020e83936e402ac23c9e84726",
   "bugs": {
     "url": "https://github.com/TooTallNate/node-gyp/issues"
   },
   "homepage": "https://github.com/TooTallNate/node-gyp#readme",
-  "_id": "node-gyp@2.0.0",
+  "_id": "node-gyp@2.0.1",
   "scripts": {},
-  "_shasum": "0063644d2c9c8452489d5922cdf7b0085081b66b",
-  "_from": "node-gyp@>=2.0.0 <2.1.0",
+  "_shasum": "38e9c5b54df7115cd0953cee67863f839d0c7888",
+  "_from": "node-gyp@>=2.0.1 <2.1.0",
   "_npmVersion": "2.9.1",
   "_nodeVersion": "0.12.3",
   "_npmUser": {
@@ -76,9 +76,9 @@
     }
   ],
   "dist": {
-    "shasum": "0063644d2c9c8452489d5922cdf7b0085081b66b",
-    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-2.0.0.tgz"
+    "shasum": "38e9c5b54df7115cd0953cee67863f839d0c7888",
+    "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-2.0.1.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-2.0.0.tgz"
+  "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-2.0.1.tgz"
 }