From 5ef39aec762a5e61da9c18ae5752d5edeeb51be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Chastanet?= Date: Sun, 15 Sep 2024 17:14:37 +0200 Subject: [PATCH] update binaries template using authorizedValues --- .pre-commit-config-github.yaml | 7 +- .pre-commit-config.yaml | 7 +- bin/cli | 59 +++++++------ bin/dbImport | 66 +++++++------- bin/dbImportProfile | 54 ++++++------ bin/dbImportStream | 62 +++++++------- bin/dbQueryAllDatabases | 53 ++++++------ bin/dbScriptAllDatabases | 70 +++++++-------- bin/doc | 45 +++++----- bin/gitIsAncestorOf | 58 +++++++------ bin/gitIsBranch | 51 ++++++----- bin/gitRenameBranch | 61 ++++++------- bin/installRequirements | 44 ++++++---- bin/mysql2puml | 52 +++++------ bin/postmanCli | 66 ++++++++------ bin/upgradeGithubRelease | 59 ++++++------- bin/waitForIt | 69 ++++++++------- bin/waitForMysql | 81 +++++++++--------- conf/dbScripts/extractData | 44 ++++++---- install | 45 +++++----- .../mysql2puml/testsData/mysql2puml.help.txt | 28 ++++-- .../mysql2puml/testsData/mysql2puml.svg | 2 +- .../testsData/mysql2pumlSkins/default.png | Bin 950 -> 949 bytes .../testsData/mysql2pumlSkins/default.svg | 2 +- .../dbImport/testsData/dbImport.help.txt | 31 +++++-- .../testsData/dbImportProfile.help.txt | 28 ++++-- .../testsData/dbImportStream.help.txt | 31 +++++-- .../testsData/dbQueryAllDatabases.help.txt | 28 ++++-- .../dbScriptAllDatabases-binary.yaml | 7 +- .../testsData/dbScriptAllDatabases.help.txt | 35 ++++++-- .../Docker/cli/testsData/cli.help.txt | 34 ++++++-- .../testsData/gitIsAncestorOf.help.txt | 31 +++++-- .../testsData/gitIsBranch.help.txt | 28 ++++-- .../testsData/gitRenameBranch.help.txt | 31 +++++-- .../testsData/upgradeGithubRelease.help.txt | 31 +++++-- .../postmanCli/testsData/postmanCli.help.txt | 34 ++++++-- .../waitForIt/testsData/waitForIt.help.txt | 34 ++++++-- .../Utils/waitForIt/waitForIt-binary.yaml | 1 - .../testsData/waitForMysql.help.txt | 40 ++++++--- 39 files changed, 901 insertions(+), 608 deletions(-) diff --git a/.pre-commit-config-github.yaml b/.pre-commit-config-github.yaml index f095b61a..9539ab7b 100644 --- a/.pre-commit-config-github.yaml +++ b/.pre-commit-config-github.yaml @@ -94,13 +94,13 @@ repos: )$ - repo: https://github.com/rhysd/actionlint - rev: v1.6.27 + rev: v1.7.1 hooks: - id: actionlint stages: [pre-commit, pre-push, manual] - repo: https://github.com/codespell-project/codespell - rev: v2.2.6 + rev: v2.3.0 hooks: - id: codespell args: @@ -161,7 +161,7 @@ repos: exclude: /testsData/ - repo: https://github.com/fchastanet/bash-tools-framework - rev: 5.1.2 + rev: 4.0.4 hooks: - id: fixShebangExecutionBit - id: awkLint @@ -192,6 +192,7 @@ repos: WARNING, ] - id: plantuml + args: [--same-dir, -f, png, -f, svg, --limit-size, "1200"] exclude: | (?x)( ^conf/mysql2pumlSkins/default.puml$ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7c89af86..29ce7dd3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -89,13 +89,13 @@ repos: )$ - repo: https://github.com/rhysd/actionlint - rev: v1.6.27 + rev: v1.7.1 hooks: - id: actionlint stages: [pre-commit, pre-push, manual] - repo: https://github.com/codespell-project/codespell - rev: v2.2.6 + rev: v2.3.0 hooks: - id: codespell args: @@ -156,7 +156,7 @@ repos: exclude: /testsData/ - repo: https://github.com/fchastanet/bash-tools-framework - rev: 5.1.2 + rev: 4.0.4 hooks: - id: fixShebangExecutionBit - id: awkLint @@ -187,6 +187,7 @@ repos: WARNING, ] - id: plantuml + args: [--same-dir, -f, png, -f, svg, --limit-size, "1200"] exclude: | (?x)( ^conf/mysql2pumlSkins/default.puml$ diff --git a/bin/cli b/bin/cli index 75d631b3..b1aa1dfc 100755 --- a/bin/cli +++ b/bin/cli @@ -1824,7 +1824,7 @@ cliCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1875,7 +1875,7 @@ cliCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1921,7 +1921,7 @@ cliCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -1991,7 +1991,6 @@ cliCommandParse() { # Argument 1/3 - containerArg # Argument containerArg min 0 max 1 - # Argument containerArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountContainerArg >= 1 )); then @@ -2005,7 +2004,6 @@ cliCommandParse() { # Argument 2/3 - userArg # Argument userArg min 0 max 1 - # Argument userArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex1 && options_parse_parsedArgIndex < maxParsedArgIndex2 )); then if ((options_parse_argParsedCountUserArg >= 1 )); then @@ -2019,7 +2017,6 @@ cliCommandParse() { # Argument 3/3 - commandArg # Argument commandArg min 0 max 1 - # Argument commandArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex2 && options_parse_parsedArgIndex < maxParsedArgIndex3 )); then if ((options_parse_argParsedCountCommandArg >= 1 )); then @@ -2081,18 +2078,18 @@ cliCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}container${__HELP_NORMAL} {single}] - " + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}container${__HELP_NORMAL} {single}]" containerArgHelpFunction - Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}user${__HELP_NORMAL} {single}] - " + + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}user${__HELP_NORMAL} {single}]" userArgHelpFunction - Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}command${__HELP_NORMAL} {single}] - " + + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}command${__HELP_NORMAL} {single}]" commandArgHelpFunction + # ------------------------------------------ # options section # ------------------------------------------ @@ -2103,69 +2100,77 @@ cliCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -2174,12 +2179,10 @@ cliCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/bin/dbImport b/bin/dbImport index 90a9de58..7805b7f4 100755 --- a/bin/dbImport +++ b/bin/dbImport @@ -2338,7 +2338,7 @@ dbImportCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2389,7 +2389,7 @@ dbImportCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2435,7 +2435,7 @@ dbImportCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -2506,7 +2506,6 @@ dbImportCommandParse() { # Argument 1/2 - fromDbName # Argument fromDbName min 1 max 1 - # Argument fromDbName authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountFromDbName >= 1 )); then @@ -2520,7 +2519,6 @@ dbImportCommandParse() { # Argument 2/2 - targetDbName # Argument targetDbName min 0 max 1 - # Argument targetDbName authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex1 && options_parse_parsedArgIndex < maxParsedArgIndex2 )); then if ((options_parse_argParsedCountTargetDbName >= 1 )); then @@ -2612,14 +2610,14 @@ dbImportCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}fromDbName${__HELP_NORMAL} {single} (mandatory) - " + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}fromDbName${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The name of the source/remote database." - echo - Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}${__HELP_NORMAL} {single}] - " + echo + + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}${__HELP_NORMAL} {single}]" Array::wrap2 ' ' 76 4 " " "The name of the target database" "Default value: (without extension)" "" - echo + echo + # ------------------------------------------ # options section # ------------------------------------------ @@ -2630,12 +2628,10 @@ dbImportCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--target-dsn${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-t ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Dsn to use for target database." echo - Array::wrap2 ' ' 76 6 " Default value: " "default.local" echo @@ -2643,7 +2639,6 @@ dbImportCommandHelp() { Array::wrap2 ' ' 76 4 " " "Change the character set used during database creation." echo - echo echo -e "${__HELP_TITLE_COLOR}PROFILE OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--profile${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-p ${__HELP_NORMAL} {single}" @@ -2651,12 +2646,10 @@ dbImportCommandHelp() { - echo -e " ${__HELP_OPTION_COLOR}--tables ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Import only table specified in the list." "If aws mode, ignore profile option." echo - echo echo -e "${__HELP_TITLE_COLOR}SOURCE OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--skip-schema${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-s${__HELP_NORMAL} {single}" @@ -2664,18 +2657,15 @@ dbImportCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--from-dsn${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-f ${__HELP_NORMAL} {single}" dsnHelpFunction - echo -e " ${__HELP_OPTION_COLOR}--from-aws${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-a ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "db dump will be downloaded from s3 instead of using remote db." "The value is the name of the file without s3 location" "(Only .gz or tar.gz file are supported)." "This option is incompatible with -f|--from-dsn option." "" echo - echo echo -e "${__HELP_TITLE_COLOR}GLOBAL OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--help${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-h${__HELP_NORMAL} {single}" @@ -2683,69 +2673,77 @@ dbImportCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -2754,12 +2752,10 @@ dbImportCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/bin/dbImportProfile b/bin/dbImportProfile index 1dfc9a80..7aa5a393 100755 --- a/bin/dbImportProfile +++ b/bin/dbImportProfile @@ -2053,7 +2053,7 @@ dbImportProfileCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2104,7 +2104,7 @@ dbImportProfileCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2150,7 +2150,7 @@ dbImportProfileCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -2219,7 +2219,6 @@ dbImportProfileCommandParse() { # Argument 1/1 - fromDbName # Argument fromDbName min 1 max 1 - # Argument fromDbName authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountFromDbName >= 1 )); then @@ -2306,10 +2305,10 @@ dbImportProfileCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}fromDbName${__HELP_NORMAL} {single} (mandatory) - " + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}fromDbName${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The name of the source/remote database." - echo + echo + # ------------------------------------------ # options section # ------------------------------------------ @@ -2319,7 +2318,6 @@ dbImportProfileCommandHelp() { optionRatioHelpFunction - Array::wrap2 ' ' 76 6 " Default value: " "70" echo @@ -2327,14 +2325,12 @@ dbImportProfileCommandHelp() { profileOptionHelpFunction - echo echo -e "${__HELP_TITLE_COLOR}SOURCE OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--from-dsn${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-f ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Target mysql server." echo - echo echo -e "${__HELP_TITLE_COLOR}GLOBAL OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--help${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-h${__HELP_NORMAL} {single}" @@ -2342,69 +2338,77 @@ dbImportProfileCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -2413,12 +2417,10 @@ dbImportProfileCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/bin/dbImportStream b/bin/dbImportStream index 7c30dc70..e3a49d87 100755 --- a/bin/dbImportStream +++ b/bin/dbImportStream @@ -2102,7 +2102,7 @@ dbImportStreamCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2153,7 +2153,7 @@ dbImportStreamCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2199,7 +2199,7 @@ dbImportStreamCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -2270,7 +2270,6 @@ dbImportStreamCommandParse() { # Argument 1/2 - argDumpFile # Argument argDumpFile min 1 max 1 - # Argument argDumpFile authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountArgDumpFile >= 1 )); then @@ -2284,7 +2283,6 @@ dbImportStreamCommandParse() { # Argument 2/2 - argTargetDbName # Argument argTargetDbName min 1 max 1 - # Argument argTargetDbName authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex1 && options_parse_parsedArgIndex < maxParsedArgIndex2 )); then if ((options_parse_argParsedCountArgTargetDbName >= 1 )); then @@ -2377,14 +2375,14 @@ dbImportStreamCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}argDumpFile${__HELP_NORMAL} {single} (mandatory) - " + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}argDumpFile${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The file that will be streamed through mysql." - echo - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}argTargetDbName${__HELP_NORMAL} {single} (mandatory) - " + echo + + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}argTargetDbName${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The name of the mysql target database." - echo + echo + # ------------------------------------------ # options section # ------------------------------------------ @@ -2395,19 +2393,16 @@ dbImportStreamCommandHelp() { - echo -e " ${__HELP_OPTION_COLOR}--tables ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Import only table specified in the list." "If aws mode, ignore profile option." echo - echo echo -e "${__HELP_TITLE_COLOR}TARGET OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--target-dsn${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-t ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Dsn to use for target database." echo - Array::wrap2 ' ' 76 6 " Default value: " "default.local" echo @@ -2415,7 +2410,6 @@ dbImportStreamCommandHelp() { Array::wrap2 ' ' 76 4 " " "Change the character set used during database creation." echo - echo echo -e "${__HELP_TITLE_COLOR}GLOBAL OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--help${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-h${__HELP_NORMAL} {single}" @@ -2423,69 +2417,77 @@ dbImportStreamCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -2494,12 +2496,10 @@ dbImportStreamCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/bin/dbQueryAllDatabases b/bin/dbQueryAllDatabases index e3657570..e2b1af68 100755 --- a/bin/dbQueryAllDatabases +++ b/bin/dbQueryAllDatabases @@ -2106,7 +2106,7 @@ dbQueryAllDatabasesCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2157,7 +2157,7 @@ dbQueryAllDatabasesCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2203,7 +2203,7 @@ dbQueryAllDatabasesCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -2293,7 +2293,6 @@ dbQueryAllDatabasesCommandParse() { # Argument 1/1 - argQuery # Argument argQuery min 1 max 1 - # Argument argQuery authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountArgQuery >= 1 )); then @@ -2383,10 +2382,10 @@ dbQueryAllDatabasesCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}argQuery${__HELP_NORMAL} {single} (mandatory) - " + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}argQuery${__HELP_NORMAL} {single} (mandatory)" argQueryHelpFunction + # ------------------------------------------ # options section # ------------------------------------------ @@ -2396,7 +2395,6 @@ dbQueryAllDatabasesCommandHelp() { Array::wrap2 ' ' 76 4 " " "The number of databases to query in parallel." echo - Array::wrap2 ' ' 76 6 " Default value: " "1" echo @@ -2404,14 +2402,12 @@ dbQueryAllDatabasesCommandHelp() { Array::wrap2 ' ' 76 4 " " "Show progress as a progress bar. In the bar is shown: % of jobs" "completed, estimated seconds left, and number of jobs started." echo - echo echo -e "${__HELP_TITLE_COLOR}SOURCE OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--from-dsn${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-f ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Target mysql server." echo - echo echo -e "${__HELP_TITLE_COLOR}GLOBAL OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--help${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-h${__HELP_NORMAL} {single}" @@ -2419,69 +2415,77 @@ dbQueryAllDatabasesCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -2490,19 +2494,16 @@ dbQueryAllDatabasesCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - echo echo -e "${__HELP_TITLE_COLOR}QUERY OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--separator${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-s ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Character to use to separate mysql column." echo - Array::wrap2 ' ' 76 6 " Default value: " "|" echo # ------------------------------------------ diff --git a/bin/dbScriptAllDatabases b/bin/dbScriptAllDatabases index 23416349..b13433d3 100755 --- a/bin/dbScriptAllDatabases +++ b/bin/dbScriptAllDatabases @@ -2012,7 +2012,7 @@ dbScriptAllDatabasesCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2063,7 +2063,7 @@ dbScriptAllDatabasesCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2109,7 +2109,7 @@ dbScriptAllDatabasesCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -2210,7 +2210,7 @@ dbScriptAllDatabasesCommandParse() { return 1 fi if [[ ! "$1" =~ none|log ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([none log])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(none, log)" return 1 fi @@ -2245,7 +2245,6 @@ dbScriptAllDatabasesCommandParse() { # Argument 1/2 - argScriptToExecute # Argument argScriptToExecute min 1 max 1 - # Argument argScriptToExecute authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountArgScriptToExecute >= 1 )); then @@ -2260,7 +2259,6 @@ dbScriptAllDatabasesCommandParse() { # Argument 2/2 - scriptArguments # Argument scriptArguments min 0 max -1 - # Argument scriptArguments authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex1 )); then ((++options_parse_argParsedCountScriptArguments)) # shellcheck disable=SC2034 @@ -2344,14 +2342,14 @@ dbScriptAllDatabasesCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}scriptToExecute${__HELP_NORMAL} {single} (mandatory) - " + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}scriptToExecute${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The script that will be executed on each databases." - echo - Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}scriptArguments${__HELP_NORMAL} {list} (optional)] - " + echo + + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}scriptArguments${__HELP_NORMAL} {list} (optional)]" Array::wrap2 ' ' 76 4 " " "Optional parameters to pass to the script." - echo + echo + # ------------------------------------------ # options section # ------------------------------------------ @@ -2361,7 +2359,6 @@ dbScriptAllDatabasesCommandHelp() { Array::wrap2 ' ' 76 4 " " "The number of databases to query in parallel." echo - Array::wrap2 ' ' 76 6 " Default value: " "1" echo @@ -2369,14 +2366,12 @@ dbScriptAllDatabasesCommandHelp() { Array::wrap2 ' ' 76 4 " " "Show progress as a progress bar. In the bar is shown: % of jobs" "completed, estimated seconds left, and number of jobs started." echo - echo echo -e "${__HELP_TITLE_COLOR}SOURCE OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--from-dsn${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-f ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Target mysql server." echo - echo echo -e "${__HELP_TITLE_COLOR}GLOBAL OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--help${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-h${__HELP_NORMAL} {single}" @@ -2384,69 +2379,77 @@ dbScriptAllDatabasesCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -2455,12 +2458,10 @@ dbScriptAllDatabasesCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - echo echo -e "${__HELP_TITLE_COLOR}SCRIPTS OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--database ${__HELP_NORMAL} {single}" @@ -2468,19 +2469,18 @@ dbScriptAllDatabasesCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--output${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-o ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Output directory, see log-format option." echo - echo -e " ${__HELP_OPTION_COLOR}--log-format${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-l ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "If output dir provided, will log each db result to log file." echo - Array::wrap2 ' ' 76 6 " Possible values: " "none, " "log" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}none${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}log${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "none" echo # ------------------------------------------ diff --git a/bin/doc b/bin/doc index 7129dfb5..838ff28d 100755 --- a/bin/doc +++ b/bin/doc @@ -1688,7 +1688,7 @@ docCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1739,7 +1739,7 @@ docCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1785,7 +1785,7 @@ docCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -1892,7 +1892,6 @@ docCommandHelp() { Array::wrap2 ' ' 76 4 " " "Activate continuous integration mode (tmp folder not shared with host)" "" echo - echo echo -e "${__HELP_TITLE_COLOR}GLOBAL OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--help${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-h${__HELP_NORMAL} {single}" @@ -1900,69 +1899,77 @@ docCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -1971,12 +1978,10 @@ docCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - # ------------------------------------------ # version section # ------------------------------------------ diff --git a/bin/gitIsAncestorOf b/bin/gitIsAncestorOf index c337d386..c935a28e 100755 --- a/bin/gitIsAncestorOf +++ b/bin/gitIsAncestorOf @@ -1491,7 +1491,7 @@ gitIsAncestorOfCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1542,7 +1542,7 @@ gitIsAncestorOfCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1588,7 +1588,7 @@ gitIsAncestorOfCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -1659,7 +1659,6 @@ gitIsAncestorOfCommandParse() { # Argument 1/2 - claimedBranchArg # Argument claimedBranchArg min 1 max 1 - # Argument claimedBranchArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountClaimedBranchArg >= 1 )); then @@ -1673,7 +1672,6 @@ gitIsAncestorOfCommandParse() { # Argument 2/2 - refArg # Argument refArg min 1 max 1 - # Argument refArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex1 && options_parse_parsedArgIndex < maxParsedArgIndex2 )); then if ((options_parse_argParsedCountRefArg >= 1 )); then @@ -1760,14 +1758,14 @@ gitIsAncestorOfCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}claimedBranch${__HELP_NORMAL} {single} (mandatory) - " + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}claimedBranch${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The branch in which the ref will be searched." - echo - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}ref${__HELP_NORMAL} {single} (mandatory) - " + echo + + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}ref${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The ref to check." - echo + echo + # ------------------------------------------ # options section # ------------------------------------------ @@ -1778,69 +1776,77 @@ gitIsAncestorOfCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -1849,12 +1855,10 @@ gitIsAncestorOfCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/bin/gitIsBranch b/bin/gitIsBranch index 4ab4d29e..6a4bfa31 100755 --- a/bin/gitIsBranch +++ b/bin/gitIsBranch @@ -1486,7 +1486,7 @@ gitIsBranchCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1537,7 +1537,7 @@ gitIsBranchCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1583,7 +1583,7 @@ gitIsBranchCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -1652,7 +1652,6 @@ gitIsBranchCommandParse() { # Argument 1/1 - branchNameArg # Argument branchNameArg min 1 max 1 - # Argument branchNameArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountBranchNameArg >= 1 )); then @@ -1734,10 +1733,10 @@ gitIsBranchCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}branchName${__HELP_NORMAL} {single} (mandatory) - " + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}branchName${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The branch name to check." - echo + echo + # ------------------------------------------ # options section # ------------------------------------------ @@ -1748,69 +1747,77 @@ gitIsBranchCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -1819,12 +1826,10 @@ gitIsBranchCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/bin/gitRenameBranch b/bin/gitRenameBranch index ef6c4ee7..5ac67014 100755 --- a/bin/gitRenameBranch +++ b/bin/gitRenameBranch @@ -1549,7 +1549,7 @@ gitRenameBranchCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1600,7 +1600,7 @@ gitRenameBranchCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1646,7 +1646,7 @@ gitRenameBranchCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -1759,7 +1759,6 @@ gitRenameBranchCommandParse() { # Argument 1/2 - newBranchNameArg # Argument newBranchNameArg min 1 max 1 - # Argument newBranchNameArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountNewBranchNameArg >= 1 )); then @@ -1773,7 +1772,6 @@ gitRenameBranchCommandParse() { # Argument 2/2 - oldBranchNameArg # Argument oldBranchNameArg min 0 max 1 - # Argument oldBranchNameArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex1 && options_parse_parsedArgIndex < maxParsedArgIndex2 )); then if ((options_parse_argParsedCountOldBranchNameArg >= 1 )); then @@ -1860,14 +1858,14 @@ gitRenameBranchCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}newBranchName${__HELP_NORMAL} {single} (mandatory) - " + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}newBranchName${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The new branch name." - echo - Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}oldBranchName${__HELP_NORMAL} {single}] - " + echo + + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}oldBranchName${__HELP_NORMAL} {single}]" Array::wrap2 ' ' 76 4 " " "The name of the old branch if not current one." - echo + echo + # ------------------------------------------ # options section # ------------------------------------------ @@ -1878,69 +1876,77 @@ gitRenameBranchCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -1949,12 +1955,10 @@ gitRenameBranchCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - echo echo -e "${__HELP_TITLE_COLOR}OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--assume-yes${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}--yes${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-y${__HELP_NORMAL} {single}" @@ -1962,18 +1966,15 @@ gitRenameBranchCommandHelp() { - echo -e " ${__HELP_OPTION_COLOR}--push${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-p${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Push the new branch." echo - echo -e " ${__HELP_OPTION_COLOR}--delete${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-d${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Delete the old remote branch." echo - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/bin/installRequirements b/bin/installRequirements index 6452910f..56732489 100755 --- a/bin/installRequirements +++ b/bin/installRequirements @@ -1411,7 +1411,7 @@ installRequirementsCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1462,7 +1462,7 @@ installRequirementsCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1508,7 +1508,7 @@ installRequirementsCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -1616,69 +1616,77 @@ installRequirementsCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -1687,12 +1695,10 @@ installRequirementsCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/bin/mysql2puml b/bin/mysql2puml index 79e5830d..fcec3383 100755 --- a/bin/mysql2puml +++ b/bin/mysql2puml @@ -1573,7 +1573,7 @@ mysql2pumlCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1624,7 +1624,7 @@ mysql2pumlCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1670,7 +1670,7 @@ mysql2pumlCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -1760,7 +1760,6 @@ mysql2pumlCommandParse() { # Argument 1/1 - inputSqlFile # Argument inputSqlFile min 0 max 1 - # Argument inputSqlFile authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountInputSqlFile >= 1 )); then @@ -1824,10 +1823,10 @@ mysql2pumlCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}sqlFile${__HELP_NORMAL} {single}] - " + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}sqlFile${__HELP_NORMAL} {single}]" Array::wrap2 ' ' 76 4 " " "Sql filepath to parse (read from stdin if not provided)." - echo + echo + # ------------------------------------------ # options section # ------------------------------------------ @@ -1838,69 +1837,77 @@ mysql2pumlCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -1909,19 +1916,16 @@ mysql2pumlCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - echo echo -e "${__HELP_TITLE_COLOR}OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--skin ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Header configuration of the plantuml file." echo - Array::wrap2 ' ' 76 6 " Default value: " "default" echo # ------------------------------------------ diff --git a/bin/postmanCli b/bin/postmanCli index 2eebe51d..44ecf2e5 100755 --- a/bin/postmanCli +++ b/bin/postmanCli @@ -2121,7 +2121,7 @@ postmanCliCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2172,7 +2172,7 @@ postmanCliCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -2218,7 +2218,7 @@ postmanCliCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -2305,9 +2305,13 @@ postmanCliCommandParse() { # Argument 1/2 - argCommand # Argument argCommand min 0 max 1 - # Argument argCommand authorizedValues: + # Argument argCommand authorizedValues: pull|push elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then + if [[ ! "${options_parse_arg}" =~ pull|push ]]; then + Log::displayError "Command ${SCRIPT_NAME} - Argument command - value '${options_parse_arg}' is not part of authorized values(pull, push)" + return 1 + fi if ((options_parse_argParsedCountArgCommand >= 1 )); then Log::displayError "Command ${SCRIPT_NAME} - Argument command - Maximum number of argument occurrences reached(1)" return 1 @@ -2319,7 +2323,6 @@ postmanCliCommandParse() { # Argument 2/2 - commandArgs # Argument commandArgs min 0 max -1 - # Argument commandArgs authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex1 )); then ((++options_parse_argParsedCountCommandArgs)) # shellcheck disable=SC2034 @@ -2378,14 +2381,20 @@ postmanCliCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}command${__HELP_NORMAL} {single}] - " + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}command${__HELP_NORMAL} {single}]" argCommandHelpFunction - Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}ref${__HELP_NORMAL} {list} (optional)] - " + + echo " Possible values:" + Array::wrap2 ' ' 76 8 " - ${__OPTION_COLOR}pull:${__RESET_COLOR} Pull" + echo + Array::wrap2 ' ' 76 8 " - ${__OPTION_COLOR}push:${__RESET_COLOR} Push" + echo + + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}ref${__HELP_NORMAL} {list} (optional)]" commandArgsHelpFunction + # ------------------------------------------ # options section # ------------------------------------------ @@ -2396,69 +2405,77 @@ postmanCliCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -2467,19 +2484,16 @@ postmanCliCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - echo echo -e "${__HELP_TITLE_COLOR}PUSH/PULL OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--postman-model${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-m ${__HELP_NORMAL} {single}" optionPostmanModelConfigHelpFunction - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/bin/upgradeGithubRelease b/bin/upgradeGithubRelease index 5c62a189..28f6a289 100755 --- a/bin/upgradeGithubRelease +++ b/bin/upgradeGithubRelease @@ -1879,7 +1879,7 @@ upgradeGithubReleaseCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1930,7 +1930,7 @@ upgradeGithubReleaseCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1976,7 +1976,7 @@ upgradeGithubReleaseCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -2104,7 +2104,6 @@ upgradeGithubReleaseCommandParse() { # Argument 1/2 - targetFileArg # Argument targetFileArg min 1 max 1 - # Argument targetFileArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountTargetFileArg >= 1 )); then @@ -2119,7 +2118,6 @@ upgradeGithubReleaseCommandParse() { # Argument 2/2 - githubUrlPatternArg # Argument githubUrlPatternArg min 1 max 1 - # Argument githubUrlPatternArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex1 && options_parse_parsedArgIndex < maxParsedArgIndex2 )); then if ((options_parse_argParsedCountGithubUrlPatternArg >= 1 )); then @@ -2208,14 +2206,14 @@ upgradeGithubReleaseCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}targetFile${__HELP_NORMAL} {single} (mandatory) - " + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}targetFile${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The binary downloaded will be written to this file path. Ensure the path is writable." - echo - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}githubUrlPattern${__HELP_NORMAL} {single} (mandatory) - " + echo + + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}githubUrlPattern${__HELP_NORMAL} {single} (mandatory)" githubUrlPatternHelpFunction + # ------------------------------------------ # options section # ------------------------------------------ @@ -2226,69 +2224,77 @@ upgradeGithubReleaseCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -2297,19 +2303,16 @@ upgradeGithubReleaseCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - echo echo -e "${__HELP_TITLE_COLOR}VERSION MANAGEMENT:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--version-arg ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "The argument that will be provided to the currently installed binary" "to check the version of the software. See options constraints below." "" echo - Array::wrap2 ' ' 76 6 " Default value: " "--version" echo @@ -2318,12 +2321,10 @@ upgradeGithubReleaseCommandHelp() { - echo -e " ${__HELP_OPTION_COLOR}--exact-version${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-e ${__HELP_NORMAL} {single}" exactVersionHelpFunction - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/bin/waitForIt b/bin/waitForIt index 3a5dbfc9..e832ee7b 100755 --- a/bin/waitForIt +++ b/bin/waitForIt @@ -1592,7 +1592,7 @@ waitForItCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1643,7 +1643,7 @@ waitForItCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1689,7 +1689,7 @@ waitForItCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -1794,7 +1794,6 @@ waitForItCommandParse() { # Argument 1/3 - hostOrIpArg # Argument hostOrIpArg min 1 max 1 - # Argument hostOrIpArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountHostOrIpArg >= 1 )); then @@ -1808,7 +1807,6 @@ waitForItCommandParse() { # Argument 2/3 - portArg # Argument portArg min 1 max 1 - # Argument portArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex1 && options_parse_parsedArgIndex < maxParsedArgIndex2 )); then if ((options_parse_argParsedCountPortArg >= 1 )); then @@ -1823,7 +1821,6 @@ waitForItCommandParse() { # Argument 3/3 - commandArgs # Argument commandArgs min 0 max -1 - # Argument commandArgs authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex2 )); then ((++options_parse_argParsedCountCommandArgs)) # shellcheck disable=SC2034 @@ -1909,18 +1906,18 @@ waitForItCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}hostOrIp${__HELP_NORMAL} {single} (mandatory) - " + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}hostOrIp${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "Host or IP under test." - echo - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}port${__HELP_NORMAL} {single} (mandatory) - " + echo + + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}port${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "TCP port under test." - echo - Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}commandArgs${__HELP_NORMAL} {list} (optional)] - " + echo + + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}commandArgs${__HELP_NORMAL} {list} (optional)]" Array::wrap2 ' ' 76 4 " " "Execute command with args after the test finishes or exit with status code if no command provided." - echo + echo + # ------------------------------------------ # options section # ------------------------------------------ @@ -1930,7 +1927,6 @@ waitForItCommandHelp() { Array::wrap2 ' ' 76 4 " " "Timeout in seconds, zero for no timeout." echo - Array::wrap2 ' ' 76 6 " Default value: " "15" echo @@ -1938,7 +1934,6 @@ waitForItCommandHelp() { Array::wrap2 ' ' 76 4 " " "Execute sub-command even if timeout is reached." echo - echo echo -e "${__HELP_TITLE_COLOR}GLOBAL OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--help${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-h${__HELP_NORMAL} {single}" @@ -1946,69 +1941,77 @@ waitForItCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -2017,12 +2020,10 @@ waitForItCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - echo echo -e "${__HELP_TITLE_COLOR}OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--algorithm${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}--algo ${__HELP_NORMAL} {single}" @@ -2030,12 +2031,10 @@ waitForItCommandHelp() { - echo -e " ${__HELP_OPTION_COLOR}--user-nc${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Legacy mode using nc command or while loop (uses timeout command by default)." echo - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/bin/waitForMysql b/bin/waitForMysql index afd01c54..d271b2a3 100755 --- a/bin/waitForMysql +++ b/bin/waitForMysql @@ -1541,7 +1541,7 @@ waitForMysqlCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1592,7 +1592,7 @@ waitForMysqlCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1638,7 +1638,7 @@ waitForMysqlCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -1712,7 +1712,6 @@ waitForMysqlCommandParse() { # Argument 1/5 - mysqlHostArg # Argument mysqlHostArg min 1 max 1 - # Argument mysqlHostArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex0 && options_parse_parsedArgIndex < maxParsedArgIndex1 )); then if ((options_parse_argParsedCountMysqlHostArg >= 1 )); then @@ -1726,7 +1725,6 @@ waitForMysqlCommandParse() { # Argument 2/5 - mysqlPortArg # Argument mysqlPortArg min 1 max 1 - # Argument mysqlPortArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex1 && options_parse_parsedArgIndex < maxParsedArgIndex2 )); then if ((options_parse_argParsedCountMysqlPortArg >= 1 )); then @@ -1741,7 +1739,6 @@ waitForMysqlCommandParse() { # Argument 3/5 - mysqlUserArg # Argument mysqlUserArg min 1 max 1 - # Argument mysqlUserArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex2 && options_parse_parsedArgIndex < maxParsedArgIndex3 )); then if ((options_parse_argParsedCountMysqlUserArg >= 1 )); then @@ -1755,7 +1752,6 @@ waitForMysqlCommandParse() { # Argument 4/5 - mysqlPasswordArg # Argument mysqlPasswordArg min 1 max 1 - # Argument mysqlPasswordArg authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex3 && options_parse_parsedArgIndex < maxParsedArgIndex4 )); then if ((options_parse_argParsedCountMysqlPasswordArg >= 1 )); then @@ -1769,7 +1765,6 @@ waitForMysqlCommandParse() { # Argument 5/5 - commandArgs # Argument commandArgs min 0 max -1 - # Argument commandArgs authorizedValues: elif (( options_parse_parsedArgIndex >= minParsedArgIndex4 )); then ((++options_parse_argParsedCountCommandArgs)) # shellcheck disable=SC2034 @@ -1861,26 +1856,26 @@ waitForMysqlCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}ARGUMENTS:${__RESET_COLOR}" - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}mysqlHost${__HELP_NORMAL} {single} (mandatory) - " + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}mysqlHost${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "Mysql host name." - echo - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}mysqlPort${__HELP_NORMAL} {single} (mandatory) - " + echo + + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}mysqlPort${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "Mysql port." - echo - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}mysqlUser${__HELP_NORMAL} {single} (mandatory) - " + echo + + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}mysqlUser${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "Mysql user name." - echo - Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}mysqlPassword${__HELP_NORMAL} {single} (mandatory) - " + echo + + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}mysqlPassword${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "Mysql user password." - echo - Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}commandArgs${__HELP_NORMAL} {list} (optional)] - " + echo + + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}commandArgs${__HELP_NORMAL} {list} (optional)]" Array::wrap2 ' ' 76 4 " " "Execute command with args after the test finishes or exit with status code if no command provided." - echo + echo + # ------------------------------------------ # options section # ------------------------------------------ @@ -1890,7 +1885,6 @@ waitForMysqlCommandHelp() { Array::wrap2 ' ' 76 4 " " "Timeout in seconds, zero for no timeout." echo - Array::wrap2 ' ' 76 6 " Default value: " "15" echo @@ -1898,7 +1892,6 @@ waitForMysqlCommandHelp() { Array::wrap2 ' ' 76 4 " " "Execute sub-command even if timeout is reached." echo - echo echo -e "${__HELP_TITLE_COLOR}GLOBAL OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--help${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-h${__HELP_NORMAL} {single}" @@ -1906,69 +1899,77 @@ waitForMysqlCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -1977,12 +1978,10 @@ waitForMysqlCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/conf/dbScripts/extractData b/conf/dbScripts/extractData index e8c8111b..6dff9821 100755 --- a/conf/dbScripts/extractData +++ b/conf/dbScripts/extractData @@ -1780,7 +1780,7 @@ extractDataCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1831,7 +1831,7 @@ extractDataCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1877,7 +1877,7 @@ extractDataCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -1985,69 +1985,77 @@ extractDataCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -2056,12 +2064,10 @@ extractDataCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - # ------------------------------------------ # version section # ------------------------------------------ diff --git a/install b/install index 884310ae..653a0668 100755 --- a/install +++ b/install @@ -1400,7 +1400,7 @@ installCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1451,7 +1451,7 @@ installCommandParse() { return 1 fi if [[ ! "$1" =~ OFF|ERR|ERROR|WARN|WARNING|INFO|DEBUG|TRACE ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([OFF ERR ERROR WARN WARNING INFO DEBUG TRACE])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE)" return 1 fi @@ -1497,7 +1497,7 @@ installCommandParse() { return 1 fi if [[ ! "$1" =~ default|default-force|noColor ]]; then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values([default default-force noColor])" + Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - value '$1' is not part of authorized values(default, default-force, noColor)" return 1 fi @@ -1619,69 +1619,77 @@ installCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--config${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Displays configuration" echo - echo -e " ${__HELP_OPTION_COLOR}--bash-framework-config ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Use alternate bash framework configuration." echo - echo -e " ${__HELP_OPTION_COLOR}--verbose${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-v${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Info level verbose mode (alias of --display-level INFO)" echo - echo -e " ${__HELP_OPTION_COLOR}-vv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Debug level verbose mode (alias of --display-level DEBUG)" echo - echo -e " ${__HELP_OPTION_COLOR}-vvv${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Trace level verbose mode (alias of --display-level TRACE)" echo - echo -e " ${__HELP_OPTION_COLOR}--log-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--log-file ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set log file" echo - echo -e " ${__HELP_OPTION_COLOR}--display-level ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Set display level" echo - Array::wrap2 ' ' 76 6 " Possible values: " "OFF, " "ERR, " "ERROR, " "WARN, " "WARNING, " "INFO, " "DEBUG, " "TRACE" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}OFF${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}ERROR${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARN${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}WARNING${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}INFO${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}DEBUG${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}TRACE${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--no-color${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Produce monochrome output. alias of --theme noColor." echo - echo -e " ${__HELP_OPTION_COLOR}--theme ${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Choose color theme - default-force means colors will be produced even if command is piped." echo - Array::wrap2 ' ' 76 6 " Possible values: " "default, " "default-force, " "noColor" - echo + echo " Possible values: " + echo -e " - ${__OPTION_COLOR}default${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}default-force${__RESET_COLOR}" + echo -e " - ${__OPTION_COLOR}noColor${__RESET_COLOR}" Array::wrap2 ' ' 76 6 " Default value: " "default" echo @@ -1690,19 +1698,16 @@ installCommandHelp() { echo - echo -e " ${__HELP_OPTION_COLOR}--quiet${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}-q${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "Quiet mode, doesn't display any output." echo - echo echo -e "${__HELP_TITLE_COLOR}OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--skip-backup${__HELP_NORMAL} {single}" Array::wrap2 ' ' 76 4 " " "skip backup of ~/bash-tools." echo - # ------------------------------------------ # longDescription section # ------------------------------------------ diff --git a/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.help.txt b/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.help.txt index 9b759192..88c0be89 100644 --- a/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.help.txt +++ b/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.help.txt @@ -9,8 +9,7 @@ [--quiet|-q] [--skin ] ARGUMENTS: - [sqlFile {single}] - Sql filepath to parse (read from stdin if not provided). + [sqlFile {single}] Sql filepath to parse (read from stdin if not provided). GLOBAL OPTIONS: --help, -h {single} @@ -27,18 +26,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.svg b/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.svg index 35dbbd03..6b7ce65c 100644 --- a/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.svg +++ b/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.svg @@ -1 +1 @@ -customer id : int11identifier : varchar128created_at : datetime6updated_at : datetime6learner id : int10 unsignedcustomer_id : int11external_id : varchar255created_at : datetime6updated_at : datetime6learner_attribute id : int11attribute_id : int10 unsignedlearner_id : int10 unsignedcreated_at : datetime6interest : doublelevel : doubleupdated_at : datetime6attribute id : int10 unsignedmapped_attribute_id : int10 unsignedinternal_id : int11created_at : datetime6translations : jsonupdated_at : datetime6product id : int10 unsignedcustomer_id : int11external_id : int10 unsignedcreated_at : datetime6updated_at : datetime6product_attribute id : int11attribute_id : int10 unsignedtraining_course_id : int10 unsignedcreated_at : datetime6relevance : doubleupdated_at : datetime6id0..*1id0..*1id0..*1id0..*1id0..*1id0..*1id0..*1 +customer id : int11identifier : varchar128created_at : datetime6updated_at : datetime6learner id : int10 unsignedcustomer_id : int11external_id : varchar255created_at : datetime6updated_at : datetime6learner_attribute id : int11attribute_id : int10 unsignedlearner_id : int10 unsignedcreated_at : datetime6interest : doublelevel : doubleupdated_at : datetime6attribute id : int10 unsignedmapped_attribute_id : int10 unsignedinternal_id : int11created_at : datetime6translations : jsonupdated_at : datetime6product id : int10 unsignedcustomer_id : int11external_id : int10 unsignedcreated_at : datetime6updated_at : datetime6product_attribute id : int11attribute_id : int10 unsignedtraining_course_id : int10 unsignedcreated_at : datetime6relevance : doubleupdated_at : datetime6id0..*1id0..*1id0..*1id0..*1id0..*1id0..*1id0..*1 diff --git a/src/_binaries/Converters/mysql2puml/testsData/mysql2pumlSkins/default.png b/src/_binaries/Converters/mysql2puml/testsData/mysql2pumlSkins/default.png index c27f2fa4bb2b4c28ce42ae1cc08e0677090d2b08..0205cf6f941d096b7457d65d8d29a314eb34badd 100644 GIT binary patch delta 805 zcmV+=1KRwy2ek)~S^+7MTOxmX>8iDg0JWoKYJrxO(yx;t2UsLd=GaB-*YE6v7S_Sm z6$#n#-97jCd@mP?Vp8caa1KF>Nfd@C6sS2uzy-n>gJ=nS3adyTN(7y7F#}SIwL%F? zuI9i%qT+&q&yzS{D?&;ZT*OSW5d4_Kr&`U)O$lA`NWdc-2UyGt7Gi(N0mzZDmIB;K zz>)-9I07r9)rCd_ijU=kPUn(-C1|x=Cx^mcW09w&;Y2*6z=vrhA(lL3as>-CJZ2J6 z5Z!p^*ek`1IkUOePUs%g98ez6%`$8&t_qha%-#hP+zEW-&@l*QH&&NY`n$ zrtq}47t05X!Us)oU59_Z58*0}kL5;kifWM{ph+5ot_y{NL4q88cDfc~3#4JM;Ysvc zjRHZm8dZBjF(Ew+65IjU+z&VoH10+GJA@7ME{r!eg^&xKWD3IP)9vV(@R}3>KA{(0 z$H|;p8h4{!?+uY`b7auROzd>Nskfg+`jp!ovNOYCba(S@biIF<2h%=}j*}QCO6u?f zl(MpdRFMl?os!SyD$DHRpj(Cx{l}4-mno42ZYSWY53u0*G_i-o%}8I$%}dMAJof$a17n)&HBlfAVHC`Cabbho7eTzdG0jxM92X(CbE+D*oQ*=w+$j zDmF`iJu_}A#G`-n1}Cq)Wp-mWS$OUH-u=T%5td;|W|-v(C);dmpPbgY3WMxu68WYx z7Hzj}w@aptBYLEwVy{}I6clDoRH*q^ZLh|pV$2Wv)Ips&_Yp!=^TU-QA2N=i+~5I(;1f1$1C;GV1r>ncBZ; z^YzL}?c}s_Rva<~LyVzz2KBmEKlkcqFnVl*5tp3e*Fg`GNXrSDnoM1geaX3{CxHh| z^g{~ReT?Gvs=GdbYw^rwB+OuSZlC(E3ZGApzi{JG5)*jpJ6AYmI#6Umk3oahBk!H# jbEn6|OtTdkVWV)`5#h=e$%f7^uIWydHI_6YlZ^u@@~n#u delta 806 zcmV+>1KIqw2et>0S^+ANTOxmfwy2sSK<#LmTA*d6?CWI60TzjqId&2I^*cL(!aCTx zA|X4zyXPLC@8v2{Oe!4)&M{~)iNX+t0yRenxIh?V5G{dEVHN3PiJ%iMWz6Qawz;Y7I|74PQ)_`e3(WOV#z}$SFk|CVB*@Wcr)wd0KpOTMoJ2Nas4|iWjw+DZDFzxf`G>LJdqz*qo zDJv^T6}hn0Dfw)!vdk_Hx@G9le;lcKnG#vxZUVmg01KW^6MIP9jC50OURr)8&)=V* zTNlx-tz@;3TMmsvmLrX-{@?8VlQ)~m?{fD({4~w~)xkc%E!&-kUN^#2@%KJQFH8Ma zu~`D_g>hRU9-V(TICa$4sq46>t1F+b{42X*G$M+i~PBR@$$5*iQ~nOsVo z*Lh$qua%N~OcUge%4^7fBGepmN0WyuPU=^5cQcZltIdCO`Z)dubYN~W>i6J<+P`V@ zXO;8XdA(9E4w-`MSVHX*&g$O9g?C`V-)u{-Sq+7iWe>;VFs&n|E>S3a9Kb7%oPk#5)=5=cW!XXbfCzB9)kw0N8UT9 kpPU{OGtCxegpI;!M}#X^BpW)v0Hq2}hNZ8Hi<684Da|x`3;+NC diff --git a/src/_binaries/Converters/mysql2puml/testsData/mysql2pumlSkins/default.svg b/src/_binaries/Converters/mysql2puml/testsData/mysql2pumlSkins/default.svg index d10d03a9..db2c1b79 100644 --- a/src/_binaries/Converters/mysql2puml/testsData/mysql2pumlSkins/default.svg +++ b/src/_binaries/Converters/mysql2puml/testsData/mysql2pumlSkins/default.svg @@ -1 +1 @@ - + diff --git a/src/_binaries/Database/dbImport/testsData/dbImport.help.txt b/src/_binaries/Database/dbImport/testsData/dbImport.help.txt index 0e8602cc..709ae77b 100644 --- a/src/_binaries/Database/dbImport/testsData/dbImport.help.txt +++ b/src/_binaries/Database/dbImport/testsData/dbImport.help.txt @@ -12,10 +12,8 @@ [--quiet|-q] ARGUMENTS: - fromDbName {single} (mandatory) - The name of the source/remote database. - [ {single}] - The name of the target database + fromDbName {single} (mandatory) The name of the source/remote database. + [ {single}] The name of the target database Default value: (without extension) @@ -63,18 +61,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Database/dbImportProfile/testsData/dbImportProfile.help.txt b/src/_binaries/Database/dbImportProfile/testsData/dbImportProfile.help.txt index 0975e6f8..036e1094 100644 --- a/src/_binaries/Database/dbImportProfile/testsData/dbImportProfile.help.txt +++ b/src/_binaries/Database/dbImportProfile/testsData/dbImportProfile.help.txt @@ -10,8 +10,7 @@ [--quiet|-q] ARGUMENTS: - fromDbName {single} (mandatory) - The name of the source/remote database. + fromDbName {single} (mandatory) The name of the source/remote database. PROFILE OPTIONS: --ratio, -r  {single} @@ -45,18 +44,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Database/dbImportStream/testsData/dbImportStream.help.txt b/src/_binaries/Database/dbImportStream/testsData/dbImportStream.help.txt index 6f0e9cf6..7d6d1838 100644 --- a/src/_binaries/Database/dbImportStream/testsData/dbImportStream.help.txt +++ b/src/_binaries/Database/dbImportStream/testsData/dbImportStream.help.txt @@ -11,10 +11,8 @@ [--quiet|-q] ARGUMENTS: - argDumpFile {single} (mandatory) - The file that will be streamed through mysql. - argTargetDbName {single} (mandatory) - The name of the mysql target database. + argDumpFile {single} (mandatory) The file that will be streamed through mysql. + argTargetDbName {single} (mandatory) The name of the mysql target database. PROFILE OPTIONS: --profile, -p  {single} @@ -46,18 +44,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Database/dbQueryAllDatabases/testsData/dbQueryAllDatabases.help.txt b/src/_binaries/Database/dbQueryAllDatabases/testsData/dbQueryAllDatabases.help.txt index 70c974d5..a5988178 100644 --- a/src/_binaries/Database/dbQueryAllDatabases/testsData/dbQueryAllDatabases.help.txt +++ b/src/_binaries/Database/dbQueryAllDatabases/testsData/dbQueryAllDatabases.help.txt @@ -11,8 +11,7 @@ [--quiet|-q] [--separator|-s ] ARGUMENTS: - argQuery {single} (mandatory) - Query to execute + argQuery {single} (mandatory) Query to execute - , try to execute the mysql query provided by the file - , search for query file in @@ -47,18 +46,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Database/dbScriptAllDatabases/dbScriptAllDatabases-binary.yaml b/src/_binaries/Database/dbScriptAllDatabases/dbScriptAllDatabases-binary.yaml index 9a9d8b5a..99437851 100644 --- a/src/_binaries/Database/dbScriptAllDatabases/dbScriptAllDatabases-binary.yaml +++ b/src/_binaries/Database/dbScriptAllDatabases/dbScriptAllDatabases-binary.yaml @@ -3,7 +3,6 @@ extends: - "${BASH_TOOLS_ROOT_DIR}/src/_binaries/commandDefinitions/optionsFromDsn.yaml" - "${BASH_TOOLS_ROOT_DIR}/src/_binaries/commandDefinitions/optionsVersion.yaml" - "${BASH_TOOLS_ROOT_DIR}/src/_binaries/commandDefinitions/optionsDefault.yaml" - - "${BASH_TOOLS_ROOT_DIR}/src/_binaries/commandDefinitions/optionsDefault.yaml" - "${FRAMEWORK_ROOT_DIR}/src/_binaries/commandDefinitions/defaultCommand.yaml" - "${FRAMEWORK_ROOT_DIR}/src/_binaries/commandDefinitions/frameworkConfig.yaml" @@ -78,9 +77,9 @@ binData: type: String help: If output dir provided, will log each db result to log file. helpValueName: logFormat - authorizedValuesList: - - none - - log + authorizedValues: + - value: none + - value: log defaultValue: none callbacks: - outputDirectoryCallback diff --git a/src/_binaries/Database/dbScriptAllDatabases/testsData/dbScriptAllDatabases.help.txt b/src/_binaries/Database/dbScriptAllDatabases/testsData/dbScriptAllDatabases.help.txt index 4c699c78..d48cd093 100644 --- a/src/_binaries/Database/dbScriptAllDatabases/testsData/dbScriptAllDatabases.help.txt +++ b/src/_binaries/Database/dbScriptAllDatabases/testsData/dbScriptAllDatabases.help.txt @@ -12,10 +12,8 @@ [--log-format|-l ] ARGUMENTS: - scriptToExecute {single} (mandatory) - The script that will be executed on each databases. - [scriptArguments {list} (optional)] - Optional parameters to pass to the script. + scriptToExecute {single} (mandatory) The script that will be executed on each databases. + [scriptArguments {list} (optional)] Optional parameters to pass to the script. JOB OPTIONS: --jobs, -j  {single} @@ -44,18 +42,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. @@ -70,7 +87,9 @@ Output directory, see log-format option. --log-format, -l  {single} If output dir provided, will log each db result to log file. - Possible values: none, log + Possible values: + - none + - log Default value: none diff --git a/src/_binaries/Docker/cli/testsData/cli.help.txt b/src/_binaries/Docker/cli/testsData/cli.help.txt index aced4feb..edb7108c 100644 --- a/src/_binaries/Docker/cli/testsData/cli.help.txt +++ b/src/_binaries/Docker/cli/testsData/cli.help.txt @@ -9,23 +9,20 @@ [--quiet|-q] ARGUMENTS: - [container {single}] - Container should be the name of a profile from profile list, + [container {single}] Container should be the name of a profile from profile list, check containers list below. If no value provided, it will load the container specified in default configuration. Default: project-apache2 - [user {single}] - user to connect on this container + [user {single}] user to connect on this container If no value provided, it will load the user specified in default configuration. Default: www-data - [command {single}] - The command to execute + [command {single}] The command to execute If no value provided, it will load the command specified in default configuration. @@ -47,18 +44,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Git/gitIsAncestorOf/testsData/gitIsAncestorOf.help.txt b/src/_binaries/Git/gitIsAncestorOf/testsData/gitIsAncestorOf.help.txt index b7a62a3e..d76b4354 100644 --- a/src/_binaries/Git/gitIsAncestorOf/testsData/gitIsAncestorOf.help.txt +++ b/src/_binaries/Git/gitIsAncestorOf/testsData/gitIsAncestorOf.help.txt @@ -9,10 +9,8 @@ [--quiet|-q] ARGUMENTS: - claimedBranch {single} (mandatory) - The branch in which the ref will be searched. - ref {single} (mandatory) - The ref to check. + claimedBranch {single} (mandatory) The branch in which the ref will be searched. + ref {single} (mandatory) The ref to check. GLOBAL OPTIONS: --help, -h {single} @@ -29,18 +27,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Git/gitIsBranch/testsData/gitIsBranch.help.txt b/src/_binaries/Git/gitIsBranch/testsData/gitIsBranch.help.txt index 1d03b7b8..df54d8f5 100644 --- a/src/_binaries/Git/gitIsBranch/testsData/gitIsBranch.help.txt +++ b/src/_binaries/Git/gitIsBranch/testsData/gitIsBranch.help.txt @@ -9,8 +9,7 @@ [--quiet|-q] ARGUMENTS: - branchName {single} (mandatory) - The branch name to check. + branchName {single} (mandatory) The branch name to check. GLOBAL OPTIONS: --help, -h {single} @@ -27,18 +26,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Git/gitRenameBranch/testsData/gitRenameBranch.help.txt b/src/_binaries/Git/gitRenameBranch/testsData/gitRenameBranch.help.txt index 23d53f7a..96659d93 100644 --- a/src/_binaries/Git/gitRenameBranch/testsData/gitRenameBranch.help.txt +++ b/src/_binaries/Git/gitRenameBranch/testsData/gitRenameBranch.help.txt @@ -9,10 +9,8 @@ [--quiet|-q] [--assume-yes|--yes|-y] [--push|-p] [--delete|-d] ARGUMENTS: - newBranchName {single} (mandatory) - The new branch name. - [oldBranchName {single}] - The name of the old branch if not current one. + newBranchName {single} (mandatory) The new branch name. + [oldBranchName {single}] The name of the old branch if not current one. GLOBAL OPTIONS: --help, -h {single} @@ -29,18 +27,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Github/upgradeGithubRelease/testsData/upgradeGithubRelease.help.txt b/src/_binaries/Github/upgradeGithubRelease/testsData/upgradeGithubRelease.help.txt index 38a220e6..d53dbad4 100644 --- a/src/_binaries/Github/upgradeGithubRelease/testsData/upgradeGithubRelease.help.txt +++ b/src/_binaries/Github/upgradeGithubRelease/testsData/upgradeGithubRelease.help.txt @@ -10,11 +10,9 @@ [--current-version|-c ] [--exact-version|-e ] ARGUMENTS: - targetFile {single} (mandatory) - The binary downloaded will be written to this file path. Ensure the path + targetFile {single} (mandatory) The binary downloaded will be written to this file path. Ensure the path is writable. - githubUrlPattern {single} (mandatory) - The url pattern to use to download the binary, see examples below. + githubUrlPattern {single} (mandatory) The url pattern to use to download the binary, see examples below. @version@ is template variable that will be replaced by the latest version tag found on github. @@ -33,18 +31,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Postman/postmanCli/testsData/postmanCli.help.txt b/src/_binaries/Postman/postmanCli/testsData/postmanCli.help.txt index 21ba2db6..2ea3f858 100644 --- a/src/_binaries/Postman/postmanCli/testsData/postmanCli.help.txt +++ b/src/_binaries/Postman/postmanCli/testsData/postmanCli.help.txt @@ -9,13 +9,14 @@ [--quiet|-q] [--postman-model|-m ] ARGUMENTS: - [command {single}] - pull + [command {single}] pull Pull collections from Postman back to repositories. push Push repositories collections to Postman. - [ref {list} (optional)] - List of postman collection's references to pull or push + Possible values: + - pull: Pull + - push: Push + [ref {list} (optional)] List of postman collection's references to pull or push or no argument to pull or push all the collections GLOBAL OPTIONS: @@ -33,18 +34,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Utils/waitForIt/testsData/waitForIt.help.txt b/src/_binaries/Utils/waitForIt/testsData/waitForIt.help.txt index 7a5d30b7..e576098b 100644 --- a/src/_binaries/Utils/waitForIt/testsData/waitForIt.help.txt +++ b/src/_binaries/Utils/waitForIt/testsData/waitForIt.help.txt @@ -10,12 +10,9 @@ [--quiet|-q] [--algorithm|--algo ] [--user-nc] ARGUMENTS: - hostOrIp {single} (mandatory) - Host or IP under test. - port {single} (mandatory) - TCP port under test. - [commandArgs {list} (optional)] - Execute command with args after the test finishes or exit with status co + hostOrIp {single} (mandatory) Host or IP under test. + port {single} (mandatory) TCP port under test. + [commandArgs {list} (optional)] Execute command with args after the test finishes or exit with status co de if no command provided. TIMEOUT OPTIONS: @@ -40,18 +37,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit. diff --git a/src/_binaries/Utils/waitForIt/waitForIt-binary.yaml b/src/_binaries/Utils/waitForIt/waitForIt-binary.yaml index 82975ce6..82717c03 100644 --- a/src/_binaries/Utils/waitForIt/waitForIt-binary.yaml +++ b/src/_binaries/Utils/waitForIt/waitForIt-binary.yaml @@ -2,7 +2,6 @@ extends: - "${BASH_TOOLS_ROOT_DIR}/src/_binaries/commandDefinitions/optionsTimeout.yaml" - "${BASH_TOOLS_ROOT_DIR}/src/_binaries/commandDefinitions/optionsVersion.yaml" - "${BASH_TOOLS_ROOT_DIR}/src/_binaries/commandDefinitions/optionsDefault.yaml" - - "${BASH_TOOLS_ROOT_DIR}/src/_binaries/commandDefinitions/optionsDefault.yaml" - "${FRAMEWORK_ROOT_DIR}/src/_binaries/commandDefinitions/defaultCommand.yaml" - "${FRAMEWORK_ROOT_DIR}/src/_binaries/commandDefinitions/frameworkConfig.yaml" diff --git a/src/_binaries/Utils/waitForMysql/testsData/waitForMysql.help.txt b/src/_binaries/Utils/waitForMysql/testsData/waitForMysql.help.txt index 88377118..c74ce7c5 100644 --- a/src/_binaries/Utils/waitForMysql/testsData/waitForMysql.help.txt +++ b/src/_binaries/Utils/waitForMysql/testsData/waitForMysql.help.txt @@ -10,16 +10,11 @@ [--quiet|-q] ARGUMENTS: - mysqlHost {single} (mandatory) - Mysql host name. - mysqlPort {single} (mandatory) - Mysql port. - mysqlUser {single} (mandatory) - Mysql user name. - mysqlPassword {single} (mandatory) - Mysql user password. - [commandArgs {list} (optional)] - Execute command with args after the test finishes or exit with status co + mysqlHost {single} (mandatory) Mysql host name. + mysqlPort {single} (mandatory) Mysql port. + mysqlUser {single} (mandatory) Mysql user name. + mysqlPassword {single} (mandatory) Mysql user password. + [commandArgs {list} (optional)] Execute command with args after the test finishes or exit with status co de if no command provided. TIMEOUT OPTIONS: @@ -44,18 +39,37 @@ Trace level verbose mode (alias of --display-level TRACE) --log-level  {single} Set log level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --log-file  {single} Set log file --display-level  {single} Set display level - Possible values: OFF, ERR, ERROR, WARN, WARNING, INFO, DEBUG, TRACE + Possible values: + - OFF + - ERR + - ERROR + - WARN + - WARNING + - INFO + - DEBUG + - TRACE --no-color {single} Produce monochrome output. alias of --theme noColor. --theme  {single} Choose color theme - default-force means colors will be produced even if command is piped. - Possible values: default, default-force, noColor + Possible values: + - default + - default-force + - noColor Default value: default --version {single} Print version information and quit.