refactor: standardize help generation

plugins/tar/commands

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 [[ " help tar:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
-source "$PLUGIN_AVAILABLE_PATH/tar/internal-functions"
+source "$PLUGIN_AVAILABLE_PATH/tar/help-functions"
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
   help | tar:help)
-    cmd-tar-help "$1"
+    cmd-tar-help "$@"
     ;;
 
   *)

plugins/tar/help-functions

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-tar-help() {
+  declare desc="help command"
+  declare CMD="$1"
+  local plugin_name="tar"
+  local plugin_description="Manage app deploys via tar"
+
+  if [[ "$CMD" == "$plugin_name:help" ]]; then
+    echo -e "Usage: dokku $plugin_name[:COMMAND]"
+    echo ''
+    echo "$plugin_description"
+    echo ''
+    echo 'Additional commands:'
+    fn-help-content | sort | column -c2 -t -s,
+  elif [[ $(ps -o command= $PPID) == *"--all"* ]]; then
+    fn-help-content
+  else
+    cat <<help_desc
+    $plugin_name, $plugin_description
+help_desc
+  fi
+}
+
+fn-help-content() {
+  declare desc="return help content"
+  cat <<help_content
+    tar:in <app>, Reads an tarball containing the app from stdin
+    tar:from <app> <url>, Loads an app tarball from url
+help_content
+}

plugins/tar/internal-functions

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-[[ $DOKKU_TRACE ]] && set -x
-
-tar_help_content_func() {
-  declare desc="return tar plugin help content"
-  cat <<help_content
-    tar:in <app>, Reads an tarball containing the app from stdin
-    tar:from <app> <url>, Loads an app tarball from url
-help_content
-}
-
-cmd-tar-help() {
-  if [[ $1 == "tar:help" ]]; then
-    echo -e 'Usage: dokku tar[:COMMAND]'
-    echo ''
-    echo 'An alternative to using git, apps are loaded via tarballs instead.'
-    echo ''
-    echo 'Additional commands:'
-    tar_help_content_func | sort | column -c2 -t -s,
-  elif [[ $(ps -o command= $PPID) == *"--all"* ]]; then
-    tar_help_content_func
-  else
-    cat <<help_desc
-    tar, Deploy applications via tarball instead of git
-help_desc
-  fi
-}

plugins/tar/subcommands/default

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_AVAILABLE_PATH/tar/internal-functions"
+source "$PLUGIN_AVAILABLE_PATH/tar/help-functions"
 
 cmd-tar-help "tar:help"