Merge pull request #497 from bleggett/remove-adm-zip

Replace adm_zip install dependency with extract-zip

Author: nicks

install.js

@@ -8,7 +8,7 @@
 
 var requestProgress = require('request-progress')
 var progress = require('progress')
-var AdmZip = require('adm-zip')
+var extractZip = require('extract-zip')
 var cp = require('child_process')
 var fs = require('fs-extra')
 var hasha = require('hasha')
@@ -285,15 +285,14 @@ function extractDownload(filePath) {
 
   if (filePath.substr(-4) === '.zip') {
     console.log('Extracting zip contents')
-
-    try {
-      var zip = new AdmZip(filePath)
-      zip.extractAllTo(extractedPath, true)
-      deferred.resolve(extractedPath)
-    } catch (err) {
-      console.error('Error extracting zip')
-      deferred.reject(err)
-    }
+    extractZip(path.resolve(filePath), {dir: extractedPath}, function(err) {
+      if (err) {
+        console.error('Error extracting zip')
+        deferred.reject(err)
+      } else {
+        deferred.resolve(extractedPath)
+      }
+    })
 
   } else {
     console.log('Extracting tar contents (via spawned process)')

package.json

@@ -39,7 +39,7 @@
     "test": "nodeunit --reporter=minimal test/tests.js && eslint install.js"
   },
   "dependencies": {
-    "adm-zip": "~0.4.7",
+    "extract-zip": "~1.5.0",
     "fs-extra": "~0.26.4",
     "hasha": "^2.2.0",
     "kew": "~0.7.0",