upgrade node modules, switch from tap-spec to faucet

Makefile

@@ -63,11 +63,11 @@ $(MBGL)/config/%.gypi: $(MBGL) $(MBGL)/configure
 
 .PHONY: test-suite
 test-suite:
-	-@(`npm bin`/tape test/render.test.js | `npm bin`/tap-spec)
+	-@(`npm bin`/tape test/render.test.js | `npm bin`/faucet)
 
 .PHONY: test-js
 test-js:
-	@(`npm bin`/tape test/js/**/*.test.js | `npm bin`/tap-spec)
+	@(`npm bin`/tape test/js/**/*.test.js | `npm bin`/faucet)
 
 .PHONY: test
 test: test-js test-suite

package.json

@@ -18,20 +18,21 @@
     }
   ],
   "dependencies": {
-    "nan": "^1.4.1",
-    "node-pre-gyp": "^0.6.4"
+    "nan": "^1.8.4",
+    "node-pre-gyp": "^0.6.7"
   },
   "bundledDependencies": [
     "node-pre-gyp"
   ],
   "devDependencies": {
-    "aws-sdk": "^2.1.9",
+    "aws-sdk": "^2.1.27",
+    "faucet": "0.0.1",
     "mapbox-gl-test-suite": "git://github.com/mapbox/mapbox-gl-test-suite#master",
-    "mkdirp": "^0.5.0",
-    "request": "^2.53.0",
-    "tap-spec": "^2.2.1",
-    "tape": "^3.5.0",
-    "st": "^0.5.3"
+    "mkdirp": "^0.5.1",
+    "request": "^2.55.0",
+    "st": "^0.5.3",
+    "tap-spec": "^3.0.0",
+    "tape": "^4.0.0"
   },
   "scripts": {
     "install": "node-pre-gyp install || make",

src/node_file_source.cpp

@@ -125,9 +125,7 @@ void NodeFileSource::processCancel(mbgl::Request *req) {
 #endif
 
         // Dispose and remove the persistent handle
-#if (NODE_MODULE_VERSION > NODE_0_10_MODULE_VERSION)
-        // it->second.Reset();
-#else
+#if (NODE_MODULE_VERSION <= NODE_0_10_MODULE_VERSION)
         NanDisposePersistent(it->second);
 #endif
         pending.erase(it);
@@ -155,9 +153,7 @@ void NodeFileSource::notify(mbgl::Request *req, const std::shared_ptr<const mbgl
     // First, remove the request, since it might be destructed at any point now.
     auto it = pending.find(req);
     if (it != pending.end()) {
-#if (NODE_MODULE_VERSION > NODE_0_10_MODULE_VERSION)
-        // it->second.Dispose();
-#else
+#if (NODE_MODULE_VERSION <= NODE_0_10_MODULE_VERSION)
         NanDisposePersistent(it->second);
 #endif
         pending.erase(it);