navy 6.0.0 → 7.0.0-alpha.2

package/lib/cli/open.js

@@ -1,20 +1,15 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
-var _opn = _interopRequireDefault(require("opn"));
-
+var _open = _interopRequireDefault(require("open"));
 var _ = require("../");
-
 async function _default(service, opts) {
   const navy = (0, _.getNavy)(opts.navy);
-  (0, _opn.default)(await navy.url(service));
+  (0, _open.default)(await navy.url(service));
   console.log(`🌐  Opening ${service}...`);
 }
-
 module.exports = exports.default;

package/lib/cli/program.js

@@ -1,24 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _commander = _interopRequireDefault(require("commander"));
-
+var _commander = require("commander");
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _errors = require("../errors");
-
 var _config = require("../config");
-
 var _driverLogging = require("../driver-logging");
-
 var _configProvider = require("../config-provider");
-
+var _mergeActionOptions = require("./util/merge-action-options");
 const loadingLabelMap = {
   destroy: 'Destroying services...',
   start: 'Starting services...',
@@ -33,20 +26,32 @@ const loadingLabelMap = {
   usePort: 'Setting up port mapping...',
   resetPort: 'Resetting port mapping...'
 };
-
 function removeFirstLineFromStackTrace(stack) {
-  var _stack$split, _stack$split$slice;
-
-  return stack === null || stack === void 0 ? void 0 : (_stack$split = stack.split('\n')) === null || _stack$split === void 0 ? void 0 : (_stack$split$slice = _stack$split.slice(1)) === null || _stack$split$slice === void 0 ? void 0 : _stack$split$slice.join('\n');
+  return stack?.split('\n')?.slice(1)?.join('\n');
+}
+function normaliseLazyRequireArgs(args) {
+  if (args.length === 0) return args;
+  const last = args[args.length - 1];
+  if (!last || typeof last.optsWithGlobals !== 'function') {
+    return args;
+  }
+  const command = last;
+  const rest = args.slice(0, -1);
+  if (rest.length === 0) {
+    return rest;
+  }
+  const lastOpt = rest[rest.length - 1];
+  if (lastOpt && typeof lastOpt === 'object' && !Array.isArray(lastOpt)) {
+    return [...rest.slice(0, -1), (0, _mergeActionOptions.mergeActionOptions)(lastOpt, command)];
+  }
+  return rest;
 }
-
 function wrapper(res) {
   if (res.catch) {
     res.catch(ex => {
       (0, _driverLogging.stopDriverLogging)({
         success: false
       });
-
       if (ex instanceof _errors.NavyError) {
         ex.prettyPrint();
       } else if (ex.name === 'Invariant Violation') {
@@ -62,14 +67,11 @@ function wrapper(res) {
       } else {
         console.error(ex.stack);
       }
-
       process.exit(1);
     });
   }
-
   return res;
 }
-
 function basicCliWrapper(fnName, wrapperOpts = {}) {
   const driverLogging = wrapperOpts.driverLogging == null ? true : wrapperOpts.driverLogging;
   return async function (maybeServices, ...args) {
@@ -77,27 +79,37 @@ function basicCliWrapper(fnName, wrapperOpts = {}) {
       getNavy
     } = require('../navy');
 
-    const opts = args.length === 0 ? maybeServices : args[args.length - 1];
+    // commander v12 invokes action handlers with a trailing Command instance
+    // appended after the parsed options. Strip it and merge global options
+    // (e.g. `navy -e dev start`) into the opts object.
+    let command = null;
+    if (args.length > 0) {
+      const last = args[args.length - 1];
+      if (last && typeof last.optsWithGlobals === 'function') {
+        command = last;
+        args = args.slice(0, -1);
+      }
+    }
+    let opts = args.length === 0 ? maybeServices : args[args.length - 1];
     const otherArgs = args.slice(0, args.length - 1);
+    if (command && opts && typeof opts === 'object' && !Array.isArray(opts)) {
+      opts = (0, _mergeActionOptions.mergeActionOptions)(opts, command);
+    }
     const envName = opts.navy;
-
     if (wrapperOpts.serviceBasedAlias && maybeServices.length) {
       console.log(`This command should not be called with a list of services. calling '${wrapperOpts.serviceBasedAlias}' instead`);
       fnName = wrapperOpts.serviceBasedAlias;
       maybeServices = maybeServices.split(' ');
     }
-
     process.on('unhandledRejection', ex => {
       (0, _driverLogging.stopDriverLogging)({
         success: false
       });
-
       if (ex instanceof _errors.NavyError) {
         ex.prettyPrint();
       } else {
         console.error(ex.stack);
       }
-
       process.exit();
     });
     if (driverLogging) (0, _driverLogging.startDriverLogging)(loadingLabelMap[fnName]);
@@ -107,37 +119,30 @@ function basicCliWrapper(fnName, wrapperOpts = {}) {
     const returnVal = await navy[fnName](Array.isArray(maybeServices) && maybeServices.length === 0 ? undefined : maybeServices, ...otherArgs);
     await navy.emitAsync(`cli.after.${fnName}`, fnName);
     if (driverLogging) (0, _driverLogging.stopDriverLogging)();
-
     if (Array.isArray(returnVal)) {
       return console.log(returnVal.join('\n'));
     }
-
     if (returnVal != null) {
       console.log(returnVal);
     }
   };
 }
-
 function lazyRequire(path) {
   return function (...args) {
     const mod = require(path);
-
-    return wrapper((mod.default || mod)(...args));
+    const normalised = normaliseLazyRequireArgs(args);
+    return wrapper((mod.default || mod)(...normalised));
   };
 }
-
 const defaultNavy = process.env.NAVY_NAME || (0, _config.getConfig)().defaultNavy;
-
-const importCommand = _commander.default.command('import').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Imports docker compose configuration from the current working directory and initialises a new navy').action(lazyRequire('./import'));
-
+_commander.program.option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy);
+const importCommand = _commander.program.command('import').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Imports docker compose configuration from the current working directory and initialises a new navy').action(lazyRequire('./import'));
 (0, _configProvider.getImportCommandLineOptions)().forEach(opt => importCommand.option(...opt));
-
-_commander.default.command('launch [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Launches the given services in a navy').action(lazyRequire('./launch')).on('--help', () => console.log(`
+_commander.program.command('launch [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Launches the given services in a navy').action(lazyRequire('./launch')).on('--help', () => console.log(`
   This will prompt you for the services that you want to bring up.
   You can optionally provide the names of services to bring up which will disable the interactive prompt.
   `));
-
-_commander.default.command('destroy').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Destroys a navy and all related data and services').action(basicCliWrapper('destroy', {
+_commander.program.command('destroy').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Destroys a navy and all related data and services').action(basicCliWrapper('destroy', {
   serviceBasedAlias: 'kill'
 })).on('--help', () => console.log(`
   This will destroy an entire navy and all of its data and services.
@@ -147,36 +152,21 @@ _commander.default.command('destroy').option('-e, --navy [env]', `set the navy n
     $ navy destroy -e dev # destroy "dev" navy
     $ navy destroy -e test # destroy "test" navy
   `));
-
-_commander.default.command('delete').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Removes a navy configuration without removing any docker containers or services').action(basicCliWrapper('delete'));
-
-_commander.default.command('ps').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).option('--json', 'output JSON instead of a table').description('Lists the running services for a navy').action(lazyRequire('./ps'));
-
-_commander.default.command('start [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Starts the given services').action(basicCliWrapper('start'));
-
-_commander.default.command('stop [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Stops the given services').action(basicCliWrapper('stop'));
-
-_commander.default.command('restart [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Restarts the given services').action(basicCliWrapper('restart'));
-
-_commander.default.command('kill [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Kills the given services').action(basicCliWrapper('kill'));
-
-_commander.default.command('rm [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Removes the given services').action(basicCliWrapper('rm'));
-
-_commander.default.command('update [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Pulls the given services\' images from their respective registries and relaunches the services').action(basicCliWrapper('update'));
-
-_commander.default.command('updates').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Checks for updates for all the launched services').action(lazyRequire('./updates'));
-
-_commander.default.command('logs [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Streams logs for the given services').action(lazyRequire('./logs'));
-
-_commander.default.command('health').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Shows the health status for all of the launched services').action(lazyRequire('./health'));
-
-_commander.default.command('wait-for-healthy [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Waits for the given services to be healthy').action(lazyRequire('./wait-for-healthy'));
-
-_commander.default.command('use-tag <service> <tag>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Uses a specific tag for the given service').action(basicCliWrapper('useTag'));
-
-_commander.default.command('reset-tag <service>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Resets any tag override on the given service').action(basicCliWrapper('resetTag'));
-
-_commander.default.command('https [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).option('-d, --disable <service>', 'disable https (deletes cert) for a given service', null).description('Prints or enables HTTPS services').action(lazyRequire('./https')).on('--help', () => console.log(`
+_commander.program.command('delete').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Removes a navy configuration without removing any docker containers or services').action(basicCliWrapper('delete'));
+_commander.program.command('ps').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).option('--json', 'output JSON instead of a table').description('Lists the running services for a navy').action(lazyRequire('./ps'));
+_commander.program.command('start [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Starts the given services').action(basicCliWrapper('start'));
+_commander.program.command('stop [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Stops the given services').action(basicCliWrapper('stop'));
+_commander.program.command('restart [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Restarts the given services').action(basicCliWrapper('restart'));
+_commander.program.command('kill [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Kills the given services').action(basicCliWrapper('kill'));
+_commander.program.command('rm [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Removes the given services').action(basicCliWrapper('rm'));
+_commander.program.command('update [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Pulls the given services\' images from their respective registries and relaunches the services').action(basicCliWrapper('update'));
+_commander.program.command('updates').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Checks for updates for all the launched services').action(lazyRequire('./updates'));
+_commander.program.command('logs [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Streams logs for the given services').action(lazyRequire('./logs'));
+_commander.program.command('health').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Shows the health status for all of the launched services').action(lazyRequire('./health'));
+_commander.program.command('wait-for-healthy [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Waits for the given services to be healthy').action(lazyRequire('./wait-for-healthy'));
+_commander.program.command('use-tag <service> <tag>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Uses a specific tag for the given service').action(basicCliWrapper('useTag'));
+_commander.program.command('reset-tag <service>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Resets any tag override on the given service').action(basicCliWrapper('resetTag'));
+_commander.program.command('https [services...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).option('-d, --disable <service>', 'disable https (deletes cert) for a given service', null).description('Prints or enables HTTPS services').action(lazyRequire('./https')).on('--help', () => console.log(`
   Examples:
     List urls of services that listen on https:
     $ navy https
@@ -187,57 +177,39 @@ _commander.default.command('https [services...]').option('-e, --navy [env]', `se
     Disable https for mywebservice
     $ navy https -d mywebservice
   `));
-
-_commander.default.command('use-port <service> <internal> <external>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Uses a specific external port for the given service and internal port').action(basicCliWrapper('usePort'));
-
-_commander.default.command('reset-port <service> <internal>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Resets a specific external port mapping set by use-port').action(basicCliWrapper('resetPort'));
-
-_commander.default.command('url <service>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Prints the external URL for the given service if it is a web service').action(basicCliWrapper('url', {
+_commander.program.command('use-port <service> <internal> <external>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Uses a specific external port for the given service and internal port').action(basicCliWrapper('usePort'));
+_commander.program.command('reset-port <service> <internal>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Resets a specific external port mapping set by use-port').action(basicCliWrapper('resetPort'));
+_commander.program.command('url <service>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Prints the external URL for the given service if it is a web service').action(basicCliWrapper('url', {
   driverLogging: false
 })).on('--help', () => console.log(`
   Examples:
     $ navy url mywebserver
     http://mywebserver.dev.127.0.0.1.nip.io
   `));
-
-_commander.default.command('open <service>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Opens the given service in the default web browser, if the service is configured with a URL').action(lazyRequire('./open')).on('--help', () => console.log(`
+_commander.program.command('open <service>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Opens the given service in the default web browser, if the service is configured with a URL').action(lazyRequire('./open')).on('--help', () => console.log(`
   Examples:
     $ navy open mywebserver
     Opening mywebserver...
   `));
-
-_commander.default.command('port <service> <port>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Prints the external port for the given internal port of the given service').action(basicCliWrapper('port', {
+_commander.program.command('port <service> <port>').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Prints the external port for the given internal port of the given service').action(basicCliWrapper('port', {
   driverLogging: false
 })).on('--help', () => console.log(`
   Examples:
     $ navy port mywebserver 80
     35821
   `));
-
-_commander.default.command('available-services').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Prints the names of the services that are launched or can be launched').action(basicCliWrapper('getAvailableServiceNames', {
+_commander.program.command('available-services').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Prints the names of the services that are launched or can be launched').action(basicCliWrapper('getAvailableServiceNames', {
   driverLogging: false
 }));
-
-_commander.default.command('develop [service]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Puts the given service into development using the current working directory').action(lazyRequire('./develop'));
-
-_commander.default.command('live [service]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Takes the given service out of development').action(lazyRequire('./live'));
-
-_commander.default.command('run <name> [args...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Runs a named command specific to the given Navy').action(lazyRequire('./run'));
-
-_commander.default.command('refresh-config').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Refreshes the configuration for the given Navy').action(lazyRequire('./refresh-config'));
-
-_commander.default.command('status').option('--json', 'output JSON instead of a table').description('List all of the imported navies').action(lazyRequire('./status'));
-
-_commander.default.command('doctor').description('Identifies and tries to fix some common issues which might cause Navy to stop working').action(lazyRequire('./doctor'));
-
-_commander.default.command('config').description('Modify and get Navy global config - run `navy config` for help').action(lazyRequire('./config/wrapper'));
-
-_commander.default.command('external-ip').description('Prints the external IP which services are accessible on').action(lazyRequire('./external-ip'));
-
-_commander.default.command('use-lan-ip').description('Use your LAN ip address for connecting to Navy services').action(lazyRequire('./lan-ip'));
-
-_commander.default.command('use-local-ip').description('Use your local ip address (127.0.0.1) for connecting to Navy services').action(lazyRequire('./local-ip'));
-
-var _default = _commander.default;
-exports.default = _default;
+_commander.program.command('develop [service]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Puts the given service into development using the current working directory').action(lazyRequire('./develop'));
+_commander.program.command('live [service]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Takes the given service out of development').action(lazyRequire('./live'));
+_commander.program.command('run <name> [args...]').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Runs a named command specific to the given Navy').action(lazyRequire('./run'));
+_commander.program.command('refresh-config').option('-e, --navy [env]', `set the navy name to be used [${defaultNavy}]`, defaultNavy).description('Refreshes the configuration for the given Navy').action(lazyRequire('./refresh-config'));
+_commander.program.command('status').option('--json', 'output JSON instead of a table').description('List all of the imported navies').action(lazyRequire('./status'));
+_commander.program.command('doctor').description('Identifies and tries to fix some common issues which might cause Navy to stop working').action(lazyRequire('./doctor'));
+_commander.program.command('config').description('Modify and get Navy global config - run `navy config` for help').action(lazyRequire('./config/wrapper'));
+_commander.program.command('external-ip').description('Prints the external IP which services are accessible on').action(lazyRequire('./external-ip'));
+_commander.program.command('use-lan-ip').description('Use your LAN ip address for connecting to Navy services').action(lazyRequire('./lan-ip'));
+_commander.program.command('use-local-ip').description('Use your local ip address (127.0.0.1) for connecting to Navy services').action(lazyRequire('./local-ip'));
+var _default = exports.default = _commander.program;
 module.exports = exports.default;

package/lib/cli/ps.js

@@ -1,70 +1,50 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _ = require("../");
-
 var _serviceHost = require("../util/service-host");
-
 var _table = _interopRequireDefault(require("../util/table"));
-
 const SMALL_WINDOW_COLUMNS = 185;
-
 function getStatus(service, state) {
   let statusString = service.status === 'exited' ? _chalk.default.red(service.status) : service.status;
-
   if (state && state.services && state.services[service.name]) {
     const serviceState = state.services[service.name];
-
     if (serviceState._develop) {
       statusString += ' ' + _chalk.default.yellow('(development)');
     }
-
     if (serviceState._tag) {
       statusString += ' ' + _chalk.default.cyan(`@ ${serviceState._tag}`);
     }
   }
-
   return statusString;
 }
-
 function getPorts(service) {
   if (!service || !service.raw || !service.raw.NetworkSettings || !service.raw.NetworkSettings.Ports) {
     return '-';
   }
-
   const ports = service.raw.NetworkSettings.Ports;
   const portKeys = Object.keys(ports);
   return portKeys.map(portKey => {
     return ports[portKey] ? `${ports[portKey].map(conf => conf.HostPort).join(', ')}->${portKey}` : portKey;
   }).join(', ');
 }
-
 const getDisplayUrl = serviceUrl => serviceUrl != null ? serviceUrl : '-';
-
 async function _default(opts) {
   const navy = (0, _.getNavy)(opts.navy);
   const ps = await navy.ps();
-  const state = await navy.getState(); // $FlowIgnore getWindowSize not on type
-
+  const state = await navy.getState();
   const isSmallConsole = process.stdout.isTTY && process.stdout.getWindowSize()[0] < SMALL_WINDOW_COLUMNS;
-
   if (opts.json) {
     return console.log(JSON.stringify(ps, null, 2));
   }
-
   if (isSmallConsole) {
     return console.log((0, _table.default)([['ID', 'NAME', 'STATUS', 'PORTS', 'URL'], ...ps.map(service => [service.id.substring(0, 12), service.name, getStatus(service, state), getPorts(service), getDisplayUrl((0, _serviceHost.getUrlFromService)(service))])]));
   }
-
   console.log((0, _table.default)([['ID', 'NAME', 'IMAGE', 'STATUS', 'PORTS', 'URL'], ...ps.map(service => [service.id.substring(0, 12), service.name, service.image, getStatus(service, state), getPorts(service), getDisplayUrl((0, _serviceHost.getUrlFromService)(service))])]));
 }
-
 module.exports = exports.default;

package/lib/cli/refresh-config.js

@@ -1,20 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _invariant = _interopRequireDefault(require("invariant"));
-
 var _ = require("../");
-
 var _driverLogging = require("../driver-logging");
-
 async function _default(opts) {
   const navy = (0, _.getNavy)(opts.navy);
   const configProvider = await navy.getConfigProvider();
@@ -25,5 +19,4 @@ async function _default(opts) {
   (0, _driverLogging.stopDriverLogging)();
   console.log(_chalk.default.green(`Config refreshed for Navy "${opts.navy}"`));
 }
-
 module.exports = exports.default;

package/lib/cli/run.js

@@ -4,13 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _ = require("../");
-
 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,31 +1,22 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _ = require("../");
-
 var _table = _interopRequireDefault(require("../util/table"));
-
 var _config = require("../config");
-
 function formatNavyName(navy, defaultNavy) {
   if (navy.name === defaultNavy) {
     return `${navy.name} ${_chalk.default.cyan('(default)')}`;
   }
-
   return navy.name;
 }
-
 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();
@@ -43,7 +34,6 @@ async function _default(opts) {
       };
     })), null, 2));
   }
-
   const config = await (0, _config.getConfig)();
   const {
     defaultNavy
@@ -57,5 +47,4 @@ async function _default(opts) {
   }));
   console.log((0, _table.default)([['NAME', 'ACTIVE', 'SERVICES', 'CONFIG PROVIDER', 'CONFIG LOCATION', 'URL'], ...rows]));
 }
-
 module.exports = exports.default;

package/lib/cli/updates.js

@@ -1,29 +1,19 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _readline = _interopRequireDefault(require("readline"));
-
 var _cliSpinners = require("cli-spinners");
-
 var _ = require("../");
-
 var _table = _interopRequireDefault(require("../util/table"));
-
 var _hasUpdate = _interopRequireDefault(require("../util/has-update"));
-
 const debug = require('debug')('navy:updates');
-
 let spinnerIndex = 0;
 let spinnerFrame = _cliSpinners.dots.frames[0];
-
 function renderStatus(status) {
   if (status == null) {
     return _chalk.default.yellow(spinnerFrame) + ' ' + _chalk.default.dim('Checking...');
@@ -39,42 +29,32 @@ function renderStatus(status) {
     return _chalk.default.green('✔ Up to date');
   }
 }
-
 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 (let i = 0; i < drawnLines; i++) {
       _readline.default.moveCursor(process.stdout, 0, -1);
-
       _readline.default.clearLine(process.stdout, 0);
     }
-
     draw();
   }
-
   const spinner = setInterval(() => {
     spinnerIndex++;
-
     if (spinnerIndex >= _cliSpinners.dots.frames.length) {
       spinnerIndex = 0;
     }
-
     spinnerFrame = _cliSpinners.dots.frames[spinnerIndex];
     redraw();
   }, _cliSpinners.dots.interval);
@@ -84,7 +64,6 @@ async function _default(opts) {
       if (!service || !service.raw || !service.raw.Image) {
         return updateStatus[service.id] = 'NO_IMAGE';
       }
-
       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);
@@ -94,5 +73,4 @@ async function _default(opts) {
   redraw();
   clearInterval(spinner);
 }
-
 module.exports = exports.default;

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

@@ -0,0 +1,66 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _chai = require("chai");
+var _sinon = _interopRequireDefault(require("sinon"));
+var _proxyquire = _interopRequireDefault(require("proxyquire"));
+/* eslint-env mocha */
+
+describe('cli/util/get-or-initialise-navy', function () {
+  let sandbox;
+  let getNavyStub;
+  let importNavyStub;
+  let getImportOptionsForCLIStub;
+  let navyStub;
+  let getOrInitialiseNavy;
+  beforeEach(function () {
+    sandbox = _sinon.default.createSandbox();
+    navyStub = {
+      isInitialised: sandbox.stub()
+    };
+    getNavyStub = sandbox.stub().returns(navyStub);
+    importNavyStub = sandbox.stub().resolves();
+    getImportOptionsForCLIStub = sandbox.stub().resolves({
+      configProvider: 'filesystem',
+      path: '/cwd'
+    });
+    getOrInitialiseNavy = _proxyquire.default.noCallThru()('../get-or-initialise-navy', {
+      '../../': {
+        getNavy: getNavyStub
+      },
+      './import': {
+        importNavy: importNavyStub
+      },
+      '../../config-providers/filesystem': {
+        getImportOptionsForCLI: getImportOptionsForCLIStub
+      }
+    }).getOrInitialiseNavy;
+  });
+  afterEach(function () {
+    sandbox.restore();
+  });
+  describe('getOrInitialiseNavy', function () {
+    it('should return the navy without importing when already initialised', async function () {
+      navyStub.isInitialised.resolves(true);
+      const result = await getOrInitialiseNavy('env-1');
+      (0, _chai.expect)(result).to.equal(navyStub);
+      (0, _chai.expect)(getNavyStub.calledOnce).to.equal(true);
+      (0, _chai.expect)(getNavyStub.firstCall.args[0]).to.equal('env-1');
+      (0, _chai.expect)(importNavyStub.called).to.equal(false);
+      (0, _chai.expect)(getImportOptionsForCLIStub.called).to.equal(false);
+    });
+    it('should import the navy using filesystem provider opts when not initialised', async function () {
+      navyStub.isInitialised.resolves(false);
+      const result = await getOrInitialiseNavy('env-2');
+      (0, _chai.expect)(result).to.equal(navyStub);
+      (0, _chai.expect)(getImportOptionsForCLIStub.calledOnce).to.equal(true);
+      (0, _chai.expect)(getImportOptionsForCLIStub.firstCall.args[0]).to.eql({});
+      (0, _chai.expect)(importNavyStub.calledOnce).to.equal(true);
+      (0, _chai.expect)(importNavyStub.firstCall.args[0]).to.equal(navyStub);
+      (0, _chai.expect)(importNavyStub.firstCall.args[1]).to.eql({
+        configProvider: 'filesystem',
+        path: '/cwd'
+      });
+    });
+  });
+});