refactor: standardize help generation

plugins/apps/commands

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 [[ " help apps:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
-source "$PLUGIN_AVAILABLE_PATH/apps/internal-functions"
+source "$PLUGIN_AVAILABLE_PATH/apps/help-functions"
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 

plugins/apps/help-functions

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-apps-help() {
+  declare desc="help command"
+  declare CMD="$1"
+  local plugin_name="apps"
+  local plugin_description="Manage apps"
+
+  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
+    apps, [DEPRECATED] Alias for apps:list
+    apps:clone <old-app> <new-app>, Clones an app
+    apps:create <app>, Create a new app
+    apps:destroy <app>, Permanently destroy an app
+    apps:exists <app>, Checks if an app exists
+    apps:list, List your apps
+    apps:lock <app>, Locks an app for deployment
+    apps:locked <app>, Checks if an app is locked for deployment
+    apps:rename <old-app> <new-app>, Rename an app
+    apps:report [<app>] [<flag>], Display report about an app
+    apps:unlock <app>, Unlocks an app for deployment
+help_content
+}

plugins/apps/internal-functions

@@ -78,47 +78,6 @@ cmd-apps-report-single() {
   fi
 }
 
-apps_help_content_func() {
-  declare desc="return apps plugin help content"
-  cat <<help_content
-    apps, [DEPRECATED] Alias for apps:list
-    apps:clone <old-app> <new-app>, Clones an app
-    apps:create <app>, Create a new app
-    apps:destroy <app>, Permanently destroy an app
-    apps:exists <app>, Checks if an app exists
-    apps:list, List your apps
-    apps:lock <app>, Locks an app for deployment
-    apps:locked <app>, Checks if an app is locked for deployment
-    apps:rename <old-app> <new-app>, Rename an app
-    apps:report [<app>] [<flag>], Display report about an app
-    apps:unlock <app>, Unlocks an app for deployment
-help_content
-}
-
-cmd-apps-help() {
-  if [[ $1 == "apps:help" ]]; then
-    echo -e 'Usage: dokku apps[:COMMAND]'
-    echo ''
-    echo 'Manage Dokku apps'
-    echo ''
-    echo 'Example:'
-    echo ''
-    echo '$ dokku apps:list'
-    echo '=====> My Apps'
-    echo 'example'
-    echo 'example2'
-    echo ''
-    echo 'Additional commands:'
-    apps_help_content_func | sort | column -c2 -t -s,
-  elif [[ $(ps -o command= $PPID) == *"--all"* ]]; then
-    apps_help_content_func
-  else
-    cat <<help_desc
-    apps, Manage Dokku apps
-help_desc
-  fi
-}
-
 cmd-apps-list() {
   declare desc="lists all apps"
   local cmd="apps"