Merge branch 'main' into merge-logging

Revision of 67cce192df.

See https://git.autonomic.zone/coop-cloud/abra/pulls/54#issuecomment-2300.

.drone.yml

@@ -3,7 +3,7 @@ kind: pipeline
 name: linters
 steps:
   - name: run shellcheck
-    image: koalaman/shellcheck-alpine:latest
+    image: koalaman/shellcheck-alpine:v0.7.1
     commands:
       - shellcheck abra
 
@@ -15,9 +15,9 @@ steps:
 
   - name: collect code coverage
     failure: ignore  # until we fix this
-    image: kcov/kcov:latest
+    image: kcov/kcov:38
     commands:
-      - apk add bats git bash
+      - apt update && apt install -y bats git bash
       - kcov . bats tests || true
 
   - name: send code coverage report to codecov

CHANGELOG.md

@@ -1,6 +1,21 @@
 # abra x.x.x (UNRELEASED)
 
-- ???
+- 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))
+
+# abra 0.4.1 (2020-12-24)
+
+- Bug-fixes on `app ls --status` & custom commands
+- Add `app ls --server=...` and alias
+
+# abra 0.4.0 (2020-12-24)
+
+- New command-line interface based on docopt
+- ~/.abra directory instead of expecting local .env files
+- Integration tests & code coverage
 
 # abra 0.3.1 (2020-09-27)
 
@@ -8,7 +23,7 @@
 
 # abra 0.3.0 (2020-09-27)
 
-- Add multilogs stack logs implementation ([#8](https://git.autonomic.zone/compose-stacks/abra/issues/8)
+- Add multilogs stack logs implementation ([#8](https://git.autonomic.zone/compose-stacks/abra/issues/8))
 - Add beginnings of "monorepo" functionality
 
 # abra 0.2.0 (2020-09-24)

README.md

@@ -7,6 +7,10 @@
 
 The cooperative cloud utility belt 🎩🐇
 
+## Documentation
+
+> [docs.cloud.autonomic.zone](https://docs.cloud.autonomic.zone/)
+
 ## Install
 
 ```sh

abra

@@ -11,28 +11,28 @@ DOC="
 The cooperative cloud utility belt 🎩🐇
 
 Usage:
-  abra [options] app new [--server=<server>] [--domain=<domain>] [--pass] [--auto] <app>
-  abra [options] app (list|ls) [--status]
-  abra [options] app <domain> deploy
+  abra [options] app new [--server=<server>] [--domain=<domain>] [--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> multilogs
   abra [options] app <domain> cp <src> <dst>
   abra [options] app <domain> check
   abra [options] app <domain> ps
-  abra [options] app <domain> run [--user=<user>] <service> <args>...
+  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] server add <host> [<user>] [<port>]
   abra [options] server (list|ls)
-  abra [options] server rm <host>
-  abra [options] server use <host>
-  abra [options] server init <host>
+  abra [options] server <host> rm
+  abra [options] server <host> init
+  abra [options] server <host> apps [--status]
   abra [options] upgrade
 
 Options:
@@ -143,85 +143,91 @@ 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:1449}
-usage=${DOC:40:1141}; digest=2bcee; shorts=(-s -h -e -v '' '' '' '' '' '' '' '')
-longs=(--stack --help --env --version --server --domain --pass --auto --status --force --user --all)
-argcounts=(1 0 1 0 1 1 0 0 0 0 1 0); node_0(){ value __stack 0; }; node_1(){
-switch __help 1; }; node_2(){ value __env 2; }; node_3(){ switch __version 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: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(){
 switch __pass 6; }; node_7(){ switch __auto 7; }; node_8(){ switch __status 8; }
-node_9(){ switch __force 9; }; node_10(){ value __user 10; }; node_11(){
-switch __all 11; }; node_12(){ value _app_ a; }; node_13(){ value _domain_ a; }
-node_14(){ value _service_ a; }; node_15(){ value _src_ a; }; node_16(){
-value _dst_ a; }; node_17(){ value _args_ a true; }; node_18(){ value _secret_ a
-}; node_19(){ value _version_ a; }; node_20(){ value _cmd_ a; }; node_21(){
-value _data_ a; }; node_22(){ value _host_ a; }; node_23(){ value _user_ a; }
-node_24(){ value _port_ a; }; node_25(){ _command app; }; node_26(){
-_command new; }; node_27(){ _command list; }; node_28(){ _command ls; }
-node_29(){ _command deploy; }; node_30(){ _command undeploy; }; node_31(){
-_command config; }; node_32(){ _command delete; }; node_33(){ _command rm; }
-node_34(){ _command logs; }; node_35(){ _command multilogs; }; node_36(){
-_command cp; }; node_37(){ _command check; }; node_38(){ _command ps; }
-node_39(){ _command run; }; node_40(){ _command secret; }; node_41(){
-_command auto; }; node_42(){ _command generate; }; node_43(){ _command insert; }
-node_44(){ _command server; }; node_45(){ _command add; }; node_46(){
-_command use; }; node_47(){ _command init; }; node_48(){ _command upgrade; }
-node_49(){ optional 0 1 2 3; }; node_50(){ optional 49; }; node_51(){ optional 4
-}; node_52(){ optional 5; }; node_53(){ optional 6; }; node_54(){ optional 7; }
-node_55(){ required 50 25 26 51 52 53 54 12; }; node_56(){ either 27 28; }
-node_57(){ required 56; }; node_58(){ optional 8; }; node_59(){
-required 50 25 57 58; }; node_60(){ required 50 25 13 29; }; node_61(){
-required 50 25 13 30; }; node_62(){ required 50 25 13 31; }; node_63(){
-either 32 33; }; node_64(){ required 63; }; node_65(){ optional 9; }; node_66(){
-required 50 25 13 64 65; }; node_67(){ optional 14; }; node_68(){
-required 50 25 13 34 67; }; node_69(){ required 50 25 13 35; }; node_70(){
-required 50 25 13 36 15 16; }; node_71(){ required 50 25 13 37; }; node_72(){
-required 50 25 13 38; }; node_73(){ optional 10; }; node_74(){ oneormore 17; }
-node_75(){ required 50 25 13 39 73 14 74; }; node_76(){
-required 50 25 13 39 14 74; }; node_77(){ required 50 25 13 40 41 53; }
-node_78(){ optional 20; }; node_79(){ required 50 25 13 40 42 18 19 78 53; }
-node_80(){ required 50 25 13 40 43 18 19 21 53; }; node_81(){ either 18 11; }
-node_82(){ required 81; }; node_83(){ required 50 25 13 40 64 82 53 65; }
-node_84(){ optional 23; }; node_85(){ optional 24; }; node_86(){
-required 50 44 45 22 84 85; }; node_87(){ required 50 44 57; }; node_88(){
-required 50 44 33 22; }; node_89(){ required 50 44 46 22; }; node_90(){
-required 50 44 47 22; }; node_91(){ required 50 48; }; node_92(){
-either 55 59 60 61 62 66 68 69 70 71 72 75 76 77 79 80 83 86 87 88 89 90 91; }
-node_93(){ required 92; }; cat <<<' docopt_exit() {
-[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1141}" >&2
-exit 1; }'; unset var___stack var___help var___env var___version var___server \
-var___domain var___pass var___auto var___status var___force var___user \
-var___all var__app_ var__domain_ var__service_ var__src_ var__dst_ var__args_ \
-var__secret_ var__version_ var__cmd_ var__data_ 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_multilogs var_cp var_check var_ps var_run \
-var_secret var_auto var_generate var_insert var_server var_add var_use \
-var_init var_upgrade; parse 93 "$@"; local prefix=${DOCOPT_PREFIX:-''}
-unset "${prefix}__stack" "${prefix}__help" "${prefix}__env" \
-"${prefix}__version" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \
-"${prefix}__auto" "${prefix}__status" "${prefix}__force" "${prefix}__user" \
-"${prefix}__all" "${prefix}_app_" "${prefix}_domain_" "${prefix}_service_" \
-"${prefix}_src_" "${prefix}_dst_" "${prefix}_args_" "${prefix}_secret_" \
-"${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_host_" \
+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(){
+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}multilogs" "${prefix}cp" "${prefix}check" "${prefix}ps" \
-"${prefix}run" "${prefix}secret" "${prefix}auto" "${prefix}generate" \
-"${prefix}insert" "${prefix}server" "${prefix}add" "${prefix}use" \
-"${prefix}init" "${prefix}upgrade"; eval "${prefix}"'__stack=${var___stack:-}'
-eval "${prefix}"'__help=${var___help:-false}'
+"${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"
 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}"'__pass=${var___pass:-false}'
 eval "${prefix}"'__auto=${var___auto:-false}'
 eval "${prefix}"'__status=${var___status:-false}'
+eval "${prefix}"'__skip_check=${var___skip_check:-false}'
 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}"'_app_=${var__app_:-}'
+eval "${prefix}"'_type_=${var__type_:-}'
 eval "${prefix}"'_domain_=${var__domain_:-}'
 eval "${prefix}"'_service_=${var__service_:-}'
 eval "${prefix}"'_src_=${var__src_:-}'; eval "${prefix}"'_dst_=${var__dst_:-}'
@@ -230,6 +236,7 @@ eval "${prefix}"'_args_=("${var__args_[@]}")'; else eval "${prefix}"'_args_=()'
 fi; eval "${prefix}"'_secret_=${var__secret_:-}'
 eval "${prefix}"'_version_=${var__version_:-}'
 eval "${prefix}"'_cmd_=${var__cmd_:-}'; eval "${prefix}"'_data_=${var__data_:-}'
+eval "${prefix}"'_command_=${var__command_:-}'
 eval "${prefix}"'_host_=${var__host_:-}'
 eval "${prefix}"'_user_=${var__user_:-}'
 eval "${prefix}"'_port_=${var__port_:-}'
@@ -240,7 +247,6 @@ eval "${prefix}"'undeploy=${var_undeploy:-false}'
 eval "${prefix}"'config=${var_config:-false}'
 eval "${prefix}"'delete=${var_delete:-false}'
 eval "${prefix}"'rm=${var_rm:-false}'; eval "${prefix}"'logs=${var_logs:-false}'
-eval "${prefix}"'multilogs=${var_multilogs:-false}'
 eval "${prefix}"'cp=${var_cp:-false}'
 eval "${prefix}"'check=${var_check:-false}'
 eval "${prefix}"'ps=${var_ps:-false}'; eval "${prefix}"'run=${var_run:-false}'
@@ -249,23 +255,24 @@ eval "${prefix}"'auto=${var_auto:-false}'
 eval "${prefix}"'generate=${var_generate:-false}'
 eval "${prefix}"'insert=${var_insert:-false}'
 eval "${prefix}"'server=${var_server:-false}'
-eval "${prefix}"'add=${var_add:-false}'; eval "${prefix}"'use=${var_use:-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
 [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
-declare -p "${prefix}__stack" "${prefix}__help" "${prefix}__env" \
-"${prefix}__version" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \
-"${prefix}__auto" "${prefix}__status" "${prefix}__force" "${prefix}__user" \
-"${prefix}__all" "${prefix}_app_" "${prefix}_domain_" "${prefix}_service_" \
-"${prefix}_src_" "${prefix}_dst_" "${prefix}_args_" "${prefix}_secret_" \
-"${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_host_" \
+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}multilogs" "${prefix}cp" "${prefix}check" "${prefix}ps" \
-"${prefix}run" "${prefix}secret" "${prefix}auto" "${prefix}generate" \
-"${prefix}insert" "${prefix}server" "${prefix}add" "${prefix}use" \
-"${prefix}init" "${prefix}upgrade"; done; }
+"${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; }
 # docopt parser above, complete command for generating this parser is `docopt.sh abra`
 
 PROGRAM_NAME=$(basename "$0")
@@ -286,7 +293,7 @@ warning() {
 }
 
 success() {
-  echo "$(tput setaf 2)$*$(tput sgr0)"
+  echo "$(tput setaf 2)SUCCESS: $*$(tput sgr0)"
 }
 
 ###### Default settings
@@ -313,16 +320,19 @@ require_stack() {
   fi
 }
 
-require_app_clone() {
+require_app_latest() {
   APP="$1"
   APP_DIR="$ABRA_DIR/apps/$APP"
 
   if [ ! -d "$APP_DIR" ]; then
-    warning "'$APP' not found, fetching via git.."
-    if ! git clone "$GIT_URL/$APP.git" "$ABRA_DIR/apps/$APP"; then
-      error "Could not retrieve '$APP', this app doesn't exist?"
+    warning "The app type '$APP' was not found, fetching via Git"
+    if ! git clone "$GIT_URL/$APP.git" "$ABRA_DIR/apps/$APP" > /dev/null 2>&1 ; then
+      error "Could not retrieve app type '$APP', this app type doesn't exist?"
     fi
+    success "Fetched app configuration via Git"
   fi
+
+  cd "$APP_DIR" && git pull > /dev/null 2>&1
 }
 
 # FIXME 3wc: update or remove
@@ -338,6 +348,12 @@ load_custom_commands() {
     source abra-commands.sh
   fi
 
+  if [ -n "$abra__domain_" ]; then
+    load_instance
+    load_instance_env
+    require_app_latest "$APP"
+  fi
+
   if [ -f "$APP_DIR/abra-commands.sh" ]; then
     # shellcheck disable=SC1090,SC1091
     source "$APP_DIR/abra-commands.sh"
@@ -436,6 +452,22 @@ parse_secret() {
   sub_app_secret_generate
 }
 
+stack_logs (){
+  # Note(decentral1se): see https://github.com/moby/moby/issues/31458#issuecomment-617871046
+  STACK="$1"
+
+  services=$(docker stack services "${STACK}" --format "{{.ID}}")
+
+  # shellcheck disable=SC2154
+  trap 'jobs=$(jobs -p) && test -n "$jobs" && kill $jobs' EXIT
+
+  for item in ${services//\\n/$'\n'}; do
+      docker service logs -f -t --tail 10 "$item" &
+  done
+
+  sleep infinity
+}
+
 #######################################
 # abra app ..
 #######################################
@@ -446,19 +478,28 @@ sub_app_ls (){
 }
 
 sub_app_list (){
+  SERVER="$abra___server"
+  if [ -z "$SERVER" ]; then
+    SERVER='*'
+  fi
+
   shopt -s nullglob dotglob
   # shellcheck disable=SC2206
-  ENV_FILES=($ABRA_DIR/servers/*/*.env)
+  ENV_FILES=($ABRA_DIR/servers/$SERVER/*.env)
   shopt -u nullglob dotglob
 
   STATUS="$( [[ $abra___status == "true" ]] && echo "Y" )"
 
   if [ -n "$STATUS" ]; then
-    get_servers
+    if [ -z "$SERVER" ]; then
+      get_servers
+    else
+      SERVERS=( "$SERVER" )
+    fi
 
     local -a DEPLOYED_APPS  # array
 
-    warning "Loading status from ${#SERVERS[@]} servers, patience advised.."
+    warning "Loading status from ${#SERVERS[@]} server(s), patience advised.."
 
     for SERVER in "${SERVERS[@]}"; do
       SERVER="${SERVER##*/}"  # basename
@@ -468,8 +509,6 @@ sub_app_list (){
     done
   fi
 
-  printf '%s\n' "${DEPLOYED_APPS[@]}"
-
   printf "%s lovely apps:\n\n" "${#ENV_FILES[@]}"
 
   for i in "${!ENV_FILES[@]}"; do
@@ -490,7 +529,7 @@ sub_app_list (){
     APP="$(source "$ENV_FILE" && echo "$APP")"
     # shellcheck disable=SC1090
     APP_STACK_NAME="$(source "$ENV_FILE" && echo "$STACK_NAME")"
-    if [ -z "$STACK_NAME" ]; then
+    if [ -z "$APP_STACK_NAME" ]; then
       APP_STACK_NAME="${DOMAIN//./_}"
     fi
     if [ -n "$STATUS" ]; then
@@ -506,11 +545,15 @@ sub_app_new (){
   require_abra_dir
   get_servers
 
-  APP=$abra__app_
+  # 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_
+
   SERVER=$abra___server
   DOMAIN=$abra___domain
 
-  require_app_clone "$APP"
+  require_app_latest "$APP"
 
   if [ -z "$SERVER" ]; then
     echo "Where would you like to put $APP?"
@@ -566,7 +609,11 @@ sub_app_deploy (){
   load_instance
   load_instance_env
 
-  require_app_clone "$APP"
+  require_app_latest "$APP"
+
+  if [ "$abra___skip_check" == "false" ]; then
+    sub_app_check
+  fi
 
   echo "About to deploy:"
   echo "  Server: $(tput setaf 4)${SERVER}$(tput sgr0)"
@@ -588,7 +635,6 @@ sub_app_deploy (){
   prompt_confirm
 
   APP=$(basename "$APP_DIR")
-  require_app_clone "$APP"
 
   (
     cd "$APP_DIR" || error "\$APP_DIR '$APP_DIR' not found"
@@ -628,15 +674,17 @@ sub_app_check (){
   load_instance
   load_instance_env
 
-  APP_ENV=$(grep -v '^#' "$ENV_FILE" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort)
-  STACK_ENV=$(grep -v '^#' "$APP_DIR/.envrc.sample" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort)
+  #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)
 
   # Only show "1", items in STACK_ENV which aren't in APP_ENV
   MISSING_VARS=$(comm -23 <(echo "$STACK_ENV") <(echo "$APP_ENV"))
 
   if [ -z "$MISSING_VARS" ]; then
     success "Yay! All the necessary basic variables are defined"
-    exit 0
+    return 0
   fi
 
   error "Found missing variables: $MISSING_VARS"
@@ -778,6 +826,12 @@ sub_app_run(){
     RUN_USER="-u $abra___user"
   fi
 
+  if [ "$abra___no_tty" = "true" ]; then
+    ARGS="-i"
+  else
+    ARGS="-it"
+  fi
+
   CONTAINER=$(docker container ls --format "table {{.ID}},{{.Names}}" \
     | grep "${STACK_NAME}_${abra__service_}" | head -n1 | cut -d',' -f1)
 
@@ -789,32 +843,11 @@ sub_app_run(){
   # 3wc: we want the "splitting" that shellcheck warns us about, so that -u and
   # $RUN_USER aren't treated as a single argument:
   # shellcheck disable=SC2086
-  docker exec $RUN_USER -it "$CONTAINER" "$@"
+  docker exec $RUN_USER $ARGS "$CONTAINER" "$@"
 
   return
 }
 
-###### .. app <domain> multilogs
-sub_app_multilogs() {
-  # Inspired by https://github.com/moby/moby/issues/31458#issuecomment-475411564
-  require_multitail
-
-  load_instance
-  load_instance_env
-
-  # Get a list of the service names
-  SERVICES=$(docker stack services --format "{{.Name}}" "${STACK_NAME}")
-  # Sort the service names
-  SERVICES=$(echo "${SERVICES}" | sort)
-  # Create the command to run
-  COMMAND='multitail --mergeall'
-  for SERVICE in ${SERVICES}; do
-      COMMAND="${COMMAND} -L 'docker service logs --tail 20 -f ${SERVICE}'"
-  done
-  # Run the command
-  bash -c "${COMMAND}"
-}
-
 ###### .. app <domain> logs <service> <args>...
 sub_app_logs (){
   load_instance
@@ -823,8 +856,8 @@ sub_app_logs (){
   SERVICE="${abra__service_}"
 
   if [ -z "$SERVICE" ]; then
-    warning "No \$SERVICE provided, running multilogs"
-    sub_app_multilogs
+    stack_logs "${STACK_NAME}"
+    return
   fi
 
   shift
@@ -938,9 +971,10 @@ sub_server_delete() {
   docker context rm  "$abra__host_"
 }
 
-###### .. server <host> use
-sub_server_use() {
-  docker context use "$abra__host_"
+###### .. server <host> apps
+sub_server_apps() {
+  abra___server="$abra__host_"
+  sub_app_list
 }
 
 #######################################
@@ -952,18 +986,24 @@ sub_upgrade() {
   curl https://install.abra.autonomic.zone | bash
 }
 
-###### .. volume <args>...
+###### .. stack <args>...
 sub_stack() {
   # shellcheck disable=SC2068
   docker stack $@
 }
 
-###### .. stack <args>...
+###### .. volume <args>...
 sub_volume() {
   # shellcheck disable=SC2068
   docker volume $@
 }
 
+###### .. network <args>...
+sub_network() {
+  # shellcheck disable=SC2068
+  docker network $@
+}
+
 #######################################
 # Main
 #######################################
@@ -973,9 +1013,9 @@ abra() {
   # the place to handle the dynamically-defined vars
   declare abra___stack abra___env abra__command_ abra__args_ \
     abra__secret_ abra__version_ abra__data_ abra___user abra__host_ \
-    abra__app_ abra__port_ abra__user_ abra__service_ abra__src_ abra__dst_ \
+    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___auto abra___status abra___no_tty abra___skip_check
 
   if ! type tput > /dev/null 2>&1; then
     tput() {

installer/installer

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ABRA_VERSION="0.3.1"
+ABRA_VERSION="0.4.1"
 ABRA_SRC="https://git.autonomic.zone/coop-cloud/abra/raw/tag/$ABRA_VERSION/abra"
 
 function install_abra {

tests/02_abra.bats

@@ -1,37 +1,37 @@
 #!/usr/bin/env bats
 
 setup() {
-    mkdir -p ~/.abra/servers/default
+    export ABRA_DIR=$(mktemp -d)
+    mkdir -p $ABRA_DIR/servers/default
 }
 
 teardown() {
-    rm -rf ~/.abra/servers/default
-    rm -rf ~/.abra/servers/swarm.test.com
+    rm -rf "$ABRA_DIR"
 }
 
 @test "abra server add/rm works" {
     ./abra server add swarm.test.com
     docker context ls | grep swarm.test.com
-    [ -d ~/.abra/servers/swarm.test.com ]
-    ./abra server rm swarm.test.com
+    [ -d $ABRA_DIR/servers/swarm.test.com ]
+    ./abra server swarm.test.com rm
 
     ./abra server add swarm.test.com foobar 12345
-    [ -d ~/.abra/servers/swarm.test.com ]
-    ./abra server rm swarm.test.com
+    [ -d $ABRA_DIR/servers/swarm.test.com ]
+    ./abra server swarm.test.com rm
 }
 
 @test "abra app new/rm works" {
     ./abra app new --server default --domain traefik.test.com traefik
-    [ -f ~/.abra/servers/default/traefik.test.com.env ]
+    [ -f $ABRA_DIR/servers/default/traefik.test.com.env ]
 
     # interactive prompt
     echo "y" | ./abra app traefik.test.com delete
-    [ ! -f ~/.abra/servers/default/traefik.test.com.env ]
+    [ ! -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/servers/default/traefik.test.com.env ]
+    [ ! -f $ABRA_DIR/servers/default/traefik.test.com.env ]
 }
 
 @test "abra app <domain> secret (insert|generate|rm)" {