github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: unify command declaration across codebase

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-02-10 01:40:30 -05:00
parent b0abeb49dd
commit e67b96780d
108 changed files with 475 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/plugin/internal-functions
View File

@@ -5,7 +5,8 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
cmd-plugin-list() {
declare desc="lists all plugins"
local cmd="plugin"
declare cmd="plugin"
[[ "$1" == "$cmd" ]] && shift 1
plugn version
plugn list

8
plugins/plugin/subcommands/disable
View File

@@ -7,9 +7,11 @@ source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
cmd-plugin-disable() {
declare desc="disables plugin via command line"
local cmd="plugin:disable"
[[ -z $2 ]] && dokku_log_fail "Please specify a plugin to disable"
local PLUGIN="$2"
declare cmd="plugin:disable"
[[ "$1" == "$cmd" ]] && shift 1
declare PLUGIN="$1"
[[ -z "$PLUGIN" ]] && dokku_log_fail "Please specify a plugin to disable"
disable_plugin "$PLUGIN"
plugin_prime_bash_completion
}

8
plugins/plugin/subcommands/enable
View File

@@ -7,9 +7,11 @@ source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
cmd-plugin-enable() {
declare desc="enables plugin via command line"
local cmd="plugin:enable"
[[ -z $2 ]] && dokku_log_fail "Please specify a plugin to enable"
local PLUGIN="$2"
declare cmd="plugin:enable"
[[ "$1" == "$cmd" ]] && shift 1
declare PLUGIN="$1"
[[ -z "$PLUGIN" ]] && dokku_log_fail "Please specify a plugin to enable"
enable_plugin "$PLUGIN"
plugin_prime_bash_completion
}

10
plugins/plugin/subcommands/install
View File

@@ -7,14 +7,16 @@ source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
cmd-plugin-install() {
declare desc="installs a plugin from URL and calls install plugin trigger via command line"
local cmd="plugin:install"
case "$2" in
declare cmd="plugin:install"
[[ "$1" == "$cmd" ]] && shift 1
declare FLAG="$1"
case "$FLAG" in
--core)
[[ "$#" -gt 2 ]] && dokku_log_info1_quiet "Cannot install additional core plugins, running core plugin install trigger"
[[ "$#" -gt 1 ]] && dokku_log_info1_quiet "Cannot install additional core plugins, running core plugin install trigger"
PLUGIN_PATH="$PLUGIN_CORE_PATH" plugn trigger install
;;
https:* | git* | ssh:* | file:* | *.tar.gz | *.tgz)
shift
download_and_enable_plugin "$@"
plugn trigger install
;;

7
plugins/plugin/subcommands/install-dependencies
View File

@@ -4,8 +4,11 @@ set -eo pipefail
cmd-plugin-install-dependencies() {
declare desc="calls dependencies plugin trigger via command line"
local cmd="plugin:install-dependencies"
if [[ $2 == "--core" ]]; then
declare cmd="plugin:install-dependencies"
[[ "$1" == "$cmd" ]] && shift 1
declare FLAG="$1"
if [[ "$FLAG" == "--core" ]]; then
export PLUGIN_PATH="$PLUGIN_CORE_PATH"
fi
plugn trigger dependencies

2
plugins/plugin/subcommands/trigger
View File

@@ -4,7 +4,7 @@ set -eo pipefail
cmd-plugin-trigger() {
declare desc="trigger an arbitrary plugin hook"
local cmd="plugin:trigger"
declare cmd="plugin:trigger"
[[ "$1" == "$cmd" ]] && shift 1
plugn trigger "$@"

8
plugins/plugin/subcommands/uninstall
View File

@@ -7,9 +7,11 @@ source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
cmd-plugin-uninstall() {
declare desc="uninstalls plugin via command line"
local cmd="plugin:uninstall"
[[ -z $2 ]] && dokku_log_fail "Please specify a plugin to uninstall"
local PLUGIN="$2"
declare cmd="plugin:uninstall"
[[ "$1" == "$cmd" ]] && shift 1
declare PLUGIN="$1"
[[ -z "$PLUGIN" ]] && dokku_log_fail "Please specify a plugin to uninstall"
uninstall_plugin "$PLUGIN"
plugin_prime_bash_completion
}

9
plugins/plugin/subcommands/update
View File

@@ -5,10 +5,11 @@ source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
cmd-plugin-update() {
declare desc="updates plugin to optional committish and calls update plugin trigger via command line"
local cmd="plugin:update"
if [[ -n "$2" ]]; then
local PLUGIN="$2"
local PLUGIN_COMMITTISH="$3"
declare cmd="plugin:update"
[[ "$1" == "$cmd" ]] && shift 1
declare PLUGIN="$1" PLUGIN_COMMITTISH="$2"
if [[ -n "$PLUGIN" ]]; then
plugn update "$PLUGIN" "$PLUGIN_COMMITTISH"
fi
plugn trigger update