From 225840b79d004d0b4befcdd33826c2ff0867ee7a Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 20 Feb 2017 21:48:58 -0700
Subject: [PATCH] refactor: move proxy:help to internal-functions

---
 plugins/proxy/commands           | 27 ++-----------------------
 plugins/proxy/internal-functions | 34 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 25 deletions(-)
 create mode 100644 plugins/proxy/internal-functions

diff --git a/plugins/proxy/commands b/plugins/proxy/commands
index 7df9f973b..db59fda92 100755
--- a/plugins/proxy/commands
+++ b/plugins/proxy/commands
@@ -1,34 +1,11 @@
 #!/usr/bin/env bash
 [[ " help proxy:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
+source "$PLUGIN_AVAILABLE_PATH/proxy/internal-functions"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
   help | proxy:help)
-    help_content_func () {
-      declare desc="return proxy plugin help content"
-      cat<<help_content
-    proxy <app>, Show proxy settings for app
-    proxy:enable <app>, Enable proxy for app
-    proxy:disable <app>, Disable proxy for app
-    proxy:ports <app>, List proxy port mappings for app
-    proxy:ports-clear <app>, Clear all proxy port mappings for app
-    proxy:ports-add <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...], Set proxy port mappings for app
-    proxy:ports-remove <app> <host-port> [<host-port>|<scheme>:<host-port>:<container-port>...], Unset proxy port mappings for app
-    proxy:report [<app>] [<flag>], Displays a proxy report for one or more apps
-    proxy:set <app> <proxy-type>, Set proxy type for app
-help_content
-    }
-
-    if [[ $1 = "proxy:help" ]] ; then
-        echo -e 'Usage: dokku proxy[:COMMAND]'
-        echo ''
-        echo 'Control the proxy used by dokku, per app.'
-        echo ''
-        echo 'Additional commands:'
-        help_content_func | sort | column -c2 -t -s,
-    else
-        help_content_func
-    fi
+    proxy_vhosts_help_cmd "$@"
     ;;
 
   *)
diff --git a/plugins/proxy/internal-functions b/plugins/proxy/internal-functions
new file mode 100644
index 000000000..ec85d4ab2
--- /dev/null
+++ b/plugins/proxy/internal-functions
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+proxy_vhosts_help_content_func() {
+    declare desc="return proxy plugin help content"
+    cat<<help_content
+    proxy <app>, [DEPRECATED] Show proxy settings for app
+    proxy:enable <app>, Enable proxy for app
+    proxy:disable <app>, Disable proxy for app
+    proxy:ports <app>, List proxy port mappings for app
+    proxy:ports-clear <app>, Clear all proxy port mappings for app
+    proxy:ports-add <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...], Set proxy port mappings for app
+    proxy:ports-remove <app> <host-port> [<host-port>|<scheme>:<host-port>:<container-port>...], Unset proxy port mappings for app
+    proxy:report [<app>] [<flag>], Displays a proxy report for one or more apps
+    proxy:set <app> <proxy-type>, Set proxy type for app
+help_content
+}
+
+proxy_vhosts_help_cmd() {
+  if [[ $1 = "proxy:help" ]] ; then
+    echo -e 'Usage: dokku proxy[:COMMAND]'
+    echo ''
+    echo 'Manage the proxy used by dokku on a per app.'
+    echo ''
+    echo 'Additional commands:'
+    proxy_vhosts_help_content_func | sort | column -c2 -t -s,
+  elif [[ $(ps -o command= $PPID) == *"--all"* ]]; then
+    proxy_vhosts_help_content_func
+  else
+    cat<<help_desc
+    proxy, Manage the proxy used by dokku on a per app
+help_desc
+  fi
+}