Add third default option for installing binary

binstall.js

@@ -1,26 +1,39 @@
 var fs = require("fs");
+var path = require("path");
 var request = require("request");
 var tar = require("tar");
 var zlib = require("zlib");
 var unzip = require("unzip-stream");
 
-function binstall(url, path, options) {
-  if (url.endsWith(".zip")) {
-    return unzipUrl(url, path, options);
-  } else {
-    return untgz(url, path, options);
+// A map between file extension and behavior
+const binstallBehaviors = {
+  zip: unzipUrl,
+  tgz: untgz,
+}
+
+function binstall(url, unpackedPath, options) {
+  const fileDots = url.split('.');
+  const fileExtension = fileDots[fileDots.length - 1]
+  let behavior = binstallBehaviors[fileExtension]
+  if (!behavior) {
+    behavior = downloadBin
   }
+  return behavior(url, unpackedPath, options)
 }
 
-function untgz(url, path, options) {
+function untgz(url, unpackedPath, options) {
   options = options || {};
 
   var verbose = options.verbose;
   var verify = options.verify;
 
+  if (verbose) {
+    console.info('Downloading and unpacking tar')
+  }
+
   return new Promise(function(resolve, reject) {
     var untar = tar
-      .x({ cwd: path })
+      .x({ cwd: unpackedPath })
       .on("error", function(error) {
         reject("Error extracting " + url + " - " + error);
       })
@@ -43,7 +56,7 @@ function untgz(url, path, options) {
     });
 
     try {
-      fs.mkdirSync(path);
+      fs.mkdirSync(unpackedPath);
     } catch (error) {
       if (error.code !== 'EEXIST') throw error;
     }
@@ -74,15 +87,19 @@ function untgz(url, path, options) {
   });
 }
 
-function unzipUrl(url, path, options) {
+function unzipUrl(url, unpackedPath, options) {
   options = options || {};
 
   var verbose = options.verbose;
   var verify = options.verify;
 
+  if (verbose) {
+    console.info('Downloading and unpacking zip')
+  }
+
   return new Promise(function(resolve, reject) {
     var writeStream = unzip
-      .Extract({ path: path })
+      .Extract({ path: unpackedPath })
       .on("error", function(error) {
         reject("Error extracting " + url + " - " + error);
       })
@@ -146,4 +163,53 @@ function verifyContents(files) {
   );
 }
 
+// Download a file that is itself a binary
+// No post-processing needs to occur
+function downloadBin(url, unpackedPath, options) {
+  options = options || {};
+
+  var verbose = options.verbose;
+  if (verbose) {
+    console.info('Downloading and unpacking binary')
+  }
+
+  return new Promise(function(resolve, reject) {
+    try {
+      fs.mkdirSync(unpackedPath);
+    } catch (error) {
+      if (error.code !== 'EEXIST') throw error;
+    }
+    const urlSplit = url.split('/')
+    const fileName = urlSplit[urlSplit.length - 1]
+    const writeStream = fs.createWriteStream(path.join(unpackedPath, fileName));
+    writeStream.on('close', () => {
+      resolve();
+    })
+    console.log(unpackedPath, fileName)
+
+    request
+      .get(url, function(error, response) {
+        if (error) {
+          reject("Error communicating with URL " + url + " " + error);
+          return;
+        }
+        if (response.statusCode == 404) {
+          var errorMessage = options.errorMessage || "Not Found: " + url;
+
+          reject(new Error(errorMessage));
+          return;
+        }
+
+        if (verbose) {
+          console.log("Downloading binaries from " + url);
+        }
+
+        response.on("error", function() {
+          reject("Error receiving " + url);
+        });
+      })
+      .pipe(writeStream);
+  });
+}
+
 module.exports = binstall;