navy 4.1.2-rc.2 → 5.0.0

package/lib/cli/refresh-config.js

@@ -1,73 +1,29 @@
-'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 _invariant = require('invariant');
-
-var _invariant2 = _interopRequireDefault(_invariant);
-
-var _ = require('../');
-
-var _driverLogging = require('../driver-logging');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(opts) {
-    var navy, configProvider;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            navy = (0, _.getNavy)(opts.navy);
-            _context.next = 3;
-            return navy.getConfigProvider();
-
-          case 3:
-            configProvider = _context.sent;
-
-
-            (0, _invariant2.default)(configProvider, 'NO_CONFIG_PROVIDER: Couldn\'t determine config provider for navy %s', navy.name);
-
-            _context.next = 7;
-            return configProvider.refreshConfig();
-
-          case 7:
-
-            (0, _driverLogging.startDriverLogging)('Ensuring services are up to date...');
-            _context.next = 10;
-            return navy.reconfigure();
+var _chalk = _interopRequireDefault(require("chalk"));
 
-          case 10:
-            (0, _driverLogging.stopDriverLogging)();
+var _invariant = _interopRequireDefault(require("invariant"));
 
-            console.log(_chalk2.default.green('Config refreshed for Navy "' + opts.navy + '"'));
+var _ = require("../");
 
-          case 12:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
+var _driverLogging = require("../driver-logging");
 
-  return function (_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+async function _default(opts) {
+  const navy = (0, _.getNavy)(opts.navy);
+  const configProvider = await navy.getConfigProvider();
+  (0, _invariant.default)(configProvider, "NO_CONFIG_PROVIDER: Couldn't determine config provider for navy %s", navy.name);
+  await configProvider.refreshConfig();
+  (0, _driverLogging.startDriverLogging)('Ensuring services are up to date...');
+  await navy.reconfigure();
+  (0, _driverLogging.stopDriverLogging)();
+  console.log(_chalk.default.green(`Config refreshed for Navy "${opts.navy}"`));
+}
 
 module.exports = exports.default;

package/lib/cli/run.js

@@ -1,47 +1,16 @@
-'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 _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _ = require('../');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(name, args, opts) {
-    var navy;
-    return _regenerator2.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            navy = (0, _.getNavy)(opts.navy);
-            _context.next = 3;
-            return navy.ensurePluginsLoaded();
-
-          case 3:
-            _context.next = 5;
-            return navy.invokeCommand(name, args);
-
-          case 5:
-          case 'end':
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-
-  return function (_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
-  };
-}();
+async function _default(name, args, opts) {
+  const navy = (0, _.getNavy)(opts.navy);
+  await navy.ensurePluginsLoaded();
+  await navy.invokeCommand(name, args);
+}
 
 module.exports = exports.default;

package/lib/cli/status.js

@@ -1,221 +1,61 @@
-'use strict';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = _default;
 
-var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
-
-var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
-
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _promise = require('babel-runtime/core-js/promise');
-
-var _promise2 = _interopRequireDefault(_promise);
-
-var _stringify = require('babel-runtime/core-js/json/stringify');
-
-var _stringify2 = _interopRequireDefault(_stringify);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _chalk = require('chalk');
+var _chalk = _interopRequireDefault(require("chalk"));
 
-var _chalk2 = _interopRequireDefault(_chalk);
+var _ = require("../");
 
-var _ = require('../');
+var _table = _interopRequireDefault(require("../util/table"));
 
-var _table = require('../util/table');
-
-var _table2 = _interopRequireDefault(_table);
-
-var _config = require('../config');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _config = require("../config");
 
 function formatNavyName(navy, defaultNavy) {
   if (navy.name === defaultNavy) {
-    return navy.name + ' ' + _chalk2.default.cyan('(default)');
+    return `${navy.name} ${_chalk.default.cyan('(default)')}`;
   }
 
   return navy.name;
 }
 
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(opts) {
-    var _this = this;
-
-    var navies, config, defaultNavy, rows;
-    return _regenerator2.default.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.next = 2;
-            return (0, _.getLaunchedNavies)();
-
-          case 2:
-            navies = _context3.sent;
-
-            if (!opts.json) {
-              _context3.next = 11;
-              break;
-            }
-
-            _context3.t0 = console;
-            _context3.t1 = _stringify2.default;
-            _context3.next = 8;
-            return _promise2.default.all(navies.map(function () {
-              var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(navy) {
-                var ps, state, configProvider, isActive;
-                return _regenerator2.default.wrap(function _callee$(_context) {
-                  while (1) {
-                    switch (_context.prev = _context.next) {
-                      case 0:
-                        _context.next = 2;
-                        return navy.ps();
-
-                      case 2:
-                        ps = _context.sent;
-                        _context.next = 5;
-                        return navy.getState();
-
-                      case 5:
-                        state = _context.sent;
-                        _context.next = 8;
-                        return navy.getConfigProvider();
-
-                      case 8:
-                        configProvider = _context.sent;
-                        isActive = ps.reduce(function (active, service) {
-                          return active || service.status === 'running';
-                        }, false);
-                        _context.t0 = navy.name;
-                        _context.t1 = isActive;
-                        _context.t2 = ps;
-                        _context.t3 = state;
-                        _context.t4 = state.configProvider;
-                        _context.next = 17;
-                        return configProvider.getLocationDisplayName();
-
-                      case 17:
-                        _context.t5 = _context.sent;
-                        _context.next = 20;
-                        return navy.url('[service]');
-
-                      case 20:
-                        _context.t6 = _context.sent;
-                        return _context.abrupt('return', {
-                          name: _context.t0,
-                          isActive: _context.t1,
-                          services: _context.t2,
-                          state: _context.t3,
-                          configProvider: _context.t4,
-                          configLocation: _context.t5,
-                          url: _context.t6
-                        });
-
-                      case 22:
-                      case 'end':
-                        return _context.stop();
-                    }
-                  }
-                }, _callee, _this);
-              }));
-
-              return function (_x2) {
-                return _ref2.apply(this, arguments);
-              };
-            }()));
-
-          case 8:
-            _context3.t2 = _context3.sent;
-            _context3.t3 = (0, _context3.t1)(_context3.t2, null, 2);
-            return _context3.abrupt('return', _context3.t0.log.call(_context3.t0, _context3.t3));
-
-          case 11:
-            _context3.next = 13;
-            return (0, _config.getConfig)();
-
-          case 13:
-            config = _context3.sent;
-            defaultNavy = config.defaultNavy;
-            _context3.next = 17;
-            return _promise2.default.all(navies.map(function () {
-              var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(navy) {
-                var ps, state, configProvider, isActive;
-                return _regenerator2.default.wrap(function _callee2$(_context2) {
-                  while (1) {
-                    switch (_context2.prev = _context2.next) {
-                      case 0:
-                        _context2.next = 2;
-                        return navy.ps();
-
-                      case 2:
-                        ps = _context2.sent;
-                        _context2.next = 5;
-                        return navy.getState();
-
-                      case 5:
-                        state = _context2.sent;
-                        _context2.next = 8;
-                        return navy.getConfigProvider();
-
-                      case 8:
-                        configProvider = _context2.sent;
-                        isActive = ps.reduce(function (active, service) {
-                          return active || service.status === 'running';
-                        }, false);
-                        _context2.t0 = formatNavyName(navy, defaultNavy);
-                        _context2.t1 = isActive ? _chalk2.default.green('yes') : _chalk2.default.red('no');
-                        _context2.t2 = ps.length.toString();
-                        _context2.t3 = state.configProvider;
-                        _context2.next = 16;
-                        return configProvider.getLocationDisplayName();
-
-                      case 16:
-                        _context2.t4 = _context2.sent;
-                        _context2.next = 19;
-                        return navy.url(_chalk2.default.dim('service'));
-
-                      case 19:
-                        _context2.t5 = _context2.sent;
-                        return _context2.abrupt('return', [_context2.t0, _context2.t1, _context2.t2, _context2.t3, _context2.t4, _context2.t5]);
-
-                      case 21:
-                      case 'end':
-                        return _context2.stop();
-                    }
-                  }
-                }, _callee2, _this);
-              }));
-
-              return function (_x3) {
-                return _ref3.apply(this, arguments);
-              };
-            }()));
-
-          case 17:
-            rows = _context3.sent;
-
-
-            console.log((0, _table2.default)([['NAME', 'ACTIVE', 'SERVICES', 'CONFIG PROVIDER', 'CONFIG LOCATION', 'URL']].concat((0, _toConsumableArray3.default)(rows))));
+async function _default(opts) {
+  const navies = await (0, _.getLaunchedNavies)();
+
+  if (opts.json) {
+    return console.log(JSON.stringify(await Promise.all(navies.map(async navy => {
+      const ps = await navy.ps();
+      const state = await navy.getState();
+      const configProvider = await navy.getConfigProvider();
+      const isActive = ps.reduce((active, service) => active || service.status === 'running', false);
+      return {
+        name: navy.name,
+        isActive,
+        services: ps,
+        state,
+        configProvider: state.configProvider,
+        configLocation: await configProvider.getLocationDisplayName(),
+        url: await navy.url('[service]')
+      };
+    })), null, 2));
+  }
 
-          case 19:
-          case 'end':
-            return _context3.stop();
-        }
-      }
-    }, _callee3, this);
+  const config = await (0, _config.getConfig)();
+  const {
+    defaultNavy
+  } = config;
+  const rows = await Promise.all(navies.map(async navy => {
+    const ps = await navy.ps();
+    const state = await navy.getState();
+    const configProvider = await navy.getConfigProvider();
+    const isActive = ps.reduce((active, service) => active || service.status === 'running', false);
+    return [formatNavyName(navy, defaultNavy), isActive ? _chalk.default.green('yes') : _chalk.default.red('no'), ps.length.toString(), state.configProvider, await configProvider.getLocationDisplayName(), await navy.url(_chalk.default.dim('service'))];
   }));
-
-  return function (_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+  console.log((0, _table.default)([['NAME', 'ACTIVE', 'SERVICES', 'CONFIG PROVIDER', 'CONFIG LOCATION', 'URL'], ...rows]));
+}
 
 module.exports = exports.default;

package/lib/cli/updates.js

@@ -1,190 +1,98 @@
-'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 _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
-
-var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
-
-var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
-
-var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
-
-var _chalk = require('chalk');
-
-var _chalk2 = _interopRequireDefault(_chalk);
-
-var _readline = require('readline');
+var _chalk = _interopRequireDefault(require("chalk"));
 
-var _readline2 = _interopRequireDefault(_readline);
+var _readline = _interopRequireDefault(require("readline"));
 
-var _cliSpinners = require('cli-spinners');
+var _cliSpinners = require("cli-spinners");
 
-var _ = require('../');
+var _ = require("../");
 
-var _table = require('../util/table');
+var _table = _interopRequireDefault(require("../util/table"));
 
-var _table2 = _interopRequireDefault(_table);
+var _hasUpdate = _interopRequireDefault(require("../util/has-update"));
 
-var _hasUpdate = require('../util/has-update');
+const debug = require('debug')('navy:updates');
 
-var _hasUpdate2 = _interopRequireDefault(_hasUpdate);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var debug = require('debug')('navy:updates');
-
-var spinnerIndex = 0;
-var spinnerFrame = _cliSpinners.dots.frames[0];
+let spinnerIndex = 0;
+let spinnerFrame = _cliSpinners.dots.frames[0];
 
 function renderStatus(status) {
   if (status == null) {
-    return _chalk2.default.yellow(spinnerFrame) + ' ' + _chalk2.default.dim('Checking...');
+    return _chalk.default.yellow(spinnerFrame) + ' ' + _chalk.default.dim('Checking...');
   } else if (status === true) {
-    return _chalk2.default.yellow('• Update available');
+    return _chalk.default.yellow('• Update available');
   } else if (status === 'UNKNOWN_REMOTE') {
-    return _chalk2.default.red('• Not found');
+    return _chalk.default.red('• Not found');
   } else if (status === 'UNKNOWN_ERROR') {
-    return _chalk2.default.red('• Internal error');
+    return _chalk.default.red('• Internal error');
   } else if (status === 'NO_IMAGE') {
-    return _chalk2.default.red('• No image for service');
+    return _chalk.default.red('• No image for service');
   } else {
-    return _chalk2.default.green('✔ Up to date');
+    return _chalk.default.green('✔ Up to date');
   }
 }
 
-exports.default = function () {
-  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(opts) {
-    var _this = this;
-
-    var navy, navyFile, ps, updateStatus, drawnLines, draw, redraw, spinner;
-    return _regenerator2.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            redraw = function redraw() {
-              _readline2.default.clearLine(process.stdout, 0);
-              _readline2.default.cursorTo(process.stdout, 0);
+async function _default(opts) {
+  const navy = (0, _.getNavy)(opts.navy);
+  const navyFile = await navy.getNavyFile();
+  const ps = await navy.ps();
+  const updateStatus = {};
+  let drawnLines = 0;
+
+  function draw() {
+    drawnLines = 0;
+    const buffer = (0, _table.default)([['NAME', 'IMAGE', 'UPDATES'], ...ps.map(service => [service.name, service.image, renderStatus(updateStatus[service.id])])]);
+    drawnLines = buffer.split('\n').length;
+    console.log(buffer);
+  }
+
+  function redraw() {
+    _readline.default.clearLine(process.stdout, 0);
+
+    _readline.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;
-
-              var buffer = (0, _table2.default)([['NAME', 'IMAGE', 'UPDATES']].concat((0, _toConsumableArray3.default)(ps.map(function (service) {
-                return [service.name, service.image, renderStatus(updateStatus[service.id])];
-              }))));
-
-              drawnLines = buffer.split('\n').length;
-              console.log(buffer);
-            };
-
-            navy = (0, _.getNavy)(opts.navy);
-            _context2.next = 5;
-            return navy.getNavyFile();
-
-          case 5:
-            navyFile = _context2.sent;
-            _context2.next = 8;
-            return navy.ps();
-
-          case 8:
-            ps = _context2.sent;
-            updateStatus = {};
-            drawnLines = 0;
-            spinner = setInterval(function () {
-              spinnerIndex++;
-
-              if (spinnerIndex >= _cliSpinners.dots.frames.length) {
-                spinnerIndex = 0;
-              }
-
-              spinnerFrame = _cliSpinners.dots.frames[spinnerIndex];
-
-              redraw();
-            }, _cliSpinners.dots.interval);
-
-
-            draw();
-
-            _context2.next = 15;
-            return _promise2.default.all(ps.map(function () {
-              var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(service) {
-                return _regenerator2.default.wrap(function _callee$(_context) {
-                  while (1) {
-                    switch (_context.prev = _context.next) {
-                      case 0:
-                        _context.prev = 0;
-
-                        if (!(!service || !service.raw || !service.raw.Image)) {
-                          _context.next = 3;
-                          break;
-                        }
-
-                        return _context.abrupt('return', updateStatus[service.id] = 'NO_IMAGE');
-
-                      case 3:
-                        _context.next = 5;
-                        return (0, _hasUpdate2.default)(service.image, service.raw.Image, navyFile);
-
-                      case 5:
-                        updateStatus[service.id] = _context.sent;
-                        _context.next = 12;
-                        break;
-
-                      case 8:
-                        _context.prev = 8;
-                        _context.t0 = _context['catch'](0);
-
-                        debug('Error checking update for', service.name, _context.t0.stack || _context.t0.message);
-                        updateStatus[service.id] = 'UNKNOWN_ERROR';
-
-                      case 12:
-                      case 'end':
-                        return _context.stop();
-                    }
-                  }
-                }, _callee, _this, [[0, 8]]);
-              }));
-
-              return function (_x2) {
-                return _ref2.apply(this, arguments);
-              };
-            }()));
-
-          case 15:
-
-            redraw();
+    for (let i = 0; i < drawnLines; i++) {
+      _readline.default.moveCursor(process.stdout, 0, -1);
 
-            clearInterval(spinner);
+      _readline.default.clearLine(process.stdout, 0);
+    }
 
-          case 17:
-          case 'end':
-            return _context2.stop();
-        }
+    draw();
+  }
+
+  const spinner = setInterval(() => {
+    spinnerIndex++;
+
+    if (spinnerIndex >= _cliSpinners.dots.frames.length) {
+      spinnerIndex = 0;
+    }
+
+    spinnerFrame = _cliSpinners.dots.frames[spinnerIndex];
+    redraw();
+  }, _cliSpinners.dots.interval);
+  draw();
+  await Promise.all(ps.map(async service => {
+    try {
+      if (!service || !service.raw || !service.raw.Image) {
+        return updateStatus[service.id] = 'NO_IMAGE';
       }
-    }, _callee2, this);
-  }));
 
-  return function (_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+      updateStatus[service.id] = await (0, _hasUpdate.default)(service.image, service.raw.Image, navyFile);
+    } catch (ex) {
+      debug('Error checking update for', service.name, ex.stack || ex.message);
+      updateStatus[service.id] = 'UNKNOWN_ERROR';
+    }
+  }));
+  redraw();
+  clearInterval(spinner);
+}
 
 module.exports = exports.default;