appium-support - npm Package Compare versions

Comparing version 2.0.0-beta2 to 2.0.0-beta3

build/index.js

@@ -5,2 +5,4 @@ 'use strict';
 
+var _interopRequireDefault = require('babel-runtime/helpers/interop-require-default')['default'];
+
 Object.defineProperty(exports, '__esModule', {
@@ -22,12 +24,14 @@ value: true
 
+var _libFs = require('./lib/fs');
+
+var _libFs2 = _interopRequireDefault(_libFs);
+
+var _libRimraf = require('./lib/rimraf');
+
+var _libRimraf2 = _interopRequireDefault(_libRimraf);
+
 // can't add to other exports `as default`
 // until JSHint figures out how to parse that pattern
-exports['default'] = {
-  tempDir: tempDir,
-  system: system,
-  util: util
-};
-exports.tempDir = tempDir;
-exports.system = system;
-exports.util = util;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OzBCQUV5QixlQUFlOztJQUE1QixPQUFPOzt5QkFDSyxjQUFjOztJQUExQixNQUFNOzt1QkFDSSxZQUFZOztJQUF0QixJQUFJOzs7O3FCQUlEO0FBQ2IsU0FBTyxFQUFQLE9BQU87QUFDUCxRQUFNLEVBQU4sTUFBTTtBQUNOLE1BQUksRUFBSixJQUFJO0NBQ0w7UUFFUSxPQUFPLEdBQVAsT0FBTztRQUFFLE1BQU0sR0FBTixNQUFNO1FBQUUsSUFBSSxHQUFKLElBQUkiLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyJcblxuaW1wb3J0ICogYXMgdGVtcERpciBmcm9tICcuL2xpYi90ZW1wZGlyJztcbmltcG9ydCAqIGFzIHN5c3RlbSBmcm9tICcuL2xpYi9zeXN0ZW0nO1xuaW1wb3J0ICogYXMgdXRpbCBmcm9tICcuL2xpYi91dGlsJztcblxuLy8gY2FuJ3QgYWRkIHRvIG90aGVyIGV4cG9ydHMgYGFzIGRlZmF1bHRgXG4vLyB1bnRpbCBKU0hpbnQgZmlndXJlcyBvdXQgaG93IHRvIHBhcnNlIHRoYXQgcGF0dGVyblxuZXhwb3J0IGRlZmF1bHQge1xuICB0ZW1wRGlyLFxuICBzeXN0ZW0sXG4gIHV0aWxcbn07XG5cbmV4cG9ydCB7IHRlbXBEaXIsIHN5c3RlbSwgdXRpbCB9O1xuIl19
+exports['default'] = { tempDir: tempDir, system: system, util: util, fs: _libFs2['default'], rimraf: _libRimraf2['default'], cancellableDelay: _libUtil.cancellableDelay };
+module.exports = exports['default'];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7MEJBQXlCLGVBQWU7O0lBQTVCLE9BQU87O3lCQUNLLGNBQWM7O0lBQTFCLE1BQU07O3VCQUNJLFlBQVk7O0lBQXRCLElBQUk7O3FCQUVELFVBQVU7Ozs7eUJBQ04sY0FBYzs7Ozs7O3FCQUlsQixFQUFFLE9BQU8sRUFBUCxPQUFPLEVBQUUsTUFBTSxFQUFOLE1BQU0sRUFBRSxJQUFJLEVBQUosSUFBSSxFQUFFLEVBQUUsb0JBQUEsRUFBRSxNQUFNLHdCQUFBLEVBQUUsZ0JBQWdCLFdBTjNELGdCQUFnQixBQU0yQyxFQUFFIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgdGVtcERpciBmcm9tICcuL2xpYi90ZW1wZGlyJztcbmltcG9ydCAqIGFzIHN5c3RlbSBmcm9tICcuL2xpYi9zeXN0ZW0nO1xuaW1wb3J0ICogYXMgdXRpbCBmcm9tICcuL2xpYi91dGlsJztcbmltcG9ydCB7IGNhbmNlbGxhYmxlRGVsYXkgfSBmcm9tICcuL2xpYi91dGlsJztcbmltcG9ydCBmcyBmcm9tICcuL2xpYi9mcyc7XG5pbXBvcnQgcmltcmFmIGZyb20gJy4vbGliL3JpbXJhZic7XG5cbi8vIGNhbid0IGFkZCB0byBvdGhlciBleHBvcnRzIGBhcyBkZWZhdWx0YFxuLy8gdW50aWwgSlNIaW50IGZpZ3VyZXMgb3V0IGhvdyB0byBwYXJzZSB0aGF0IHBhdHRlcm5cbmV4cG9ydCBkZWZhdWx0IHsgdGVtcERpciwgc3lzdGVtLCB1dGlsLCBmcywgcmltcmFmLCBjYW5jZWxsYWJsZURlbGF5IH07XG4iXX0=

build/lib/util.js

@@ -12,2 +12,6 @@ 'use strict';
 
+var _bluebird = require('bluebird');
+
+var _bluebird2 = _interopRequireDefault(_bluebird);
+
 var _lodash = require('lodash');
@@ -17,6 +21,2 @@
 
-var _fs2 = require('fs');
-
-var _fs3 = _interopRequireDefault(_fs2);
-
 var _os = require('os');
@@ -26,15 +26,10 @@
 
-var _bluebird = require('bluebird');
+var _appiumLogger = require('appium-logger');
 
-var _bluebird2 = _interopRequireDefault(_bluebird);
+var _fs = require('./fs');
 
-var _appiumLogger = require('appium-logger');
+var _fs2 = _interopRequireDefault(_fs);
 
 var logger = (0, _appiumLogger.getLogger)('Appium-Support');
 
-var fs = {
-  mkdir: _bluebird2['default'].promisify(_fs3['default'].mkdir),
-  access: _bluebird2['default'].promisify(_fs3['default'].access)
-};
-
 function hasContent(val) {
@@ -68,23 +63,9 @@ return _lodash2['default'].isString(val) && val !== '';
       case 0:
-        context$1$0.prev = 0;
-        context$1$0.next = 3;
-        return _regeneratorRuntime.awrap(fs.access(path, fs.F_OK | fs.R_OK));
+        return context$1$0.abrupt('return', _fs2['default'].hasAccess(path));
 
-      case 3:
-        context$1$0.next = 8;
-        break;
-
-      case 5:
-        context$1$0.prev = 5;
-        context$1$0.t0 = context$1$0['catch'](0);
-        return context$1$0.abrupt('return', false);
-
-      case 8:
-        return context$1$0.abrupt('return', true);
-
-      case 9:
+      case 1:
       case 'end':
         return context$1$0.stop();
     }
-  }, null, this, [[0, 5]]);
+  }, null, this);
 }
@@ -98,3 +79,3 @@
         context$1$0.next = 3;
-        return _regeneratorRuntime.awrap(fs.mkdir(dirName));
+        return _regeneratorRuntime.awrap(_fs2['default'].mkdir(dirName));
 
@@ -127,2 +108,18 @@ case 3:
 
+/*
+ * Creates a promise that is cancellable, and will timeout
+ * after `ms` delay
+ */
+function cancellableDelay(ms) {
+  var timer = undefined;
+  return new _bluebird2['default'].Promise(function (resolve) {
+    timer = setTimeout(function () {
+      resolve();
+    }, ms);
+  }).cancellable()['catch'](_bluebird2['default'].CancellationError, function (err) {
+    clearTimeout(timer);
+    throw err;
+  });
+}
+
 exports.hasValue = hasValue;
@@ -133,2 +130,5 @@ exports.escapeSpace = escapeSpace;
 exports.localIp = localIp;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlsLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztRQWVnQixVQUFVLEdBQVYsVUFBVTs7c0JBZFosUUFBUTs7OzttQkFDTixJQUFJOzs7O2tCQUNMLElBQUk7Ozs7d0JBQ0wsVUFBVTs7Ozs0QkFDRSxlQUFlOztBQUV6QyxJQUFJLE1BQU0sR0FBRyxrQkFGSixTQUFTLEVBRUssZ0JBQWdCLENBQUMsQ0FBQzs7QUFFekMsSUFBSSxFQUFFLEdBQUc7QUFDUCxPQUFLLEVBQUUsc0JBQUUsU0FBUyxDQUFDLGdCQUFJLEtBQUssQ0FBQztBQUM3QixRQUFNLEVBQUUsc0JBQUUsU0FBUyxDQUFDLGdCQUFJLE1BQU0sQ0FBQztDQUNoQyxDQUFDOztBQUdLLFNBQVMsVUFBVSxDQUFFLEdBQUcsRUFBRTtBQUMvQixTQUFPLG9CQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxHQUFHLEtBQUssRUFBRSxDQUFDO0NBQ3RDOzs7QUFHRCxTQUFTLFFBQVEsQ0FBRSxHQUFHLEVBQUU7QUFDdEIsTUFBSSxNQUFNLEdBQUcsS0FBSyxDQUFDOztBQUVuQixNQUFJLG9CQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRTtBQUNuQixVQUFNLEdBQUcsQ0FBQyxvQkFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7R0FDeEIsTUFBTTtBQUNMLFVBQU0sR0FBRyxDQUFDLG9CQUFFLFdBQVcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLG9CQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztHQUNoRDs7QUFFRCxTQUFPLE1BQU0sQ0FBQztDQUNmOzs7QUFHRCxTQUFTLFdBQVcsQ0FBRSxHQUFHLEVBQUU7QUFDekIsU0FBTyxHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztDQUNuQzs7OztBQUlELFNBQWUsU0FBUyxDQUFFLElBQUk7Ozs7Ozt5Q0FFcEIsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDOzs7Ozs7Ozs7NENBRWpDLEtBQUs7Ozs0Q0FFUCxJQUFJOzs7Ozs7O0NBQ1o7O0FBRUQsU0FBZSxLQUFLLENBQUUsT0FBTzs7Ozs7O3lDQUVuQixFQUFFLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQzs7Ozs7Ozs7OztBQUV2QixZQUFJLGtCQUFPLGVBQUksSUFBSSxLQUFLLFFBQVEsRUFBRTtBQUNoQyxnQkFBTSxDQUFDLGFBQWEsZ0JBQUssQ0FBQztTQUMzQjs7Ozs7OztDQUVKOztBQUVELFNBQVMsT0FBTyxHQUFJO0FBQ2xCLE1BQUksRUFBRSxHQUFHLG9CQUFFLEtBQUssQ0FBQyxnQkFBRyxpQkFBaUIsRUFBRSxDQUFDLENBQ3JDLE1BQU0sRUFBRSxDQUNSLE9BQU8sRUFBRSxDQUNULE1BQU0sQ0FBQyxVQUFVLEdBQUcsRUFBRTtBQUNyQixXQUFRLEdBQUcsQ0FBQyxNQUFNLEtBQUssTUFBTSxJQUFJLEdBQUcsQ0FBQyxRQUFRLEtBQUssS0FBSyxDQUFFO0dBQzFELENBQUMsQ0FDRCxLQUFLLENBQUMsU0FBUyxDQUFDLENBQ2hCLEtBQUssRUFBRSxDQUNQLEtBQUssRUFBRSxDQUFDO0FBQ1gsU0FBTyxFQUFFLENBQUM7Q0FDWDs7UUFFUSxRQUFRLEdBQVIsUUFBUTtRQUFFLFdBQVcsR0FBWCxXQUFXO1FBQUUsU0FBUyxHQUFULFNBQVM7UUFBRSxLQUFLLEdBQUwsS0FBSztRQUFFLE9BQU8sR0FBUCxPQUFPIiwiZmlsZSI6ImxpYi91dGlsLmpzIiwic291cmNlc0NvbnRlbnQiOlsiXG5pbXBvcnQgXyBmcm9tICdsb2Rhc2gnO1xuaW1wb3J0IF9mcyBmcm9tICdmcyc7XG5pbXBvcnQgb3MgZnJvbSAnb3MnO1xuaW1wb3J0IEIgZnJvbSAnYmx1ZWJpcmQnO1xuaW1wb3J0IHsgZ2V0TG9nZ2VyIH0gZnJvbSAnYXBwaXVtLWxvZ2dlcic7XG5cbmxldCBsb2dnZXIgPSBnZXRMb2dnZXIoJ0FwcGl1bS1TdXBwb3J0Jyk7XG5cbmxldCBmcyA9IHtcbiAgbWtkaXI6IEIucHJvbWlzaWZ5KF9mcy5ta2RpciksXG4gIGFjY2VzczogQi5wcm9taXNpZnkoX2ZzLmFjY2Vzcylcbn07XG5cblxuZXhwb3J0IGZ1bmN0aW9uIGhhc0NvbnRlbnQgKHZhbCkge1xuICByZXR1cm4gXy5pc1N0cmluZyh2YWwpICYmIHZhbCAhPT0gXCJcIjtcbn1cblxuLy8gcmV0dXJuIHRydWUgaWYgdGhlIHRoZSB2YWx1ZSBpcyBub3QgdW5kZWZpbmVkLCBudWxsLCBvciBOYU4uXG5mdW5jdGlvbiBoYXNWYWx1ZSAodmFsKSB7XG4gIGxldCBoYXNWYWwgPSBmYWxzZTtcbiAgLy8gYXZvaWQgaW5jb3JyZWN0bHkgZXZhbHVhdGluZyBgMGAgYXMgZmFsc2VcbiAgaWYgKF8uaXNOdW1iZXIodmFsKSkge1xuICAgIGhhc1ZhbCA9ICFfLmlzTmFOKHZhbCk7XG4gIH0gZWxzZSB7XG4gICAgaGFzVmFsID0gIV8uaXNVbmRlZmluZWQodmFsKSAmJiAhXy5pc051bGwodmFsKTtcbiAgfVxuXG4gIHJldHVybiBoYXNWYWw7XG59XG5cbi8vIGVzY2FwZSBzcGFjZXMgaW4gc3RyaW5nLCBmb3IgY29tbWFuZGxpbmUgY2FsbHNcbmZ1bmN0aW9uIGVzY2FwZVNwYWNlIChzdHIpIHtcbiAgcmV0dXJuIHN0ci5zcGxpdCgvIC8pLmpvaW4oJ1xcXFwgJyk7XG59XG5cbi8vIHByb21pc2Ugd2hpY2ggcmVzb2x2ZXMgdHJ1ZSBpZiBwcm9ncmFtIGhhcyBhY2Nlc3MgdG8gcmVhZCB0aGUgcGF0aCBwYXNzZWQgaW4sXG4vLyBmYWxzZSBvdGhlcndpc2VcbmFzeW5jIGZ1bmN0aW9uIGhhc0FjY2VzcyAocGF0aCkge1xuICB0cnkgeyBcbiAgICBhd2FpdCBmcy5hY2Nlc3MocGF0aCwgZnMuRl9PSyB8IGZzLlJfT0spO1xuICB9IGNhdGNoIChlcnIpIHtcbiAgICByZXR1cm4gZmFsc2U7XG4gIH1cbiAgcmV0dXJuIHRydWU7XG59XG5cbmFzeW5jIGZ1bmN0aW9uIG1rZGlyIChkaXJOYW1lKSB7XG4gIHRyeSB7IFxuICAgIGF3YWl0IGZzLm1rZGlyKGRpck5hbWUpO1xuICB9IGNhdGNoIChlcnIpIHtcbiAgICBpZiAoZXJyICYmIGVyci5jb2RlICE9PSBcIkVFWElTVFwiKSB7XG4gICAgICBsb2dnZXIuZXJyb3JBbmRUaHJvdyhlcnIpO1xuICAgIH0gXG4gIH1cbn1cblxuZnVuY3Rpb24gbG9jYWxJcCAoKSB7XG4gIGxldCBpcCA9IF8uY2hhaW4ob3MubmV0d29ya0ludGVyZmFjZXMoKSlcbiAgICAudmFsdWVzKClcbiAgICAuZmxhdHRlbigpXG4gICAgLmZpbHRlcihmdW5jdGlvbiAodmFsKSB7XG4gICAgICByZXR1cm4gKHZhbC5mYW1pbHkgPT09ICdJUHY0JyAmJiB2YWwuaW50ZXJuYWwgPT09IGZhbHNlKTtcbiAgICB9KVxuICAgIC5wbHVjaygnYWRkcmVzcycpXG4gICAgLmZpcnN0KClcbiAgICAudmFsdWUoKTtcbiAgcmV0dXJuIGlwO1xufVxuXG5leHBvcnQgeyBoYXNWYWx1ZSwgZXNjYXBlU3BhY2UsIGhhc0FjY2VzcywgbWtkaXIsIGxvY2FsSXAgfTsiXX0=
+exports.cancellableDelay = cancellableDelay;
+
+// TODO: deprecate, use fs.hasAccess instead
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlsLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztRQVFnQixVQUFVLEdBQVYsVUFBVTs7d0JBUlosVUFBVTs7OztzQkFDVixRQUFROzs7O2tCQUNQLElBQUk7Ozs7NEJBQ08sZUFBZTs7a0JBQzFCLE1BQU07Ozs7QUFFckIsSUFBSSxNQUFNLEdBQUcsa0JBSEosU0FBUyxFQUdLLGdCQUFnQixDQUFDLENBQUM7O0FBRWxDLFNBQVMsVUFBVSxDQUFFLEdBQUcsRUFBRTtBQUMvQixTQUFPLG9CQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxHQUFHLEtBQUssRUFBRSxDQUFDO0NBQ3RDOzs7QUFHRCxTQUFTLFFBQVEsQ0FBRSxHQUFHLEVBQUU7QUFDdEIsTUFBSSxNQUFNLEdBQUcsS0FBSyxDQUFDOztBQUVuQixNQUFJLG9CQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRTtBQUNuQixVQUFNLEdBQUcsQ0FBQyxvQkFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7R0FDeEIsTUFBTTtBQUNMLFVBQU0sR0FBRyxDQUFDLG9CQUFFLFdBQVcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLG9CQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztHQUNoRDs7QUFFRCxTQUFPLE1BQU0sQ0FBQztDQUNmOzs7QUFHRCxTQUFTLFdBQVcsQ0FBRSxHQUFHLEVBQUU7QUFDekIsU0FBTyxHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztDQUNuQzs7OztBQUlELFNBQWUsU0FBUyxDQUFFLElBQUk7Ozs7NENBRXJCLGdCQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUM7Ozs7Ozs7Q0FDMUI7O0FBRUQsU0FBZSxLQUFLLENBQUUsT0FBTzs7Ozs7O3lDQUVuQixnQkFBRyxLQUFLLENBQUMsT0FBTyxDQUFDOzs7Ozs7Ozs7O0FBRXZCLFlBQUksa0JBQU8sZUFBSSxJQUFJLEtBQUssUUFBUSxFQUFFO0FBQ2hDLGdCQUFNLENBQUMsYUFBYSxnQkFBSyxDQUFDO1NBQzNCOzs7Ozs7O0NBRUo7O0FBRUQsU0FBUyxPQUFPLEdBQUk7QUFDbEIsTUFBSSxFQUFFLEdBQUcsb0JBQUUsS0FBSyxDQUFDLGdCQUFHLGlCQUFpQixFQUFFLENBQUMsQ0FDckMsTUFBTSxFQUFFLENBQ1IsT0FBTyxFQUFFLENBQ1QsTUFBTSxDQUFDLFVBQVUsR0FBRyxFQUFFO0FBQ3JCLFdBQVEsR0FBRyxDQUFDLE1BQU0sS0FBSyxNQUFNLElBQUksR0FBRyxDQUFDLFFBQVEsS0FBSyxLQUFLLENBQUU7R0FDMUQsQ0FBQyxDQUNELEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FDaEIsS0FBSyxFQUFFLENBQ1AsS0FBSyxFQUFFLENBQUM7QUFDWCxTQUFPLEVBQUUsQ0FBQztDQUNYOzs7Ozs7QUFNRCxTQUFTLGdCQUFnQixDQUFFLEVBQUUsRUFBRTtBQUM3QixNQUFJLEtBQUssWUFBQSxDQUFDO0FBQ1YsU0FBTyxJQUFJLHNCQUFFLE9BQU8sQ0FBQyxVQUFDLE9BQU8sRUFBSztBQUNoQyxTQUFLLEdBQUcsVUFBVSxDQUFDLFlBQVc7QUFDNUIsYUFBTyxFQUFFLENBQUM7S0FDWCxFQUFFLEVBQUUsQ0FBQyxDQUFDO0dBQ1IsQ0FBQyxDQUNELFdBQVcsRUFBRSxTQUNSLENBQUMsc0JBQUUsaUJBQWlCLEVBQUUsVUFBQyxHQUFHLEVBQUs7QUFDbkMsZ0JBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUNwQixVQUFNLEdBQUcsQ0FBQztHQUNYLENBQUMsQ0FBQztDQUNKOztRQUVRLFFBQVEsR0FBUixRQUFRO1FBQUUsV0FBVyxHQUFYLFdBQVc7UUFBRSxTQUFTLEdBQVQsU0FBUztRQUFFLEtBQUssR0FBTCxLQUFLO1FBQUUsT0FBTyxHQUFQLE9BQU87UUFBRSxnQkFBZ0IsR0FBaEIsZ0JBQWdCIiwiZmlsZSI6ImxpYi91dGlsLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IEIgZnJvbSAnYmx1ZWJpcmQnO1xuaW1wb3J0IF8gZnJvbSAnbG9kYXNoJztcbmltcG9ydCBvcyBmcm9tICdvcyc7XG5pbXBvcnQgeyBnZXRMb2dnZXIgfSBmcm9tICdhcHBpdW0tbG9nZ2VyJztcbmltcG9ydCBmcyBmcm9tICcuL2ZzJztcblxubGV0IGxvZ2dlciA9IGdldExvZ2dlcignQXBwaXVtLVN1cHBvcnQnKTtcblxuZXhwb3J0IGZ1bmN0aW9uIGhhc0NvbnRlbnQgKHZhbCkge1xuICByZXR1cm4gXy5pc1N0cmluZyh2YWwpICYmIHZhbCAhPT0gXCJcIjtcbn1cblxuLy8gcmV0dXJuIHRydWUgaWYgdGhlIHRoZSB2YWx1ZSBpcyBub3QgdW5kZWZpbmVkLCBudWxsLCBvciBOYU4uXG5mdW5jdGlvbiBoYXNWYWx1ZSAodmFsKSB7XG4gIGxldCBoYXNWYWwgPSBmYWxzZTtcbiAgLy8gYXZvaWQgaW5jb3JyZWN0bHkgZXZhbHVhdGluZyBgMGAgYXMgZmFsc2VcbiAgaWYgKF8uaXNOdW1iZXIodmFsKSkge1xuICAgIGhhc1ZhbCA9ICFfLmlzTmFOKHZhbCk7XG4gIH0gZWxzZSB7XG4gICAgaGFzVmFsID0gIV8uaXNVbmRlZmluZWQodmFsKSAmJiAhXy5pc051bGwodmFsKTtcbiAgfVxuXG4gIHJldHVybiBoYXNWYWw7XG59XG5cbi8vIGVzY2FwZSBzcGFjZXMgaW4gc3RyaW5nLCBmb3IgY29tbWFuZGxpbmUgY2FsbHNcbmZ1bmN0aW9uIGVzY2FwZVNwYWNlIChzdHIpIHtcbiAgcmV0dXJuIHN0ci5zcGxpdCgvIC8pLmpvaW4oJ1xcXFwgJyk7XG59XG5cbi8vIHByb21pc2Ugd2hpY2ggcmVzb2x2ZXMgdHJ1ZSBpZiBwcm9ncmFtIGhhcyBhY2Nlc3MgdG8gcmVhZCB0aGUgcGF0aCBwYXNzZWQgaW4sXG4vLyBmYWxzZSBvdGhlcndpc2VcbmFzeW5jIGZ1bmN0aW9uIGhhc0FjY2VzcyAocGF0aCkge1xuICAvLyBUT0RPOiBkZXByZWNhdGUsIHVzZSBmcy5oYXNBY2Nlc3MgaW5zdGVhZFxuICByZXR1cm4gZnMuaGFzQWNjZXNzKHBhdGgpO1xufVxuXG5hc3luYyBmdW5jdGlvbiBta2RpciAoZGlyTmFtZSkge1xuICB0cnkgeyBcbiAgICBhd2FpdCBmcy5ta2RpcihkaXJOYW1lKTtcbiAgfSBjYXRjaCAoZXJyKSB7XG4gICAgaWYgKGVyciAmJiBlcnIuY29kZSAhPT0gXCJFRVhJU1RcIikge1xuICAgICAgbG9nZ2VyLmVycm9yQW5kVGhyb3coZXJyKTtcbiAgICB9IFxuICB9XG59XG5cbmZ1bmN0aW9uIGxvY2FsSXAgKCkge1xuICBsZXQgaXAgPSBfLmNoYWluKG9zLm5ldHdvcmtJbnRlcmZhY2VzKCkpXG4gICAgLnZhbHVlcygpXG4gICAgLmZsYXR0ZW4oKVxuICAgIC5maWx0ZXIoZnVuY3Rpb24gKHZhbCkge1xuICAgICAgcmV0dXJuICh2YWwuZmFtaWx5ID09PSAnSVB2NCcgJiYgdmFsLmludGVybmFsID09PSBmYWxzZSk7XG4gICAgfSlcbiAgICAucGx1Y2soJ2FkZHJlc3MnKVxuICAgIC5maXJzdCgpXG4gICAgLnZhbHVlKCk7XG4gIHJldHVybiBpcDtcbn1cblxuLypcbiAqIENyZWF0ZXMgYSBwcm9taXNlIHRoYXQgaXMgY2FuY2VsbGFibGUsIGFuZCB3aWxsIHRpbWVvdXRcbiAqIGFmdGVyIGBtc2AgZGVsYXlcbiAqL1xuZnVuY3Rpb24gY2FuY2VsbGFibGVEZWxheSAobXMpIHtcbiAgbGV0IHRpbWVyO1xuICByZXR1cm4gbmV3IEIuUHJvbWlzZSgocmVzb2x2ZSkgPT4ge1xuICAgIHRpbWVyID0gc2V0VGltZW91dChmdW5jdGlvbigpIHtcbiAgICAgIHJlc29sdmUoKTtcbiAgICB9LCBtcyk7XG4gIH0pXG4gIC5jYW5jZWxsYWJsZSgpXG4gIC5jYXRjaChCLkNhbmNlbGxhdGlvbkVycm9yLCAoZXJyKSA9PiB7XG4gICAgY2xlYXJUaW1lb3V0KHRpbWVyKTtcbiAgICB0aHJvdyBlcnI7XG4gIH0pO1xufVxuXG5leHBvcnQgeyBoYXNWYWx1ZSwgZXNjYXBlU3BhY2UsIGhhc0FjY2VzcywgbWtkaXIsIGxvY2FsSXAsIGNhbmNlbGxhYmxlRGVsYXkgfTtcbiJdfQ==

build/test/util-specs.js

@@ -21,2 +21,6 @@ 'use strict';
 
+var _chaiAsPromised = require('chai-as-promised');
+
+var _chaiAsPromised2 = _interopRequireDefault(_chaiAsPromised);
+
 var _bluebird = require('bluebird');
@@ -32,2 +36,3 @@
 var should = _chai2['default'].should();
+_chai2['default'].use(_chaiAsPromised2['default']);
 
@@ -258,3 +263,38 @@ describe('util', function () {
   });
+
+  describe('cancellableDelay', function () {
+    it('should delay', function callee$2$0() {
+      return _regeneratorRuntime.async(function callee$2$0$(context$3$0) {
+        while (1) switch (context$3$0.prev = context$3$0.next) {
+          case 0:
+            context$3$0.next = 2;
+            return _regeneratorRuntime.awrap(_.util.cancellableDelay('10'));
+
+          case 2:
+          case 'end':
+            return context$3$0.stop();
+        }
+      }, null, this);
+    });
+    it('cancel should work', function callee$2$0() {
+      var delay;
+      return _regeneratorRuntime.async(function callee$2$0$(context$3$0) {
+        while (1) switch (context$3$0.prev = context$3$0.next) {
+          case 0:
+            delay = _.util.cancellableDelay('1000');
+
+            _bluebird2['default'].delay(10).then(function () {
+              delay.cancel();
+            }).done();
+            context$3$0.next = 4;
+            return _regeneratorRuntime.awrap(delay.should.be.rejectedWith(/cancellation error/));
+
+          case 4:
+          case 'end':
+            return context$3$0.stop();
+        }
+      }, null, this);
+    });
+  });
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["test/util-specs.js"],"names":[],"mappings":"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","file":"test/util-specs.js","sourcesContent":["\"use strict\";\n\nimport { util } from '../..';\nimport _rimraf from 'rimraf';\nimport path from 'path';\nimport chai from 'chai';\nimport B from 'bluebird';\nimport sinon from 'sinon';\n\nlet rimraf = B.promisify(_rimraf);\nlet should = chai.should();\n\n\ndescribe('util', function () {\n\n  describe(\"hasValue \", function () {\n    it(\"should exist\", function () {\n      should.exist(util.hasValue);\n    });\n\n    it('should handle undefined', function () {\n      util.hasValue(undefined).should.be.false;\n    });\n\n    it('should handle not a number', function () {\n      util.hasValue(NaN).should.be.false;\n    });\n\n    it('should handle null', function () {\n      util.hasValue(null).should.be.false;\n    });\n\n    it('should handle functions', function () {\n      util.hasValue(function () {}).should.be.true;\n    });\n\n    it('should handle empty arrays', function () {\n      util.hasValue({}).should.be.true;\n    });\n\n    it('should handle zero', function () {\n      util.hasValue(0).should.be.true;\n    });\n\n    it('should handle simple string', function () {\n      util.hasValue('string').should.be.true;\n    });\n\n    it('should handle booleans', function () {\n      util.hasValue(false).should.be.true;\n    });\n\n    it('should handle empty strings', function () {\n      util.hasValue('').should.be.true;\n    });\n  });\n\n  describe(\"hasContent \", function () {\n    it('should exist', function () {\n      should.exist(util.hasContent);\n    });\n\n    it('should handle undefined', function () {\n      util.hasContent(undefined).should.be.false;\n    });\n\n    it('should handle not a number', function () {\n      util.hasContent(NaN).should.be.false;\n    });\n\n    it('should handle null', function () {\n      util.hasContent(null).should.be.false;\n    });\n\n    it('should handle functions', function () {\n      util.hasContent(function () {}).should.be.false;\n    });\n\n    it('should handle empty arrays', function () {\n      util.hasContent({}).should.be.false;\n    });\n\n    it('should handle zero', function () {\n      util.hasContent(0).should.be.false;\n    });\n\n    it('should handle simple string', function () {\n      util.hasContent('string').should.be.true;\n    });\n\n    it('should handle booleans', function () {\n      util.hasContent(false).should.be.false;\n    });\n\n    it('should handle empty strings', function () {\n      util.hasContent('').should.be.false;\n    });\n  });\n\n  describe(\"escapeSpace\", function () {\n    it(\"should do nothing to a string without space\", function () {\n      let actual = 'appium';\n      let expected = 'appium';\n      util.escapeSpace(actual).should.equal(expected);\n    });\n\n    it(\"should do escape spaces\", function () {\n      let actual = '/Applications/ Xcode 6.1.1.app/Contents/Developer';\n      let expected = '/Applications/\\\\ Xcode\\\\ 6.1.1.app/Contents/Developer';\n      util.escapeSpace(actual).should.equal(expected);\n    });\n\n    it(\"should escape consecutive spaces\", function () {\n      let actual = 'appium   space';\n      let expected = 'appium\\\\ \\\\ \\\\ space';\n      util.escapeSpace(actual).should.equal(expected);\n    });\n  });\n\n  describe(\"fileExists\", function () {\n    it(\"should return true if file is readable\", async function () {\n      let exists = await util.hasAccess('/');\n      exists.should.be.true;\n\n    });\n\n    it(\"should return false if file does not exist\", async function () {\n      let exists = await util.hasAccess('chuckwudi');\n      exists.should.be.false;\n    });\n  });\n\n  describe(\"localIp\", function () {\n    it(\"should find a local ip address\", function () {\n      let utilMock = sinon.mock(util);\n      utilMock.expects('localIp').returns('10.35.4.175');\n      util.localIp();\n      utilMock.verify();\n    });\n  });\n\n  describe(\"mkdir\", function () {\n    let dirName = path.resolve(__dirname, \"tmp\");\n\n    it(\"should make a directory that doesn't exist\", async function () {\n      await rimraf(dirName);\n      await util.mkdir(dirName);\n      let exists = await util.hasAccess(dirName);\n      exists.should.be.true;\n    });\n\n    it(\"should not complain if the dir already exists\", async function () {\n        let exists = await util.hasAccess(dirName);\n        exists.should.be.true;\n        await util.mkdir(dirName);\n    });\n\n    it(\"should still throw an error if something else goes wrong\", async function () {\n      await util.mkdir(\"/bin/foo\").should.be.rejected;\n    });\n  });\n});\n\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["test/util-specs.js"],"names":[],"mappings":"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","file":"test/util-specs.js","sourcesContent":["\"use strict\";\n\nimport { util } from '../..';\nimport _rimraf from 'rimraf';\nimport path from 'path';\nimport chai from 'chai';\nimport chaiAsPromised from 'chai-as-promised';\nimport B from 'bluebird';\nimport sinon from 'sinon';\n\nlet rimraf = B.promisify(_rimraf);\nlet should = chai.should();\nchai.use(chaiAsPromised);\n\ndescribe('util', function () {\n\n  describe(\"hasValue \", function () {\n    it(\"should exist\", function () {\n      should.exist(util.hasValue);\n    });\n\n    it('should handle undefined', function () {\n      util.hasValue(undefined).should.be.false;\n    });\n\n    it('should handle not a number', function () {\n      util.hasValue(NaN).should.be.false;\n    });\n\n    it('should handle null', function () {\n      util.hasValue(null).should.be.false;\n    });\n\n    it('should handle functions', function () {\n      util.hasValue(function () {}).should.be.true;\n    });\n\n    it('should handle empty arrays', function () {\n      util.hasValue({}).should.be.true;\n    });\n\n    it('should handle zero', function () {\n      util.hasValue(0).should.be.true;\n    });\n\n    it('should handle simple string', function () {\n      util.hasValue('string').should.be.true;\n    });\n\n    it('should handle booleans', function () {\n      util.hasValue(false).should.be.true;\n    });\n\n    it('should handle empty strings', function () {\n      util.hasValue('').should.be.true;\n    });\n  });\n\n  describe(\"hasContent \", function () {\n    it('should exist', function () {\n      should.exist(util.hasContent);\n    });\n\n    it('should handle undefined', function () {\n      util.hasContent(undefined).should.be.false;\n    });\n\n    it('should handle not a number', function () {\n      util.hasContent(NaN).should.be.false;\n    });\n\n    it('should handle null', function () {\n      util.hasContent(null).should.be.false;\n    });\n\n    it('should handle functions', function () {\n      util.hasContent(function () {}).should.be.false;\n    });\n\n    it('should handle empty arrays', function () {\n      util.hasContent({}).should.be.false;\n    });\n\n    it('should handle zero', function () {\n      util.hasContent(0).should.be.false;\n    });\n\n    it('should handle simple string', function () {\n      util.hasContent('string').should.be.true;\n    });\n\n    it('should handle booleans', function () {\n      util.hasContent(false).should.be.false;\n    });\n\n    it('should handle empty strings', function () {\n      util.hasContent('').should.be.false;\n    });\n  });\n\n  describe(\"escapeSpace\", function () {\n    it(\"should do nothing to a string without space\", function () {\n      let actual = 'appium';\n      let expected = 'appium';\n      util.escapeSpace(actual).should.equal(expected);\n    });\n\n    it(\"should do escape spaces\", function () {\n      let actual = '/Applications/ Xcode 6.1.1.app/Contents/Developer';\n      let expected = '/Applications/\\\\ Xcode\\\\ 6.1.1.app/Contents/Developer';\n      util.escapeSpace(actual).should.equal(expected);\n    });\n\n    it(\"should escape consecutive spaces\", function () {\n      let actual = 'appium   space';\n      let expected = 'appium\\\\ \\\\ \\\\ space';\n      util.escapeSpace(actual).should.equal(expected);\n    });\n  });\n\n  describe(\"fileExists\", function () {\n    it(\"should return true if file is readable\", async function () {\n      let exists = await util.hasAccess('/');\n      exists.should.be.true;\n\n    });\n\n    it(\"should return false if file does not exist\", async function () {\n      let exists = await util.hasAccess('chuckwudi');\n      exists.should.be.false;\n    });\n  });\n\n  describe(\"localIp\", function () {\n    it(\"should find a local ip address\", function () {\n      let utilMock = sinon.mock(util);\n      utilMock.expects('localIp').returns('10.35.4.175');\n      util.localIp();\n      utilMock.verify();\n    });\n  });\n\n  describe(\"mkdir\", function () {\n    let dirName = path.resolve(__dirname, \"tmp\");\n\n    it(\"should make a directory that doesn't exist\", async function () {\n      await rimraf(dirName);\n      await util.mkdir(dirName);\n      let exists = await util.hasAccess(dirName);\n      exists.should.be.true;\n    });\n\n    it(\"should not complain if the dir already exists\", async function () {\n        let exists = await util.hasAccess(dirName);\n        exists.should.be.true;\n        await util.mkdir(dirName);\n    });\n\n    it(\"should still throw an error if something else goes wrong\", async function () {\n      await util.mkdir(\"/bin/foo\").should.be.rejected;\n    });\n  });\n\n  describe(\"cancellableDelay\", function () {\n    it(\"should delay\", async function () {\n      await util.cancellableDelay('10');\n    });\n    it(\"cancel should work\", async function () {\n      let delay = util.cancellableDelay('1000');\n      B.delay(10).then(function() { delay.cancel(); }).done();\n      await delay.should.be.rejectedWith(/cancellation error/);\n    });\n  });\n});\n\n"]}

index.js

@@ -1,15 +0,10 @@
-
-
 import * as tempDir from './lib/tempdir';
 import * as system from './lib/system';
 import * as util from './lib/util';
+import { cancellableDelay } from './lib/util';
+import fs from './lib/fs';
+import rimraf from './lib/rimraf';
 
 // can't add to other exports `as default`
 // until JSHint figures out how to parse that pattern
-export default {
-  tempDir,
-  system,
-  util
-};
-
-export { tempDir, system, util };
+export default { tempDir, system, util, fs, rimraf, cancellableDelay };

lib/util.js

@@ -1,16 +0,9 @@
-
+import B from 'bluebird';
 import _ from 'lodash';
-import _fs from 'fs';
 import os from 'os';
-import B from 'bluebird';
 import { getLogger } from 'appium-logger';
+import fs from './fs';
 
 let logger = getLogger('Appium-Support');
 
-let fs = {
-  mkdir: B.promisify(_fs.mkdir),
-  access: B.promisify(_fs.access)
-};
-
-
 export function hasContent (val) {
@@ -41,8 +34,4 @@ return _.isString(val) && val !== "";
 async function hasAccess (path) {
-  try { 
-    await fs.access(path, fs.F_OK | fs.R_OK);
-  } catch (err) {
-    return false;
-  }
-  return true;
+  // TODO: deprecate, use fs.hasAccess instead
+  return fs.hasAccess(path);
 }
@@ -73,2 +62,20 @@
 
-export { hasValue, escapeSpace, hasAccess, mkdir, localIp };
+/*
+ * Creates a promise that is cancellable, and will timeout
+ * after `ms` delay
+ */
+function cancellableDelay (ms) {
+  let timer;
+  return new B.Promise((resolve) => {
+    timer = setTimeout(function() {
+      resolve();
+    }, ms);
+  })
+  .cancellable()
+  .catch(B.CancellationError, (err) => {
+    clearTimeout(timer);
+    throw err;
+  });
+}
+
+export { hasValue, escapeSpace, hasAccess, mkdir, localIp, cancellableDelay };

package.json

@@ -7,3 +7,3 @@ {
   ],
-  "version": "2.0.0-beta2",
+  "version": "2.0.0-beta3",
   "author": "appium",
@@ -10,0 +10,0 @@ "license": "Apache-2.0",

test/util-specs.js

@@ -7,2 +7,3 @@ "use strict";
 import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 import B from 'bluebird';
@@ -13,4 +14,4 @@ import sinon from 'sinon';
 let should = chai.should();
+chai.use(chaiAsPromised);
 
-
 describe('util', function () {
@@ -164,3 +165,14 @@
   });
+
+  describe("cancellableDelay", function () {
+    it("should delay", async function () {
+      await util.cancellableDelay('10');
+    });
+    it("cancel should work", async function () {
+      let delay = util.cancellableDelay('1000');
+      B.delay(10).then(function() { delay.cancel(); }).done();
+      await delay.should.be.rejectedWith(/cancellation error/);
+    });
+  });
 });
 

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Native code

Supply chain risk

Contains native code (e.g., compiled binaries or shared libraries). Including native code can obscure malicious behavior.

Found 2 instances in 1 package

Improved metrics

Lines of code

1470

increased by20.39%

Number of medium supply chain risk alerts

0

decreased by-100%

Worsened metrics

Total package byte prevSize

104788

decreased by-35.44%

No dependency changes