clever-tools 3.6.1 → 3.8.0

package/README.md

@@ -1,6 +1,6 @@
 # Clever Tools
 
-Deploy on Clever Cloud and control you applications, add-ons, services from command line.
+Deploy on Clever Cloud and control your applications, add-ons, services from command line.
 
 - [Create a Clever Cloud account](https://console.clever-cloud.com)
 
@@ -70,9 +70,3 @@ If you want to know more or if you need to release a new version, please read [R
 ## License
 
 This project is licensed under the [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html).
-
-We're using a CJS bundled version of a file from [curlconverter](https://github.com/curlconverter/curlconverter):
-
-* The project is licensed with [MIT](https://github.com/curlconverter/curlconverter/blob/master/LICENSE)
-* The copyright is at the top the file `vendors/curlconverter-parse`
-* The details are explained in [README_VENDORS.md](vendors/README_VENDORS.md)

package/bin/clever.js

@@ -1,20 +1,55 @@
 #! /usr/bin/env node
 'use strict';
 
+function hasParam (param, paramValue) {
+  const index = process.argv.indexOf(param);
+  if (index === -1) {
+    return false;
+  }
+  if (paramValue != null) {
+    return process.argv[index + 1] === paramValue;
+  }
+  return true;
+}
+
 // These need to be set before Logger and other stuffs
-if (process.argv.includes('-v') || process.argv.includes('--verbose')) {
+if (hasParam('-v') || hasParam('--verbose')) {
   process.env.CLEVER_VERBOSE = '1';
 }
 
 // These need to be set before Logger and other stuffs
 // Don't log anything in autocomplete mode
-if (process.argv.includes('--autocomplete-index')) {
+if (hasParam('--autocomplete-index')) {
   process.env.CLEVER_QUIET = '1';
 }
 
+// These need to be set before other stuffs
+const colors = require('colors');
+const colorExplicitFalse = hasParam('--no-color') || hasParam('--color', 'false');
+const colorExplicitTrue = hasParam('--color', 'true');
+if (colorExplicitFalse || (!process.stdout.isTTY && !colorExplicitTrue)) {
+  colors.disable();
+}
+
+// These need to be set before Logger and other stuffs
+const pkg = require('../package.json');
+const updateNotifierModule = require('update-notifier');
+const isRunThroughPackagedBinary = process.pkg != null;
+const updateNotifierExplicitFalse = hasParam('--no-update-notifier') || hasParam('--update-notifier', 'false');
+if (!updateNotifierExplicitFalse && !isRunThroughPackagedBinary) {
+  updateNotifierModule({
+    pkg,
+    tagsUrl: 'https://api.github.com/repos/CleverCloud/clever-tools/tags',
+  }).notify({
+    getDetails () {
+      const docsUrl = 'https://www.clever-cloud.com/doc/clever-tools/getting_started';
+      return `\nPlease follow this link to update your clever-tools:\n${docsUrl}`;
+    },
+  });
+}
+
 const cliparse = require('cliparse');
 const cliparseCommands = require('cliparse/src/command.js');
-const updateNotifier = require('update-notifier');
 const _sortBy = require('lodash/sortBy.js');
 
 const git = require('../src/models/git.js');
@@ -22,7 +57,7 @@ const Parsers = require('../src/parsers.js');
 const handleCommandPromise = require('../src/command-promise-handler.js');
 const Formatter = require('../src/models/format-string.js');
 const { AVAILABLE_ZONES } = require('../src/models/application.js');
-const { getOutputFormatOption, getSameCommitPolicyOption } = require('../src/command-options.js');
+const { getOutputFormatOption, getSameCommitPolicyOption, getExitOnOption } = require('../src/command-options.js');
 
 // Exit cleanly if the program we pipe to exits abruptly
 process.stdout.on('error', (error) => {
@@ -31,20 +66,6 @@ process.stdout.on('error', (error) => {
   }
 });
 
-const pkg = require('../package.json');
-
-if (process.pkg == null) {
-  updateNotifier({
-    pkg,
-    tagsUrl: 'https://api.github.com/repos/CleverCloud/clever-tools/tags',
-  }).notify({
-    getDetails () {
-      const docsUrl = 'https://www.clever-cloud.com/doc/clever-tools/getting_started';
-      return `\nPlease follow this link to update your clever-tools:\n${docsUrl}`;
-    },
-  });
-}
-
 // Use this alias so we get less warnings in pkg build :p
 const dynamicRequire = module.require.bind(module);
 
@@ -72,8 +93,8 @@ const Application = lazyRequire('../src/models/application.js');
 const ApplicationConfiguration = lazyRequire('../src/models/application_configuration.js');
 const Drain = lazyRequire('../src/models/drain.js');
 const Notification = lazyRequire('../src/models/notification.js');
-const Organisation = lazyRequire('../src/models/organisation.js');
 const NetworkGroup = lazyRequire('../src/models/networkgroup.js');
+const Namespaces = lazyRequire('../src/models/namespaces.js');
 
 function run () {
 
@@ -133,9 +154,9 @@ function run () {
   // OPTIONS
   const opts = {
     sourceableEnvVarsList: cliparse.flag('add-export', { description: 'Display sourceable env variables setting' }),
-    accesslogsFormat: getOutputFormatOption(['simple', 'extended', 'clf']),
-    addonEnvFormat: getOutputFormatOption(['shell']),
     logsFormat: getOutputFormatOption(['json-stream']),
+    activityFormat: getOutputFormatOption(['json-stream']),
+    envFormat: getOutputFormatOption(['shell']),
     accesslogsFollow: cliparse.flag('follow', {
       aliases: ['f'],
       description: 'Display access logs continuously (ignores before/until, after/since)',
@@ -202,7 +223,7 @@ function run () {
       metavar: 'namespace',
       description: 'Namespace in which the TCP redirection should be',
       required: true,
-      complete: Organisation('completeNamespaces'),
+      complete: Namespaces('completeNamespaces'),
     }),
     notificationEventType: cliparse.option('event', {
       metavar: 'type',
@@ -226,6 +247,7 @@ function run () {
       aliases: ['f'],
       description: 'Force deploy even if it\'s not fast-forwardable',
     }),
+    exitOnDeploy: getExitOnOption(),
     sameCommitPolicy: getSameCommitPolicyOption(),
     webhookFormat: cliparse.option('format', {
       metavar: 'format',
@@ -284,7 +306,10 @@ function run () {
       parser: Parsers.instances,
       description: 'The minimum number of parallel instances',
     }),
-    noUpdateNotifier: cliparse.flag('no-update-notifier', { description: 'Don\'t notify available updates for clever-tools' }),
+    updateNotifier: cliparse.flag('update-notifier', {
+      description: 'Choose whether to use update notifier or not. You can also use --no-update-notifier',
+      default: true,
+    }),
     emailNotificationTarget: cliparse.option('notify', {
       metavar: '<email_address>|<user_id>|"organisation"',
       description: 'Notify a user, a specific email address or the whole organisation (multiple values allowed, comma separated)',
@@ -294,9 +319,15 @@ function run () {
     onlyAddons: cliparse.flag('only-addons', { description: 'Only show add-on dependencies' }),
     onlyAliases: cliparse.flag('only-aliases', { description: 'List only application aliases' }),
     onlyApps: cliparse.flag('only-apps', { description: 'Only show app dependencies' }),
+    appIdOrName: cliparse.option('app', {
+      metavar: 'ID_OR_NAME',
+      description: 'Application to manage by its ID (or name, if unambiguous)',
+      parser: Parsers.appIdOrName,
+    }),
     orgaIdOrName: cliparse.option('org', {
+      metavar: 'ID_OR_NAME',
       aliases: ['o', 'owner'],
-      description: 'Organisation ID (or name, if unambiguous)',
+      description: 'Organisation to target by its ID (or name, if unambiguous)',
       parser: Parsers.orgaIdOrName,
     }),
     output: cliparse.option('output', {
@@ -395,6 +426,10 @@ function run () {
       description: '(TCP and UDP drains) sd-params string (e.g.: `X-OVH-TOKEN=\\"REDACTED\\"`)',
     }),
     verbose: cliparse.flag('verbose', { aliases: ['v'], description: 'Verbose output' }),
+    color: cliparse.flag('color', {
+      description: 'Choose whether to print colors or not. You can also use --no-color',
+      default: true,
+    }),
     withoutCache: cliparse.flag('without-cache', { description: 'Restart the application without using cache' }),
     confirmAddonCreation: cliparse.flag('yes', {
       aliases: ['y'],
@@ -571,14 +606,14 @@ function run () {
   const accesslogsModule = lazyRequirePromiseModule('../src/commands/accesslogs.js');
   const accesslogsCommand = cliparse.command('accesslogs', {
     description: 'Fetch access logs',
-    options: [opts.alias, opts.accesslogsFormat, opts.before, opts.after, opts.accesslogsFollow, opts.addonId],
+    options: [opts.alias, opts.appIdOrName, opts.logsFormat, opts.before, opts.after, opts.addonId],
   }, accesslogsModule('accessLogs'));
 
   // ACTIVITY COMMAND
   const activity = lazyRequirePromiseModule('../src/commands/activity.js');
   const activityCommand = cliparse.command('activity', {
     description: 'Show last deployments of an application',
-    options: [opts.alias, opts.follow, opts.showAllActivity],
+    options: [opts.alias, opts.appIdOrName, opts.follow, opts.showAllActivity, opts.activityFormat],
   }, activity('activity'));
 
   // ADDON COMMANDS
@@ -604,10 +639,11 @@ function run () {
   const addonProvidersCommand = cliparse.command('providers', {
     description: 'List available add-on providers',
     commands: [addonShowProviderCommand],
+    options: [opts.humanJsonOutputFormat],
   }, addon('listProviders'));
   const addonEnvCommand = cliparse.command('env', {
     description: 'List environment variables for an add-on',
-    options: [opts.addonEnvFormat],
+    options: [opts.envFormat],
     args: [opts.addonId],
   }, addon('env'));
   const addonListCommand = cliparse.command('list', {
@@ -618,21 +654,27 @@ function run () {
   const addonCommands = cliparse.command('addon', {
     description: 'Manage add-ons',
     options: [opts.orgaIdOrName],
+    privateOptions: [opts.humanJsonOutputFormat],
     commands: [addonCreateCommand, addonDeleteCommand, addonRenameCommand, addonListCommand, addonProvidersCommand, addonEnvCommand],
   }, addon('list'));
 
   // APPLICATIONS COMMAND
   const applications = lazyRequirePromiseModule('../src/commands/applications.js');
+  const applicationsListRemoteCommand = cliparse.command('list', {
+    description: 'List all applications',
+    options: [opts.orgaIdOrName, opts.humanJsonOutputFormat],
+  }, applications('listAll'));
   const applicationsCommand = cliparse.command('applications', {
     description: 'List linked applications',
-    options: [opts.onlyAliases, opts.jsonFormat],
+    privateOptions: [opts.onlyAliases, opts.jsonFormat],
+    commands: [applicationsListRemoteCommand],
   }, applications('list'));
 
   // CANCEL DEPLOY COMMAND
   const cancelDeploy = lazyRequirePromiseModule('../src/commands/cancel-deploy.js');
   const cancelDeployCommand = cliparse.command('cancel-deploy', {
     description: 'Cancel an ongoing deployment',
-    options: [opts.alias],
+    options: [opts.alias, opts.appIdOrName],
   }, cancelDeploy('cancelDeploy'));
 
   // CONFIG COMMAND
@@ -651,7 +693,7 @@ function run () {
   }, config('update'));
   const configCommands = cliparse.command('config', {
     description: 'Display or edit the configuration of your application',
-    options: [opts.alias],
+    options: [opts.alias, opts.appIdOrName],
     commands: [configGetCommand, configSetCommand, configUpdateCommand],
   }, config('get'));
 
@@ -673,14 +715,14 @@ function run () {
   const deleteCommandModule = lazyRequirePromiseModule('../src/commands/delete.js');
   const deleteCommand = cliparse.command('delete', {
     description: 'Delete an application',
-    options: [opts.alias, opts.confirmApplicationDeletion],
+    options: [opts.alias, opts.appIdOrName, opts.confirmApplicationDeletion],
   }, deleteCommandModule('deleteApp'));
 
   // DEPLOY COMMAND
   const deploy = lazyRequirePromiseModule('../src/commands/deploy.js');
   const deployCommand = cliparse.command('deploy', {
     description: 'Deploy an application',
-    options: [opts.alias, opts.branch, opts.gitTag, opts.quiet, opts.forceDeploy, opts.followDeployLogs, opts.sameCommitPolicy],
+    options: [opts.alias, opts.branch, opts.gitTag, opts.quiet, opts.forceDeploy, opts.followDeployLogs, opts.sameCommitPolicy, opts.exitOnDeploy],
   }, deploy('deploy'));
 
   // DIAG COMMAND
@@ -688,6 +730,7 @@ function run () {
   const diagCommand = cliparse.command('diag', {
     description: 'Diagnose the current installation (prints various informations for support)',
     args: [],
+    options: [opts.humanJsonOutputFormat],
   }, diag('diag'));
 
   // DOMAIN COMMANDS
@@ -713,7 +756,7 @@ function run () {
   }, domain('getFavourite'));
   const domainCommands = cliparse.command('domain', {
     description: 'Manage domain names for an application',
-    options: [opts.alias],
+    options: [opts.alias, opts.appIdOrName],
     commands: [domainCreateCommand, domainFavouriteCommands, domainRemoveCommand],
   }, domain('list'));
 
@@ -738,7 +781,8 @@ function run () {
   }, drain('disable'));
   const drainCommands = cliparse.command('drain', {
     description: 'Manage drains',
-    options: [opts.alias, opts.addonId],
+    options: [opts.alias, opts.appIdOrName, opts.addonId],
+    privateOptions: [opts.humanJsonOutputFormat],
     commands: [drainCreateCommand, drainRemoveCommand, drainEnableCommand, drainDisableCommand],
   }, drain('list'));
 
@@ -762,7 +806,8 @@ function run () {
   }, env('importVarsFromLocalEnv'));
   const envCommands = cliparse.command('env', {
     description: 'Manage environment variables of an application',
-    options: [opts.alias, opts.sourceableEnvVarsList],
+    options: [opts.alias, opts.appIdOrName, opts.sourceableEnvVarsList],
+    privateOptions: [opts.envFormat],
     commands: [envSetCommand, envRemoveCommand, envImportCommand, envImportVarsFromLocalEnvCommand],
   }, env('list'));
 
@@ -791,7 +836,7 @@ function run () {
   const logs = lazyRequirePromiseModule('../src/commands/logs.js');
   const logsCommand = cliparse.command('logs', {
     description: 'Fetch application logs, continuously',
-    options: [opts.alias, opts.before, opts.after, opts.search, opts.deploymentId, opts.addonId, opts.logsFormat],
+    options: [opts.alias, opts.appIdOrName, opts.before, opts.after, opts.search, opts.deploymentId, opts.addonId, opts.logsFormat],
   }, logs('appLogs'));
 
   // MAKE DEFAULT COMMAND
@@ -895,6 +940,7 @@ function run () {
   const emailNotificationsCommand = cliparse.command('notify-email', {
     description: 'Manage email notifications',
     options: [opts.orgaIdOrName, opts.listAllNotifications],
+    privateOptions: [opts.humanJsonOutputFormat],
     commands: [addEmailNotificationCommand, removeEmailNotificationCommand],
   }, notifyEmail('list'));
 
@@ -902,20 +948,21 @@ function run () {
   const open = lazyRequirePromiseModule('../src/commands/open.js');
   const openCommand = cliparse.command('open', {
     description: 'Open an application in your browser',
-    options: [opts.alias],
+    options: [opts.alias, opts.appIdOrName],
   }, open('open'));
 
   // CONSOLE COMMAND
   const consoleModule = lazyRequirePromiseModule('../src/commands/console.js');
   const consoleCommand = cliparse.command('console', {
     description: 'Open an application in the Console',
-    options: [opts.alias],
+    options: [opts.alias, opts.appIdOrName],
   }, consoleModule('openConsole'));
 
   // PROFILE COMMAND
   const profile = lazyRequirePromiseModule('../src/commands/profile.js');
   const profileCommand = cliparse.command('profile', {
     description: 'Display the profile of the current user',
+    options: [opts.humanJsonOutputFormat],
   }, profile('profile'));
 
   // PUBLISHED CONFIG COMMANDS
@@ -934,7 +981,8 @@ function run () {
   }, publishedConfig('importEnv'));
   const publishedConfigCommands = cliparse.command('published-config', {
     description: 'Manage the configuration made available to other applications by this application',
-    options: [opts.alias],
+    options: [opts.alias, opts.appIdOrName],
+    privateOptions: [opts.envFormat],
     commands: [publishedConfigSetCommand, publishedConfigRemoveCommand, publishedConfigImportCommand],
   }, publishedConfig('list'));
 
@@ -942,14 +990,14 @@ function run () {
   const restart = lazyRequirePromiseModule('../src/commands/restart.js');
   const restartCommand = cliparse.command('restart', {
     description: 'Start or restart an application',
-    options: [opts.alias, opts.commit, opts.withoutCache, opts.quiet, opts.followDeployLogs],
+    options: [opts.alias, opts.appIdOrName, opts.commit, opts.withoutCache, opts.quiet, opts.followDeployLogs, opts.exitOnDeploy],
   }, restart('restart'));
 
   // SCALE COMMAND
   const scale = lazyRequirePromiseModule('../src/commands/scale.js');
   const scaleCommand = cliparse.command('scale', {
     description: 'Change scalability of an application',
-    options: [opts.alias, opts.flavor, opts.minFlavor, opts.maxFlavor, opts.instances, opts.minInstances, opts.maxInstances, opts.buildFlavor],
+    options: [opts.alias, opts.appIdOrName, opts.flavor, opts.minFlavor, opts.maxFlavor, opts.instances, opts.minInstances, opts.maxInstances, opts.buildFlavor],
   }, scale('scale'));
 
   // SERVICE COMMANDS
@@ -972,7 +1020,8 @@ function run () {
   }, service('unlinkAddon'));
   const serviceCommands = cliparse.command('service', {
     description: 'Manage service dependencies',
-    options: [opts.alias, opts.onlyApps, opts.onlyAddons, opts.showAll],
+    options: [opts.alias, opts.appIdOrName, opts.onlyApps, opts.onlyAddons, opts.showAll],
+    privateOptions: [opts.humanJsonOutputFormat],
     commands: [serviceLinkAppCommand, serviceUnlinkAppCommand, serviceLinkAddonCommand, serviceUnlinkAddonCommand],
   }, service('list'));
 
@@ -980,27 +1029,28 @@ function run () {
   const ssh = lazyRequirePromiseModule('../src/commands/ssh.js');
   const sshCommand = cliparse.command('ssh', {
     description: 'Connect to running instances through SSH',
-    options: [opts.alias, opts.sshIdentityFile],
+    options: [opts.alias, opts.appIdOrName, opts.sshIdentityFile],
   }, ssh('ssh'));
 
   // STATUS COMMAND
   const status = lazyRequirePromiseModule('../src/commands/status.js');
   const statusCommand = cliparse.command('status', {
     description: 'See the status of an application',
-    options: [opts.alias],
+    options: [opts.alias, opts.appIdOrName, opts.humanJsonOutputFormat],
   }, status('status'));
 
   // STOP COMMAND
   const stop = lazyRequirePromiseModule('../src/commands/stop.js');
   const stopCommand = cliparse.command('stop', {
     description: 'Stop a running application',
-    options: [opts.alias],
+    options: [opts.alias, opts.appIdOrName],
   }, stop('stop'));
 
   // TCP-REDIRS COMMAND
   const tcpRedirs = lazyRequirePromiseModule('../src/commands/tcp-redirs.js');
   const tcpRedirsListNamespacesCommand = cliparse.command('list-namespaces', {
     description: 'List the namespaces in which you can create new TCP redirections',
+    options: [opts.humanJsonOutputFormat],
   }, tcpRedirs('listNamespaces'));
   const tcpRedirsAddCommand = cliparse.command('add', {
     description: 'Add a new TCP redirection to the application',
@@ -1013,7 +1063,8 @@ function run () {
   }, tcpRedirs('remove'));
   const tcpRedirsCommands = cliparse.command('tcp-redirs', {
     description: 'Control the TCP redirections from reverse proxies to your application',
-    options: [opts.alias],
+    options: [opts.alias, opts.appIdOrName],
+    privateOptions: [opts.humanJsonOutputFormat],
     commands: [tcpRedirsListNamespacesCommand, tcpRedirsAddCommand, tcpRedirsRemoveCommand],
   }, tcpRedirs('list'));
 
@@ -1045,6 +1096,7 @@ function run () {
   const webhooksCommand = cliparse.command('webhooks', {
     description: 'Manage webhooks',
     options: [opts.orgaIdOrName, opts.listAllNotifications],
+    privateOptions: [opts.humanJsonOutputFormat],
     commands: [addWebhookCommand, removeWebhookCommand],
   }, webhooks('list'));
 
@@ -1122,7 +1174,7 @@ function run () {
     name: 'clever',
     description: 'CLI tool to manage Clever Cloud\'s data and products',
     version: pkg.version,
-    options: [opts.verbose, opts.noUpdateNotifier],
+    options: [opts.color, opts.verbose, opts.updateNotifier],
     helpCommand: false,
     commands,
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clever-tools",
-  "version": "3.6.1",
+  "version": "3.8.0",
   "description": "Command Line Interface for Clever Cloud.",
   "main": "bin/clever.js",
   "keywords": [
@@ -22,68 +22,66 @@
   "files": [
     "bin",
     "src",
-    "scripts/*.sh",
-    "vendors"
+    "scripts/*.sh"
   ],
   "dependencies": {
-    "@clevercloud/client": "^8.1.2",
-    "clf-date": "^0.2.0",
-    "cliparse": "^0.3.3",
+    "@clevercloud/client": "8.3.0",
+    "cliparse": "0.4.0",
     "colors": "1.4.0",
-    "common-env": "^6.4.0",
-    "curlconverter": "^4.9.0",
-    "duration-js": "^4.0.0",
-    "eventsource": "^1.1.0",
-    "iso8601-duration": "^2.1.2",
-    "isomorphic-git": "^1.25.3",
-    "linux-release-info": "^3.0.0",
-    "lodash": "^4.17.21",
-    "mkdirp": "^1.0.4",
-    "moment": "^2.29.1",
-    "open": "^8.4.0",
-    "slugify": "^1.5.3",
-    "string-length": "^4.0.2",
-    "superagent": "^6.1.0",
-    "text-table": "^0.2.0",
-    "update-notifier": "^5.1.0",
-    "uuid": "^8.3.2",
-    "ws": "^7.4.6",
-    "xdg": "^0.1.1"
+    "common-env": "6.4.0",
+    "curlconverter": "3.21.0",
+    "duration-js": "4.0.0",
+    "eventsource": "1.1.0",
+    "iso8601-duration": "2.1.2",
+    "isomorphic-git": "1.25.3",
+    "linux-release-info": "3.0.0",
+    "lodash": "4.17.21",
+    "mkdirp": "1.0.4",
+    "moment": "2.29.1",
+    "open": "8.4.0",
+    "slugify": "1.5.3",
+    "string-length": "4.0.2",
+    "superagent": "6.1.0",
+    "text-table": "0.2.0",
+    "update-notifier": "5.1.0",
+    "uuid": "8.3.2",
+    "ws": "7.4.6",
+    "xdg": "0.1.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
-    "aws-sdk": "^2.919.0",
-    "chai": "^4.3.4",
-    "del": "^6.0.0",
-    "eslint": "^7.27.0",
-    "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-standard": "^5.0.0",
-    "fs-extra": "^10.0.0",
-    "glob": "^7.1.7",
-    "grunt": "^1.4.1",
-    "grunt-cli": "^1.4.3",
-    "grunt-http": "^2.3.3",
-    "grunt-mocha-test": "^0.13.3",
-    "mime-types": "^2.1.35",
-    "mocha": "^8.4.0",
-    "pkg": "^5.8.1",
-    "rollup": "^4.14.1",
-    "semver": "^7.3.5",
-    "text-table": "^0.2.0"
+    "@commitlint/cli": "18.4.3",
+    "@commitlint/config-conventional": "18.4.3",
+    "aws-sdk": "2.919.0",
+    "chai": "4.3.4",
+    "del": "6.0.0",
+    "eslint": "7.27.0",
+    "eslint-config-standard": "16.0.3",
+    "eslint-plugin-import": "2.23.4",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-promise": "5.1.0",
+    "eslint-plugin-standard": "5.0.0",
+    "fs-extra": "10.0.0",
+    "glob": "7.1.7",
+    "grunt": "1.4.1",
+    "grunt-cli": "1.4.3",
+    "grunt-http": "2.3.3",
+    "grunt-mocha-test": "0.13.3",
+    "mime-types": "2.1.35",
+    "mocha": "8.4.0",
+    "pkg": "5.8.1",
+    "rollup": "4.14.1",
+    "semver": "7.3.5",
+    "text-table": "0.2.0"
   },
   "overrides": {
     "pkg-fetch": "3.5.2"
   },
   "scripts": {
-    "bundle-curlconverter": "rollup -c rollup-curlconverter.config.js",
     "pretest": "npm run lint",
     "test": "grunt test",
     "lint": "eslint bin src scripts",
-    "lint:fix": "eslint --fix bin src scripts"
+    "lint:fix": "eslint --fix bin src scripts",
+    "install-local:cliparse": "(cd ../cliparse-node && npm pack) && mv ../cliparse-node/cliparse-*.tgz . && npm i -f ./cliparse-*.tgz"
   },
   "repository": {
     "type": "git",

package/src/command-options.js

@@ -22,21 +22,40 @@ function getSameCommitPolicyOption () {
   const availablePolicies = ['error', 'ignore', 'restart', 'rebuild'];
   return cliparse.option('same-commit-policy', {
     aliases: ['p'],
-    metavar: 'same-commit-policy',
+    metavar: 'policy',
     parser: (policy) => {
       return availablePolicies.includes(policy)
         ? cliparse.parsers.success(policy)
-        : cliparse.parsers.error(`The output policy must be one of ${availablePolicies.join(', ')}`);
+        : cliparse.parsers.error(`the policy must be one of ${availablePolicies.join(', ')}`);
     },
     default: 'error',
-    description: `Which policy to apply when the local commit is the same as the remote one. Available policies are (${availablePolicies.join(', ')})`,
+    description: `What to do when local and remote commit are identical (${availablePolicies.join(', ')})`,
     complete () {
       return cliparse.autocomplete.words(availablePolicies);
     },
   });
 }
 
+function getExitOnOption () {
+  const availableExitOn = ['deploy-start', 'deploy-end', 'never'];
+  return cliparse.option('exit-on', {
+    aliases: ['e'],
+    metavar: 'exiton',
+    parser: (exitOnStrategy) => {
+      return availableExitOn.includes(exitOnStrategy)
+        ? cliparse.parsers.success(exitOnStrategy)
+        : cliparse.parsers.error(`The exit-on strategy must be one of ${availableExitOn.join(', ')}`);
+    },
+    default: 'deploy-end',
+    description: `Step at which the logs streaming is ended, steps are: ${availableExitOn.join(', ')}`,
+    complete () {
+      return cliparse.autocomplete.words(availableExitOn);
+    },
+  });
+}
+
 module.exports = {
   getOutputFormatOption,
   getSameCommitPolicyOption,
+  getExitOnOption,
 };