cypress 3.7.0 → 3.8.3

package/lib/tasks/unzip.js

@@ -1,11 +1,12 @@
 'use strict';
 
+var _ = require('lodash');
 var la = require('lazy-ass');
 var is = require('check-more-types');
 var cp = require('child_process');
 var os = require('os');
 var yauzl = require('yauzl');
-var debug = require('debug')('cypress:cli');
+var debug = require('debug')('cypress:cli:unzip');
 var extract = require('extract-zip');
 var Promise = require('bluebird');
 var readline = require('readline');
@@ -17,8 +18,11 @@ var _require = require('../errors'),
 var fs = require('../fs');
 var util = require('../util');
 
-// expose this function for simple testing
-var unzip = function unzip(_ref) {
+var unzipTools = {
+  extract: extract
+
+  // expose this function for simple testing
+};var unzip = function unzip(_ref) {
   var zipFilePath = _ref.zipFilePath,
       installDir = _ref.installDir,
       progress = _ref.progress;
@@ -30,14 +34,20 @@ var unzip = function unzip(_ref) {
     throw new Error('Missing zip filename');
   }
 
+  var startTime = Date.now();
+  var yauzlDoneTime = 0;
+
   return fs.ensureDirAsync(installDir).then(function () {
     return new Promise(function (resolve, reject) {
       return yauzl.open(zipFilePath, function (err, zipFile) {
-        if (err) return reject(err);
+        yauzlDoneTime = Date.now();
+
+        if (err) {
+          debug('error using yauzl %s', err.message);
+
+          return reject(err);
+        }
 
-        // debug('zipfile.paths:', zipFile)
-        // zipFile.on('entry', debug)
-        // debug(zipFile.readEntry())
         var total = zipFile.entryCount;
 
         debug('zipFile entries count', total);
@@ -65,11 +75,17 @@ var unzip = function unzip(_ref) {
         };
 
         var unzipWithNode = function unzipWithNode() {
+          debug('unzipping with node.js (slow)');
+
           var endFn = function endFn(err) {
             if (err) {
+              debug('error %s', err.message);
+
               return reject(err);
             }
 
+            debug('node unzip finished');
+
             return resolve();
           };
 
@@ -78,21 +94,67 @@ var unzip = function unzip(_ref) {
             onEntry: tick
           };
 
-          return extract(zipFilePath, opts, endFn);
+          debug('calling Node extract tool %s %o', zipFilePath, opts);
+
+          return unzipTools.extract(zipFilePath, opts, endFn);
         };
 
-        //# we attempt to first unzip with the native osx
-        //# ditto because its less likely to have problems
-        //# with corruption, symlinks, or icons causing failures
-        //# and can handle resource forks
-        //# http://automatica.com.au/2011/02/unzip-mac-os-x-zip-in-terminal/
+        var unzipFallback = _.once(unzipWithNode);
+
+        var unzipWithUnzipTool = function unzipWithUnzipTool() {
+          debug('unzipping via `unzip`');
+
+          var inflatingRe = /inflating:/;
+
+          var sp = cp.spawn('unzip', ['-o', zipFilePath, '-d', installDir]);
+
+          sp.on('error', function (err) {
+            debug('unzip tool error: %s', err.message);
+            unzipFallback();
+          });
+
+          sp.on('close', function (code) {
+            debug('unzip tool close with code %d', code);
+            if (code === 0) {
+              percent = 100;
+              notify(percent);
+
+              return resolve();
+            }
+
+            debug('`unzip` failed %o', { code: code });
+
+            return unzipFallback();
+          });
+
+          sp.stdout.on('data', function (data) {
+            if (inflatingRe.test(data)) {
+              return tick();
+            }
+          });
+
+          sp.stderr.on('data', function (data) {
+            debug('`unzip` stderr %s', data);
+          });
+        };
+
+        // we attempt to first unzip with the native osx
+        // ditto because its less likely to have problems
+        // with corruption, symlinks, or icons causing failures
+        // and can handle resource forks
+        // http://automatica.com.au/2011/02/unzip-mac-os-x-zip-in-terminal/
         var unzipWithOsx = function unzipWithOsx() {
+          debug('unzipping via `ditto`');
+
           var copyingFileRe = /^copying file/;
 
           var sp = cp.spawn('ditto', ['-xkV', zipFilePath, installDir]);
 
           // f-it just unzip with node
-          sp.on('error', unzipWithNode);
+          sp.on('error', function (err) {
+            debug(err.message);
+            unzipFallback();
+          });
 
           sp.on('close', function (code) {
             if (code === 0) {
@@ -104,7 +166,9 @@ var unzip = function unzip(_ref) {
               return resolve();
             }
 
-            return unzipWithNode();
+            debug('`ditto` failed %o', { code: code });
+
+            return unzipFallback();
           });
 
           return readline.createInterface({
@@ -120,12 +184,18 @@ var unzip = function unzip(_ref) {
           case 'darwin':
             return unzipWithOsx();
           case 'linux':
+            return unzipWithUnzipTool();
           case 'win32':
             return unzipWithNode();
           default:
             return;
         }
       });
+    }).tap(function () {
+      debug('unzip completed %o', {
+        yauzlMs: yauzlDoneTime - startTime,
+        unzipMs: Date.now() - yauzlDoneTime
+      });
     });
   });
 };
@@ -154,5 +224,9 @@ var start = function start(_ref2) {
 };
 
 module.exports = {
-  start: start
+  start: start,
+  utils: {
+    unzip: unzip,
+    unzipTools: unzipTools
+  }
 };

package/lib/util.js

@@ -181,7 +181,7 @@ var dequote = function dequote(str) {
 };
 
 var parseOpts = function parseOpts(opts) {
-  opts = _.pick(opts, 'project', 'spec', 'reporter', 'reporterOptions', 'path', 'destination', 'port', 'env', 'cypressVersion', 'config', 'record', 'key', 'configFile', 'browser', 'detached', 'headed', 'global', 'dev', 'force', 'exit', 'cachePath', 'cacheList', 'cacheClear', 'parallel', 'group', 'ciBuildId');
+  opts = _.pick(opts, 'browser', 'cachePath', 'cacheList', 'cacheClear', 'ciBuildId', 'config', 'configFile', 'cypressVersion', 'destination', 'detached', 'dev', 'exit', 'env', 'force', 'global', 'group', 'headed', 'headless', 'key', 'path', 'parallel', 'port', 'project', 'reporter', 'reporterOptions', 'record', 'spec', 'tag');
 
   if (opts.exit) {
     opts = _.omit(opts, 'exit');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "3.7.0",
+  "version": "3.8.3",
   "main": "index.js",
   "scripts": {
     "postinstall": "node index.js --exec install",
@@ -18,6 +18,7 @@
     "commander": "2.15.1",
     "common-tags": "1.8.0",
     "debug": "3.2.6",
+    "eventemitter2": "4.1.2",
     "execa": "0.10.0",
     "executable": "4.1.1",
     "extract-zip": "1.6.7",

package/types/bluebird/README.md

@@ -5,12 +5,12 @@
 This package contains type definitions for bluebird (https://github.com/petkaantonov/bluebird).
 
 # Details
-Files were exported from https://www.github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/bluebird
+Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/bluebird.
 
-Additional Details
- * Last updated: Tue, 31 Oct 2017 00:15:11 GMT
+### Additional Details
+ * Last updated: Mon, 11 Nov 2019 20:12:15 GMT
  * Dependencies: none
  * Global values: none
 
 # Credits
-These definitions were written by Leonard Hecker <https://github.com/lhecker>.
+These definitions were written by Leonard Hecker (https://github.com/lhecker), and thislooksfun (https://github.com/thislooksfun).