refactor: standardize help generation

plugins/ssh-keys/commands

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

plugins/ssh-keys/help-functions

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-ssh-keys-help() {
+  declare desc="help command"
+  declare CMD="$1"
+  local plugin_name="ssh-keys"
+  local plugin_description="Manage public ssh keys used for deployment"
+
+  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
+    ssh-keys:list, List of all authorized dokku public ssh keys
+    ssh-keys:add <name> [/path/to/key], Add a new public key by pipe or path
+    ssh-keys:remove <name>, Remove SSH public key by name
+help_content
+}

plugins/ssh-keys/internal-functions

@@ -2,33 +2,6 @@
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 
-ssh_keys_help_content_func() {
-  declare desc="return ssh-keys plugin help content"
-  cat <<help_content
-    ssh-keys:list, List of all authorized dokku public ssh keys
-    ssh-keys:add <name> [/path/to/key], Add a new public key by pipe or path
-    ssh-keys:remove <name>, Remove SSH public key by name
-help_content
-}
-
-cmd-ssh-keys-help() {
-  if [[ $1 == "ssh-keys:help" ]]; then
-    echo -e 'Usage: dokku ssh-keys[:COMMAND]'
-    echo ''
-    echo 'Manage public ssh keys that are allowed to connect to Dokku'
-    echo ''
-    echo 'Additional commands:'
-    ssh_keys_help_content_func | sort | column -c2 -t -s,
-  elif [[ $(ps -o command= $PPID) == *"--all"* ]]; then
-    ssh_keys_help_content_func
-  else
-    cat <<help_desc
-    ssh-keys, Manage public ssh keys that are allowed to connect to Dokku
-help_desc
-  fi
-}
-
-
 cmd-list-ssh-keys() {
   declare desc="List ssh key hashes"
   local cmd="ssh-keys:list"

plugins/ssh-keys/subcommands/default

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