@getgauge/cli 1.5.0 → 1.5.1

package/package.json

@@ -29,7 +29,7 @@
     "sinon": "^6.2.0"
   },
   "dependencies": {
-    "unzipper": "^0.9.3"
+    "adm-zip": "^0.5.10"
   },
-  "version": "1.5.0"
+  "version": "1.5.1"
 }

package/src/index.js

@@ -4,19 +4,35 @@
 
 const install = require("./install"),
     path = require("path"),
-    unzip = require('unzipper'),
+    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) {
+        try {
+            const zip = new AdmZip(buffer);
+            zip.extractAllTo(path.normalize(binPath), true, true);
+            resolve();
+        } catch (err) {
+            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 => {
         if (res.statusCode >= 300 && res.statusCode < 400) {
-            downloadFollowingRedirect(res.headers.location, reject, resolve);
-        } else if (res.statusCode > 400) {
-            console.error(`Unable to download '${url}' : ${res.statusCode}-'${res.statusMessage}'`);
+            downloadFollowingRedirect(res.headers.location, resolve, reject);
+        } else if (res.statusCode >= 400) {
+            reject(new Error(`Unable to download '${url}' : ${res.statusCode}-'${res.statusMessage}'`));
         } else {
-            res.pipe(unzip.Extract({ path: path.normalize(binPath) })).on('error', reject).on('end', resolve);
+            const chunks = [];
+            res
+                .on('data', chunk => chunks.push(chunk))
+                .on('end', () => resolve(Buffer.concat(chunks)))
+                .on('error', reject);
         }
     });
 };
@@ -32,6 +48,7 @@ var downloadAndExtract = function(version) {
             reject(error);
         }
     })
+    .then(extractZipArchive)
 };
 
 install.getVersion(packageJsonPath)

package/src/install.js

@@ -25,7 +25,12 @@ var getVersion = function(p) {
             if(err) {
                 reject(err);
             }
-            resolve(JSON.parse(data).version);   
+            const pkg = JSON.parse(data);
+            if (pkg.version) {
+                resolve(pkg.version);
+            } else {
+                reject(new Error("Unable to find version in package.json."));
+            }
         })    
     });
 }