diff --git a/README.md b/README.md index c455549..2a82664 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,12 @@ contains your `docker-compose.yml` / `docker-compose.dev.yml`, or a parent of it > **Platform support.** Every command runs on macOS, Linux and Windows, except `sync` > (macOS + Windows only) and the `up --separateWindow` flag (Windows only). +> **Non-interactive / AI-agent use.** Commands that would otherwise prompt for confirmation +> accept **`-y, --yes`** to proceed with the defaults without asking: `up`, `restart`, `down`, +> `stop-all`, `test`, `import`, `export`, `open`. Combine with `lab help --json` for a +> machine-readable command overview. (Note: writing the hosts file still needs `sudo`/elevation, +> and Doppler-based apps need a pre-authenticated Doppler CLI — neither can be answered by `-y`.) + ### Run & inspect your app #### `up` (alias `start`) @@ -136,6 +142,7 @@ Stops the current application (`docker compose stop`). #### `down` Destroys the current app's containers and removes their images if required (`docker compose down`). +- `-y, --yes` — proceed non-interactively (destroy the app; keep the hosts entry). #### `status` (alias `ps`) Checks whether the app is currently running. @@ -168,6 +175,7 @@ lab sh --shell sh -s #### `open` Opens the app's main container in your default browser. - `-p, --protocol ` — the protocol to use (default `https`). +- `-y, --yes` — if the app isn't running, start it automatically (non-interactively) and then open it. #### `sync` _(macOS + Windows only)_ Runs a [unison](#file-sync-unison) sync into your application. Useful when the bind-mount is too @@ -188,6 +196,7 @@ Restarts the docker engine. #### `stop-all` Stops **all** currently running containers (not just the current app's). +- `-y, --yes` — proceed non-interactively (skip the confirmation). ### Project setup & data @@ -211,14 +220,17 @@ repository. Then just run `lab up`. Triggers the import process using the [LABOR import/export container](https://github.com/labor-digital/docker-import-export). - `-c, --copyFromTest` — copy import data from the test-data directory first (**overwrites existing files**). +- `-y, --yes` — proceed non-interactively (skip the confirmation). #### `export` Triggers the export process using the LABOR import/export container. - `-c, --copyToTest` — copy the exported files into the test-data directory if it exists (**overwrites existing files**). +- `-y, --yes` — proceed non-interactively (skip the confirmation). #### `test` Runs the test process using the LABOR jest-puppeteer container. - `-u, --update` — run `test-update` instead of `test` (usually updates reference snapshots). +- `-y, --yes` — proceed non-interactively (skip the confirmation). #### `installCa` Installs our root CA ([`@labor-digital/ssl-certs`](https://www.npmjs.com/package/@labor-digital/ssl-certs)) diff --git a/lib/Classes/Api/DockerCompose.js b/lib/Classes/Api/DockerCompose.js index 6bfc6a8..2742c97 100644 --- a/lib/Classes/Api/DockerCompose.js +++ b/lib/Classes/Api/DockerCompose.js @@ -208,7 +208,6 @@ class DockerCompose { } const command = this.baseDockerComposeCommand + 'logs --timestamps ' + '--tail="' + lines + '" ' + (follow === true ? '--follow ' : ''); - childProcess.execSync(command, { 'stdio': 'inherit' }); try { childProcess.execSync(command, { stdio: 'inherit' }); resolve(); diff --git a/lib/Classes/Api/DockerCompose.js.map b/lib/Classes/Api/DockerCompose.js.map index cf09d7c..2322b8f 100644 --- a/lib/Classes/Api/DockerCompose.js.map +++ b/lib/Classes/Api/DockerCompose.js.map @@ -1 +1 @@ -{"version":3,"file":"DockerCompose.js","sourceRoot":"","sources":["../../../src/Classes/Api/DockerCompose.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DockerCompose.js","sourceRoot":"","sources":["../../../src/Classes/Api/DockerCompose.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/Classes/Command/AbstractImportExportCommand.js b/lib/Classes/Command/AbstractImportExportCommand.js index 717f1e9..6bdb74a 100644 --- a/lib/Classes/Command/AbstractImportExportCommand.js +++ b/lib/Classes/Command/AbstractImportExportCommand.js @@ -63,7 +63,10 @@ const Bugfixes_1 = require("../Core/Bugfixes"); const DockerApp_1 = require("../Core/DockerApp/DockerApp"); class AbstractImportExportCommand { execute(cmd, context, stack) { - return (new DockerApp_1.DockerApp(context)).initialize().then(app => { + const acceptDefaults = cmd.opts().yes === true; + const dockerApp = new DockerApp_1.DockerApp(context); + dockerApp.acceptDefaults = acceptDefaults; + return dockerApp.initialize().then(app => { // Check if we have an import container let hasImportContainer = false; (0, ForEachHelper_1.forEach)(app.dockerCompose.getServiceList(), (container) => { @@ -76,7 +79,7 @@ class AbstractImportExportCommand { } // Perform the import if the user consented return this - .askForConsent(context) + .askForConsent(context, acceptDefaults) .then(execute => { if (!execute) { return Promise.reject(); @@ -134,7 +137,11 @@ class AbstractImportExportCommand { /** * Asks the user for consent to stop all containers */ - askForConsent(context) { + askForConsent(context, acceptDefaults = false) { + // Non-interactive: proceed with the import/export. + if (acceptDefaults) { + return Promise.resolve(true); + } return new Promise((resolve) => { inquirer_1.default.prompt({ name: 'ok', diff --git a/lib/Classes/Command/AbstractImportExportCommand.js.map b/lib/Classes/Command/AbstractImportExportCommand.js.map index bdc922e..04f82b2 100644 --- a/lib/Classes/Command/AbstractImportExportCommand.js.map +++ b/lib/Classes/Command/AbstractImportExportCommand.js.map @@ -1 +1 @@ -{"version":3,"file":"AbstractImportExportCommand.js","sourceRoot":"","sources":["../../../src/Classes/Command/AbstractImportExportCommand.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"AbstractImportExportCommand.js","sourceRoot":"","sources":["../../../src/Classes/Command/AbstractImportExportCommand.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/Classes/Command/DockerComposeDownCommand.js b/lib/Classes/Command/DockerComposeDownCommand.js index c8291a2..25dfe50 100644 --- a/lib/Classes/Command/DockerComposeDownCommand.js +++ b/lib/Classes/Command/DockerComposeDownCommand.js @@ -27,9 +27,12 @@ const DockerApp_1 = require("../Core/DockerApp/DockerApp"); const DockerHosts_1 = require("../Core/DockerApp/DockerHosts"); class DockerComposeDownCommand { execute(cmd, context) { - return (new DockerApp_1.DockerApp(context)).initialize().then(app => { + const acceptDefaults = cmd.opts().yes === true; + const dockerApp = new DockerApp_1.DockerApp(context); + dockerApp.acceptDefaults = acceptDefaults; + return dockerApp.initialize().then(app => { return Promise.resolve() - .then(() => this.askForConsent(context)) + .then(() => this.askForConsent(context, acceptDefaults)) .then((consent) => { if (!consent) { console.log('Ok, aborting the process!'); @@ -37,7 +40,7 @@ class DockerComposeDownCommand { } return app.dockerCompose.down(); }) - .then(() => this.askForHostsCleanup(context)) + .then(() => this.askForHostsCleanup(context, acceptDefaults)) .then((consent) => { if (!consent) { console.log('Ok, I keep the host file as it is...'); @@ -57,7 +60,11 @@ class DockerComposeDownCommand { * Asks the user if he really wants to remove the containers * @param context */ - askForConsent(context) { + askForConsent(context, acceptDefaults = false) { + // Non-interactive: take the prompt default (proceed with the down). + if (acceptDefaults) { + return Promise.resolve(true); + } return new Promise((resolve) => { inquirer_1.default.prompt({ name: 'executeDown', @@ -78,7 +85,11 @@ class DockerComposeDownCommand { * Asks if the user wants to remove the entry in the hosts file * @param context */ - askForHostsCleanup(context) { + askForHostsCleanup(context, acceptDefaults = false) { + // Non-interactive: take the prompt default (keep the hosts entry). + if (acceptDefaults) { + return Promise.resolve(false); + } return new Promise((resolve) => { inquirer_1.default.prompt({ name: 'removeHosts', diff --git a/lib/Classes/Command/DockerComposeDownCommand.js.map b/lib/Classes/Command/DockerComposeDownCommand.js.map index a98a3d0..b5b5b16 100644 --- a/lib/Classes/Command/DockerComposeDownCommand.js.map +++ b/lib/Classes/Command/DockerComposeDownCommand.js.map @@ -1 +1 @@ -{"version":3,"file":"DockerComposeDownCommand.js","sourceRoot":"","sources":["../../../src/Classes/Command/DockerComposeDownCommand.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;AAGH,wDAAgC;AAEhC,+CAA0C;AAC1C,2DAAsD;AACtD,+DAA0D;AAE1D,MAAa,wBAAwB;IAE1B,OAAO,CAAC,GAAY,EAAE,OAAmB;QAE5C,OAAO,CAAC,IAAI,qBAAS,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACpD,OAAO,OAAO,CAAC,OAAO,EAAE;iBACT,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;iBACvC,IAAI,CAAC,CAAC,OAAgB,EAAE,EAAE;gBACvB,IAAI,CAAC,OAAO,EAAE,CAAC;oBACX,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;oBACzC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC7B,CAAC;gBACD,OAAO,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YACpC,CAAC,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;iBAC5C,IAAI,CAAC,CAAC,OAAgB,EAAE,EAAE;gBACvB,IAAI,CAAC,OAAO,EAAE,CAAC;oBACX,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;oBACpD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC7B,CAAC;gBAED,uCAAuC;gBACvC,MAAM,KAAK,GAAG,IAAI,yBAAW,CAAC,OAAO,CAAC,CAAC;gBACvC,KAAK,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,CAAC;gBAE9B,0EAA0E;gBAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;gBACxD,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;gBACnB,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACO,aAAa,CAAC,OAAmB;QAEvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,kBAAQ,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,+FAA+F;oBAC/F,OAAO,CAAC,aAAa,GAAG,4BAA4B;gBAC7D,OAAO,EAAE,IAAI;aAChB,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChB,mBAAQ,CAAC,+BAA+B,EAAE,CAAC;gBAC3C,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;oBACvB,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC1B,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;OAGG;IACO,kBAAkB,CAAC,OAAmB;QAE5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,kBAAQ,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,iGAAiG;gBAC1G,OAAO,EAAE,KAAK;aACjB,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChB,mBAAQ,CAAC,+BAA+B,EAAE,CAAC;gBAC3C,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;oBACvB,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC1B,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AA7ED,4DA6EC"} \ No newline at end of file +{"version":3,"file":"DockerComposeDownCommand.js","sourceRoot":"","sources":["../../../src/Classes/Command/DockerComposeDownCommand.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/Classes/Command/DockerComposeOpenCommand.js b/lib/Classes/Command/DockerComposeOpenCommand.js index 7343705..f4f6403 100644 --- a/lib/Classes/Command/DockerComposeOpenCommand.js +++ b/lib/Classes/Command/DockerComposeOpenCommand.js @@ -60,10 +60,13 @@ const Bugfixes_1 = require("../Core/Bugfixes"); const DockerApp_1 = require("../Core/DockerApp/DockerApp"); class DockerComposeOpenCommand { execute(cmd, context, stack) { - return (new DockerApp_1.DockerApp(context)).initialize().then(app => { + const acceptDefaults = cmd.opts().yes === true; + const dockerApp = new DockerApp_1.DockerApp(context); + dockerApp.acceptDefaults = acceptDefaults; + return dockerApp.initialize().then(app => { var _a; if (!app.dockerCompose.isRunning) { - return this.askToStartContainer(context, stack); + return this.askToStartContainer(context, stack, acceptDefaults); } const domain = app.env.get('APP_DOMAIN', app.env.get('APP_IP')); const protocol = app.env.get('APP_PROTOCOL', `${(_a = cmd.opts().protocol) !== null && _a !== void 0 ? _a : 'https'}://`); @@ -88,7 +91,13 @@ class DockerComposeOpenCommand { * @param context * @param stack */ - askToStartContainer(context, stack) { + askToStartContainer(context, stack, acceptDefaults = false) { + // Non-interactive: start the app (with -y so its init is non-interactive too) and re-open. + if (acceptDefaults) { + stack.push(['up', '-y']); + stack.push(['open', '-y']); + return Promise.resolve(); + } return new Promise((resolve, reject) => { inquirer_1.default.prompt({ name: 'startApp', diff --git a/lib/Classes/Command/DockerComposeOpenCommand.js.map b/lib/Classes/Command/DockerComposeOpenCommand.js.map index f03d7fe..65917a0 100644 --- a/lib/Classes/Command/DockerComposeOpenCommand.js.map +++ b/lib/Classes/Command/DockerComposeOpenCommand.js.map @@ -1 +1 @@ -{"version":3,"file":"DockerComposeOpenCommand.js","sourceRoot":"","sources":["../../../src/Classes/Command/DockerComposeOpenCommand.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,4DAA8C;AAE9C,wDAAgC;AAEhC,+CAA0C;AAE1C,2DAAsD;AAEtD,MAAa,wBAAwB;IAE1B,OAAO,CAAC,GAAY,EAAE,OAAmB,EAAE,KAAmB;QAEjE,OAAO,CAAC,IAAI,qBAAS,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;;YACpD,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;gBAC/B,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACpD,CAAC;YAED,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;YAChE,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,MAAA,GAAG,CAAC,IAAI,EAAE,CAAC,QAAQ,mCAAI,OAAO,KAAK,CAAC,CAAC;YACrF,MAAM,GAAG,GAAG,QAAQ,GAAG,MAAM,CAAC;YAE9B,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,GAAG,GAAG,4BAA4B,CAAC,CAAC;YACtE,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACpC,OAAO,EAAE,GAAG,EAAE;oBACV,OAAO,YAAY,GAAG,GAAG,GAAG,GAAG,CAAC;gBACpC,CAAC;gBACD,MAAM,EAAE,GAAG,EAAE;oBACT,OAAO,QAAQ,GAAG,GAAG,GAAG,GAAG,CAAC;gBAChC,CAAC;gBACD,KAAK,EAAE,GAAG,EAAE;oBACR,OAAO,WAAW,GAAG,GAAG,CAAC;gBAC7B,CAAC;aACJ,CAAC,EAAE,CAAC;YAEL,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACO,mBAAmB,CAAC,OAAmB,EAAE,KAAmB;QAElE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,kBAAQ,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,uFAAuF;aACnG,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChB,mBAAQ,CAAC,+BAA+B,EAAE,CAAC;gBAC3C,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBACpB,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC,CAAC;gBAClF,CAAC;gBACD,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gBACnB,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;gBACrB,OAAO,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AArDD,4DAqDC"} \ No newline at end of file +{"version":3,"file":"DockerComposeOpenCommand.js","sourceRoot":"","sources":["../../../src/Classes/Command/DockerComposeOpenCommand.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/Classes/Command/DockerStopAllContainersCommand.js b/lib/Classes/Command/DockerStopAllContainersCommand.js index ae14f3d..e0b26b6 100644 --- a/lib/Classes/Command/DockerStopAllContainersCommand.js +++ b/lib/Classes/Command/DockerStopAllContainersCommand.js @@ -26,7 +26,7 @@ const Docker_1 = require("../Api/Docker"); const Bugfixes_1 = require("../Core/Bugfixes"); class DockerStopAllContainersCommand { execute(cmd, context) { - return this.askForConsent().then(execute => { + return this.askForConsent(cmd.opts().yes === true).then(execute => { if (!execute) { return Promise.resolve(); } @@ -36,7 +36,11 @@ class DockerStopAllContainersCommand { /** * Asks the user for consent to stop all containers */ - askForConsent() { + askForConsent(acceptDefaults = false) { + // Non-interactive: proceed with stopping all containers. + if (acceptDefaults) { + return Promise.resolve(true); + } return new Promise((resolve) => { inquirer_1.default.prompt({ name: 'stopAll', diff --git a/lib/Classes/Command/DockerStopAllContainersCommand.js.map b/lib/Classes/Command/DockerStopAllContainersCommand.js.map index 4abf1d1..40c216a 100644 --- a/lib/Classes/Command/DockerStopAllContainersCommand.js.map +++ b/lib/Classes/Command/DockerStopAllContainersCommand.js.map @@ -1 +1 @@ -{"version":3,"file":"DockerStopAllContainersCommand.js","sourceRoot":"","sources":["../../../src/Classes/Command/DockerStopAllContainersCommand.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;AAGH,wDAAgC;AAChC,0CAAqC;AAErC,+CAA0C;AAE1C,MAAa,8BAA8B;IAGhC,OAAO,CAAC,GAAY,EAAE,OAAmB;QAE5C,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACvC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;YAC7B,CAAC;YACD,OAAO,CAAC,IAAI,eAAM,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC;QACrD,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACO,aAAa;QAEnB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,kBAAQ,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,mFAAmF;aAC/F,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChB,mBAAQ,CAAC,+BAA+B,EAAE,CAAC;gBAC3C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;oBACnB,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC1B,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAhCD,wEAgCC"} \ No newline at end of file +{"version":3,"file":"DockerStopAllContainersCommand.js","sourceRoot":"","sources":["../../../src/Classes/Command/DockerStopAllContainersCommand.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;AAGH,wDAAgC;AAChC,0CAAqC;AAErC,+CAA0C;AAE1C,MAAa,8BAA8B;IAGhC,OAAO,CAAC,GAAY,EAAE,OAAmB;QAE5C,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;YAC7B,CAAC;YACD,OAAO,CAAC,IAAI,eAAM,CAAC,OAAO,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC;QACrD,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACO,aAAa,CAAC,iBAA0B,KAAK;QAEnD,yDAAyD;QACzD,IAAI,cAAc,EAAE,CAAC;YACjB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,kBAAQ,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,mFAAmF;aAC/F,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChB,mBAAQ,CAAC,+BAA+B,EAAE,CAAC;gBAC3C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;oBACnB,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC1B,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AApCD,wEAoCC"} \ No newline at end of file diff --git a/lib/Classes/Command/ProjectTestCommand.js b/lib/Classes/Command/ProjectTestCommand.js index dd81d5e..fbb3cce 100644 --- a/lib/Classes/Command/ProjectTestCommand.js +++ b/lib/Classes/Command/ProjectTestCommand.js @@ -10,7 +10,10 @@ const Bugfixes_1 = require("../Core/Bugfixes"); const DockerApp_1 = require("../Core/DockerApp/DockerApp"); class ProjectTestCommand { execute(cmd, context, stack) { - return (new DockerApp_1.DockerApp(context)).initialize().then(app => { + const acceptDefaults = cmd.opts().yes === true; + const dockerApp = new DockerApp_1.DockerApp(context); + dockerApp.acceptDefaults = acceptDefaults; + return dockerApp.initialize().then(app => { // Check if we have a test container let hasTestContainer = false; (0, ForEachHelper_1.forEach)(app.dockerCompose.getServiceList(), (container) => { @@ -24,7 +27,7 @@ class ProjectTestCommand { if (!app.dockerCompose.isRunning) { return Promise.reject(Error('It seems like your composition is not running. Please make sure to start your composition via "lab up" first.')); } - return this.askForConsent(context).then(execute => { + return this.askForConsent(context, acceptDefaults).then(execute => { if (!execute) { return Promise.resolve(); } @@ -51,7 +54,11 @@ class ProjectTestCommand { /** * Asks the user for consent to stop all containers */ - askForConsent(context) { + askForConsent(context, acceptDefaults = false) { + // Non-interactive: proceed with the test run. + if (acceptDefaults) { + return Promise.resolve(true); + } return new Promise((resolve) => { inquirer_1.default.prompt({ name: 'ok', diff --git a/lib/Classes/Command/ProjectTestCommand.js.map b/lib/Classes/Command/ProjectTestCommand.js.map index e4044a7..6e65ab7 100644 --- a/lib/Classes/Command/ProjectTestCommand.js.map +++ b/lib/Classes/Command/ProjectTestCommand.js.map @@ -1 +1 @@ -{"version":3,"file":"ProjectTestCommand.js","sourceRoot":"","sources":["../../../src/Classes/Command/ProjectTestCommand.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAoD;AAsBpD,wDAAgC;AAGhC,+CAA0C;AAE1C,2DAAsD;AAEtD,MAAa,kBAAkB;IAEpB,OAAO,CAAC,GAAY,EAAE,OAAmB,EAAE,KAAmB;QAEjE,OAAO,CAAC,IAAI,qBAAS,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACpD,oCAAoC;YACpC,IAAI,gBAAgB,GAAG,KAAK,CAAC;YAC7B,IAAA,uBAAO,EAAC,GAAG,CAAC,aAAa,CAAC,cAAc,EAAE,EAAE,CAAC,SAAiD,EAAE,EAAE;gBAC9F,IAAI,SAAS,CAAC,GAAG,KAAK,MAAM,EAAE,CAAC;oBAC3B,gBAAgB,GAAG,IAAI,CAAC;gBAC5B,CAAC;YACL,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACpB,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,iMAAiM,CAAC,CAAC,CAAC;YAC5M,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;gBAC/B,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,+GAA+G,CAAC,CAAC,CAAC;YAC1H,CAAC;YAED,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;oBACX,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC7B,CAAC;gBAED,OAAO,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE;qBAC1B,IAAI,CAAC,GAAG,EAAE;oBACP,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAC;oBAC3E,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;oBACvC,OAAO,GAAG,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC;gBAClC,CAAC,CAAC;qBACD,IAAI,CAAC,GAAG,EAAE;oBACP,OAAO,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBAC9E,CAAC,CAAC;qBACD,IAAI,CAAC,GAAG,EAAE;oBACP,OAAO,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;gBACpC,CAAC,CAAC;qBACD,IAAI,CAAC,GAAG,EAAE;oBACP,OAAO,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC;oBAClF,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;oBACtC,OAAO,GAAG,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC;gBAClC,CAAC,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACO,aAAa,CAAC,OAAmB;QAEvC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,kBAAQ,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,sIAAsI;aAClJ,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAChB,mBAAQ,CAAC,+BAA+B,EAAE,CAAC;gBAC3C,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;oBACd,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC1B,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CAEJ;AApED,gDAoEC"} \ No newline at end of file +{"version":3,"file":"ProjectTestCommand.js","sourceRoot":"","sources":["../../../src/Classes/Command/ProjectTestCommand.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/Classes/Core/Command/DefaultCommands.js b/lib/Classes/Core/Command/DefaultCommands.js index 4127ced..ab4a382 100644 --- a/lib/Classes/Core/Command/DefaultCommands.js +++ b/lib/Classes/Core/Command/DefaultCommands.js @@ -135,7 +135,14 @@ class DefaultCommands { }); context.commandRegistry.registerCommand('down', '../../Command/DockerComposeDownCommand', { description: 'destroys the current app\'s containers and removes their images if required (docker compose down)', - platforms: { windows: true, darwin: true, linux: true } + platforms: { windows: true, darwin: true, linux: true }, + options: [ + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false + } + ] }); context.commandRegistry.registerCommand('sync', '../../Command/DockerComposeUnisonCommand', { description: 'runs a unison sync into your application. Useful if the volume-mount is to slow!', @@ -156,12 +163,24 @@ class DefaultCommands { definition: '-p, --protocol ', description: 'used to define the protocol to use', default: 'https' + }, + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false } ] }); context.commandRegistry.registerCommand('stop-all', '../../Command/DockerStopAllContainersCommand', { description: 'stops >ALL< currently running container instances', - platforms: { windows: true, darwin: true, linux: true } + platforms: { windows: true, darwin: true, linux: true }, + options: [ + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false + } + ] }); context.commandRegistry.registerCommand('start-engine', '../../Command/DockerEngineStartCommand', { description: 'starts the docker engine, if it is currently not running', @@ -195,6 +214,11 @@ class DefaultCommands { definition: '-c, --copyFromTest', description: 'will copy import data from the test-data directory (if it exists) first before importing (Caution: This will overwrite existing files!)', default: false + }, + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false } ] }); @@ -206,6 +230,11 @@ class DefaultCommands { definition: '-c, --copyToTest', description: 'will copy the exported files to the test-data directory if it exists (Caution: This will overwrite existing files!)', default: false + }, + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false } ] }); @@ -240,6 +269,11 @@ class DefaultCommands { definition: '-u, --update', description: 'will call the "test-update" command instead of the "test" command (normally this will update all reference snapshots)', default: false + }, + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false } ] }); diff --git a/lib/Classes/Core/Command/DefaultCommands.js.map b/lib/Classes/Core/Command/DefaultCommands.js.map index 3bbcb63..4dae98e 100644 --- a/lib/Classes/Core/Command/DefaultCommands.js.map +++ b/lib/Classes/Core/Command/DefaultCommands.js.map @@ -1 +1 @@ -{"version":3,"file":"DefaultCommands.js","sourceRoot":"","sources":["../../../../src/Classes/Core/Command/DefaultCommands.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;AAEH,gDAAwB;AAGxB,MAAa,eAAe;IAEjB,MAAM,CAAC,IAAI,CAAC,OAAmB;QAElC,OAAO,CAAC,eAAe,CAAC,eAAe,CACnC,oCAAoC,EACpC,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,0BAA0B,CAAC,CAAC,EAChE;YACI,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,WAAW,EAAE,uIAAuI;YACpJ,cAAc,EAAE,GAAG,EAAE;gBACjB,2DAA2D;gBAC3D,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,UAAU,IAAI;oBAC1C,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;wBAC9B,OAAO;oBACX,CAAC;oBACD,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;wBAC5B,OAAO;oBACX,CAAC;oBACD,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBACrC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;wBAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,IAAI;qBACnD,CAAC,CAAC;gBACP,CAAC,CAAC,CAAC;YACP,CAAC;SACJ,CAAC,CACL;QAED,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,EAAE,sCAAsC,EAAE;YAClF,KAAK,EAAE,OAAO;YACd,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,WAAW,EAAE,yEAAyE;YACtF,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,cAAc;oBAC1B,WAAW,EAAE,yDAAyD;oBACtE,OAAO,EAAE,KAAK;iBACjB;gBACD;oBACI,UAAU,EAAE,YAAY;oBACxB,WAAW,EAAE,yFAAyF;oBACtG,OAAO,EAAE,KAAK;iBACjB;gBACD;oBACI,UAAU,EAAE,WAAW;oBACvB,WAAW,EAAE,2FAA2F;oBACxG,OAAO,EAAE,KAAK;iBACjB;gBACD;oBACI,UAAU,EAAE,cAAc;oBAC1B,WAAW,EAAE,qEAAqE;oBAClF,OAAO,EAAE,KAAK;iBACjB;gBACD,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;oBAC7B;wBACI,UAAU,EAAE,sBAAsB;wBAClC,WAAW,EAAE,iDAAiD;wBAC9D,OAAO,EAAE,KAAK;qBACjB;iBACJ,CAAC,CAAC,CAAC,EAAE,CAAC;aACV;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,EAAE,wCAAwC,EAAE;YACtF,WAAW,EAAE,qDAAqD;YAClE,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,aAAa;oBACzB,WAAW,EAAE,oDAAoD;oBACjE,OAAO,EAAE,KAAK;iBACjB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,EAAE,wCAAwC,EAAE;YACtF,WAAW,EAAE,sEAAsE;YACnF,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,qBAAqB;oBACjC,WAAW,EAAE,8GAA8G;oBAC3H,UAAU,EAAE,YAAY;oBACxB,OAAO,EAAE,EAAE;iBACd,EAAE;oBACC,UAAU,EAAE,cAAc;oBAC1B,WAAW,EAAE,sCAAsC;oBACnD,OAAO,EAAE,KAAK;iBACjB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,OAAO,EAAE,yCAAyC,EAAE;YACxF,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,wGAAwG;YACrH,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,iBAAiB;oBAC7B,WAAW,EAAE,uCAAuC;oBACpD,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC;iBACtD;gBACD;oBACI,UAAU,EAAE,cAAc;oBAC1B,WAAW,EAAE,uDAAuD;oBACpE,OAAO,EAAE,KAAK;iBACjB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,SAAS,EAAE,2CAA2C,EAAE;YAC5F,WAAW,EAAE,uGAAuG;YACpH,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,WAAW;oBACvB,WAAW,EAAE,wCAAwC;oBACrD,OAAO,EAAE,KAAK;iBACjB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,EAAE,wCAAwC,EAAE;YACtF,WAAW,EAAE,mGAAmG;YAChH,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;SACxD,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,EAAE,0CAA0C,EAAE;YACxF,WAAW,EAAE,kFAAkF;YAC/F,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAC;YACtD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,SAAS;oBACrB,WAAW,EAAE,oGAAoG;oBACjH,OAAO,EAAE,KAAK;iBACjB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,EAAE,wCAAwC,EAAE;YACtF,WAAW,EAAE,sEAAsE;YACnF,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,2BAA2B;oBACvC,WAAW,EAAE,oCAAoC;oBACjD,OAAO,EAAE,OAAO;iBACnB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,UAAU,EAAE,8CAA8C,EAAE;YAChG,WAAW,EAAE,mDAAmD;YAChE,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;SACxD,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,cAAc,EAAE,wCAAwC,EAAE;YAC9F,WAAW,EAAE,0DAA0D;YACvE,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;SACxD,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,gBAAgB,EAAE,0CAA0C,EAAE;YAClG,WAAW,EAAE,4BAA4B;YACzC,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;SACxD,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,QAAQ,EAAE,0CAA0C,EAAE;YAC1F,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,+CAA+C;YAC5D,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;SACxD,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,aAAa,EAAE,uCAAuC,EAAE;YAC5F,WAAW,EAAE,qDAAqD;YAClE,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,SAAS;oBACrB,WAAW,EAAE,mEAAmE;oBAChF,OAAO,EAAE,KAAK;iBACjB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,QAAQ,EAAE,oCAAoC,EAAE;YACpF,WAAW,EAAE,qEAAqE;YAClF,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,oBAAoB;oBAChC,WAAW,EAAE,yIAAyI;oBACtJ,OAAO,EAAE,KAAK;iBACjB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,QAAQ,EAAE,oCAAoC,EAAE;YACpF,WAAW,EAAE,qEAAqE;YAClF,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,kBAAkB;oBAC9B,WAAW,EAAE,qHAAqH;oBAClI,OAAO,EAAE,KAAK;iBACjB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,EAAE,kCAAkC,EAAE;YAChF,WAAW,EAAE,6DAA6D;YAC1E,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,mBAAmB;oBAC/B,WAAW,EAAE,mEAAmE;iBACnF;gBACD;oBACI,UAAU,EAAE,iCAAiC;oBAC7C,WAAW,EAAE,oCAAoC;iBACpD;gBACD;oBACI,UAAU,EAAE,aAAa;oBACzB,WAAW,EAAE,yDAAyD;oBACtE,OAAO,EAAE,KAAK;iBACjB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,WAAW,EAAE,gCAAgC,EAAE;YACnF,WAAW,EAAE,iFAAiF;YAC9F,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;SACxD,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,EAAE,kCAAkC,EAAE;YAChF,WAAW,EAAE,oEAAoE;YACjF,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,cAAc;oBAC1B,WAAW,EAAE,uHAAuH;oBACpI,OAAO,EAAE,KAAK;iBACjB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,MAAM,EAAE,2BAA2B,EAAE;YACzE,WAAW,EAAE,uGAAuG;YACpH,SAAS,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAC;YACrD,OAAO,EAAE;gBACL;oBACI,UAAU,EAAE,QAAQ;oBACpB,WAAW,EAAE,sEAAsE;oBACnF,OAAO,EAAE,KAAK;iBACjB;aACJ;SACJ,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;CACJ;AApQD,0CAoQC"} \ No newline at end of file +{"version":3,"file":"DefaultCommands.js","sourceRoot":"","sources":["../../../../src/Classes/Core/Command/DefaultCommands.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/Classes/Core/DockerApp/DockerAppInit.js b/lib/Classes/Core/DockerApp/DockerAppInit.js index f44f7b1..488f291 100644 --- a/lib/Classes/Core/DockerApp/DockerAppInit.js +++ b/lib/Classes/Core/DockerApp/DockerAppInit.js @@ -64,6 +64,7 @@ const path = __importStar(require("path")); const Ip_1 = require("../../Api/Ip"); const AppEventList_1 = require("../AppEventList"); const Bugfixes_1 = require("../Bugfixes"); +const UserError_1 = require("../Error/UserError"); const DockerComposeServiceSelectWizard_1 = require("../Ui/DockerComposeServiceSelectWizard"); const ProjectNameInputWizard_1 = require("../Ui/ProjectNameInputWizard"); const DockerEnv_1 = require("./DockerEnv"); @@ -334,7 +335,7 @@ class DockerAppInit { hosts2.write(); return Promise.resolve(); } - return new Promise(resolve => { + return new Promise((resolve, reject) => { console.log(chalk_1.default.yellowBright(e.message)); return inquirer_1.default.prompt([ { @@ -347,8 +348,10 @@ class DockerAppInit { ]).then(answers => { Bugfixes_1.Bugfixes.inquirerChildProcessReadLineFix(); if (answers.ok === false) { - console.log(chalk_1.default.redBright('Please fix your hosts file before continuing!')); - process.exit(); + // Reject with a real error instead of killing the process, so + // callers (and agents) get a diagnostic they can act on. + return reject(new UserError_1.UserError('Aborted: the hosts file entry for "' + this._app.env.get('APP_DOMAIN') + + '" conflicts with an existing one. Please fix your hosts file before continuing.')); } hosts.removeDomain(this._app.env.get('APP_DOMAIN')); hosts.set(this._app.env.get('APP_IP'), this._app.env.get('APP_DOMAIN')); diff --git a/lib/Classes/Core/DockerApp/DockerAppInit.js.map b/lib/Classes/Core/DockerApp/DockerAppInit.js.map index ae1d9bb..336884b 100644 --- a/lib/Classes/Core/DockerApp/DockerAppInit.js.map +++ b/lib/Classes/Core/DockerApp/DockerAppInit.js.map @@ -1 +1 @@ -{"version":3,"file":"DockerAppInit.js","sourceRoot":"","sources":["../../../../src/Classes/Core/DockerApp/DockerAppInit.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DockerAppInit.js","sourceRoot":"","sources":["../../../../src/Classes/Core/DockerApp/DockerAppInit.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/Classes/Api/DockerCompose.ts b/src/Classes/Api/DockerCompose.ts index cf22884..9a23aa6 100644 --- a/src/Classes/Api/DockerCompose.ts +++ b/src/Classes/Api/DockerCompose.ts @@ -214,7 +214,6 @@ export class DockerCompose } const command = this.baseDockerComposeCommand + 'logs --timestamps ' + '--tail="' + lines + '" ' + (follow === true ? '--follow ' : ''); - childProcess.execSync(command, {'stdio': 'inherit'}); try { childProcess.execSync(command, {stdio: 'inherit'}); resolve(); diff --git a/src/Classes/Command/AbstractImportExportCommand.ts b/src/Classes/Command/AbstractImportExportCommand.ts index dc85c4b..d1c47ff 100644 --- a/src/Classes/Command/AbstractImportExportCommand.ts +++ b/src/Classes/Command/AbstractImportExportCommand.ts @@ -38,7 +38,10 @@ export abstract class AbstractImportExportCommand public execute(cmd: Command, context: AppContext, stack: CommandStack): Promise { - return (new DockerApp(context)).initialize().then(app => { + const acceptDefaults = cmd.opts().yes === true; + const dockerApp = new DockerApp(context); + dockerApp.acceptDefaults = acceptDefaults; + return dockerApp.initialize().then(app => { // Check if we have an import container let hasImportContainer = false; forEach(app.dockerCompose.getServiceList(), (container: { key: string, containerName: string }) => { @@ -53,7 +56,7 @@ export abstract class AbstractImportExportCommand // Perform the import if the user consented return this - .askForConsent(context) + .askForConsent(context, acceptDefaults) .then(execute => { if (!execute) { return Promise.reject(); @@ -125,8 +128,12 @@ export abstract class AbstractImportExportCommand /** * Asks the user for consent to stop all containers */ - protected askForConsent(context: AppContext): Promise + protected askForConsent(context: AppContext, acceptDefaults: boolean = false): Promise { + // Non-interactive: proceed with the import/export. + if (acceptDefaults) { + return Promise.resolve(true); + } return new Promise((resolve) => { inquirer.prompt({ name: 'ok', diff --git a/src/Classes/Command/DockerComposeDownCommand.ts b/src/Classes/Command/DockerComposeDownCommand.ts index be4f2aa..c3348a6 100644 --- a/src/Classes/Command/DockerComposeDownCommand.ts +++ b/src/Classes/Command/DockerComposeDownCommand.ts @@ -27,9 +27,12 @@ export class DockerComposeDownCommand { public execute(cmd: Command, context: AppContext): Promise { - return (new DockerApp(context)).initialize().then(app => { + const acceptDefaults = cmd.opts().yes === true; + const dockerApp = new DockerApp(context); + dockerApp.acceptDefaults = acceptDefaults; + return dockerApp.initialize().then(app => { return Promise.resolve() - .then(() => this.askForConsent(context)) + .then(() => this.askForConsent(context, acceptDefaults)) .then((consent: boolean) => { if (!consent) { console.log('Ok, aborting the process!'); @@ -37,7 +40,7 @@ export class DockerComposeDownCommand } return app.dockerCompose.down(); }) - .then(() => this.askForHostsCleanup(context)) + .then(() => this.askForHostsCleanup(context, acceptDefaults)) .then((consent: boolean) => { if (!consent) { console.log('Ok, I keep the host file as it is...'); @@ -60,8 +63,12 @@ export class DockerComposeDownCommand * Asks the user if he really wants to remove the containers * @param context */ - protected askForConsent(context: AppContext): Promise + protected askForConsent(context: AppContext, acceptDefaults: boolean = false): Promise { + // Non-interactive: take the prompt default (proceed with the down). + if (acceptDefaults) { + return Promise.resolve(true); + } return new Promise((resolve) => { inquirer.prompt({ name: 'executeDown', @@ -83,8 +90,12 @@ export class DockerComposeDownCommand * Asks if the user wants to remove the entry in the hosts file * @param context */ - protected askForHostsCleanup(context: AppContext): Promise + protected askForHostsCleanup(context: AppContext, acceptDefaults: boolean = false): Promise { + // Non-interactive: take the prompt default (keep the hosts entry). + if (acceptDefaults) { + return Promise.resolve(false); + } return new Promise((resolve) => { inquirer.prompt({ name: 'removeHosts', diff --git a/src/Classes/Command/DockerComposeOpenCommand.ts b/src/Classes/Command/DockerComposeOpenCommand.ts index fb66c0c..9fea01e 100644 --- a/src/Classes/Command/DockerComposeOpenCommand.ts +++ b/src/Classes/Command/DockerComposeOpenCommand.ts @@ -28,9 +28,12 @@ export class DockerComposeOpenCommand { public execute(cmd: Command, context: AppContext, stack: CommandStack): Promise { - return (new DockerApp(context)).initialize().then(app => { + const acceptDefaults = cmd.opts().yes === true; + const dockerApp = new DockerApp(context); + dockerApp.acceptDefaults = acceptDefaults; + return dockerApp.initialize().then(app => { if (!app.dockerCompose.isRunning) { - return this.askToStartContainer(context, stack); + return this.askToStartContainer(context, stack, acceptDefaults); } const domain = app.env.get('APP_DOMAIN', app.env.get('APP_IP')); @@ -59,8 +62,14 @@ export class DockerComposeOpenCommand * @param context * @param stack */ - protected askToStartContainer(context: AppContext, stack: CommandStack): Promise + protected askToStartContainer(context: AppContext, stack: CommandStack, acceptDefaults: boolean = false): Promise { + // Non-interactive: start the app (with -y so its init is non-interactive too) and re-open. + if (acceptDefaults) { + stack.push(['up', '-y']); + stack.push(['open', '-y']); + return Promise.resolve(); + } return new Promise((resolve, reject) => { inquirer.prompt({ name: 'startApp', diff --git a/src/Classes/Command/DockerStopAllContainersCommand.ts b/src/Classes/Command/DockerStopAllContainersCommand.ts index 47688c1..065d8db 100644 --- a/src/Classes/Command/DockerStopAllContainersCommand.ts +++ b/src/Classes/Command/DockerStopAllContainersCommand.ts @@ -27,19 +27,23 @@ export class DockerStopAllContainersCommand public execute(cmd: Command, context: AppContext): Promise { - return this.askForConsent().then(execute => { + return this.askForConsent(cmd.opts().yes === true).then(execute => { if (!execute) { return Promise.resolve(); } return (new Docker(context)).stopAllContainers(); }); } - + /** * Asks the user for consent to stop all containers */ - protected askForConsent(): Promise + protected askForConsent(acceptDefaults: boolean = false): Promise { + // Non-interactive: proceed with stopping all containers. + if (acceptDefaults) { + return Promise.resolve(true); + } return new Promise((resolve) => { inquirer.prompt({ name: 'stopAll', diff --git a/src/Classes/Command/ProjectTestCommand.ts b/src/Classes/Command/ProjectTestCommand.ts index 8f4957a..058b981 100644 --- a/src/Classes/Command/ProjectTestCommand.ts +++ b/src/Classes/Command/ProjectTestCommand.ts @@ -31,7 +31,10 @@ export class ProjectTestCommand { public execute(cmd: Command, context: AppContext, stack: CommandStack): Promise { - return (new DockerApp(context)).initialize().then(app => { + const acceptDefaults = cmd.opts().yes === true; + const dockerApp = new DockerApp(context); + dockerApp.acceptDefaults = acceptDefaults; + return dockerApp.initialize().then(app => { // Check if we have a test container let hasTestContainer = false; forEach(app.dockerCompose.getServiceList(), (container: { key: string, containerName: string }) => { @@ -49,7 +52,7 @@ export class ProjectTestCommand 'It seems like your composition is not running. Please make sure to start your composition via "lab up" first.')); } - return this.askForConsent(context).then(execute => { + return this.askForConsent(context, acceptDefaults).then(execute => { if (!execute) { return Promise.resolve(); } @@ -78,8 +81,12 @@ export class ProjectTestCommand /** * Asks the user for consent to stop all containers */ - protected askForConsent(context: AppContext): Promise + protected askForConsent(context: AppContext, acceptDefaults: boolean = false): Promise { + // Non-interactive: proceed with the test run. + if (acceptDefaults) { + return Promise.resolve(true); + } return new Promise((resolve) => { inquirer.prompt({ name: 'ok', diff --git a/src/Classes/Core/Command/DefaultCommands.ts b/src/Classes/Core/Command/DefaultCommands.ts index 7947cad..c10172b 100644 --- a/src/Classes/Core/Command/DefaultCommands.ts +++ b/src/Classes/Core/Command/DefaultCommands.ts @@ -144,7 +144,14 @@ export class DefaultCommands context.commandRegistry.registerCommand('down', '../../Command/DockerComposeDownCommand', { description: 'destroys the current app\'s containers and removes their images if required (docker compose down)', - platforms: {windows: true, darwin: true, linux: true} + platforms: {windows: true, darwin: true, linux: true}, + options: [ + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false + } + ] }); context.commandRegistry.registerCommand('sync', '../../Command/DockerComposeUnisonCommand', { @@ -167,13 +174,25 @@ export class DefaultCommands definition: '-p, --protocol ', description: 'used to define the protocol to use', default: 'https' + }, + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false } ] }); context.commandRegistry.registerCommand('stop-all', '../../Command/DockerStopAllContainersCommand', { description: 'stops >ALL< currently running container instances', - platforms: {windows: true, darwin: true, linux: true} + platforms: {windows: true, darwin: true, linux: true}, + options: [ + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false + } + ] }); context.commandRegistry.registerCommand('start-engine', '../../Command/DockerEngineStartCommand', { @@ -212,6 +231,11 @@ export class DefaultCommands definition: '-c, --copyFromTest', description: 'will copy import data from the test-data directory (if it exists) first before importing (Caution: This will overwrite existing files!)', default: false + }, + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false } ] }); @@ -224,6 +248,11 @@ export class DefaultCommands definition: '-c, --copyToTest', description: 'will copy the exported files to the test-data directory if it exists (Caution: This will overwrite existing files!)', default: false + }, + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false } ] }); @@ -261,6 +290,11 @@ export class DefaultCommands definition: '-u, --update', description: 'will call the "test-update" command instead of the "test" command (normally this will update all reference snapshots)', default: false + }, + { + definition: '-y, --yes', + description: 'accept all confirmations/defaults without prompting (for non-interactive / agent use)', + default: false } ] }); diff --git a/src/Classes/Core/DockerApp/DockerAppInit.ts b/src/Classes/Core/DockerApp/DockerAppInit.ts index 81ec2a5..983f360 100644 --- a/src/Classes/Core/DockerApp/DockerAppInit.ts +++ b/src/Classes/Core/DockerApp/DockerAppInit.ts @@ -28,6 +28,7 @@ import {Ip} from '../../Api/Ip'; import {AppContext} from '../AppContext'; import {AppEventList} from '../AppEventList'; import {Bugfixes} from '../Bugfixes'; +import {UserError} from '../Error/UserError'; import {DockerComposeServiceSelectWizard} from '../Ui/DockerComposeServiceSelectWizard'; import {ProjectNameInputWizard} from '../Ui/ProjectNameInputWizard'; import {DockerApp} from './DockerApp'; @@ -380,7 +381,7 @@ export class DockerAppInit hosts2.write(); return Promise.resolve(); } - return new Promise(resolve => { + return new Promise((resolve, reject) => { console.log(chalk.yellowBright(e.message)); return inquirer.prompt( [ @@ -395,8 +396,11 @@ export class DockerAppInit answers => { Bugfixes.inquirerChildProcessReadLineFix(); if (answers.ok === false) { - console.log(chalk.redBright('Please fix your hosts file before continuing!')); - process.exit(); + // Reject with a real error instead of killing the process, so + // callers (and agents) get a diagnostic they can act on. + return reject(new UserError( + 'Aborted: the hosts file entry for "' + this._app.env.get('APP_DOMAIN') + + '" conflicts with an existing one. Please fix your hosts file before continuing.')); } hosts.removeDomain(this._app.env.get('APP_DOMAIN')); hosts.set(this._app.env.get('APP_IP'), this._app.env.get('APP_DOMAIN')); diff --git a/test/AgentNonInteractive.test.ts b/test/AgentNonInteractive.test.ts new file mode 100644 index 0000000..905bb96 --- /dev/null +++ b/test/AgentNonInteractive.test.ts @@ -0,0 +1,78 @@ +import { Command } from 'commander'; +import inquirer from 'inquirer'; +import { DockerComposeDownCommand } from '../src/Classes/Command/DockerComposeDownCommand'; +import { DockerStopAllContainersCommand } from '../src/Classes/Command/DockerStopAllContainersCommand'; +import { DockerComposeOpenCommand } from '../src/Classes/Command/DockerComposeOpenCommand'; +import { AppContext } from '../src/Classes/Core/AppContext'; +import { CommandStack } from '../src/Classes/Core/Command/CommandStack'; +import { DockerApp } from '../src/Classes/Core/DockerApp/DockerApp'; +import { Docker } from '../src/Classes/Api/Docker'; + +jest.mock('../src/Classes/Core/DockerApp/DockerApp'); +jest.mock('../src/Classes/Api/Docker'); + +function cmdWith(opts: any): Command { + return { name: () => 'x', opts: () => opts } as unknown as Command; +} + +describe('non-interactive --yes (agent friendliness)', () => { + let mockApp: any; + let mockDocker: any; + const ctx = { + rootDirectory: '/mock/root', + appRegistry: { get: () => ({}), set: () => {} } + } as unknown as AppContext; + + beforeEach(() => { + jest.clearAllMocks(); + jest.spyOn(console, 'log').mockImplementation(() => undefined); + + mockApp = { + acceptDefaults: false, + initialize: jest.fn().mockImplementation(() => Promise.resolve(mockApp)), + env: { get: (_k: string, fb?: any) => fb }, + dockerCompose: { + isRunning: true, + down: jest.fn().mockResolvedValue(undefined) + } + }; + (DockerApp as unknown as jest.Mock).mockImplementation(() => mockApp); + + mockDocker = { stopAllContainers: jest.fn().mockResolvedValue(undefined) }; + (Docker as unknown as jest.Mock).mockImplementation(() => mockDocker); + }); + + afterEach(() => jest.restoreAllMocks()); + + it('down --yes destroys the app without prompting and sets acceptDefaults', async () => { + await new DockerComposeDownCommand().execute(cmdWith({ yes: true }), ctx); + + expect(inquirer.prompt).not.toHaveBeenCalled(); + expect(mockApp.dockerCompose.down).toHaveBeenCalled(); + expect(mockApp.acceptDefaults).toBe(true); + }); + + it('down without --yes falls back to the interactive prompt', async () => { + await new DockerComposeDownCommand().execute(cmdWith({}), ctx); + + expect(inquirer.prompt).toHaveBeenCalled(); + }); + + it('stop-all --yes stops all containers without prompting', async () => { + await new DockerStopAllContainersCommand().execute(cmdWith({ yes: true }), ctx); + + expect(inquirer.prompt).not.toHaveBeenCalled(); + expect(mockDocker.stopAllContainers).toHaveBeenCalled(); + }); + + it('open --yes auto-starts a stopped app (queues up -y / open) without prompting', async () => { + mockApp.dockerCompose.isRunning = false; + const stack = { push: jest.fn() } as unknown as CommandStack; + + await new DockerComposeOpenCommand().execute(cmdWith({ yes: true }), ctx, stack); + + expect(inquirer.prompt).not.toHaveBeenCalled(); + expect((stack.push as jest.Mock)).toHaveBeenCalledWith(['up', '-y']); + expect((stack.push as jest.Mock)).toHaveBeenCalledWith(['open', '-y']); + }); +});