Change -v option to version subcommand
				
					
				
			This commit is contained in:
		
							
								
								
									
										163
									
								
								abra
									
									
									
									
									
								
							
							
						
						
									
										163
									
								
								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 | ||||
| @ -33,12 +34,12 @@ Usage: | ||||
|   abra [options] server <host> init | ||||
|   abra [options] server <host> apps [--status] | ||||
|   abra [options] upgrade | ||||
|   abra [options] version | ||||
|  | ||||
| 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. | ||||
| " | ||||
| @ -142,82 +143,80 @@ 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:1448} | ||||
| usage=${DOC:40:1140}; digest=9b6cc | ||||
| shorts=(-v -h -s -e '' '' '' '' '' '' '' '' '' '' '') | ||||
| longs=(--version --help --stack --env --server --domain --app-name --pass --auto --status --skip-check --force --no-tty --user --all) | ||||
| argcounts=(0 0 1 1 1 1 1 0 0 0 0 0 0 1 0); node_0(){ switch __version 0; } | ||||
| node_1(){ switch __help 1; }; node_2(){ value __stack 2; }; node_3(){ | ||||
| value __env 3; }; node_4(){ value __server 4; }; node_5(){ value __domain 5; } | ||||
| node_6(){ value __app_name 6; }; node_7(){ switch __pass 7; }; node_8(){ | ||||
| switch __auto 8; }; node_9(){ switch __status 9; }; node_10(){ | ||||
| switch __skip_check 10; }; node_11(){ switch __force 11; }; node_12(){ | ||||
| switch __no_tty 12; }; node_13(){ value __user 13; }; node_14(){ switch __all 14 | ||||
| }; node_15(){ value _type_ a; }; node_16(){ value _app_ a; }; node_17(){ | ||||
| value _service_ a; }; node_18(){ value _src_ a; }; node_19(){ value _dst_ a; } | ||||
| node_20(){ value _args_ a true; }; node_21(){ value _secret_ a; }; node_22(){ | ||||
| value _version_ a; }; node_23(){ value _cmd_ a; }; node_24(){ value _data_ a; } | ||||
| node_25(){ value _command_ a; }; node_26(){ value _host_ a; }; node_27(){ | ||||
| value _user_ a; }; node_28(){ value _port_ a; }; 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(){ optional 0 1 2 3; } | ||||
| node_53(){ optional 52; }; node_54(){ optional 4; }; node_55(){ optional 5; } | ||||
| node_56(){ optional 6; }; node_57(){ optional 7; }; node_58(){ optional 8; } | ||||
| node_59(){ required 53 29 30 54 55 56 57 58 15; }; node_60(){ either 31 32; } | ||||
| node_61(){ required 60; }; node_62(){ optional 9; }; node_63(){ | ||||
| required 53 29 61 62 54; }; node_64(){ optional 10; }; node_65(){ | ||||
| required 53 29 16 33 64; }; node_66(){ required 53 29 16 34; }; node_67(){ | ||||
| required 53 29 16 35; }; node_68(){ either 36 37; }; node_69(){ required 68; } | ||||
| node_70(){ optional 11; }; node_71(){ required 53 29 16 69 70; }; node_72(){ | ||||
| optional 17; }; node_73(){ required 53 29 16 38 72; }; node_74(){ | ||||
| required 53 29 16 39 18 19; }; node_75(){ required 53 29 16 40; }; node_76(){ | ||||
| required 53 29 16 41; }; node_77(){ optional 12; }; node_78(){ optional 13; } | ||||
| node_79(){ oneormore 20; }; node_80(){ required 53 29 16 42 77 78 17 79; } | ||||
| node_81(){ required 53 29 16 43 44 57; }; node_82(){ optional 23; }; node_83(){ | ||||
| required 53 29 16 43 45 21 22 82 57; }; node_84(){ | ||||
| required 53 29 16 43 46 21 22 24 57; }; node_85(){ either 21 14; }; node_86(){ | ||||
| required 85; }; node_87(){ required 53 29 16 43 69 86 57 70; }; node_88(){ | ||||
| optional 79; }; node_89(){ required 53 29 16 25 88; }; node_90(){ optional 27; } | ||||
| node_91(){ optional 28; }; node_92(){ required 53 47 48 26 90 91; }; node_93(){ | ||||
| required 53 47 61; }; node_94(){ required 53 47 26 37; }; node_95(){ | ||||
| required 53 47 26 49; }; node_96(){ required 53 47 26 50 62; }; node_97(){ | ||||
| required 53 51; }; node_98(){ | ||||
| either 59 63 65 66 67 71 73 74 75 76 80 81 83 84 87 89 92 93 94 95 96 97; } | ||||
| node_99(){ required 98; }; cat <<<' docopt_exit() { | ||||
| [[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1140}" >&2 | ||||
| exit 1; }'; unset var___version var___help var___stack var___env 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_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 99 "$@"; local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__version" \ | ||||
| "${prefix}__help" "${prefix}__stack" "${prefix}__env" "${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}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" | ||||
| eval "${prefix}"'__version=${var___version:-false}' | ||||
| eval "${prefix}"'__help=${var___help:-false}' | ||||
| printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1429} | ||||
| usage=${DOC:40:1165}; digest=cb5e2 | ||||
| shorts=(-s -e -h '' '' '' '' '' '' '' '' '' '' '') | ||||
| longs=(--stack --env --help --server --domain --app-name --pass --auto --status --skip-check --force --no-tty --user --all) | ||||
| argcounts=(1 1 0 1 1 1 0 0 0 0 0 0 1 0); node_0(){ value __stack 0; }; node_1(){ | ||||
| value __env 1; }; node_2(){ switch __help 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 _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(){ _command version; } | ||||
| node_52(){ optional 0 1 2; }; node_53(){ optional 52; }; node_54(){ optional 3 | ||||
| }; node_55(){ optional 4; }; node_56(){ optional 5; }; node_57(){ optional 6; } | ||||
| node_58(){ optional 7; }; node_59(){ required 53 28 29 54 55 56 57 58 14; } | ||||
| node_60(){ either 30 31; }; node_61(){ required 60; }; node_62(){ optional 8; } | ||||
| node_63(){ required 53 28 61 62 54; }; node_64(){ optional 9; }; node_65(){ | ||||
| required 53 28 15 32 64; }; node_66(){ required 53 28 15 33; }; node_67(){ | ||||
| required 53 28 15 34; }; node_68(){ either 35 36; }; node_69(){ required 68; } | ||||
| node_70(){ optional 10; }; node_71(){ required 53 28 15 69 70; }; node_72(){ | ||||
| optional 16; }; node_73(){ required 53 28 15 37 72; }; node_74(){ | ||||
| required 53 28 15 38 17 18; }; node_75(){ required 53 28 15 39; }; node_76(){ | ||||
| required 53 28 15 40; }; node_77(){ optional 11; }; node_78(){ optional 12; } | ||||
| node_79(){ oneormore 19; }; node_80(){ required 53 28 15 41 77 78 16 79; } | ||||
| node_81(){ required 53 28 15 42 43 57; }; node_82(){ optional 22; }; node_83(){ | ||||
| required 53 28 15 42 44 20 21 82 57; }; node_84(){ | ||||
| required 53 28 15 42 45 20 21 23 57; }; node_85(){ either 20 13; }; node_86(){ | ||||
| required 85; }; node_87(){ required 53 28 15 42 69 86 57 70; }; node_88(){ | ||||
| optional 79; }; node_89(){ required 53 28 15 24 88; }; node_90(){ optional 26; } | ||||
| node_91(){ optional 27; }; node_92(){ required 53 46 47 25 90 91; }; node_93(){ | ||||
| required 53 46 61; }; node_94(){ required 53 46 25 36; }; node_95(){ | ||||
| required 53 46 25 48; }; node_96(){ required 53 46 25 49 62; }; node_97(){ | ||||
| required 53 50; }; node_98(){ required 53 51; }; node_99(){ | ||||
| either 59 63 65 66 67 71 73 74 75 76 80 81 83 84 87 89 92 93 94 95 96 97 98; } | ||||
| node_100(){ required 99; }; cat <<<' docopt_exit() { | ||||
| [[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1165}" >&2 | ||||
| exit 1; }'; unset var___stack var___env var___help 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_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; parse 100 "$@" | ||||
| local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" "${prefix}__env" \ | ||||
| "${prefix}__help" "${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}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" | ||||
| eval "${prefix}"'__stack=${var___stack:-}' | ||||
| eval "${prefix}"'__env=${var___env:-}' | ||||
| eval "${prefix}"'__help=${var___help:-false}' | ||||
| eval "${prefix}"'__server=${var___server:-}' | ||||
| eval "${prefix}"'__domain=${var___domain:-}' | ||||
| eval "${prefix}"'__app_name=${var___app_name:-}' | ||||
| @ -259,10 +258,11 @@ 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}'; local docopt_i=1 | ||||
| [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do | ||||
| declare -p "${prefix}__version" "${prefix}__help" "${prefix}__stack" \ | ||||
| "${prefix}__env" "${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \ | ||||
| declare -p "${prefix}__stack" "${prefix}__env" "${prefix}__help" \ | ||||
| "${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_" \ | ||||
| @ -274,7 +274,7 @@ declare -p "${prefix}__version" "${prefix}__help" "${prefix}__stack" \ | ||||
| "${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; } | ||||
| "${prefix}upgrade" "${prefix}version"; done; } | ||||
| # docopt parser above, complete command for generating this parser is `docopt.sh abra` | ||||
|  | ||||
| PROGRAM_NAME=$(basename "$0") | ||||
| @ -1004,6 +1004,11 @@ sub_upgrade() { | ||||
|   curl https://install.abra.autonomic.zone | bash | ||||
| } | ||||
|  | ||||
| ###### .. version | ||||
| sub_version() { | ||||
|   echo "$ABRA_VERSION" | ||||
| } | ||||
|  | ||||
| ###### .. stack <args>... | ||||
| sub_stack() { | ||||
|   # shellcheck disable=SC2068 | ||||
|  | ||||
		Reference in New Issue
	
	Block a user