Merge pull request #256 from Marsup/bump-deps

Bump request and mocha to avoid npm warnings

Author: stephenash

lib/install.js

@@ -98,16 +98,16 @@ function install(opts, cb) {
   });
 
   function onlyInstallMissingFiles(opts, cb) {
-    async.series([
+    async.waterfall([
       checksum.bind(null, opts.to),
-      etag.bind(null, opts.from, requestOpts)
-    ], function (error, results) {
+      isUpToDate.bind(null, opts.from, requestOpts)
+    ], function (error, isLatest) {
       if (error) {
         return cb(error);
       }
 
       // File already exists. Prevent download/installation.
-      if (results[0] === results[1]) {
+      if (isLatest) {
         logger('---');
         logger('File from ' + opts.from + ' has already been downloaded');
         expectedRequests -= 1;
@@ -391,7 +391,7 @@ function logInstallSummary(logger, paths, urls) {
 
 function checksum (filepath, cb) {
   if (!fs.existsSync(filepath)) {
-    return cb();
+    return cb(null, null);
   }
 
   var hash = crypto.createHash('md5');
@@ -414,13 +414,31 @@ function unquote (str, quoteChar) {
   return str;
 }
 
-function etag (url, requestOpts, cb) {
-  request.head(url, requestOpts).on('response', function (res) {
+function isUpToDate (url, requestOpts, hash, cb) {
+  if (!hash) {
+    return cb(null, false);
+  }
+
+  var query = Object.assign({}, requestOpts, {
+    url: url,
+    headers: {
+      'If-None-Match': '"' + hash + '"'
+    }
+  });
+
+  var req = request.get(query);
+  req.on('response', function (res) {
+    req.abort();
+
+    if (res.statusCode === 304) {
+      return cb(null, true);
+    }
+
     if (res.statusCode !== 200) {
       return cb(new Error('Could not request headers from ' + url + ': ', res.statusCodestatusCode));
     }
 
-    cb(null, unquote(res.headers.etag));
+    cb(null, false);
   }).once('error', function (err) {
     cb(new Error('Could not request headers from ' + url + ': ' + err));
   });

package.json

@@ -27,14 +27,14 @@
     "minimist": "1.1.0",
     "mkdirp": "0.5.0",
     "progress": "1.1.8",
-    "request": "2.51.0",
+    "request": "2.79.0",
     "tar-stream": "1.5.2",
     "urijs": "1.16.1",
     "which": "1.1.1",
     "yauzl": "^2.5.0"
   },
   "devDependencies": {
     "chai": "3.5.0",
-    "mocha": "2.1.0"
+    "mocha": "3.2.0"
   }
 }