Prefer --fast for skipping all checks

Closes coop-cloud/abra#169

CHANGELOG.md

@@ -10,6 +10,7 @@
 # abra x.x.x (UNRELEASED)
 
 - Add `--bump` to `deploy` command to allow packagers to make minor package related releases ([#173](https://git.autonomic.zone/coop-cloud/abra/issues/173))
+- Drop `--skip-version-check`/`--no-domain-poll`/`--no-state-poll` in favour of `--fast` ([#169](https://git.autonomic.zone/coop-cloud/abra/issues/169))
 
 # abra 9.0.0 (2021-06-10)
 

abra

@@ -19,7 +19,7 @@ Usage:
   abra [options] app (list|ls) [--status] [--server=<server>] [--type=<type>]
   abra [options] app new [--server=<server>] [--domain=<domain>] [--app-name=<app_name>] [--pass] [--secrets] <type>
   abra [options] app <app> backup (<service>|--all)
-  abra [options] app <app> deploy [--update] [--force] [--fast] [--skip-version-check] [--no-domain-poll] [--no-state-poll] [--chaos] [<version>]
+  abra [options] app <app> deploy [--update] [--force] [--fast] [--chaos] [<version>]
   abra [options] app <app> check
   abra [options] app <app> version
   abra [options] app <app> config
@@ -167,92 +167,88 @@ 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:2511}
+printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2451}
-usage=${DOC:40:1902}; digest=145c2
+usage=${DOC:40:1842}; digest=c7bae
-shorts=(-s -d -U -b -h -C -n -v -e '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+shorts=(-e -b -s -C -U -h -d -v -n '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
-longs=(--stack --debug --skip-update --branch --help --skip-check --no-prompt --verbose --env --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --skip-version-check --no-domain-poll --no-state-poll --chaos --volumes --no-tty --user --bump --dev)
+longs=(--env --branch --stack --skip-check --skip-update --help --debug --verbose --no-prompt --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --chaos --volumes --no-tty --user --bump --dev)
-argcounts=(1 0 0 1 0 0 0 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0); node_0(){
+argcounts=(1 1 1 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0 0); node_0(){
-value __stack 0; }; node_1(){ switch __debug 1; }; node_2(){
+value __env 0; }; node_1(){ value __branch 1; }; node_2(){ value __stack 2; }
-switch __skip_update 2; }; node_3(){ value __branch 3; }; node_4(){
+node_3(){ switch __skip_check 3; }; node_4(){ switch __skip_update 4; }
-switch __help 4; }; node_5(){ switch __skip_check 5; }; node_6(){
+node_5(){ switch __help 5; }; node_6(){ switch __debug 6; }; node_7(){
-switch __no_prompt 6; }; node_7(){ switch __verbose 7; }; node_8(){
+switch __verbose 7; }; node_8(){ switch __no_prompt 8; }; node_9(){
-value __env 8; }; node_9(){ switch __status 9; }; node_10(){ value __server 10
+switch __status 9; }; node_10(){ value __server 10; }; node_11(){
-}; node_11(){ value __type 11; }; node_12(){ value __domain 12; }; node_13(){
+value __type 11; }; node_12(){ value __domain 12; }; node_13(){
 value __app_name 13; }; node_14(){ switch __pass 14; }; node_15(){
 switch __secrets 15; }; node_16(){ switch __all 16; }; node_17(){
 switch __update 17; }; node_18(){ switch __force 18; }; node_19(){
-switch __fast 19; }; node_20(){ switch __skip_version_check 20; }; node_21(){
+switch __fast 19; }; node_20(){ switch __chaos 20; }; node_21(){
-switch __no_domain_poll 21; }; node_22(){ switch __no_state_poll 22; }
+switch __volumes 21; }; node_22(){ switch __no_tty 22; }; node_23(){
-node_23(){ switch __chaos 23; }; node_24(){ switch __volumes 24; }; node_25(){
+value __user 23; }; node_24(){ switch __bump 24; }; node_25(){ switch __dev 25
-switch __no_tty 25; }; node_26(){ value __user 26; }; node_27(){
+}; node_26(){ value _type_ a; }; node_27(){ value _app_ a; }; node_28(){
-switch __bump 27; }; node_28(){ switch __dev 28; }; node_29(){ value _type_ a; }
+value _service_ a; }; node_29(){ value _version_ a; }; node_30(){ value _src_ a
-node_30(){ value _app_ a; }; node_31(){ value _service_ a; }; node_32(){
+}; node_31(){ value _dst_ a; }; node_32(){ value _backup_file_ a; }; node_33(){
-value _version_ a; }; node_33(){ value _src_ a; }; node_34(){ value _dst_ a; }
+value _args_ a true; }; node_34(){ value _secret_ a; }; node_35(){ value _cmd_ a
-node_35(){ value _backup_file_ a; }; node_36(){ value _args_ a true; }
+}; node_36(){ value _data_ a; }; node_37(){ value _volume_ a; }; node_38(){
-node_37(){ value _secret_ a; }; node_38(){ value _cmd_ a; }; node_39(){
+value _command_ a; }; node_39(){ value _recipe_ a; }; node_40(){ value _host_ a
-value _data_ a; }; node_40(){ value _volume_ a; }; node_41(){ value _command_ a
+}; node_41(){ value _user_ a; }; node_42(){ value _port_ a; }; node_43(){
-}; node_42(){ value _recipe_ a; }; node_43(){ value _host_ a; }; node_44(){
+value _provider_ a; }; node_44(){ value _subcommands_ a true; }; node_45(){
-value _user_ a; }; node_45(){ value _port_ a; }; node_46(){ value _provider_ a
+_command app; }; node_46(){ _command list; }; node_47(){ _command ls; }
-}; node_47(){ value _subcommands_ a true; }; node_48(){ _command app; }
+node_48(){ _command new; }; node_49(){ _command backup; }; node_50(){
-node_49(){ _command list; }; node_50(){ _command ls; }; node_51(){ _command new
+_command deploy; }; node_51(){ _command check; }; node_52(){ _command version; }
-}; node_52(){ _command backup; }; node_53(){ _command deploy; }; node_54(){
+node_53(){ _command config; }; node_54(){ _command cp; }; node_55(){
-_command check; }; node_55(){ _command version; }; node_56(){ _command config; }
+_command logs; }; node_56(){ _command ps; }; node_57(){ _command restore; }
-node_57(){ _command cp; }; node_58(){ _command logs; }; node_59(){ _command ps
+node_58(){ _command rm; }; node_59(){ _command delete; }; node_60(){
-}; node_60(){ _command restore; }; node_61(){ _command rm; }; node_62(){
+_command run; }; node_61(){ _command rollback; }; node_62(){ _command secret; }
-_command delete; }; node_63(){ _command run; }; node_64(){ _command rollback; }
+node_63(){ _command generate; }; node_64(){ _command insert; }; node_65(){
-node_65(){ _command secret; }; node_66(){ _command generate; }; node_67(){
+_command undeploy; }; node_66(){ _command volume; }; node_67(){ _command recipe
-_command insert; }; node_68(){ _command undeploy; }; node_69(){ _command volume
+}; node_68(){ _command create; }; node_69(){ _command release; }; node_70(){
-}; node_70(){ _command recipe; }; node_71(){ _command create; }; node_72(){
+_command versions; }; node_71(){ _command server; }; node_72(){ _command add; }
-_command release; }; node_73(){ _command versions; }; node_74(){ _command server
+node_73(){ _command __ --; }; node_74(){ _command init; }; node_75(){
-}; node_75(){ _command add; }; node_76(){ _command __ --; }; node_77(){
+_command apps; }; node_76(){ _command upgrade; }; node_77(){ _command doctor; }
-_command init; }; node_78(){ _command apps; }; node_79(){ _command upgrade; }
+node_78(){ _command help; }; node_79(){ optional 0 1 2 3 4 5 6 7 8; }
-node_80(){ _command doctor; }; node_81(){ _command help; }; node_82(){
+node_80(){ optional 79; }; node_81(){ either 46 47; }; node_82(){ required 81; }
-optional 0 1 2 3 4 5 6 7 8; }; node_83(){ optional 82; }; node_84(){
+node_83(){ optional 9; }; node_84(){ optional 10; }; node_85(){ optional 11; }
-either 49 50; }; node_85(){ required 84; }; node_86(){ optional 9; }; node_87(){
+node_86(){ required 80 45 82 83 84 85; }; node_87(){ optional 12; }; node_88(){
-optional 10; }; node_88(){ optional 11; }; node_89(){ required 83 48 85 86 87 88
+optional 13; }; node_89(){ optional 14; }; node_90(){ optional 15; }; node_91(){
-}; node_90(){ optional 12; }; node_91(){ optional 13; }; node_92(){ optional 14
+required 80 45 48 84 87 88 89 90 26; }; node_92(){ either 28 16; }; node_93(){
-}; node_93(){ optional 15; }; node_94(){ required 83 48 51 87 90 91 92 93 29; }
+required 92; }; node_94(){ required 80 45 27 49 93; }; node_95(){ optional 17; }
-node_95(){ either 31 16; }; node_96(){ required 95; }; node_97(){
+node_96(){ optional 18; }; node_97(){ optional 19; }; node_98(){ optional 20; }
-required 83 48 30 52 96; }; node_98(){ optional 17; }; node_99(){ optional 18; }
+node_99(){ optional 29; }; node_100(){ required 80 45 27 50 95 96 97 98 99; }
-node_100(){ optional 19; }; node_101(){ optional 20; }; node_102(){ optional 21
+node_101(){ required 80 45 27 51; }; node_102(){ required 80 45 27 52; }
-}; node_103(){ optional 22; }; node_104(){ optional 23; }; node_105(){
+node_103(){ required 80 45 27 53; }; node_104(){ required 80 45 27 54 30 31; }
-optional 32; }; node_106(){ required 83 48 30 53 98 99 100 101 102 103 104 105
+node_105(){ optional 28; }; node_106(){ required 80 45 27 55 105; }; node_107(){
-}; node_107(){ required 83 48 30 54; }; node_108(){ required 83 48 30 55; }
+required 80 45 27 56; }; node_108(){ required 80 45 27 57 93; }; node_109(){
-node_109(){ required 83 48 30 56; }; node_110(){ required 83 48 30 57 33 34; }
+either 58 59; }; node_110(){ required 109; }; node_111(){ optional 21; }
-node_111(){ optional 31; }; node_112(){ required 83 48 30 58 111; }; node_113(){
+node_112(){ required 80 45 27 110 111 90; }; node_113(){ optional 32; }
-required 83 48 30 59; }; node_114(){ required 83 48 30 60 96; }; node_115(){
+node_114(){ required 80 45 27 57 28 113; }; node_115(){ optional 22; }
-either 61 62; }; node_116(){ required 115; }; node_117(){ optional 24; }
+node_116(){ optional 23; }; node_117(){ oneormore 33; }; node_118(){
-node_118(){ required 83 48 30 116 117 93; }; node_119(){ optional 35; }
+required 80 45 27 60 115 116 28 117; }; node_119(){ required 80 45 27 61 99; }
-node_120(){ required 83 48 30 60 31 119; }; node_121(){ optional 25; }
+node_120(){ required 34 29; }; node_121(){ either 120 16; }; node_122(){
-node_122(){ optional 26; }; node_123(){ oneormore 36; }; node_124(){
+required 121; }; node_123(){ optional 35; }; node_124(){
-required 83 48 30 63 121 122 31 123; }; node_125(){ required 83 48 30 64 105; }
+required 80 45 27 62 63 122 123 89; }; node_125(){
-node_126(){ required 37 32; }; node_127(){ either 126 16; }; node_128(){
+required 80 45 27 62 64 34 29 36 89; }; node_126(){ either 34 16; }; node_127(){
-required 127; }; node_129(){ optional 38; }; node_130(){
+required 126; }; node_128(){ required 80 45 27 62 110 127 89; }; node_129(){
-required 83 48 30 65 66 128 129 92; }; node_131(){
+required 80 45 27 65; }; node_130(){ required 80 45 27 66 47; }; node_131(){
-required 83 48 30 65 67 37 32 39 92; }; node_132(){ either 37 16; }; node_133(){
+either 37 16; }; node_132(){ required 131; }; node_133(){
-required 132; }; node_134(){ required 83 48 30 65 116 133 92; }; node_135(){
+required 80 45 27 66 110 132; }; node_134(){ optional 117; }; node_135(){
-required 83 48 30 68; }; node_136(){ required 83 48 30 69 50; }; node_137(){
+required 80 45 27 38 134; }; node_136(){ required 80 67 47; }; node_137(){
-either 40 16; }; node_138(){ required 137; }; node_139(){
+required 80 67 68 39; }; node_138(){ optional 24; }; node_139(){
-required 83 48 30 69 116 138; }; node_140(){ optional 123; }; node_141(){
+required 80 67 39 69 96 138; }; node_140(){ required 80 67 39 70; }; node_141(){
-required 83 48 30 41 140; }; node_142(){ required 83 70 50; }; node_143(){
+optional 41; }; node_142(){ optional 42; }; node_143(){
-required 83 70 71 42; }; node_144(){ optional 27; }; node_145(){
+required 80 71 72 40 141 142; }; node_144(){ required 80 71 48 43 73 33; }
-required 83 70 42 72 99 144; }; node_146(){ required 83 70 42 73; }; node_147(){
+node_145(){ required 80 71 82; }; node_146(){ required 80 71 40 58; }
-optional 44; }; node_148(){ optional 45; }; node_149(){
+node_147(){ required 80 71 40 74; }; node_148(){ required 80 71 40 75 83; }
-required 83 74 75 43 147 148; }; node_150(){ required 83 74 51 46 76 36; }
+node_149(){ optional 25; }; node_150(){ required 80 76 149; }; node_151(){
-node_151(){ required 83 74 85; }; node_152(){ required 83 74 43 61; }
+required 80 52; }; node_152(){ required 80 77; }; node_153(){ oneormore 44; }
-node_153(){ required 83 74 43 77; }; node_154(){ required 83 74 43 78 86; }
+node_154(){ optional 153; }; node_155(){ required 80 78 154; }; node_156(){
-node_155(){ optional 28; }; node_156(){ required 83 79 155; }; node_157(){
+required 80; }; node_157(){
-required 83 55; }; node_158(){ required 83 80; }; node_159(){ oneormore 47; }
+either 86 91 94 100 101 102 103 104 106 107 108 112 114 118 119 124 125 128 129 130 133 135 136 137 139 140 143 144 145 146 147 148 150 151 152 155 156
-node_160(){ optional 159; }; node_161(){ required 83 81 160; }; node_162(){
+}; node_158(){ required 157; }; cat <<<' docopt_exit() {
-required 83; }; node_163(){
+[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1842}" >&2
-either 89 94 97 106 107 108 109 110 112 113 114 118 120 124 125 130 131 134 135 136 139 141 142 143 145 146 149 150 151 152 153 154 156 157 158 161 162
+exit 1; }'; unset var___env var___branch var___stack var___skip_check \
-}; node_164(){ required 163; }; cat <<<' docopt_exit() {
+var___skip_update var___help var___debug var___verbose var___no_prompt \
-[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1902}" >&2
-exit 1; }'; unset var___stack var___debug var___skip_update var___branch \
-var___help var___skip_check var___no_prompt var___verbose var___env \
 var___status var___server var___type var___domain var___app_name var___pass \
-var___secrets var___all var___update var___force var___fast \
+var___secrets var___all var___update var___force var___fast var___chaos \
-var___skip_version_check var___no_domain_poll var___no_state_poll var___chaos \
 var___volumes var___no_tty var___user var___bump var___dev var__type_ \
 var__app_ var__service_ var__version_ var__src_ var__dst_ var__backup_file_ \
 var__args_ var__secret_ var__cmd_ var__data_ var__volume_ var__command_ \
@@ -261,18 +257,17 @@ var_app var_list var_ls var_new var_backup var_deploy var_check var_version \
 var_config var_cp var_logs var_ps var_restore var_rm var_delete var_run \
 var_rollback var_secret var_generate var_insert var_undeploy var_volume \
 var_recipe var_create var_release var_versions var_server var_add var___ \
-var_init var_apps var_upgrade var_doctor var_help; parse 164 "$@"
+var_init var_apps var_upgrade var_doctor var_help; parse 158 "$@"
-local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" "${prefix}__debug" \
+local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" "${prefix}__branch" \
-"${prefix}__skip_update" "${prefix}__branch" "${prefix}__help" \
+"${prefix}__stack" "${prefix}__skip_check" "${prefix}__skip_update" \
-"${prefix}__skip_check" "${prefix}__no_prompt" "${prefix}__verbose" \
+"${prefix}__help" "${prefix}__debug" "${prefix}__verbose" \
-"${prefix}__env" "${prefix}__status" "${prefix}__server" "${prefix}__type" \
+"${prefix}__no_prompt" "${prefix}__status" "${prefix}__server" \
-"${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
+"${prefix}__type" "${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
 "${prefix}__secrets" "${prefix}__all" "${prefix}__update" "${prefix}__force" \
-"${prefix}__fast" "${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
+"${prefix}__fast" "${prefix}__chaos" "${prefix}__volumes" "${prefix}__no_tty" \
-"${prefix}__no_state_poll" "${prefix}__chaos" "${prefix}__volumes" \
+"${prefix}__user" "${prefix}__bump" "${prefix}__dev" "${prefix}_type_" \
-"${prefix}__no_tty" "${prefix}__user" "${prefix}__bump" "${prefix}__dev" \
+"${prefix}_app_" "${prefix}_service_" "${prefix}_version_" "${prefix}_src_" \
-"${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \
+"${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
-"${prefix}_src_" "${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
 "${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
 "${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
 "${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
@@ -284,15 +279,15 @@ local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" "${prefix}__debug" \
 "${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
 "${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
 "${prefix}upgrade" "${prefix}doctor" "${prefix}help"
-eval "${prefix}"'__stack=${var___stack:-}'
-eval "${prefix}"'__debug=${var___debug:-false}'
-eval "${prefix}"'__skip_update=${var___skip_update:-false}'
-eval "${prefix}"'__branch=${var___branch:-}'
-eval "${prefix}"'__help=${var___help:-false}'
-eval "${prefix}"'__skip_check=${var___skip_check:-false}'
-eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
-eval "${prefix}"'__verbose=${var___verbose:-false}'
 eval "${prefix}"'__env=${var___env:-}'
+eval "${prefix}"'__branch=${var___branch:-}'
+eval "${prefix}"'__stack=${var___stack:-}'
+eval "${prefix}"'__skip_check=${var___skip_check:-false}'
+eval "${prefix}"'__skip_update=${var___skip_update:-false}'
+eval "${prefix}"'__help=${var___help:-false}'
+eval "${prefix}"'__debug=${var___debug:-false}'
+eval "${prefix}"'__verbose=${var___verbose:-false}'
+eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
 eval "${prefix}"'__status=${var___status:-false}'
 eval "${prefix}"'__server=${var___server:-}'
 eval "${prefix}"'__type=${var___type:-}'
@@ -304,9 +299,6 @@ eval "${prefix}"'__all=${var___all:-false}'
 eval "${prefix}"'__update=${var___update:-false}'
 eval "${prefix}"'__force=${var___force:-false}'
 eval "${prefix}"'__fast=${var___fast:-false}'
-eval "${prefix}"'__skip_version_check=${var___skip_version_check:-false}'
-eval "${prefix}"'__no_domain_poll=${var___no_domain_poll:-false}'
-eval "${prefix}"'__no_state_poll=${var___no_state_poll:-false}'
 eval "${prefix}"'__chaos=${var___chaos:-false}'
 eval "${prefix}"'__volumes=${var___volumes:-false}'
 eval "${prefix}"'__no_tty=${var___no_tty:-false}'
@@ -363,23 +355,22 @@ eval "${prefix}"'upgrade=${var_upgrade:-false}'
 eval "${prefix}"'doctor=${var_doctor:-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}__stack" "${prefix}__debug" "${prefix}__skip_update" \
+declare -p "${prefix}__env" "${prefix}__branch" "${prefix}__stack" \
-"${prefix}__branch" "${prefix}__help" "${prefix}__skip_check" \
+"${prefix}__skip_check" "${prefix}__skip_update" "${prefix}__help" \
-"${prefix}__no_prompt" "${prefix}__verbose" "${prefix}__env" \
+"${prefix}__debug" "${prefix}__verbose" "${prefix}__no_prompt" \
 "${prefix}__status" "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
 "${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
-"${prefix}__update" "${prefix}__force" "${prefix}__fast" \
+"${prefix}__update" "${prefix}__force" "${prefix}__fast" "${prefix}__chaos" \
-"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
+"${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__bump" \
-"${prefix}__no_state_poll" "${prefix}__chaos" "${prefix}__volumes" \
+"${prefix}__dev" "${prefix}_type_" "${prefix}_app_" "${prefix}_service_" \
-"${prefix}__no_tty" "${prefix}__user" "${prefix}__bump" "${prefix}__dev" \
+"${prefix}_version_" "${prefix}_src_" "${prefix}_dst_" \
-"${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \
+"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \
-"${prefix}_src_" "${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
+"${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" "${prefix}_command_" \
-"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
+"${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
-"${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
+"${prefix}_provider_" "${prefix}_subcommands_" "${prefix}app" "${prefix}list" \
-"${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
+"${prefix}ls" "${prefix}new" "${prefix}backup" "${prefix}deploy" \
-"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \
+"${prefix}check" "${prefix}version" "${prefix}config" "${prefix}cp" \
-"${prefix}deploy" "${prefix}check" "${prefix}version" "${prefix}config" \
+"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
-"${prefix}cp" "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
 "${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
 "${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
 "${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
@@ -1318,17 +1309,14 @@ _abra_backup_mysql() {
 
 ###### .. app deploy
 help_app_deploy (){
-  echo "abra [options] app <app> deploy [--update] [--force] [--fast] [--skip-version-check] [--no-domain-poll] [--no-state-poll]
+  echo "abra [options] app <app> deploy [--update] [--force] [--fast]
 
 Deploy app <app> to the configured server.
 
 OPTIONS
   --update                Consent to deploying an updated app version
   --force                 Force a deployment regardless of state
-  --skip-version-check    Don't try and detect deployed version
+  --fast                  Run deployment without various safety checks
-  --no-domain-poll        Don't wait for the configured domain to come up
-  --no-state-poll         Don't watch deployment state for success/failure
-  --fast                  Alias for --skip-version-check --no-domain-poll
   --chaos                 Deploy straight from latest Git version (potentially chaotic!)
 
 POWERED BY
@@ -1343,9 +1331,9 @@ sub_app_deploy (){
     NO_DOMAIN_POLL=true
     NO_STATE_POLL=true
   else
-    SKIP_VERSION_CHECK=$abra___skip_version_check
+    SKIP_VERSION_CHECK=false
-    NO_DOMAIN_POLL=$abra___no_domain_poll
+    NO_DOMAIN_POLL=false
-    NO_STATE_POLL=$abra___no_state_poll
+    NO_STATE_POLL=false
   fi
 
   if [ ! "$abra__version_" = "dev" ]; then
@@ -2564,9 +2552,7 @@ abra() {
     abra___skip_check abra__backup_file_ abra___verbose abra___debug \
     abra___help abra___branch abra___volumes abra__provider_ abra___type \
     abra___dev abra___update abra___no_prompt abra___force \
-    abra___skip_version_check abra__recipe_ abra___no_domain_poll \
+    abra__recipe_ abra___fast abra__volume_ abra___bump abra___chaos
-    abra___fast abra__volume_ abra___no_state_poll abra___bump \
-    abra___chaos
 
   if ! type tput > /dev/null 2>&1; then
     tput() {