Merge branch 'main' into command_help_2

See https://git.autonomic.zone/coop-cloud/docker-dind-bats-kcov.

CHANGELOG.md

@@ -1,10 +1,18 @@
 # abra x.x.x (UNRELEASED)
 
+- Avoid outputting length during secret generation when not in use ([#67](https://git.autonomic.zone/coop-cloud/abra/issues/67))
+- Support graceful failure when missing secret generation commands ([44d3ac3a1cb86edc9b9e91eea1a00e70eae14965](https://git.autonomic.zone/coop-cloud/abra/commit/44d3ac3a1cb86edc9b9e91eea1a00e70eae14965))
+- Fix secret detection when using new `.env` file format in apps ([55324524ca77141666ffe6cc41b62cc71cf89ace](https://git.autonomic.zone/coop-cloud/abra/commit/55324524ca77141666ffe6cc41b62cc71cf89ace))
+- Support choosing an `$EDITOR` when editing configs ([29cc392dff3e93e48e0e2edd3ce11b405c66a95a](https://git.autonomic.zone/coop-cloud/abra/commit/29cc392dff3e93e48e0e2edd3ce11b405c66a95a))
+- "server" shell completion fixed ([8839bd45951d00dccf4ef81ece445bcc49e13ee6](https://git.autonomic.zone/coop-cloud/abra/commit/8839bd45951d00dccf4ef81ece445bcc49e13ee6))
+- Make `-v` spit out the version ([0179f600f5ce40fc1520fc365f92b7cb6eeec1f5](https://git.autonomic.zone/coop-cloud/abra/commit/0179f600f5ce40fc1520fc365f92b7cb6eeec1f5))
 - Drop `multilogs` command ([#56](https://git.autonomic.zone/coop-cloud/abra/pulls/56))
 - Remove `server use` command ([#51](https://git.autonomic.zone/coop-cloud/abra/issues/51))
 - `new <app>` becomes `new <type>` ([#48](https://git.autonomic.zone/coop-cloud/abra/issues/48))
 - `check` is run on `deploy` now and configurable ([77ba5652b2fe15820f5edfa0f642636f7b8eae7e](https://git.autonomic.zone/coop-cloud/abra/commit/77ba5652b2fe15820f5edfa0f642636f7b8eae7e))
 - App configurations are always updated now ([#42](https://git.autonomic.zone/coop-cloud/abra/issues/42))
+- We use docker format `.env` files (no "export" syntax) from now now ([#55](https://git.autonomic.zone/coop-cloud/abra/pulls/55))
+- Rename `<domain>` option to `<app>` and `APP` variable to `TYPE`, see [#47](https://git.autonomic.zone/coop-cloud/abra/pulls/55)
 
 # abra 0.4.1 (2020-12-24)
 
@@ -14,7 +22,7 @@
 # abra 0.4.0 (2020-12-24)
 
 - New command-line interface based on docopt
-- ~/.abra directory instead of expecting local .env files
+- `~/.abra` directory instead of expecting local `.env` files
 - Integration tests & code coverage
 
 # abra 0.3.1 (2020-09-27)

Makefile

@@ -1,12 +1,30 @@
 .PHONY: test shellcheck docopt kcov codecov
 
-test:
+test_dind:
+	@sudo DOCKER_CONTEXT=default docker run \
+		-v $$(pwd):/workdir \
+		--privileged \
+		-d \
+		--name=abra-test-dind \
+		-e DOCKER_TLS_CERTDIR="" \
+		decentral1se/docker-dind-bats-kcov
+	@DOCKER_CONTEXT=default docker exec \
+		-it \
+		abra-test-dind \
+		sh -c "cd /workdir && bats /workdir/tests"
+	@DOCKER_CONTEXT=default docker stop abra-test-dind
+	@DOCKER_CONTEXT=default docker rm abra-test-dind
+
+test_docker:
 	@DOCKER_CONTEXT=default docker run \
 		-it \
 		--rm \
 		-v $$(pwd):/workdir \
-		docker:dind \
-		sh -c "apk add bats git bash && cd /workdir && bats /workdir/test.bats"
+		decentral1se/docker-dind-bats-kcov \
+		sh -c "cd /workdir && bats /workdir/tests"
+
+test_local:
+	bats tests
 
 shellcheck:
 	@docker run \

abra

@@ -2,6 +2,7 @@
 
 GIT_URL="https://git.autonomic.zone/coop-cloud/"
 ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
+ABRA_VERSION="0.4.1"
 
 #######################################
 # Global help
@@ -11,35 +12,35 @@ DOC="
 The cooperative cloud utility belt 🎩🐇
 
 Usage:
-  abra [options] app new [--server=<server>] [--domain=<domain>] [--pass] [--auto] <type>
+  abra [options] app new [--server=<server>] [--domain=<domain>] [--app-name=<app_name>] [--pass] [--auto] <type>
   abra [options] app (list|ls) [--status] [--server=<server>]
-  abra [options] app <domain> deploy [--skip-check]
-  abra [options] app <domain> undeploy
-  abra [options] app <domain> config
-  abra [options] app <domain> (delete|rm) [--force]
-  abra [options] app <domain> logs [<service>]
-  abra [options] app <domain> cp <src> <dst>
-  abra [options] app <domain> check
-  abra [options] app <domain> ps
-  abra [options] app <domain> run [--no-tty] [--user=<user>] <service> <args>...
-  abra [options] app <domain> run <service> <args>...
-  abra [options] app <domain> secret auto [--pass]
-  abra [options] app <domain> secret generate <secret> <version> [<cmd>] [--pass]
-  abra [options] app <domain> secret insert <secret> <version> <data> [--pass]
-  abra [options] app <domain> secret (delete|rm) (<secret>|--all) [--pass] [--force]
-  abra [options] app <domain> <command> [<args>...]
+  abra [options] app <app> deploy [--skip-check]
+  abra [options] app <app> undeploy
+  abra [options] app <app> config
+  abra [options] app <app> (delete|rm) [--force]
+  abra [options] app <app> logs [<service>]
+  abra [options] app <app> cp <src> <dst>
+  abra [options] app <app> check
+  abra [options] app <app> ps
+  abra [options] app <app> run [--no-tty] [--user=<user>] <service> <args>...
+  abra [options] app <app> secret auto [--pass]
+  abra [options] app <app> secret generate <secret> <version> [<cmd>] [--pass]
+  abra [options] app <app> secret insert <secret> <version> <data> [--pass]
+  abra [options] app <app> secret (delete|rm) (<secret>|--all) [--pass] [--force]
+  abra [options] app <app> <command> [<args>...]
   abra [options] server add <host> [<user>] [<port>]
   abra [options] server (list|ls)
   abra [options] server <host> rm
   abra [options] server <host> init
   abra [options] server <host> apps [--status]
   abra [options] upgrade
+  abra [options] version
+  abra [options] help [<subcommands>...]
 
 Options:
   -e, --env=<path>     Environment variables to load
   -h, --help           Show this message and exit
   -s, --stack=<stack>  Name of the target stack
-  -v, --version        Show program version
 
 See 'abra help <command>' to read about a specific subcommand.
 "
@@ -143,82 +144,86 @@ eval "var_$1+=($value)"; else eval "var_$1=$value"; fi; return 0; fi; done
 return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() {
 printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() {
 [[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() {
-printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1520}
-usage=${DOC:40:1212}; digest=7df47
-shorts=(-e -h -v -s '' '' '' '' '' '' '' '' '' '')
-longs=(--env --help --version --stack --server --domain --pass --auto --status --skip-check --force --no-tty --user --all)
-argcounts=(1 0 0 1 1 1 0 0 0 0 0 0 1 0); node_0(){ value __env 0; }; node_1(){
-switch __help 1; }; node_2(){ switch __version 2; }; node_3(){ value __stack 3
-}; node_4(){ value __server 4; }; node_5(){ value __domain 5; }; node_6(){
+printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1470}
+usage=${DOC:40:1206}; digest=b4523
+shorts=(-h -e -s '' '' '' '' '' '' '' '' '' '' '')
+longs=(--help --env --stack --server --domain --app-name --pass --auto --status --skip-check --force --no-tty --user --all)
+argcounts=(0 1 1 1 1 1 0 0 0 0 0 0 1 0); node_0(){ switch __help 0; }; node_1(){
+value __env 1; }; node_2(){ value __stack 2; }; node_3(){ value __server 3; }
+node_4(){ value __domain 4; }; node_5(){ value __app_name 5; }; node_6(){
 switch __pass 6; }; node_7(){ switch __auto 7; }; node_8(){ switch __status 8; }
 node_9(){ switch __skip_check 9; }; node_10(){ switch __force 10; }; node_11(){
 switch __no_tty 11; }; node_12(){ value __user 12; }; node_13(){ switch __all 13
-}; node_14(){ value _type_ a; }; node_15(){ value _domain_ a; }; node_16(){
+}; node_14(){ value _type_ a; }; node_15(){ value _app_ a; }; node_16(){
 value _service_ a; }; node_17(){ value _src_ a; }; node_18(){ value _dst_ a; }
 node_19(){ value _args_ a true; }; node_20(){ value _secret_ a; }; node_21(){
 value _version_ a; }; node_22(){ value _cmd_ a; }; node_23(){ value _data_ a; }
 node_24(){ value _command_ a; }; node_25(){ value _host_ a; }; node_26(){
-value _user_ a; }; node_27(){ value _port_ a; }; node_28(){ _command app; }
-node_29(){ _command new; }; node_30(){ _command list; }; node_31(){ _command ls
-}; node_32(){ _command deploy; }; node_33(){ _command undeploy; }; node_34(){
-_command config; }; node_35(){ _command delete; }; node_36(){ _command rm; }
-node_37(){ _command logs; }; node_38(){ _command cp; }; node_39(){
-_command check; }; node_40(){ _command ps; }; node_41(){ _command run; }
-node_42(){ _command secret; }; node_43(){ _command auto; }; node_44(){
-_command generate; }; node_45(){ _command insert; }; node_46(){ _command server
-}; node_47(){ _command add; }; node_48(){ _command init; }; node_49(){
-_command apps; }; node_50(){ _command upgrade; }; node_51(){ optional 0 1 2 3; }
-node_52(){ optional 51; }; node_53(){ optional 4; }; node_54(){ optional 5; }
-node_55(){ optional 6; }; node_56(){ optional 7; }; node_57(){
-required 52 28 29 53 54 55 56 14; }; node_58(){ either 30 31; }; node_59(){
-required 58; }; node_60(){ optional 8; }; node_61(){ required 52 28 59 60 53; }
-node_62(){ optional 9; }; node_63(){ required 52 28 15 32 62; }; node_64(){
-required 52 28 15 33; }; node_65(){ required 52 28 15 34; }; node_66(){
-either 35 36; }; node_67(){ required 66; }; node_68(){ optional 10; }
-node_69(){ required 52 28 15 67 68; }; node_70(){ optional 16; }; node_71(){
-required 52 28 15 37 70; }; node_72(){ required 52 28 15 38 17 18; }; node_73(){
-required 52 28 15 39; }; node_74(){ required 52 28 15 40; }; node_75(){
-optional 11; }; node_76(){ optional 12; }; node_77(){ oneormore 19; }
-node_78(){ required 52 28 15 41 75 76 16 77; }; node_79(){
-required 52 28 15 41 16 77; }; node_80(){ required 52 28 15 42 43 55; }
-node_81(){ optional 22; }; node_82(){ required 52 28 15 42 44 20 21 81 55; }
-node_83(){ required 52 28 15 42 45 20 21 23 55; }; node_84(){ either 20 13; }
-node_85(){ required 84; }; node_86(){ required 52 28 15 42 67 85 55 68; }
-node_87(){ optional 77; }; node_88(){ required 52 28 15 24 87; }; node_89(){
-optional 26; }; node_90(){ optional 27; }; node_91(){ required 52 46 47 25 89 90
-}; node_92(){ required 52 46 59; }; node_93(){ required 52 46 25 36; }
-node_94(){ required 52 46 25 48; }; node_95(){ required 52 46 25 49 60; }
-node_96(){ required 52 50; }; node_97(){
-either 57 61 63 64 65 69 71 72 73 74 78 79 80 82 83 86 88 91 92 93 94 95 96; }
-node_98(){ required 97; }; cat <<<' docopt_exit() {
-[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1212}" >&2
-exit 1; }'; unset var___env var___help var___version var___stack var___server \
-var___domain var___pass var___auto var___status var___skip_check var___force \
-var___no_tty var___user var___all var__type_ var__domain_ var__service_ \
-var__src_ var__dst_ var__args_ var__secret_ var__version_ var__cmd_ var__data_ \
-var__command_ var__host_ var__user_ var__port_ var_app var_new var_list var_ls \
-var_deploy var_undeploy var_config var_delete var_rm var_logs var_cp var_check \
-var_ps var_run var_secret var_auto var_generate var_insert var_server var_add \
-var_init var_apps var_upgrade; parse 98 "$@"; local prefix=${DOCOPT_PREFIX:-''}
-unset "${prefix}__env" "${prefix}__help" "${prefix}__version" \
-"${prefix}__stack" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \
-"${prefix}__auto" "${prefix}__status" "${prefix}__skip_check" \
-"${prefix}__force" "${prefix}__no_tty" "${prefix}__user" "${prefix}__all" \
-"${prefix}_type_" "${prefix}_domain_" "${prefix}_service_" "${prefix}_src_" \
-"${prefix}_dst_" "${prefix}_args_" "${prefix}_secret_" "${prefix}_version_" \
-"${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" "${prefix}_host_" \
-"${prefix}_user_" "${prefix}_port_" "${prefix}app" "${prefix}new" \
-"${prefix}list" "${prefix}ls" "${prefix}deploy" "${prefix}undeploy" \
-"${prefix}config" "${prefix}delete" "${prefix}rm" "${prefix}logs" \
-"${prefix}cp" "${prefix}check" "${prefix}ps" "${prefix}run" "${prefix}secret" \
-"${prefix}auto" "${prefix}generate" "${prefix}insert" "${prefix}server" \
-"${prefix}add" "${prefix}init" "${prefix}apps" "${prefix}upgrade"
+value _user_ a; }; node_27(){ value _port_ a; }; node_28(){
+value _subcommands_ a true; }; node_29(){ _command app; }; node_30(){
+_command new; }; node_31(){ _command list; }; node_32(){ _command ls; }
+node_33(){ _command deploy; }; node_34(){ _command undeploy; }; node_35(){
+_command config; }; node_36(){ _command delete; }; node_37(){ _command rm; }
+node_38(){ _command logs; }; node_39(){ _command cp; }; node_40(){
+_command check; }; node_41(){ _command ps; }; node_42(){ _command run; }
+node_43(){ _command secret; }; node_44(){ _command auto; }; node_45(){
+_command generate; }; node_46(){ _command insert; }; node_47(){ _command server
+}; node_48(){ _command add; }; node_49(){ _command init; }; node_50(){
+_command apps; }; node_51(){ _command upgrade; }; node_52(){ _command version; }
+node_53(){ _command help; }; node_54(){ optional 0 1 2; }; node_55(){
+optional 54; }; node_56(){ optional 3; }; node_57(){ optional 4; }; node_58(){
+optional 5; }; node_59(){ optional 6; }; node_60(){ optional 7; }; node_61(){
+required 55 29 30 56 57 58 59 60 14; }; node_62(){ either 31 32; }; node_63(){
+required 62; }; node_64(){ optional 8; }; node_65(){ required 55 29 63 64 56; }
+node_66(){ optional 9; }; node_67(){ required 55 29 15 33 66; }; node_68(){
+required 55 29 15 34; }; node_69(){ required 55 29 15 35; }; node_70(){
+either 36 37; }; node_71(){ required 70; }; node_72(){ optional 10; }
+node_73(){ required 55 29 15 71 72; }; node_74(){ optional 16; }; node_75(){
+required 55 29 15 38 74; }; node_76(){ required 55 29 15 39 17 18; }; node_77(){
+required 55 29 15 40; }; node_78(){ required 55 29 15 41; }; node_79(){
+optional 11; }; node_80(){ optional 12; }; node_81(){ oneormore 19; }
+node_82(){ required 55 29 15 42 79 80 16 81; }; node_83(){
+required 55 29 15 43 44 59; }; node_84(){ optional 22; }; node_85(){
+required 55 29 15 43 45 20 21 84 59; }; node_86(){
+required 55 29 15 43 46 20 21 23 59; }; node_87(){ either 20 13; }; node_88(){
+required 87; }; node_89(){ required 55 29 15 43 71 88 59 72; }; node_90(){
+optional 81; }; node_91(){ required 55 29 15 24 90; }; node_92(){ optional 26; }
+node_93(){ optional 27; }; node_94(){ required 55 47 48 25 92 93; }; node_95(){
+required 55 47 63; }; node_96(){ required 55 47 25 37; }; node_97(){
+required 55 47 25 49; }; node_98(){ required 55 47 25 50 64; }; node_99(){
+required 55 51; }; node_100(){ required 55 52; }; node_101(){ oneormore 28; }
+node_102(){ optional 101; }; node_103(){ required 55 53 102; }; node_104(){
+either 61 65 67 68 69 73 75 76 77 78 82 83 85 86 89 91 94 95 96 97 98 99 100 103
+}; node_105(){ required 104; }; cat <<<' docopt_exit() {
+[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1206}" >&2
+exit 1; }'; unset var___help var___env var___stack var___server var___domain \
+var___app_name var___pass var___auto var___status var___skip_check var___force \
+var___no_tty var___user var___all var__type_ var__app_ var__service_ var__src_ \
+var__dst_ var__args_ var__secret_ var__version_ var__cmd_ var__data_ \
+var__command_ var__host_ var__user_ var__port_ var__subcommands_ var_app \
+var_new var_list var_ls var_deploy var_undeploy var_config var_delete var_rm \
+var_logs var_cp var_check var_ps var_run var_secret var_auto var_generate \
+var_insert var_server var_add var_init var_apps var_upgrade var_version var_help
+parse 105 "$@"; local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__help" \
+"${prefix}__env" "${prefix}__stack" "${prefix}__server" "${prefix}__domain" \
+"${prefix}__app_name" "${prefix}__pass" "${prefix}__auto" "${prefix}__status" \
+"${prefix}__skip_check" "${prefix}__force" "${prefix}__no_tty" \
+"${prefix}__user" "${prefix}__all" "${prefix}_type_" "${prefix}_app_" \
+"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" "${prefix}_args_" \
+"${prefix}_secret_" "${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" \
+"${prefix}_command_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
+"${prefix}_subcommands_" "${prefix}app" "${prefix}new" "${prefix}list" \
+"${prefix}ls" "${prefix}deploy" "${prefix}undeploy" "${prefix}config" \
+"${prefix}delete" "${prefix}rm" "${prefix}logs" "${prefix}cp" "${prefix}check" \
+"${prefix}ps" "${prefix}run" "${prefix}secret" "${prefix}auto" \
+"${prefix}generate" "${prefix}insert" "${prefix}server" "${prefix}add" \
+"${prefix}init" "${prefix}apps" "${prefix}upgrade" "${prefix}version" \
+"${prefix}help"; eval "${prefix}"'__help=${var___help:-false}'
 eval "${prefix}"'__env=${var___env:-}'
-eval "${prefix}"'__help=${var___help:-false}'
-eval "${prefix}"'__version=${var___version:-false}'
 eval "${prefix}"'__stack=${var___stack:-}'
 eval "${prefix}"'__server=${var___server:-}'
 eval "${prefix}"'__domain=${var___domain:-}'
+eval "${prefix}"'__app_name=${var___app_name:-}'
 eval "${prefix}"'__pass=${var___pass:-false}'
 eval "${prefix}"'__auto=${var___auto:-false}'
 eval "${prefix}"'__status=${var___status:-false}'
@@ -227,8 +232,7 @@ eval "${prefix}"'__force=${var___force:-false}'
 eval "${prefix}"'__no_tty=${var___no_tty:-false}'
 eval "${prefix}"'__user=${var___user:-}'
 eval "${prefix}"'__all=${var___all:-false}'
-eval "${prefix}"'_type_=${var__type_:-}'
-eval "${prefix}"'_domain_=${var__domain_:-}'
+eval "${prefix}"'_type_=${var__type_:-}'; eval "${prefix}"'_app_=${var__app_:-}'
 eval "${prefix}"'_service_=${var__service_:-}'
 eval "${prefix}"'_src_=${var__src_:-}'; eval "${prefix}"'_dst_=${var__dst_:-}'
 if declare -p var__args_ >/dev/null 2>&1; then
@@ -240,7 +244,10 @@ eval "${prefix}"'_command_=${var__command_:-}'
 eval "${prefix}"'_host_=${var__host_:-}'
 eval "${prefix}"'_user_=${var__user_:-}'
 eval "${prefix}"'_port_=${var__port_:-}'
-eval "${prefix}"'app=${var_app:-false}'; eval "${prefix}"'new=${var_new:-false}'
+if declare -p var__subcommands_ >/dev/null 2>&1; then
+eval "${prefix}"'_subcommands_=("${var__subcommands_[@]}")'; else
+eval "${prefix}"'_subcommands_=()'; fi; eval "${prefix}"'app=${var_app:-false}'
+eval "${prefix}"'new=${var_new:-false}'
 eval "${prefix}"'list=${var_list:-false}'; eval "${prefix}"'ls=${var_ls:-false}'
 eval "${prefix}"'deploy=${var_deploy:-false}'
 eval "${prefix}"'undeploy=${var_undeploy:-false}'
@@ -258,21 +265,25 @@ eval "${prefix}"'server=${var_server:-false}'
 eval "${prefix}"'add=${var_add:-false}'
 eval "${prefix}"'init=${var_init:-false}'
 eval "${prefix}"'apps=${var_apps:-false}'
-eval "${prefix}"'upgrade=${var_upgrade:-false}'; local docopt_i=1
+eval "${prefix}"'upgrade=${var_upgrade:-false}'
+eval "${prefix}"'version=${var_version:-false}'
+eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1
 [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
-declare -p "${prefix}__env" "${prefix}__help" "${prefix}__version" \
-"${prefix}__stack" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \
-"${prefix}__auto" "${prefix}__status" "${prefix}__skip_check" \
-"${prefix}__force" "${prefix}__no_tty" "${prefix}__user" "${prefix}__all" \
-"${prefix}_type_" "${prefix}_domain_" "${prefix}_service_" "${prefix}_src_" \
-"${prefix}_dst_" "${prefix}_args_" "${prefix}_secret_" "${prefix}_version_" \
-"${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" "${prefix}_host_" \
-"${prefix}_user_" "${prefix}_port_" "${prefix}app" "${prefix}new" \
-"${prefix}list" "${prefix}ls" "${prefix}deploy" "${prefix}undeploy" \
-"${prefix}config" "${prefix}delete" "${prefix}rm" "${prefix}logs" \
-"${prefix}cp" "${prefix}check" "${prefix}ps" "${prefix}run" "${prefix}secret" \
-"${prefix}auto" "${prefix}generate" "${prefix}insert" "${prefix}server" \
-"${prefix}add" "${prefix}init" "${prefix}apps" "${prefix}upgrade"; done; }
+declare -p "${prefix}__help" "${prefix}__env" "${prefix}__stack" \
+"${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \
+"${prefix}__pass" "${prefix}__auto" "${prefix}__status" \
+"${prefix}__skip_check" "${prefix}__force" "${prefix}__no_tty" \
+"${prefix}__user" "${prefix}__all" "${prefix}_type_" "${prefix}_app_" \
+"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" "${prefix}_args_" \
+"${prefix}_secret_" "${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" \
+"${prefix}_command_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
+"${prefix}_subcommands_" "${prefix}app" "${prefix}new" "${prefix}list" \
+"${prefix}ls" "${prefix}deploy" "${prefix}undeploy" "${prefix}config" \
+"${prefix}delete" "${prefix}rm" "${prefix}logs" "${prefix}cp" "${prefix}check" \
+"${prefix}ps" "${prefix}run" "${prefix}secret" "${prefix}auto" \
+"${prefix}generate" "${prefix}insert" "${prefix}server" "${prefix}add" \
+"${prefix}init" "${prefix}apps" "${prefix}upgrade" "${prefix}version" \
+"${prefix}help"; done; }
 # docopt parser above, complete command for generating this parser is `docopt.sh abra`
 
 PROGRAM_NAME=$(basename "$0")
@@ -304,9 +315,15 @@ fi
 
 ###### Safety checks
 
-require_multitail() {
-  if ! type multitail > /dev/null 2>&1; then
-    error "multitail program is not installed"
+require_pwqgen() {
+  if ! type pwqgen > /dev/null 2>&1; then
+    error "pwqgen program is not installed"
+  fi
+}
+
+require_pwgen() {
+  if ! type pwgen > /dev/null 2>&1; then
+    error "pwgen program is not installed"
   fi
 }
 
@@ -336,7 +353,7 @@ require_app_latest() {
 }
 
 # FIXME 3wc: update or remove
-if [ -z "$ABRA_ENV" ] && [ -f .envrc ] && type direnv > /dev/null 2>&1 && ! direnv status | grep -q 'Found RC allowed true'; then
+if [ -z "$ABRA_ENV" ] && [ -f .env ] && type direnv > /dev/null 2>&1 && ! direnv status | grep -q 'Found RC allowed true'; then
   error "direnv is blocked, run direnv allow"
 fi
 
@@ -348,10 +365,10 @@ load_custom_commands() {
     source abra-commands.sh
   fi
 
-  if [ -n "$abra__domain_" ]; then
+  if [ -n "$abra__app_" ]; then
     load_instance
     load_instance_env
-    require_app_latest "$APP"
+    require_app_latest "$TYPE"
   fi
 
   if [ -f "$APP_DIR/abra-commands.sh" ]; then
@@ -376,22 +393,22 @@ get_app_secrets() {
 
 get_app_passwords() {
   # FIXME 3wc: requires bash 4, use for loop instead
-  mapfile -t PASSWORDS < <(grep "SECRET.*PASSWORD.*VERSION.*" "$ENV_FILE" | cut -d ' ' -f2-)
+  mapfile -t PASSWORDS < <(grep "SECRET.*PASSWORD.*VERSION.*" "$ENV_FILE")
 }
 
 get_app_keys() {
   # FIXME 3wc: requires bash 4, use for loop instead
-  mapfile -t KEYS < <(grep "SECRET.*KEY.*VERSION.*" "$ENV_FILE" | cut -d' ' -f2-)
+  mapfile -t KEYS < <(grep "SECRET.*KEY.*VERSION.*" "$ENV_FILE")
 }
 
 load_instance() {
-  DOMAIN="$abra__domain_"
+  APP="$abra__app_"
   # FIXME 3wc: requires bash 4, use for loop instead
-  mapfile -t ENV_FILES < <(find -L "$ABRA_DIR" -name "$DOMAIN.env")
+  mapfile -t ENV_FILES < <(find -L "$ABRA_DIR" -name "$APP.env")
   case "${#ENV_FILES[@]}" in
     1 ) ;;
-    0 ) error "Can't find app '$DOMAIN'"; return;;
-    * ) error "Found $DOMAIN in multiple servers: ${ENV_FILES[*]}"; return;;
+    0 ) error "Can't find app '$APP'"; return;;
+    * ) error "Found $APP in multiple servers: ${ENV_FILES[*]}"; return;;
   esac
   ENV_FILE="${ENV_FILES[0]}"
   if [ ! -f "$ENV_FILE" ]; then
@@ -399,16 +416,19 @@ load_instance() {
   fi
   IFS='/' read -r -a PARTS <<< "$ENV_FILE"
   SERVER="${PARTS[-2]}"
-  export STACK_NAME="${DOMAIN//./_}"
+  export STACK_NAME="$APP"
 }
 
 load_instance_env() {
+  set -a
   # shellcheck disable=SC1090
   source "$ENV_FILE"
-  if [ -z "$APP" ]; then
-    error "APP not set, maybe $ENV_FILE is using an old format?"
+  set +a
+
+  if [ -z "$TYPE" ]; then
+    error "TYPE not set, maybe $ENV_FILE is using an old format?"
   fi
-  APP_DIR="$ABRA_DIR/apps/$APP"
+  APP_DIR="$ABRA_DIR/apps/$TYPE"
   export DOCKER_CONTEXT="$SERVER"
   export DOMAIN
 }
@@ -448,7 +468,12 @@ parse_secret() {
 
   abra__version_="$(echo "$SECRET" | sed -n 's/.*\(v[0-9]\).*/\1/p')"
 
-  echo "Generating $abra__secret_, version: $abra__version_, length: $abra__length_"
+  if [[ "$SECRET" == *"length"* ]]; then
+    echo "Generating $abra__secret_, version: $abra__version_, length: $abra__length_"
+  else
+    echo "Generating $abra__secret_, version: $abra__version_"
+  fi
+
   sub_app_secret_generate
 }
 
@@ -472,11 +497,26 @@ stack_logs (){
 # abra app ..
 #######################################
 
-###### .. app (list|ls)
+###### .. app ls
+
+help_app_ls (){
+  help_app_list
+}
+
 sub_app_ls (){
   sub_app_list
 }
 
+help_app_list (){
+  echo "abra [options] app (list|ls) [--status] [--server=<server>]
+
+List your exciting apps
+
+OPTIONS
+  --status           Show whether apps are deployed (warning! slow!)
+  --server=<server>  Filter to a specific server"
+}
+
 sub_app_list (){
   SERVER="$abra___server"
   if [ -z "$SERVER" ]; then
@@ -525,10 +565,14 @@ sub_app_list (){
     FILE="${PARTS[-1]}"
     SERVER="${PARTS[-2]}"
     DOMAIN="${FILE%.env}"
+
+    set -a
     # shellcheck disable=SC1090
     APP="$(source "$ENV_FILE" && echo "$APP")"
     # shellcheck disable=SC1090
     APP_STACK_NAME="$(source "$ENV_FILE" && echo "$STACK_NAME")"
+    set +a
+
     if [ -z "$APP_STACK_NAME" ]; then
       APP_STACK_NAME="${DOMAIN//./_}"
     fi
@@ -540,7 +584,19 @@ sub_app_list (){
   # Align table `-t` based on tab characters -s`^V<Tab>`
 }
 
-###### .. app new [--domain=<domain> --server=<server>]
+###### .. app new
+help_app_new (){
+  echo "abra [options] app new [--server=<server>] [--domain=<domain>] [--pass] [--auto] <type>
+
+Create a new app of <type> (e.g. wordpress or custom-html)
+
+OPTIONS
+  --server=<server>  Specify which server to use (default: prompt)
+  --domain=<domain>  Set the domain name (default: prompt)
+  --auto             Auto-generate secrets (default: no)
+  --pass             Store generated secrets in pass (default: no)"
+}
+
 sub_app_new (){
   require_abra_dir
   get_servers
@@ -548,15 +604,16 @@ sub_app_new (){
   # Note(decentral1se): we are overloading the use of the word "app" on this
   # the interface and therefore try to use the word "type" to refer to "a type
   # of app" vs. "an instance of an app"
-  APP=$abra__type_
+  TYPE=$abra__type_
 
   SERVER=$abra___server
   DOMAIN=$abra___domain
+  APP_NAME=$abra___app_name
 
-  require_app_latest "$APP"
+  require_app_latest "$TYPE"
 
   if [ -z "$SERVER" ]; then
-    echo "Where would you like to put $APP?"
+    echo "Where would you like to put $TYPE?"
 
     select SERVER_ITEM in "${SERVERS[@]##*/}"; do
       if [ 1 -le "$REPLY" ] && [ "$REPLY" -le ${#SERVERS[@]} ]; then
@@ -572,24 +629,32 @@ sub_app_new (){
     error "Server '$SERVER' not found"
   fi
 
-  APP_DIR="$ABRA_DIR/apps/$APP"
+  APP_DIR="$ABRA_DIR/apps/$TYPE"
 
   if [ -z "$DOMAIN" ]; then
     read -rp "Domain name: " DOMAIN
   fi
 
-  ENV_FILE="$SERVER/$DOMAIN.env"
+  if [ -z "$APP_NAME" ]; then
+    DEFAULT_NAME="${TYPE/-/}_${DOMAIN//./_}"
+    read -rp "App name [$DEFAULT_NAME]: " APP_NAME
+    if [ -z "$APP_NAME" ]; then
+      APP_NAME="$DEFAULT_NAME"
+    fi
+  fi
+
+  ENV_FILE="$SERVER/$APP_NAME.env"
 
   if [ -f "$ENV_FILE" ]; then
     error "$ENV_FILE already exists"
     # FIXME 3wc: offer to user $STACK_$DOMAIN.env name instead
   fi
 
-  cp "$APP_DIR/.envrc.sample" "$ENV_FILE"
-  sed -i "s/$APP\.example\.com/$DOMAIN/g" "$ENV_FILE"
+  cp "$APP_DIR/.env.sample" "$ENV_FILE"
+  sed -i "s/$TYPE\.example\.com/$DOMAIN/g" "$ENV_FILE"
   sed -i "s/example\.com/$DOMAIN/g" "$ENV_FILE"
 
-  abra__domain_="$DOMAIN"
+  abra__app_="$APP_NAME"
 
   get_app_secrets
 
@@ -597,19 +662,27 @@ sub_app_new (){
     sub_app_secret_auto
   fi
 
-  echo "$(tput setaf 4)Your new '$APP' is ready for action:$(tput sgr0)"
+  echo "$(tput setaf 4)Your new '$TYPE' is ready for action:$(tput sgr0)"
   echo "  $(tput setaf 3)Customise the configuration:"
-  echo "    abra app $DOMAIN config$(tput sgr0)"
+  echo "    abra app $APP_NAME config$(tput sgr0)"
   echo "  $(tput setaf 2)Deploy it:"
-  echo "    abra app $DOMAIN deploy$(tput sgr0)"
+  echo "    abra app $APP_NAME deploy$(tput sgr0)"
 }
 
 ###### .. app <domain> deploy
+help_app_deploy (){
+  echo "abra [options] app <domain> deploy [--skip-check]
+
+Deploy app <domain> to the configured server
+
+OPTIONS
+  --skip-check    Don't check whether app definition is up-to-date first"
+}
 sub_app_deploy (){
   load_instance
   load_instance_env
 
-  require_app_latest "$APP"
+  require_app_latest "$TYPE"
 
   if [ "$abra___skip_check" == "false" ]; then
     sub_app_check
@@ -666,6 +739,31 @@ sub_app_undeploy (){
 sub_app_config (){
   load_instance
 
+  if [ -z "$EDITOR" ]; then
+    warning "\$EDITOR not set; which text editor would you like to use?"
+
+    EDITORS_ALL=(vi vim nano pico emacs)
+    declare -a EDITORS_AVAILABLE
+
+    for EDITOR in "${EDITORS_ALL[@]}"; do
+      if type "$EDITOR" > /dev/null 2>&1; then
+        EDITORS_AVAILABLE+=("$EDITOR")
+      fi
+    done
+
+    if [ ${#EDITORS_AVAILABLE[@]} = 0 ]; then
+      error "No text editors found! Are you using a magnetised needle? 🤪"
+    fi
+
+    select EDITOR in "${EDITORS_AVAILABLE[@]}"; do
+      if [ 1 -le "$REPLY" ] && [ "$REPLY" -le ${#EDITORS_AVAILABLE[@]} ]; then
+        SERVER="$EDITOR"
+        success "Using '${EDITOR}'; Add 'export EDITOR=${EDITOR}' to your ~/.bashrc to set as default"
+        break
+      fi
+    done
+  fi
+
   $EDITOR "$ENV_FILE"
 }
 
@@ -676,8 +774,8 @@ sub_app_check (){
 
   #APP_ENV=$(grep -v '^#' "$ENV_FILE" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort)
   APP_ENV=$(grep -v '^#' "$ENV_FILE" | cut -d' ' -f2 | cut -d'=' -f1 | sort)
-  #STACK_ENV=$(grep -v '^#' "$APP_DIR/.envrc.sample" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort)
-  STACK_ENV=$(grep -v '^#' "$APP_DIR/.envrc.sample" | cut -d' ' -f2 | cut -d'=' -f1 | sort)
+  #STACK_ENV=$(grep -v '^#' "$APP_DIR/.env.sample" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort)
+  STACK_ENV=$(grep -v '^#' "$APP_DIR/.env.sample" | cut -d' ' -f2 | cut -d'=' -f1 | sort)
 
   # Only show "1", items in STACK_ENV which aren't in APP_ENV
   MISSING_VARS=$(comm -23 <(echo "$STACK_ENV") <(echo "$APP_ENV"))
@@ -782,8 +880,10 @@ sub_app_secret_generate(){
   LENGTH="$abra__length_"
 
   if [[ "$SECRET" == *"password"* ]]; then
+    require_pwqgen
     PWGEN="${abra__cmd_:-pwqgen}"
   else
+    require_pwgen
     PWGEN=${abra__cmd_:-pwgen -s "$LENGTH" 1}
   fi
 
@@ -986,6 +1086,34 @@ sub_upgrade() {
   curl https://install.abra.autonomic.zone | bash
 }
 
+###### .. version
+sub_version() {
+  echo "$ABRA_VERSION"
+}
+
+###### .. help
+sub_help() {
+  SUBCOMMAND=$(IFS="_"; echo "${abra__subcommands_[*]}")
+  if [ -z "$SUBCOMMAND" ]; then
+    printf "%s" "$DOC"
+    exit
+  fi
+  HELP_CMD="help_${SUBCOMMAND}"
+  if type "$HELP_CMD" > /dev/null 2>&1; then
+    "$HELP_CMD"
+  else
+    HELP_COMMANDS=$(declare -Ff | grep 'help_' | cut -d' ' -f3 | sed 's/_/ /g')
+    error "No help found for '$abra__subcommands_'
+
+Try one of these:
+${HELP_COMMANDS//help /}"
+  fi
+}
+
+#######################################
+# cheeky docker aliases
+#######################################
+
 ###### .. stack <args>...
 sub_stack() {
   # shellcheck disable=SC2068
@@ -1014,8 +1142,9 @@ abra() {
   declare abra___stack abra___env abra__command_ abra__args_ \
     abra__secret_ abra__version_ abra__data_ abra___user abra__host_ \
     abra__type_ abra__port_ abra__user_ abra__service_ abra__src_ abra__dst_ \
-    abra__domain_ abra___server abra___domain abra___force abra___pass \
-    abra___auto abra___status abra___no_tty abra___skip_check
+    abra___server abra___domain abra___force abra___pass \
+    abra___auto abra___status abra___no_tty abra___skip_check \
+    abra__subcommands_ abra___app_name
 
   if ! type tput > /dev/null 2>&1; then
     tput() {
@@ -1031,8 +1160,10 @@ abra() {
 
   # --env <env>
   if [ -n "$abra___env" ]; then
+    set -a
     # shellcheck disable=SC1090
     source "$abra___env" || error "Unable to load env from '$abra___env'"
+    set +a
   fi
 
   load_custom_commands
@@ -1058,7 +1189,6 @@ abra() {
     # shellcheck disable=SC2086
     "$CMD" ${abra__args_[*]}
   else
-    "$CMD not found"
     docopt_exit
   fi
 }

completion/abra.bash

@@ -91,7 +91,7 @@ _abra_complete()
         case "$cmd" in
             server)
                 # Offer exactly one server name completion.
-                if (( COMP_CWORD == cmd_index + 2 )); then
+                if (( COMP_CWORD == cmd_index + 1 )); then
                     _abra_complete_servers "$cur"
                 fi
                 ;;

tests/02_abra.bats

@@ -9,7 +9,7 @@ teardown() {
     rm -rf "$ABRA_DIR"
 }
 
-@test "abra server add/rm works" {
+@test "abra server (add|rm)" {
     ./abra server add swarm.test.com
     docker context ls | grep swarm.test.com
     [ -d $ABRA_DIR/servers/swarm.test.com ]
@@ -20,30 +20,33 @@ teardown() {
     ./abra server swarm.test.com rm
 }
 
-@test "abra app new/rm works" {
-    ./abra app new --server default --domain traefik.test.com traefik
-    [ -f $ABRA_DIR/servers/default/traefik.test.com.env ]
+@test "abra server init" {
+    ./abra server default init
+}
+
+@test "abra app (new|rm)" {
+    ./abra app new --server default --domain traefik.test.com --app-name traefik_test_com traefik
+    [ -f $ABRA_DIR/servers/default/traefik_test_com.env ]
 
     # interactive prompt
-    echo "y" | ./abra app traefik.test.com delete
-    [ ! -f $ABRA_DIR/servers/default/traefik.test.com.env ]
+    echo "y" | ./abra app traefik_test_com delete
+    [ ! -f $ABRA_DIR/servers/default/traefik_test_com.env ]
 
     # --force
-    ./abra app new --server default --domain traefik.test.com traefik
-    ./abra app traefik.test.com delete --force
-    [ ! -f $ABRA_DIR/servers/default/traefik.test.com.env ]
+    ./abra app new --server default --domain traefik_test_com --app-name traefik_test_com traefik
+    ./abra app traefik_test_com delete --force
+    [ ! -f $ABRA_DIR/servers/default/traefik_test_com.env ]
 }
 
 @test "abra app <domain> secret (insert|generate|rm)" {
-    # TODO 3wc: mock `server new` so we don't endlessly re-test it
-    ./abra app new --server default --domain traefik.test.com traefik
+    ./abra app new --server default --domain traefik_test_com --app-name traefik_test_com traefik
 
-    ./abra app traefik.test.com secret insert foobar v1 "foobar"
+    ./abra app traefik_test_com secret insert foobar v1 "foobar"
 
     # interactive prompt
-    echo "y" | ./abra app traefik.test.com secret rm foobar
+    echo "y" | ./abra app traefik_test_com secret rm foobar
 
-    ./abra app traefik.test.com secret insert foobar v1 "foobar"
+    ./abra app traefik_test_com secret insert foobar v1 "foobar"
     #  prompt
-    ./abra app traefik.test.com secret rm foobar --force
+    ./abra app traefik_test_com secret rm foobar --force
 }