Merge branch 'get-rid-of-lodash' of https://github.com/lydell/binwrap into release/2.3.0

Author: avh4

.travis.yml

@@ -3,6 +3,3 @@ node_js:
   - "8"
   - "10"
   - "12"
-
-before_script:
-  - (cd test_app && npm install ../)

binstub.js.mustache binstub.js.template

@@ -18,7 +18,7 @@ if (os == "win32") {
 }
 
 var unpackedBinPath = path.join(__dirname, "..", "unpacked_bin");
-var binPath = path.join(unpackedBinPath, "{{ binName }}" + binExt);
+var binPath = path.join(unpackedBinPath, $binName$ + binExt);
 
 function execBin() {
   spawn(

package-lock.json

@@ -4,7 +4,7 @@
   "description": "Package cross-platform binaries",
   "main": "index.js",
   "scripts": {
-    "test": "(cd test_app && ./build_packages.sh) && mocha && eslint ."
+    "test": "(cd test_app && ./build_packages.sh && npm install ../) && mocha && eslint ."
   },
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "prepare.js",
     "test.js",
     "binstall.js",
-    "binstub.js.mustache",
+    "binstub.js.template",
     "bin/binwrap-install",
     "bin/binwrap-prepare",
     "bin/binwrap-test"
@@ -39,9 +39,7 @@
     "mocha": "^8.2.1"
   },
   "dependencies": {
-    "mustache": "^4.1.0",
     "request": "^2.88.0",
-    "request-promise": "^4.2.5",
     "tar": "^6.1.0",
     "unzip-stream": "^0.3.1"
   }

package.json

@@ -1,17 +1,16 @@
 var fs = require("fs");
 var path = require("path");
-var mustache = require("mustache");
 
 module.exports = function prepare(config) {
   if (!fs.existsSync("bin")) {
     fs.mkdirSync("bin");
   }
 
-  var binstubTemplate = fs.readFileSync(path.join(__dirname, "binstub.js.mustache")).toString();
+  var binstubTemplate = fs.readFileSync(path.join(__dirname, "binstub.js.template")).toString();
 
   config.binaries.forEach(function(bin) {
     var binPath = path.join("bin", bin);
-    var content = mustache.render(binstubTemplate, { binName: bin });
+    var content = binstubTemplate.replace(/\$binName\$/g, JSON.stringify(bin));
     fs.writeFileSync(binPath, content);
     fs.chmodSync(binPath, "755");
   });

prepare.js

@@ -1,4 +1,4 @@
-var request = require("request-promise");
+var request = require("request");
 
 // https://nodejs.org/api/os.html#os_os_platform
 var validPlatforms = {
@@ -29,7 +29,6 @@ var validArchs = {
 
 module.exports = function test(config) {
   var errors = [];
-  var checkedUrls = {};
 
   var chain = Object.keys(config.urls).reduce(
     function(p, buildId) {
@@ -49,30 +48,25 @@ module.exports = function test(config) {
       if (url.slice(0,5) === "http:") {
         console.log("WARNING: Binary is published at an insecure URL (using https is recommended): " + displayUrl)
       }
-      if (checkedUrls[url]) {
-        return p.then(function() {
-          console.log("OKAY: " + displayUrl);
-        });
-      } else {
-        return p.then(function() {
-          return request({
-            method: "GET",
-            uri: url,
-            resolveWithFullResponse: true
-          })
-            .then(function(response) {
-              if (response.statusCode != 200) {
-                throw new Error("Status code " + response.statusCode);
-              } else {
-                console.log("OKAY: " + displayUrl);
-              }
-            })
-            .catch(function(err) {
-              console.error("  - Failed to fetch " + url + " " + err.message);
+
+      return p.then(function() {
+        return new Promise(function(resolve) {
+          request({ method: "GET", uri: url }, function(err, response) {
+            if (err) {
+              console.error("  - Failed to fetch " + url + ": " + err.message);
+              errors.push(displayUrl);
+              resolve();
+            } else if (response.statusCode != 200) {
+              console.error("  - Got non-200 response for " + url + ": " + response.statusCode);
               errors.push(displayUrl);
-            });
+              resolve();
+            } else {
+              console.log("OKAY: " + displayUrl);
+              resolve();
+            }
+          });
         });
-      }
+      });
     },
     Promise.resolve()
   );