From 9a1dd41e9f179c686cad58d3e9c7f8c977f3b2f6 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 3 Mar 2018 19:11:49 -0500 Subject: [PATCH] refactor: rename to deploy-source --- docs/development/plugin-triggers.md | 6 +++--- plugins/apps/subcommands/report | 2 +- plugins/git/{deploy-method => deploy-source} | 10 +++++----- plugins/tar/{deploy-method => deploy-source} | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) rename plugins/git/{deploy-method => deploy-source} (58%) rename plugins/tar/{deploy-method => deploy-source} (59%) diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md index ef24f68e6..6a172b32a 100644 --- a/docs/development/plugin-triggers.md +++ b/docs/development/plugin-triggers.md @@ -147,9 +147,9 @@ case "$DOKKU_DISTRO" in esac ``` -### `deploy-method` +### `deploy-source` -- Description: Used for reporting what the current detected deployment method is. The first detected method should always win. +- Description: Used for reporting what the current detected deployment source is. The first detected source should always win. - Invoked by: `dokku apps:report` - Arguments: `$APP` - Example: @@ -163,7 +163,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x APP="$1" STDIN=$(cat) -# bail if another method is detected +# bail if another source is detected if [[ -n "$STDIN" ]]; then echo "$STDIN" return diff --git a/plugins/apps/subcommands/report b/plugins/apps/subcommands/report index 7bf3b0d54..5aa2c5759 100755 --- a/plugins/apps/subcommands/report +++ b/plugins/apps/subcommands/report @@ -15,7 +15,7 @@ report_single_app() { local flag_map=( "--app-dir: $APP_DIR" "--git-sha: $(GIT_DIR="$APP_DIR" git rev-parse --short HEAD 2> /dev/null || false)" - "--deploy-method: $(plugn trigger deploy-method "$APP")" + "--deploy-source: $(plugn trigger deploy-source "$APP")" ) if [[ -z "$INFO_FLAG" ]]; then diff --git a/plugins/git/deploy-method b/plugins/git/deploy-source similarity index 58% rename from plugins/git/deploy-method rename to plugins/git/deploy-source index 32fe06198..8f086c7be 100755 --- a/plugins/git/deploy-method +++ b/plugins/git/deploy-source @@ -1,14 +1,14 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x -git_deploy_method() { - declare desc="git deploy-method plugin trigger" - declare trigger="git_deploy_method" +git_deploy_source() { + declare desc="git deploy-source plugin trigger" + declare trigger="git_deploy_source" declare APP="$1" local STDIN STDIN=$(cat) - # bail if another method is detected + # bail if another source is detected if [[ -n "$STDIN" ]]; then echo "$STDIN" return @@ -19,4 +19,4 @@ git_deploy_method() { fi } -git_deploy_method "$@" +git_deploy_source "$@" diff --git a/plugins/tar/deploy-method b/plugins/tar/deploy-source similarity index 59% rename from plugins/tar/deploy-method rename to plugins/tar/deploy-source index 0fb6a0e03..14736c7de 100755 --- a/plugins/tar/deploy-method +++ b/plugins/tar/deploy-source @@ -1,14 +1,14 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x -tar_deploy_method() { - declare desc="tar deploy-method plugin trigger" - declare trigger="tar_deploy_method" +tar_deploy_source() { + declare desc="tar deploy-source plugin trigger" + declare trigger="tar_deploy_source" declare APP="$1" local STDIN STDIN=$(cat) - # bail if another method is detected + # bail if another source is detected if [[ -n "$STDIN" ]]; then echo "$STDIN" return @@ -19,4 +19,4 @@ tar_deploy_method() { fi } -tar_deploy_method "$@" +tar_deploy_source "$@"