navy 4.1.2-rc.2 → 5.0.0

package/lib/cli/util/get-or-initialise-navy.js

@@ -1,67 +1,24 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getOrInitialiseNavy = undefined;
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var getOrInitialiseNavy = exports.getOrInitialiseNavy = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(navyName) {
-    var navy;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            navy = (0, _.getNavy)(navyName);
-            _context.next = 3;
-            return navy.isInitialised();
-
-          case 3:
-            if (_context.sent) {
-              _context.next = 11;
-              break;
-            }
-
-            _context.t0 = _import.importNavy;
-            _context.t1 = navy;
-            _context.next = 8;
-            return _filesystem2.default.getImportOptionsForCLI({});
-
-          case 8:
-            _context.t2 = _context.sent;
-            _context.next = 11;
-            return (0, _context.t0)(_context.t1, _context.t2);
-
-          case 11:
-            return _context.abrupt('return', navy);
-
-          case 12:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
+exports.getOrInitialiseNavy = getOrInitialiseNavy;
 
-  return function getOrInitialiseNavy(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+var _ = require("../../");
 
-var _ = require('../../');
+var _import = require("./import");
 
-var _import = require('./import');
+var _filesystem = _interopRequireDefault(require("../../config-providers/filesystem"));
 
-var _filesystem = require('../../config-providers/filesystem');
+async function getOrInitialiseNavy(navyName) {
+  const navy = (0, _.getNavy)(navyName);
 
-var _filesystem2 = _interopRequireDefault(_filesystem);
+  if (!(await navy.isInitialised())) {
+    await (0, _import.importNavy)(navy, await _filesystem.default.getImportOptionsForCLI({}));
+  }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+  return navy;
+}

package/lib/cli/util/import.js

@@ -1,94 +1,44 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.importNavy = undefined;
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var importNavy = exports.importNavy = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(navy, initialiseOpts) {
-    var key;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return navy.isInitialised();
-
-          case 2:
-            if (!_context.sent) {
-              _context.next = 4;
-              break;
-            }
-
-            throw new _errors.NavyError('Navy "' + navy.name + '" has already been imported and initialised.');
-
-          case 4:
-            _context.next = 6;
-            return navy.initialise(initialiseOpts);
-
-          case 6:
-            _context.next = 8;
-            return navy.ensurePluginsLoaded();
-
-          case 8:
-            _context.next = 10;
-            return navy.emitAsync('cli.import');
-
-          case 10:
-
-            (0, _driverLogging.startDriverLogging)('Ensuring services are up to date...');
-            _context.next = 13;
-            return navy.relaunch();
-
-          case 13:
-            (0, _driverLogging.stopDriverLogging)();
-
-            console.log();
-            console.log(_chalk2.default.green(' Navy "' + _chalk2.default.white.bold(navy.name) + '" has now been imported and initialised. \uD83C\uDF89'));
-            console.log();
-
-            for (key in initialiseOpts) {
-              if (OPTION_LABEL_MAP[key]) {
-                console.log(' ' + _chalk2.default.bold(OPTION_LABEL_MAP[key]) + ': ' + _chalk2.default.dim(initialiseOpts[key]));
-              }
-            }
-
-            console.log();
-
-          case 19:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-
-  return function importNavy(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var _chalk = require('chalk');
-
-var _chalk2 = _interopRequireDefault(_chalk);
+exports.importNavy = importNavy;
 
-var _driverLogging = require('../../driver-logging');
+var _chalk = _interopRequireDefault(require("chalk"));
 
-var _errors = require('../../errors');
+var _driverLogging = require("../../driver-logging");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _errors = require("../../errors");
 
-var OPTION_LABEL_MAP = {
+const OPTION_LABEL_MAP = {
   configProvider: 'Provider',
   path: 'Directory',
   npmPackage: 'NPM Package'
-};
+};
+
+async function importNavy(navy, initialiseOpts) {
+  if (await navy.isInitialised()) {
+    throw new _errors.NavyError(`Navy "${navy.name}" has already been imported and initialised.`);
+  }
+
+  await navy.initialise(initialiseOpts);
+  await navy.ensurePluginsLoaded();
+  await navy.emitAsync('cli.import');
+  (0, _driverLogging.startDriverLogging)('Ensuring services are up to date...');
+  await navy.relaunch();
+  (0, _driverLogging.stopDriverLogging)();
+  console.log();
+  console.log(_chalk.default.green(` Navy "${_chalk.default.white.bold(navy.name)}" has now been imported and initialised. 🎉`));
+  console.log();
+
+  for (const key in initialiseOpts) {
+    if (OPTION_LABEL_MAP[key]) {
+      console.log(` ${_chalk.default.bold(OPTION_LABEL_MAP[key])}: ${_chalk.default.dim(initialiseOpts[key])}`);
+    }
+  }
+
+  console.log();
+}

package/lib/cli/util/index.js

@@ -1,23 +1,21 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _getOrInitialiseNavy = require('./get-or-initialise-navy');
-
-Object.defineProperty(exports, 'getOrInitialiseNavy', {
+Object.defineProperty(exports, "getOrInitialiseNavy", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _getOrInitialiseNavy.getOrInitialiseNavy;
   }
 });
-
-var _import = require('./import');
-
-Object.defineProperty(exports, 'importNavy', {
+Object.defineProperty(exports, "importNavy", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _import.importNavy;
   }
-});
+});
+
+var _getOrInitialiseNavy = require("./get-or-initialise-navy");
+
+var _import = require("./import");

package/lib/cli/util/reconfigure.js

@@ -1,110 +1,20 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.reconfigureAllNavies = undefined;
+exports.reconfigureAllNavies = reconfigureAllNavies;
 
-var _regenerator = require('babel-runtime/regenerator');
+var _ = require("../../");
 
-var _regenerator2 = _interopRequireDefault(_regenerator);
+var _driverLogging = require("../../driver-logging");
 
-var _getIterator2 = require('babel-runtime/core-js/get-iterator');
+async function reconfigureAllNavies() {
+  const navies = await (0, _.getLaunchedNavies)();
 
-var _getIterator3 = _interopRequireDefault(_getIterator2);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var reconfigureAllNavies = exports.reconfigureAllNavies = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
-    var navies, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, navy;
-
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return (0, _.getLaunchedNavies)();
-
-          case 2:
-            navies = _context.sent;
-            _iteratorNormalCompletion = true;
-            _didIteratorError = false;
-            _iteratorError = undefined;
-            _context.prev = 6;
-            _iterator = (0, _getIterator3.default)(navies);
-
-          case 8:
-            if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
-              _context.next = 17;
-              break;
-            }
-
-            navy = _step.value;
-
-            (0, _driverLogging.startDriverLogging)('Reconfiguring ' + navy.name);
-            _context.next = 13;
-            return navy.reconfigure();
-
-          case 13:
-            (0, _driverLogging.stopDriverLogging)();
-
-          case 14:
-            _iteratorNormalCompletion = true;
-            _context.next = 8;
-            break;
-
-          case 17:
-            _context.next = 23;
-            break;
-
-          case 19:
-            _context.prev = 19;
-            _context.t0 = _context['catch'](6);
-            _didIteratorError = true;
-            _iteratorError = _context.t0;
-
-          case 23:
-            _context.prev = 23;
-            _context.prev = 24;
-
-            if (!_iteratorNormalCompletion && _iterator.return) {
-              _iterator.return();
-            }
-
-          case 26:
-            _context.prev = 26;
-
-            if (!_didIteratorError) {
-              _context.next = 29;
-              break;
-            }
-
-            throw _iteratorError;
-
-          case 29:
-            return _context.finish(26);
-
-          case 30:
-            return _context.finish(23);
-
-          case 31:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this, [[6, 19, 23, 31], [24,, 26, 30]]);
-  }));
-
-  return function reconfigureAllNavies() {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var _ = require('../../');
-
-var _driverLogging = require('../../driver-logging');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+  for (const navy of navies) {
+    (0, _driverLogging.startDriverLogging)('Reconfiguring ' + navy.name);
+    await navy.reconfigure();
+    (0, _driverLogging.stopDriverLogging)();
+  }
+}

package/lib/cli/wait-for-healthy.js

@@ -1,125 +1,78 @@
-'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 _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _chalk = require('chalk');
-
-var _chalk2 = _interopRequireDefault(_chalk);
-
-var _readline = require('readline');
-
-var _readline2 = _interopRequireDefault(_readline);
-
-var _cliSpinners = require('cli-spinners');
-
-var _ = require('../');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var spinnerIndex = 0;
-var spinnerFrame = _cliSpinners.dots.frames[0];
-
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(services, opts) {
-    var navy, servicesToCheck, healthyStatus, drawnLines, draw, redraw, spinner;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            redraw = function redraw() {
-              _readline2.default.clearLine(process.stdout, 0);
-              _readline2.default.cursorTo(process.stdout, 0);
-
-              for (var i = 0; i < drawnLines; i++) {
-                _readline2.default.moveCursor(process.stdout, 0, -1);
-                _readline2.default.clearLine(process.stdout, 0);
-              }
-
-              draw();
-            };
-
-            draw = function draw() {
-              drawnLines = 0;
-
-              if (healthyStatus.length === 0) {
-                console.log('Waiting');
-                drawnLines = 1;
-                return;
-              }
+var _chalk = _interopRequireDefault(require("chalk"));
 
-              var lines = healthyStatus.map(function (service) {
-                return (service.health !== 'healthy' ? _chalk2.default.yellow(spinnerFrame) : _chalk2.default.green('✔')) + ' ' + service.service;
-              });
+var _readline = _interopRequireDefault(require("readline"));
 
-              drawnLines = lines.length;
-              console.log(lines.join('\n'));
-            };
+var _cliSpinners = require("cli-spinners");
 
-            navy = (0, _.getNavy)(opts.navy);
-            servicesToCheck = services.length === 0 ? undefined : services;
+var _ = require("../");
 
-            if (process.stdout.isTTY) {
-              _context.next = 9;
-              break;
-            }
+let spinnerIndex = 0;
+let spinnerFrame = _cliSpinners.dots.frames[0];
 
-            _context.next = 7;
-            return navy.waitForHealthy(servicesToCheck);
+async function _default(services, opts) {
+  const navy = (0, _.getNavy)(opts.navy);
+  const servicesToCheck = services.length === 0 ? undefined : services;
 
-          case 7:
-            console.log('Now available');
-            return _context.abrupt('return');
+  if (!process.stdout.isTTY) {
+    await navy.waitForHealthy(servicesToCheck);
+    console.log('Now available');
+    return;
+  }
 
-          case 9:
-            healthyStatus = [];
-            drawnLines = 0;
-            spinner = setInterval(function () {
-              spinnerIndex++;
+  let healthyStatus = [];
+  let drawnLines = 0;
 
-              if (spinnerIndex >= _cliSpinners.dots.frames.length) {
-                spinnerIndex = 0;
-              }
+  function draw() {
+    drawnLines = 0;
 
-              spinnerFrame = _cliSpinners.dots.frames[spinnerIndex];
+    if (healthyStatus.length === 0) {
+      console.log('Waiting');
+      drawnLines = 1;
+      return;
+    }
 
-              redraw();
-            }, _cliSpinners.dots.interval);
+    const lines = healthyStatus.map(service => `${service.health !== 'healthy' ? _chalk.default.yellow(spinnerFrame) : _chalk.default.green('✔')} ${service.service}`);
+    drawnLines = lines.length;
+    console.log(lines.join('\n'));
+  }
 
+  function redraw() {
+    _readline.default.clearLine(process.stdout, 0);
 
-            draw();
+    _readline.default.cursorTo(process.stdout, 0);
 
-            _context.next = 15;
-            return navy.waitForHealthy(servicesToCheck, function (servicesHealth) {
-              return healthyStatus = servicesHealth;
-            });
+    for (let i = 0; i < drawnLines; i++) {
+      _readline.default.moveCursor(process.stdout, 0, -1);
 
-          case 15:
+      _readline.default.clearLine(process.stdout, 0);
+    }
 
-            redraw();
+    draw();
+  }
 
-            clearInterval(spinner);
+  const spinner = setInterval(() => {
+    spinnerIndex++;
 
-          case 17:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
+    if (spinnerIndex >= _cliSpinners.dots.frames.length) {
+      spinnerIndex = 0;
+    }
 
-  return function (_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
+    spinnerFrame = _cliSpinners.dots.frames[spinnerIndex];
+    redraw();
+  }, _cliSpinners.dots.interval);
+  draw();
+  await navy.waitForHealthy(servicesToCheck, servicesHealth => healthyStatus = servicesHealth);
+  redraw();
+  clearInterval(spinner);
+}
 
 module.exports = exports.default;