navy 4.1.2-rc.2 → 5.0.0

package/lib/cli/doctor/clean-compose-files.js

@@ -1,87 +1,33 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _promise = require('babel-runtime/core-js/promise');
-
-var _promise2 = _interopRequireDefault(_promise);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _bluebird = require('bluebird');
-
-var _bluebird2 = _interopRequireDefault(_bluebird);
-
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-var _ = require('../../');
-
-var _util = require('./util');
-
-var _state = require('../../navy/state');
-
-var _util2 = require('../../navy/util');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-  var _this = this;
+var _bluebird = _interopRequireDefault(require("bluebird"));
 
-  var rimraf, navyNames;
-  return _regenerator2.default.wrap(function _callee2$(_context2) {
-    while (1) {
-      switch (_context2.prev = _context2.next) {
-        case 0:
-          rimraf = _bluebird2.default.promisify(require('rimraf'));
+var _path = _interopRequireDefault(require("path"));
 
+var _ = require("../../");
 
-          (0, _util.start)('Cleaning temporary Docker Compose files');
+var _util = require("./util");
 
-          _context2.next = 4;
-          return (0, _.getLaunchedNavyNames)();
+var _state = require("../../navy/state");
 
-        case 4:
-          navyNames = _context2.sent;
-          _context2.next = 7;
-          return _promise2.default.all(navyNames.map(function () {
-            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(navyName) {
-              var navyPath;
-              return _regenerator2.default.wrap(function _callee$(_context) {
-                while (1) {
-                  switch (_context.prev = _context.next) {
-                    case 0:
-                      navyPath = (0, _state.pathToNavy)((0, _util2.normaliseNavyName)(navyName));
-                      _context.next = 3;
-                      return rimraf(_path2.default.join(navyPath, 'docker-compose.tmp.yml'));
+var _util2 = require("../../navy/util");
 
-                    case 3:
-                    case 'end':
-                      return _context.stop();
-                  }
-                }
-              }, _callee, _this);
-            }));
+async function _default() {
+  const rimraf = _bluebird.default.promisify(require('rimraf'));
 
-            return function (_x) {
-              return _ref2.apply(this, arguments);
-            };
-          }()));
+  (0, _util.start)('Cleaning temporary Docker Compose files');
+  const navyNames = await (0, _.getLaunchedNavyNames)();
+  await Promise.all(navyNames.map(async navyName => {
+    const navyPath = (0, _state.pathToNavy)((0, _util2.normaliseNavyName)(navyName));
+    await rimraf(_path.default.join(navyPath, 'docker-compose.tmp.yml'));
+  }));
+}
 
-        case 7:
-        case 'end':
-          return _context2.stop();
-      }
-    }
-  }, _callee2, this);
-}));
 module.exports = exports.default;

package/lib/cli/doctor/index.js

@@ -1,170 +1,50 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-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 run = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(fns) {
-    var errors, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, fn;
-
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            errors = [];
-            _iteratorNormalCompletion = true;
-            _didIteratorError = false;
-            _iteratorError = undefined;
-            _context.prev = 4;
-            _iterator = (0, _getIterator3.default)(fns);
-
-          case 6:
-            if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
-              _context.next = 19;
-              break;
-            }
-
-            fn = _step.value;
-            _context.prev = 8;
-            _context.next = 11;
-            return fn();
-
-          case 11:
-            _context.next = 16;
-            break;
-
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context['catch'](8);
-
-            errors.push(_context.t0);
-
-          case 16:
-            _iteratorNormalCompletion = true;
-            _context.next = 6;
-            break;
-
-          case 19:
-            _context.next = 25;
-            break;
-
-          case 21:
-            _context.prev = 21;
-            _context.t1 = _context['catch'](4);
-            _didIteratorError = true;
-            _iteratorError = _context.t1;
-
-          case 25:
-            _context.prev = 25;
-            _context.prev = 26;
-
-            if (!_iteratorNormalCompletion && _iterator.return) {
-              _iterator.return();
-            }
+var _chalk = _interopRequireDefault(require("chalk"));
 
-          case 28:
-            _context.prev = 28;
+var _cleanComposeFiles = _interopRequireDefault(require("./clean-compose-files"));
 
-            if (!_didIteratorError) {
-              _context.next = 31;
-              break;
-            }
+var _invalidState = _interopRequireDefault(require("./invalid-state"));
 
-            throw _iteratorError;
+var _invalidComposeConfig = _interopRequireDefault(require("./invalid-compose-config"));
 
-          case 31:
-            return _context.finish(28);
+async function run(fns) {
+  const errors = [];
 
-          case 32:
-            return _context.finish(25);
-
-          case 33:
-            return _context.abrupt('return', errors);
-
-          case 34:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this, [[4, 21, 25, 33], [8, 13], [26,, 28, 32]]);
-  }));
-
-  return function run(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var _chalk = require('chalk');
-
-var _chalk2 = _interopRequireDefault(_chalk);
-
-var _cleanComposeFiles = require('./clean-compose-files');
-
-var _cleanComposeFiles2 = _interopRequireDefault(_cleanComposeFiles);
-
-var _invalidState = require('./invalid-state');
-
-var _invalidState2 = _interopRequireDefault(_invalidState);
-
-var _invalidComposeConfig = require('./invalid-compose-config');
-
-var _invalidComposeConfig2 = _interopRequireDefault(_invalidComposeConfig);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-  var errors;
-  return _regenerator2.default.wrap(function _callee2$(_context2) {
-    while (1) {
-      switch (_context2.prev = _context2.next) {
-        case 0:
-          _context2.next = 2;
-          return run([_cleanComposeFiles2.default, _invalidState2.default, _invalidComposeConfig2.default]);
-
-        case 2:
-          errors = _context2.sent;
-
-          if (!(errors.length > 0)) {
-            _context2.next = 8;
-            break;
-          }
-
-          console.log(_chalk2.default.yellow('There were some issues'));
-          console.log();
+  for (const fn of fns) {
+    try {
+      await fn();
+    } catch (ex) {
+      errors.push(ex);
+    }
+  }
 
-          errors.forEach(function (error) {
-            return console.log(error.stack);
-          });
+  return errors;
+}
 
-          return _context2.abrupt('return');
+async function _default() {
+  const errors = await run([_cleanComposeFiles.default, _invalidState.default, _invalidComposeConfig.default]);
 
-        case 8:
+  if (errors.length > 0) {
+    console.log(_chalk.default.yellow('There were some issues'));
+    console.log();
+    errors.forEach(error => console.log(error.stack));
+    return;
+  }
 
-          console.log();
-          console.log(_chalk2.default.green(' ✔ Finished tests'));
-          console.log();
-          console.log(' Please try running Navy again if it wasn\'t working before.');
-          console.log(' If you still have problems, please open an issue at https://github.com/momentumft/navy/issues/new');
-          console.log();
+  console.log();
+  console.log(_chalk.default.green(' ✔ Finished tests'));
+  console.log();
+  console.log(' Please try running Navy again if it wasn\'t working before.');
+  console.log(' If you still have problems, please open an issue at https://github.com/momentumft/navy/issues/new');
+  console.log();
+}
 
-        case 14:
-        case 'end':
-          return _context2.stop();
-      }
-    }
-  }, _callee2, this);
-}));
 module.exports = exports.default;

package/lib/cli/doctor/invalid-compose-config.js

@@ -1,116 +1,26 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
+
+var _ = require("../../");
+
+var _util = require("./util");
+
+async function _default() {
+  (0, _util.start)('Checking for Navies with invalid/no compose config');
+  const navies = await (0, _.getLaunchedNavies)();
+  await Promise.all(navies.map(async navy => {
+    await (0, _util.catchInvariant)('NO_DOCKER_COMPOSE_FILE', async () => {
+      await (await navy.safeGetDriver()).getConfig();
+    }, async () => {
+      await (0, _util.fix)('Found Navy %s which has no docker compose config, removing', navy.name, async () => {
+        await navy.delete();
+      });
+    });
+  }));
+}
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _promise = require('babel-runtime/core-js/promise');
-
-var _promise2 = _interopRequireDefault(_promise);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _ = require('../../');
-
-var _util = require('./util');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-  var _this = this;
-
-  var navies;
-  return _regenerator2.default.wrap(function _callee5$(_context5) {
-    while (1) {
-      switch (_context5.prev = _context5.next) {
-        case 0:
-          (0, _util.start)('Checking for Navies with invalid/no compose config');
-
-          _context5.next = 3;
-          return (0, _.getLaunchedNavies)();
-
-        case 3:
-          navies = _context5.sent;
-          _context5.next = 6;
-          return _promise2.default.all(navies.map(function () {
-            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(navy) {
-              return _regenerator2.default.wrap(function _callee4$(_context4) {
-                while (1) {
-                  switch (_context4.prev = _context4.next) {
-                    case 0:
-                      _context4.next = 2;
-                      return (0, _util.catchInvariant)('NO_DOCKER_COMPOSE_FILE', (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.next = 2;
-                                return navy.safeGetDriver();
-
-                              case 2:
-                                _context.next = 4;
-                                return _context.sent.getConfig();
-
-                              case 4:
-                              case 'end':
-                                return _context.stop();
-                            }
-                          }
-                        }, _callee, _this);
-                      })), (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.next = 2;
-                                return (0, _util.fix)('Found Navy %s which has no docker compose config, removing', navy.name, (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-                                  return _regenerator2.default.wrap(function _callee2$(_context2) {
-                                    while (1) {
-                                      switch (_context2.prev = _context2.next) {
-                                        case 0:
-                                          _context2.next = 2;
-                                          return navy.delete();
-
-                                        case 2:
-                                        case 'end':
-                                          return _context2.stop();
-                                      }
-                                    }
-                                  }, _callee2, _this);
-                                })));
-
-                              case 2:
-                              case 'end':
-                                return _context3.stop();
-                            }
-                          }
-                        }, _callee3, _this);
-                      })));
-
-                    case 2:
-                    case 'end':
-                      return _context4.stop();
-                  }
-                }
-              }, _callee4, _this);
-            }));
-
-            return function (_x) {
-              return _ref2.apply(this, arguments);
-            };
-          }()));
-
-        case 6:
-        case 'end':
-          return _context5.stop();
-      }
-    }
-  }, _callee5, this);
-}));
 module.exports = exports.default;

package/lib/cli/doctor/invalid-state.js

@@ -1,126 +1,33 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _regenerator = require('babel-runtime/regenerator');
+var _ = require("../../");
 
-var _regenerator2 = _interopRequireDefault(_regenerator);
+var _util = require("./util");
 
-var _promise = require('babel-runtime/core-js/promise');
+async function _default() {
+  (0, _util.start)('Checking for dangling Navies');
+  const navies = await (0, _.getLaunchedNavies)();
+  await Promise.all(navies.map(async navy => {
+    const configProvider = await navy.getConfigProvider();
 
-var _promise2 = _interopRequireDefault(_promise);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _ = require('../../');
-
-var _util = require('./util');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
-  var _this = this;
-
-  var navies;
-  return _regenerator2.default.wrap(function _callee4$(_context4) {
-    while (1) {
-      switch (_context4.prev = _context4.next) {
-        case 0:
-          (0, _util.start)('Checking for dangling Navies');
-
-          _context4.next = 3;
-          return (0, _.getLaunchedNavies)();
-
-        case 3:
-          navies = _context4.sent;
-          _context4.next = 6;
-          return _promise2.default.all(navies.map(function () {
-            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(navy) {
-              var configProvider;
-              return _regenerator2.default.wrap(function _callee3$(_context3) {
-                while (1) {
-                  switch (_context3.prev = _context3.next) {
-                    case 0:
-                      _context3.next = 2;
-                      return navy.getConfigProvider();
-
-                    case 2:
-                      configProvider = _context3.sent;
-
-                      if (configProvider) {
-                        _context3.next = 7;
-                        break;
-                      }
-
-                      _context3.next = 6;
-                      return (0, _util.fix)('Found Navy without config provider %s, removing', navy.name, (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.next = 2;
-                                return navy.delete();
-
-                              case 2:
-                              case 'end':
-                                return _context.stop();
-                            }
-                          }
-                        }, _callee, _this);
-                      })));
-
-                    case 6:
-                      return _context3.abrupt('return');
-
-                    case 7:
-                      _context3.next = 9;
-                      return configProvider.isDangling();
-
-                    case 9:
-                      if (!_context3.sent) {
-                        _context3.next = 12;
-                        break;
-                      }
-
-                      _context3.next = 12;
-                      return (0, _util.fix)('Found dangling Navy %s (invalid config), removing', navy.name, (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-                        return _regenerator2.default.wrap(function _callee2$(_context2) {
-                          while (1) {
-                            switch (_context2.prev = _context2.next) {
-                              case 0:
-                                _context2.next = 2;
-                                return navy.destroy();
-
-                              case 2:
-                              case 'end':
-                                return _context2.stop();
-                            }
-                          }
-                        }, _callee2, _this);
-                      })));
-
-                    case 12:
-                    case 'end':
-                      return _context3.stop();
-                  }
-                }
-              }, _callee3, _this);
-            }));
-
-            return function (_x) {
-              return _ref2.apply(this, arguments);
-            };
-          }()));
+    if (!configProvider) {
+      await (0, _util.fix)('Found Navy without config provider %s, removing', navy.name, async () => {
+        await navy.delete();
+      });
+      return;
+    }
 
-        case 6:
-        case 'end':
-          return _context4.stop();
-      }
+    if (await configProvider.isDangling()) {
+      await (0, _util.fix)('Found dangling Navy %s (invalid config), removing', navy.name, async () => {
+        await navy.destroy();
+      });
     }
-  }, _callee4, this);
-}));
+  }));
+}
+
 module.exports = exports.default;