@getgauge/cli 1.6.25 → 1.6.26

package/package.json

@@ -32,5 +32,5 @@
   "dependencies": {
     "adm-zip": "^0.5.16"
   },
-  "version": "1.6.25"
+  "version": "1.6.26"
 }

package/src/index.js

@@ -4,13 +4,14 @@
 
 const install = require("./install"),
     path = require("path"),
+    fs = require("fs"),
     AdmZip = require('adm-zip'),
     https = require('https'),
     packageJsonPath = path.join(__dirname, "..", "package.json"),
     binPath = "./bin";
 
-var extractZipArchive = function(buffer) {
-    return new Promise(function(resolve, reject) {
+const extractZipArchive = function (buffer) {
+    return new Promise(function (resolve, reject) {
         try {
             const zip = new AdmZip(buffer);
             zip.extractAllTo(path.normalize(binPath), true, true);
@@ -19,10 +20,10 @@ var extractZipArchive = function(buffer) {
             reject(new Error(`Failed to extract archive from buffer: ${err.message}`));
         }
     })
-}
+};
 
-var downloadFollowingRedirect = function(url, resolve, reject) {
-    https.get(url, { headers: { 'accept-encoding': 'gzip,deflate' } }, res => {
+const downloadFollowingRedirect = function (url, resolve, reject) {
+    https.get(url, {headers: {'accept-encoding': 'gzip,deflate'}}, res => {
         if (res.statusCode >= 300 && res.statusCode < 400) {
             downloadFollowingRedirect(res.headers.location, resolve, reject);
             res.resume()
@@ -32,14 +33,14 @@ var downloadFollowingRedirect = function(url, resolve, reject) {
         } else {
             const chunks = [];
             res
-                .on('data', chunk => chunks.push(chunk))
-                .on('end', () => resolve(Buffer.concat(chunks)))
-                .on('error', reject);
+              .on('data', chunk => chunks.push(chunk))
+              .on('end', () => resolve(Buffer.concat(chunks)))
+              .on('error', reject);
         }
     });
 };
 
-var downloadAndExtract = function(version) {
+const downloadAndExtract = function (version) {
     console.log(`Fetching download url for Gauge version ${version}`);
     let url = install.getBinaryUrl(version);
     console.log(`Downloading ${url} to ${binPath}`);
@@ -50,9 +51,19 @@ var downloadAndExtract = function(version) {
             reject(error);
         }
     })
-    .then(extractZipArchive)
+      .then(extractZipArchive)
+};
+
+const removeStubBinary = () => {
+    try {
+        fs.unlinkSync(path.normalize(`${binPath}/gauge`));
+    } catch (err) {
+        if (err.code !== 'ENOENT') {
+            console.error("Unable to clean up stub binary; ignoring...", err)
+        }
+    }
 };
 
 install.getVersion(packageJsonPath)
     .then((v) => downloadAndExtract(v.split('-')[0]))
-    .catch((e) => console.error(e));
+    .catch((e) => { removeStubBinary(); throw e; });

package/src/install.js

@@ -15,14 +15,14 @@ const BASE_URL="https://github.com/getgauge/gauge/releases/download/",
         "linux": "linux",
         "win32": "windows"
     };
- 
-var getVersion = function(p) {
-    return new Promise( (resolve, reject) => {
+
+const getVersion = function (p) {
+    return new Promise((resolve, reject) => {
         if (!fs.existsSync(p)) {
             reject("Unable to find package.json.");
         }
         fs.readFile(p, (err, data) => {
-            if(err) {
+            if (err) {
                 reject(err);
             }
             const pkg = JSON.parse(data);
@@ -31,15 +31,16 @@ var getVersion = function(p) {
             } else {
                 reject(new Error("Unable to find version in package.json."));
             }
-        })    
+        })
     });
-}
+};
 
-var getBinaryUrl = function(version) {
-    let os = PLATFORM_MAPPING[process.platform];
-    let arch = ARCH_MAPPING[process.arch];
-    return `${BASE_URL}v${version}/gauge-${version}-${os}.${arch}.zip`;
-}
+const getBinaryUrl = function (version) {
+    // Use x64 on Windows for ARM64 as we don't publish ARM64 builds yet
+    const canonical_os = PLATFORM_MAPPING[process.platform];
+    const canonical_arch = ARCH_MAPPING[canonical_os === 'windows' && process.arch === 'arm64' ? 'x64' : process.arch];
+    return `${BASE_URL}v${version}/gauge-${version}-${canonical_os}.${canonical_arch}.zip`;
+};
 
 module.exports = {
     getVersion: getVersion,

package/test/test.js

@@ -18,8 +18,8 @@ describe("getVersion", () => {
 
 describe("getBinaryUrl", () => {
     it("should return platform specific URL", async () => {
-        let originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform');;
-        let originalArch = Object.getOwnPropertyDescriptor(process, 'arch');;
+        let originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform');
+        let originalArch = Object.getOwnPropertyDescriptor(process, 'arch');
         Object.defineProperty(process, 'platform', { value: "win32" });
         Object.defineProperty(process, 'arch', { value: "ia32" });
 
@@ -29,6 +29,18 @@ describe("getBinaryUrl", () => {
         Object.defineProperty(process, 'arch', originalArch);
     });
 
+    it("should override platform specific URL for windows arm64", async () => {
+        let originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform');
+        let originalArch = Object.getOwnPropertyDescriptor(process, 'arch');
+        Object.defineProperty(process, 'platform', { value: "win32" });
+        Object.defineProperty(process, 'arch', { value: "arm64" });
+
+        expect(await subject.getBinaryUrl("1.0.0")).equals("https://github.com/getgauge/gauge/releases/download/v1.0.0/gauge-1.0.0-windows.x86_64.zip");
+
+        Object.defineProperty(process, 'platform', originalPlatform);
+        Object.defineProperty(process, 'arch', originalArch);
+    });
+
 });