From fda1b42e9f0d24e5f30849f863af69a7b5007e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arwid=20Thornstro=CC=88m?= Date: Fri, 21 Jan 2022 13:34:56 +0100 Subject: [PATCH] help --- src/cli.ts | 14 ++++++++------ src/commands/deployment/deployment.ts | 7 ++++--- .../deployment/testservers/create/create.ts | 9 +++++---- .../deployment/testservers/delete/delete.ts | 5 +++-- .../deployment/testservers/status/status.ts | 5 +++-- src/commands/deployment/testservers/testservers.ts | 5 +++-- .../deployment/testservers/update/update.ts | 7 ++++--- src/commands/pwcli.ts | 4 ++-- src/commands/setup/settings/settings.ts | 7 ++++--- src/commands/setup/setup.ts | 5 +++-- src/globals.ts | 4 ++++ 11 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 src/globals.ts diff --git a/src/cli.ts b/src/cli.ts index dfef351..3bfa821 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -15,21 +15,23 @@ async function run(argv) { }) .help({ name: 'help', - alias: 'helpmeplease', - hidden: true, + alias: 'h', + hidden: false, dashed: true, - run: toolbox => toolbox.print.info('No help for you!') + run: toolbox => { + toolbox.print.info('This is the help'); + } }) // provides default for help, h, --help, -h - .version() // provides default for version, v, --version, -v + // .version() // provides default for version, v, --version, -v .create() // enable the following method if you'd like to skip loading one of these core extensions // this can improve performance if they're not necessary for your project: // .exclude(['meta', 'strings', 'print', 'filesystem', 'semver', 'system', 'prompt', 'http', 'template', 'patching', 'package-manager']) // and run it - const toolbox = await cli.run(argv) + const toolbox = await cli.run(argv); // send it back (for testing, mostly) - return toolbox + return toolbox; } module.exports = { run } diff --git a/src/commands/deployment/deployment.ts b/src/commands/deployment/deployment.ts index 4590351..b521b9f 100644 --- a/src/commands/deployment/deployment.ts +++ b/src/commands/deployment/deployment.ts @@ -1,11 +1,12 @@ import { GluegunMenuToolbox } from '@lenne.tech/gluegun-menu'; +import { defaultMenuSettings } from '../../globals'; module.exports = { name: 'deployment', alias: ['d'], - description: 'Description for deployment (d)', - hidden: true, + description: 'Deployment (d)', + hidden: false, run: async (toolbox: GluegunMenuToolbox) => { - await toolbox.menu.showMenu('deployment'); + await toolbox.menu.showMenu('deployment', defaultMenuSettings); } }; diff --git a/src/commands/deployment/testservers/create/create.ts b/src/commands/deployment/testservers/create/create.ts index 3566d25..a44c2c8 100644 --- a/src/commands/deployment/testservers/create/create.ts +++ b/src/commands/deployment/testservers/create/create.ts @@ -3,6 +3,7 @@ const chalk = require('chalk'); const { Input, Confirm } = require('enquirer'); import { Octokit } from "@octokit/core"; import { GluegunPrint } from 'gluegun'; +import { defaultMenuSettings } from '../../../../globals'; const os = require("os"); const STACK_DEFAULTS = { @@ -113,7 +114,7 @@ module.exports = { name: 'create', alias: ['c'], description: 'Create new testserver on aws (c)', - hidden: true, + hidden: false, run: async (toolbox: GluegunMenuToolbox) => { const { system, strings, print, filesystem } = toolbox; @@ -126,7 +127,7 @@ module.exports = { `); if (toolbox.fromMenu()) { - await toolbox.menu.showMenu() + await toolbox.menu.showMenu(null, defaultMenuSettings) } else { return; } @@ -204,7 +205,7 @@ module.exports = { `); if (toolbox.fromMenu()) { - await toolbox.menu.showMenu('deployment testservers'); + await toolbox.menu.showMenu('deployment testservers', defaultMenuSettings); } } @@ -241,7 +242,7 @@ module.exports = { } if (toolbox.fromMenu()) { - await toolbox.menu.showMenu('deployment testservers') + await toolbox.menu.showMenu('deployment testservers', defaultMenuSettings) } } } diff --git a/src/commands/deployment/testservers/delete/delete.ts b/src/commands/deployment/testservers/delete/delete.ts index 29e28f9..1c73039 100644 --- a/src/commands/deployment/testservers/delete/delete.ts +++ b/src/commands/deployment/testservers/delete/delete.ts @@ -1,5 +1,6 @@ import { GluegunMenuToolbox } from '@lenne.tech/gluegun-menu' import { GluegunSystem, print } from 'gluegun'; +import { defaultMenuSettings } from '../../../../globals'; const chalk = require('chalk'); const { AutoComplete, Input, Confirm } = require('enquirer'); @@ -52,7 +53,7 @@ module.exports = { name: 'delete', alias: ['d'], description: 'Choose a testserver to delete (d)', - hidden: true, + hidden: false, run: async (toolbox: GluegunMenuToolbox) => { const { system, strings, print } = toolbox; @@ -127,7 +128,7 @@ module.exports = { } if (toolbox.fromMenu()) { - await toolbox.menu.showMenu('deployment testservers'); + await toolbox.menu.showMenu('deployment testservers', defaultMenuSettings); } } } diff --git a/src/commands/deployment/testservers/status/status.ts b/src/commands/deployment/testservers/status/status.ts index c8b9735..0899305 100644 --- a/src/commands/deployment/testservers/status/status.ts +++ b/src/commands/deployment/testservers/status/status.ts @@ -1,4 +1,5 @@ import { GluegunMenuToolbox } from '@lenne.tech/gluegun-menu' +import { defaultMenuSettings } from '../../../../globals'; const tto = require('terminal-table-output').create(); type Stack = { @@ -13,7 +14,7 @@ module.exports = { name: 'status', alias: ['s'], description: 'Show status for available testservers (s)', - hidden: true, + hidden: false, run: async (toolbox: GluegunMenuToolbox) => { const { system, strings } = toolbox @@ -62,7 +63,7 @@ module.exports = { tto.print(true); if (toolbox.fromMenu()) { - await toolbox.menu.showMenu('deployment testservers'); + await toolbox.menu.showMenu('deployment testservers', defaultMenuSettings); } } } diff --git a/src/commands/deployment/testservers/testservers.ts b/src/commands/deployment/testservers/testservers.ts index fc364ba..32d61fc 100644 --- a/src/commands/deployment/testservers/testservers.ts +++ b/src/commands/deployment/testservers/testservers.ts @@ -1,4 +1,5 @@ import { GluegunMenuToolbox } from '@lenne.tech/gluegun-menu'; +import { defaultMenuSettings } from '../../../globals'; /** * Section1 menu @@ -7,8 +8,8 @@ module.exports = { name: 'testservers', alias: ['ts'], description: 'Deploy to testservers (ts)', - hidden: true, + hidden: false, run: async (toolbox: GluegunMenuToolbox) => { - await toolbox.menu.showMenu('deployment testservers'); + await toolbox.menu.showMenu('deployment testservers', defaultMenuSettings); } }; diff --git a/src/commands/deployment/testservers/update/update.ts b/src/commands/deployment/testservers/update/update.ts index c20cedd..60c9107 100644 --- a/src/commands/deployment/testservers/update/update.ts +++ b/src/commands/deployment/testservers/update/update.ts @@ -3,6 +3,7 @@ const chalk = require('chalk'); const { AutoComplete, Input, Confirm } = require('enquirer'); import { Octokit } from "@octokit/core"; import { GluegunPrint } from 'gluegun'; +import { defaultMenuSettings } from '../../../../globals'; const os = require("os"); const STACK_DEFAULTS = { @@ -111,7 +112,7 @@ module.exports = { name: 'update', alias: ['u'], description: 'Update stack with different branch (u)', - hidden: true, + hidden: false, run: async (toolbox: GluegunMenuToolbox) => { const { system, strings, print, filesystem } = toolbox; @@ -124,7 +125,7 @@ module.exports = { `); if (toolbox.fromMenu()) { - await toolbox.menu.showMenu() + await toolbox.menu.showMenu(null, defaultMenuSettings) } else { return; } @@ -212,7 +213,7 @@ module.exports = { } if (toolbox.fromMenu()) { - await toolbox.menu.showMenu('deployment testservers') + await toolbox.menu.showMenu('deployment testservers', defaultMenuSettings) } } } diff --git a/src/commands/pwcli.ts b/src/commands/pwcli.ts index 7e83454..a767b49 100644 --- a/src/commands/pwcli.ts +++ b/src/commands/pwcli.ts @@ -2,13 +2,13 @@ import { GluegunMenuToolbox } from '@lenne.tech/gluegun-menu'; import { GluegunCommand } from 'gluegun' - const command: GluegunCommand = { name: 'pwcli', + hidden: false, run: async (toolbox: GluegunMenuToolbox) => { const { print } = toolbox; print.info('Welcome to photowall CLI for everything, almost 😬'); - await toolbox.menu.showMenu(); + await toolbox.menu.showMenu(null); } }; diff --git a/src/commands/setup/settings/settings.ts b/src/commands/setup/settings/settings.ts index 1157429..8f5097f 100644 --- a/src/commands/setup/settings/settings.ts +++ b/src/commands/setup/settings/settings.ts @@ -1,6 +1,7 @@ import { GluegunMenuToolbox } from '@lenne.tech/gluegun-menu'; import chalk = require('chalk'); import { system } from 'gluegun'; +import { defaultMenuSettings } from '../../../globals'; const { Confirm, Input } = require('enquirer'); const checkCLIProgram = async (toolbox: GluegunMenuToolbox, cmd: string) => { @@ -17,7 +18,7 @@ module.exports = { name: 'settings', alias: ['se'], description: 'Setup settings for pwcli (se)', - hidden: true, + hidden: false, run: async (toolbox: GluegunMenuToolbox) => { const {print, system, strings} = toolbox; @@ -123,9 +124,9 @@ module.exports = { await system.run(`echo '${JSON.stringify(config)}' > ~/.pwcli_settings`); } else { print.info('Ok then.'); - if (toolbox.fromMenu()) await toolbox.menu.showMenu(); + if (toolbox.fromMenu()) await toolbox.menu.showMenu(null, defaultMenuSettings); } - if (toolbox.fromMenu()) await toolbox.menu.showMenu(); + if (toolbox.fromMenu()) await toolbox.menu.showMenu(null, defaultMenuSettings); } }; diff --git a/src/commands/setup/setup.ts b/src/commands/setup/setup.ts index e4dd4b6..ed4902d 100644 --- a/src/commands/setup/setup.ts +++ b/src/commands/setup/setup.ts @@ -1,4 +1,5 @@ import { GluegunMenuToolbox } from '@lenne.tech/gluegun-menu'; +import { defaultMenuSettings } from '../../globals'; /** * Section1 menu @@ -7,8 +8,8 @@ module.exports = { name: 'setup', alias: ['s'], description: 'Setup pwcli (s)', - hidden: true, + hidden: false, run: async (toolbox: GluegunMenuToolbox) => { - await toolbox.menu.showMenu('setup'); + await toolbox.menu.showMenu('setup', defaultMenuSettings); } }; diff --git a/src/globals.ts b/src/globals.ts new file mode 100644 index 0000000..3dce568 --- /dev/null +++ b/src/globals.ts @@ -0,0 +1,4 @@ + +export const defaultMenuSettings = { + showHelp: false +};