navy 4.1.2-rc.2 → 5.0.0

package/lib/config-provider.js

@@ -1,148 +1,46 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getImportOptionsForCLI = undefined;
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _getIterator2 = require('babel-runtime/core-js/get-iterator');
-
-var _getIterator3 = _interopRequireDefault(_getIterator2);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
-
-var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
-
-var getImportOptionsForCLI = exports.getImportOptionsForCLI = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(opts) {
-    var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, provider, optionsFromProvider;
-
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _iteratorNormalCompletion = true;
-            _didIteratorError = false;
-            _iteratorError = undefined;
-            _context.prev = 3;
-            _iterator = (0, _getIterator3.default)(PROVIDERS);
-
-          case 5:
-            if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
-              _context.next = 15;
-              break;
-            }
-
-            provider = _step.value;
-            _context.next = 9;
-            return provider.getImportOptionsForCLI(opts);
-
-          case 9:
-            optionsFromProvider = _context.sent;
-
-            if (!optionsFromProvider) {
-              _context.next = 12;
-              break;
-            }
-
-            return _context.abrupt('return', optionsFromProvider);
-
-          case 12:
-            _iteratorNormalCompletion = true;
-            _context.next = 5;
-            break;
-
-          case 15:
-            _context.next = 21;
-            break;
-
-          case 17:
-            _context.prev = 17;
-            _context.t0 = _context['catch'](3);
-            _didIteratorError = true;
-            _iteratorError = _context.t0;
-
-          case 21:
-            _context.prev = 21;
-            _context.prev = 22;
-
-            if (!_iteratorNormalCompletion && _iterator.return) {
-              _iterator.return();
-            }
-
-          case 24:
-            _context.prev = 24;
-
-            if (!_didIteratorError) {
-              _context.next = 27;
-              break;
-            }
-
-            throw _iteratorError;
-
-          case 27:
-            return _context.finish(24);
-
-          case 28:
-            return _context.finish(21);
-
-          case 29:
-
-            (0, _invariant2.default)(false, 'CLI_IMPORT_RESOLVE_OPTIONS_ERR: Could not resolve import options from CLI arguments');
-
-          case 30:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this, [[3, 17, 21, 29], [22,, 24, 28]]);
-  }));
-
-  return function getImportOptionsForCLI(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-exports.resolveConfigProviderFromName = resolveConfigProviderFromName;
 exports.getImportCommandLineOptions = getImportCommandLineOptions;
+exports.getImportOptionsForCLI = getImportOptionsForCLI;
+exports.resolveConfigProviderFromName = resolveConfigProviderFromName;
 
-var _invariant = require('invariant');
-
-var _invariant2 = _interopRequireDefault(_invariant);
-
-var _filesystem = require('./config-providers/filesystem');
-
-var _filesystem2 = _interopRequireDefault(_filesystem);
-
-var _npm = require('./config-providers/npm');
+var _invariant = _interopRequireDefault(require("invariant"));
 
-var _npm2 = _interopRequireDefault(_npm);
+var _filesystem = _interopRequireDefault(require("./config-providers/filesystem"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _npm = _interopRequireDefault(require("./config-providers/npm"));
 
-var PROVIDERS = [_npm2.default, _filesystem2.default];
+const PROVIDERS = [_npm.default, _filesystem.default];
 
 function resolveConfigProviderFromName(providerName) {
   switch (providerName) {
     case 'filesystem':
-      return _filesystem2.default;
+      return _filesystem.default;
+
     case 'npm':
-      return _npm2.default;
+      return _npm.default;
   }
 
   return null;
 }
 
 function getImportCommandLineOptions() {
-  return PROVIDERS.reduce(function (arr, provider) {
-    return [].concat((0, _toConsumableArray3.default)(arr), (0, _toConsumableArray3.default)(provider.importCliOptions));
-  }, []);
+  return PROVIDERS.reduce((arr, provider) => [...arr, ...provider.importCliOptions], []);
+}
+
+async function getImportOptionsForCLI(opts) {
+  for (const provider of PROVIDERS) {
+    const optionsFromProvider = await provider.getImportOptionsForCLI(opts);
+
+    if (optionsFromProvider) {
+      return optionsFromProvider;
+    }
+  }
+
+  (0, _invariant.default)(false, "CLI_IMPORT_RESOLVE_OPTIONS_ERR: Could not resolve import options from CLI arguments");
 }

package/lib/config-providers/filesystem/index.js

@@ -1,269 +1,92 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var cwdHasValidDockerComposeConfig = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return (0, _execAsync.execAsync)('docker-compose', ['config'], null, { maxBuffer: Infinity, cwd: process.cwd() });
-
-          case 3:
-            _context.next = 8;
-            break;
-
-          case 5:
-            _context.prev = 5;
-            _context.t0 = _context['catch'](0);
-            return _context.abrupt('return', false);
-
-          case 8:
-            return _context.abrupt('return', true);
-
-          case 9:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this, [[0, 5]]);
-  }));
-
-  return function cwdHasValidDockerComposeConfig() {
-    return _ref.apply(this, arguments);
-  };
-}();
-
 exports.default = createFileSystemConfigProvider;
 
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
+var _path = _interopRequireDefault(require("path"));
 
-var _invariant = require('invariant');
+var _invariant = _interopRequireDefault(require("invariant"));
 
-var _invariant2 = _interopRequireDefault(_invariant);
+var _fs = _interopRequireDefault(require("../../util/fs"));
 
-var _fs = require('../../util/fs');
+var _execAsync = require("../../util/exec-async");
 
-var _fs2 = _interopRequireDefault(_fs);
+async function cwdHasValidDockerComposeConfig() {
+  try {
+    await (0, _execAsync.execAsync)('docker-compose', ['config'], null, {
+      maxBuffer: Infinity,
+      cwd: process.cwd()
+    });
+  } catch (ex) {
+    return false;
+  }
 
-var _execAsync = require('../../util/exec-async');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+  return true;
+}
 
 function createFileSystemConfigProvider(navy) {
   return {
-    getNavyPath: function getNavyPath() {
-      var _this = this;
-
-      return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-        var envState;
-        return _regenerator2.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return navy.getState();
-
-              case 2:
-                envState = _context2.sent;
-
-
-                (0, _invariant2.default)(!!envState, 'STATE_NONEXISTANT: State doesn\'t exist for navy %s', navy.name);
-                (0, _invariant2.default)(!!envState.path, 'FILESYSTEM_PROVIDER_REQUIRES_PATH: File system config provider requires a path for %s', navy.name);
-
-                _context2.prev = 5;
-                _context2.next = 8;
-                return _fs2.default.statAsync(envState.path);
-
-              case 8:
-                _context2.next = 13;
-                break;
-
-              case 10:
-                _context2.prev = 10;
-                _context2.t0 = _context2['catch'](5);
-
-                (0, _invariant2.default)(false, 'FILESYSTEM_PROVIDER_INVALID_PATH: Invalid path given to navy: %s', navy.name);
-
-              case 13:
-                return _context2.abrupt('return', envState.path);
+    async getNavyPath() {
+      const envState = await navy.getState();
+      (0, _invariant.default)(!!envState, "STATE_NONEXISTANT: State doesn't exist for navy %s", navy.name);
+      (0, _invariant.default)(!!envState.path, "FILESYSTEM_PROVIDER_REQUIRES_PATH: File system config provider requires a path for %s", navy.name);
+
+      try {
+        await _fs.default.statAsync(envState.path);
+      } catch (ex) {
+        (0, _invariant.default)(false, "FILESYSTEM_PROVIDER_INVALID_PATH: Invalid path given to navy: %s", navy.name);
+      }
 
-              case 14:
-              case 'end':
-                return _context2.stop();
-            }
-          }
-        }, _callee2, _this, [[5, 10]]);
-      }))();
+      return envState.path;
     },
-    getNavyFilePath: function getNavyFilePath() {
-      var _this2 = this;
-
-      return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
-        return _regenerator2.default.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.t0 = _path2.default;
-                _context3.next = 3;
-                return _this2.getNavyPath();
 
-              case 3:
-                _context3.t1 = _context3.sent;
-                return _context3.abrupt('return', _context3.t0.join.call(_context3.t0, _context3.t1, 'Navyfile.js'));
-
-              case 5:
-              case 'end':
-                return _context3.stop();
-            }
-          }
-        }, _callee3, _this2);
-      }))();
+    async getNavyFilePath() {
+      return _path.default.join(await this.getNavyPath(), 'Navyfile.js');
     },
-    refreshConfig: function refreshConfig() {
-      var _this3 = this;
-
-      return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
-        return _regenerator2.default.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                return _context4.abrupt('return', false);
 
-              case 1:
-              case 'end':
-                return _context4.stop();
-            }
-          }
-        }, _callee4, _this3);
-      }))();
+    async refreshConfig() {
+      // no-op
+      return false;
     },
-    getLocationDisplayName: function getLocationDisplayName() {
-      var _this4 = this;
-
-      return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-        var envState;
-        return _regenerator2.default.wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-                _context5.next = 2;
-                return navy.getState();
-
-              case 2:
-                envState = _context5.sent;
-
 
-                (0, _invariant2.default)(!!envState, 'STATE_NONEXISTANT: State doesn\'t exist for navy %s', navy.name);
-
-                return _context5.abrupt('return', envState.path);
-
-              case 5:
-              case 'end':
-                return _context5.stop();
-            }
-          }
-        }, _callee5, _this4);
-      }))();
+    async getLocationDisplayName() {
+      const envState = await navy.getState();
+      (0, _invariant.default)(!!envState, "STATE_NONEXISTANT: State doesn't exist for navy %s", navy.name);
+      return envState.path;
     },
-    isDangling: function isDangling() {
-      var _this5 = this;
-
-      return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
-        var envState;
-        return _regenerator2.default.wrap(function _callee6$(_context6) {
-          while (1) {
-            switch (_context6.prev = _context6.next) {
-              case 0:
-                _context6.next = 2;
-                return navy.getState();
-
-              case 2:
-                envState = _context6.sent;
-
-                if (!(!envState || !envState.path)) {
-                  _context6.next = 5;
-                  break;
-                }
-
-                return _context6.abrupt('return', true);
 
-              case 5:
-                _context6.prev = 5;
-                _context6.next = 8;
-                return _fs2.default.statAsync(envState.path);
+    async isDangling() {
+      const envState = await navy.getState();
 
-              case 8:
-                _context6.next = 13;
-                break;
-
-              case 10:
-                _context6.prev = 10;
-                _context6.t0 = _context6['catch'](5);
-                return _context6.abrupt('return', true);
+      if (!envState || !envState.path) {
+        return true;
+      }
 
-              case 13:
-                return _context6.abrupt('return', false);
+      try {
+        await _fs.default.statAsync(envState.path);
+      } catch (ex) {
+        return true;
+      }
 
-              case 14:
-              case 'end':
-                return _context6.stop();
-            }
-          }
-        }, _callee6, _this5, [[5, 10]]);
-      }))();
+      return false;
     }
+
   };
 }
 
 createFileSystemConfigProvider.importCliOptions = [];
 
-createFileSystemConfigProvider.getImportOptionsForCLI = function () {
-  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(opts) {
-    var hasValidComposeConfig;
-    return _regenerator2.default.wrap(function _callee7$(_context7) {
-      while (1) {
-        switch (_context7.prev = _context7.next) {
-          case 0:
-            _context7.next = 2;
-            return cwdHasValidDockerComposeConfig();
-
-          case 2:
-            hasValidComposeConfig = _context7.sent;
-
-
-            (0, _invariant2.default)(hasValidComposeConfig, 'NO_DOCKER_COMPOSE_FILE: No docker-compose.yml (or valid Docker Compose config) found');
-
-            return _context7.abrupt('return', {
-              configProvider: 'filesystem',
-              path: process.cwd()
-            });
-
-          case 5:
-          case 'end':
-            return _context7.stop();
-        }
-      }
-    }, _callee7, undefined);
-  }));
-
-  return function (_x) {
-    return _ref2.apply(this, arguments);
+createFileSystemConfigProvider.getImportOptionsForCLI = async opts => {
+  const hasValidComposeConfig = await cwdHasValidDockerComposeConfig();
+  (0, _invariant.default)(hasValidComposeConfig, "NO_DOCKER_COMPOSE_FILE: No docker-compose.yml (or valid Docker Compose config) found");
+  return {
+    configProvider: 'filesystem',
+    path: process.cwd()
   };
-}();
+};
+
 module.exports = exports.default;

package/lib/config-providers/npm/__tests__/util.js

@@ -1,15 +1,12 @@
-'use strict';
+"use strict";
 
-var _chai = require('chai');
+var _chai = require("chai");
 
-var _util = require('../util');
+var _util = require("../util");
 
 /* eslint-env mocha */
-
 describe('npm config provider', function () {
-
   describe('pathToModule', function () {
-
     it('should return the correct path to the module', function () {
       (0, _chai.expect)((0, _util.pathToModule)('/root', 'my-environment')).to.equal('/root/my-environment');
       (0, _chai.expect)((0, _util.pathToModule)('/root', '@my-org/my-environment')).to.equal('/root/@my-org/my-environment');