cypress 5.2.0 → 5.6.0

package/lib/fs.js

@@ -1,5 +1,5 @@
 "use strict";
 
-var Promise = require('bluebird');
+const Promise = require('bluebird');
 
 module.exports = Promise.promisifyAll(require('fs-extra'));

package/lib/logger.js

@@ -1,85 +1,59 @@
 "use strict";
 
-var R = require('ramda');
+const R = require('ramda');
 
-var chalk = require('chalk');
+const chalk = require('chalk');
 
-var logs = [];
+let logs = [];
 
-var logLevel = function logLevel() {
+const logLevel = () => {
   return process.env.npm_config_loglevel || 'notice';
 };
 
-var error = function error() {
-  for (var _len = arguments.length, messages = new Array(_len), _key = 0; _key < _len; _key++) {
-    messages[_key] = arguments[_key];
-  }
-
+const error = (...messages) => {
   logs.push(messages.join(' '));
-  console.log(chalk.red.apply(chalk, messages)); // eslint-disable-line no-console
+  console.log(chalk.red(...messages)); // eslint-disable-line no-console
 };
 
-var warn = function warn() {
+const warn = (...messages) => {
   if (logLevel() === 'silent') return;
-
-  for (var _len2 = arguments.length, messages = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-    messages[_key2] = arguments[_key2];
-  }
-
   logs.push(messages.join(' '));
-  console.log(chalk.yellow.apply(chalk, messages)); // eslint-disable-line no-console
+  console.log(chalk.yellow(...messages)); // eslint-disable-line no-console
 };
 
-var log = function log() {
-  var _console;
-
+const log = (...messages) => {
   if (logLevel() === 'silent' || logLevel() === 'warn') return;
-
-  for (var _len3 = arguments.length, messages = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-    messages[_key3] = arguments[_key3];
-  }
-
   logs.push(messages.join(' '));
-
-  (_console = console).log.apply(_console, messages); // eslint-disable-line no-console
-
+  console.log(...messages); // eslint-disable-line no-console
 };
 
-var always = function always() {
-  var _console2;
-
-  for (var _len4 = arguments.length, messages = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-    messages[_key4] = arguments[_key4];
-  }
-
+const always = (...messages) => {
   logs.push(messages.join(' '));
-
-  (_console2 = console).log.apply(_console2, messages); // eslint-disable-line no-console
-
+  console.log(...messages); // eslint-disable-line no-console
 }; // splits long text into lines and calls log()
 // on each one to allow easy unit testing for specific message
 
 
-var logLines = function logLines(text) {
-  var lines = text.split('\n');
+const logLines = text => {
+  const lines = text.split('\n');
   R.forEach(log, lines);
 };
 
-var print = function print() {
+const print = () => {
   return logs.join('\n');
 };
 
-var reset = function reset() {
+const reset = () => {
   logs = [];
 };
 
 module.exports = {
-  log: log,
-  warn: warn,
-  error: error,
-  always: always,
-  logLines: logLines,
-  print: print,
-  reset: reset,
-  logLevel: logLevel
+  log,
+  warn,
+  error,
+  always,
+  logLines,
+  print,
+  reset,
+  logLevel
 };

package/lib/tasks/cache.js

@@ -1,73 +1,121 @@
 "use strict";
 
-var state = require('./state');
+const state = require('./state');
 
-var logger = require('../logger');
+const logger = require('../logger');
 
-var fs = require('../fs');
+const fs = require('../fs');
 
-var util = require('../util');
+const util = require('../util');
 
-var _require = require('path'),
-    join = _require.join;
+const {
+  join
+} = require('path');
 
-var Table = require('cli-table3');
+const Table = require('cli-table3');
 
-var moment = require('moment');
+const moment = require('moment');
 
-var chalk = require('chalk');
+const chalk = require('chalk');
 
-var _ = require('lodash'); // output colors for the table
+const _ = require('lodash');
 
+const getFolderSize = require('./get-folder-size');
 
-var colors = {
+const Bluebird = require('bluebird'); // output colors for the table
+
+
+const colors = {
   titles: chalk.white,
   dates: chalk.cyan,
-  values: chalk.green
+  values: chalk.green,
+  size: chalk.gray
 };
 
-var logCachePath = function logCachePath() {
+const logCachePath = () => {
   logger.always(state.getCacheDir());
   return undefined;
 };
 
-var clear = function clear() {
+const clear = () => {
   return fs.removeAsync(state.getCacheDir());
 };
+
+const prune = () => {
+  const cacheDir = state.getCacheDir();
+  const currentVersion = util.pkgVersion();
+  let deletedBinary = false;
+  return fs.readdirAsync(cacheDir).then(versions => {
+    return Bluebird.all(versions.map(version => {
+      if (version !== currentVersion) {
+        deletedBinary = true;
+        const versionDir = join(cacheDir, version);
+        return fs.removeAsync(versionDir);
+      }
+    }));
+  }).then(() => {
+    if (deletedBinary) {
+      logger.always(`Deleted all binary caches except for the ${currentVersion} binary cache.`);
+    } else {
+      logger.always(`No binary caches found to prune.`);
+    }
+  }).catch({
+    code: 'ENOENT'
+  }, () => {
+    logger.always(`No Cypress cache was found at ${cacheDir}. Nothing to prune.`);
+  });
+};
+
+const fileSizeInMB = size => {
+  return `${(size / 1024 / 1024).toFixed(1)}MB`;
+};
 /**
  * Collects all cached versions, finds when each was used
  * and prints a table with results to the terminal
  */
 
 
-var list = function list() {
-  return getCachedVersions().then(function (binaries) {
-    var table = new Table({
-      head: [colors.titles('version'), colors.titles('last used')]
+const list = showSize => {
+  return getCachedVersions(showSize).then(binaries => {
+    const head = [colors.titles('version'), colors.titles('last used')];
+
+    if (showSize) {
+      head.push(colors.titles('size'));
+    }
+
+    const table = new Table({
+      head
     });
-    binaries.forEach(function (binary) {
-      var versionString = colors.values(binary.version);
-      var lastUsed = binary.accessed ? colors.dates(binary.accessed) : 'unknown';
-      return table.push([versionString, lastUsed]);
+    binaries.forEach(binary => {
+      const versionString = colors.values(binary.version);
+      const lastUsed = binary.accessed ? colors.dates(binary.accessed) : 'unknown';
+      const row = [versionString, lastUsed];
+
+      if (showSize) {
+        const size = colors.size(fileSizeInMB(binary.size));
+        row.push(size);
+      }
+
+      return table.push(row);
     });
     logger.always(table.toString());
   });
 };
 
-var getCachedVersions = function getCachedVersions() {
-  var cacheDir = state.getCacheDir();
-  return fs.readdirAsync(cacheDir).filter(util.isSemver).map(function (version) {
+const getCachedVersions = showSize => {
+  const cacheDir = state.getCacheDir();
+  return fs.readdirAsync(cacheDir).filter(util.isSemver).map(version => {
     return {
-      version: version,
+      version,
       folderPath: join(cacheDir, version)
     };
-  }).mapSeries(function (binary) {
+  }).mapSeries(binary => {
     // last access time on the folder is different from last access time
     // on the Cypress binary
-    var binaryDir = state.getBinaryDir(binary.version);
-    var executable = state.getPathToExecutable(binaryDir);
-    return fs.statAsync(executable).then(function (stat) {
-      var lastAccessedTime = _.get(stat, 'atime');
+    const binaryDir = state.getBinaryDir(binary.version);
+    const executable = state.getPathToExecutable(binaryDir);
+    return fs.statAsync(executable).then(stat => {
+      const lastAccessedTime = _.get(stat, 'atime');
 
       if (!lastAccessedTime) {
         // the test runner has never been opened
@@ -75,19 +123,31 @@ var getCachedVersions = function getCachedVersions() {
         return binary;
       }
 
-      var accessed = moment(lastAccessedTime).fromNow();
+      const accessed = moment(lastAccessedTime).fromNow();
       binary.accessed = accessed;
       return binary;
-    }, function (e) {
+    }, e => {
       // could not find the binary or gets its stats
       return binary;
     });
+  }).mapSeries(binary => {
+    if (showSize) {
+      const binaryDir = state.getBinaryDir(binary.version);
+      return getFolderSize(binaryDir).then(size => {
+        return { ...binary,
+          size
+        };
+      });
+    }
+
+    return binary;
   });
 };
 
 module.exports = {
   path: logCachePath,
-  clear: clear,
-  list: list,
-  getCachedVersions: getCachedVersions
+  clear,
+  prune,
+  list,
+  getCachedVersions
 };