From b30db17def6ba61b159bc9ca8a55a1d268a914a2 Mon Sep 17 00:00:00 2001
From: Michael Hobbs <michaelshanehobbs@gmail.com>
Date: Tue, 7 Jul 2015 09:41:18 -0700
Subject: [PATCH] use column to format help output

---
 dokku                              | 10 +++++-----
 plugins/00_dokku-standard/commands | 12 ++++++------
 plugins/20_events/commands         |  8 ++++----
 plugins/apps/commands              |  6 +++---
 plugins/backup/commands            |  4 ++--
 plugins/config/commands            |  8 ++++----
 plugins/docker-options/commands    |  8 ++++----
 plugins/domains/commands           |  8 ++++----
 plugins/nginx-vhosts/commands      |  4 ++--
 plugins/ps/commands                | 16 ++++++++--------
 plugins/shell/commands             |  2 +-
 11 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/dokku b/dokku
index 043e7a69b..a32bd815c 100755
--- a/dokku
+++ b/dokku
@@ -224,11 +224,11 @@ case "$1" in
     echo ""
     echo "Options:"
 
-    cat<<EOF | pluginhook commands help | sort
-    help                                                       Print the list of commands
-    plugins                                                    Print active plugins
-    plugins-install                                            Install active plugins
-    plugins-update                                             Update active plugins
+    cat<<EOF | pluginhook commands help | sort | column -c2 -t -s,
+    help, Print the list of commands
+    plugins, Print active plugins
+    plugins-install, Install active plugins
+    plugins-update, Update active plugins
 EOF
     ;;
 
diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index 0e12adfb2..d753f6532 100755
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -218,12 +218,12 @@ case "$1" in
 
   help)
     cat && cat<<EOF
-    ls                                                         Pretty listing of deployed applications and containers
-    logs <app> [-t]                                            Show the last logs for an application (-t follows)
-    run <app> <cmd>                                            Run a command in the environment of an application
-    url <app>                                                  Show the first URL for an application (compatibility)
-    urls <app>                                                 Show all URLs for an application
-    version                                                    Print dokku's version
+    ls, Pretty listing of deployed applications and containers
+    logs <app> [-t], Show the last logs for an application (-t follows)
+    run <app> <cmd>, Run a command in the environment of an application
+    url <app>, Show the first URL for an application (compatibility)
+    urls <app>, Show all URLs for an application
+    version, Print dokku's version
 EOF
     ;;
 
diff --git a/plugins/20_events/commands b/plugins/20_events/commands
index ad96119e5..66b72704f 100755
--- a/plugins/20_events/commands
+++ b/plugins/20_events/commands
@@ -40,10 +40,10 @@ case "$1" in
 
   help | events:help)
     cat && cat<<EOF
-    events [-t]                                                Show the last events (-t follows)
-    events:list                                                List logged events
-    events:on                                                  Enable events logger
-    events:off                                                 Disable events logger
+    events [-t], Show the last events (-t follows)
+    events:list, List logged events
+    events:on, Enable events logger
+    events:off, Disable events logger
 EOF
     ;;
 
diff --git a/plugins/apps/commands b/plugins/apps/commands
index 415956341..d1d157ce9 100755
--- a/plugins/apps/commands
+++ b/plugins/apps/commands
@@ -55,9 +55,9 @@ case "$1" in
 
   help | apps:help)
     cat && cat<<EOF
-    apps                                                       List your apps
-    apps:create <app>                                          Create a new app
-    apps:destroy <app>                                         Permanently destroy an app
+    apps, List your apps
+    apps:create <app>, Create a new app
+    apps:destroy <app>, Permanently destroy an app
 EOF
     ;;
 
diff --git a/plugins/backup/commands b/plugins/backup/commands
index 8d44e1438..d964cde6e 100755
--- a/plugins/backup/commands
+++ b/plugins/backup/commands
@@ -87,8 +87,8 @@ case "$1" in
 
   help | backup:help)
     cat && cat<<EOF
-    backup:export [file]                                       Export dokku configuration files
-    backup:import [file]                                       Import dokku configuration files
+    backup:export [file], Export dokku configuration files
+    backup:import [file], Import dokku configuration files
 EOF
     ;;
 
diff --git a/plugins/config/commands b/plugins/config/commands
index fd672833e..11ec22ef7 100755
--- a/plugins/config/commands
+++ b/plugins/config/commands
@@ -211,10 +211,10 @@ ${var}"
 
   help | config:help)
     cat && cat<<EOF
-    config (<app>|--global)                                    Display all global or app-specific config vars
-    config:get (<app>|--global) KEY                            Display a global or app-specific config value
-    config:set (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...]  Set one or more config vars
-    config:unset (<app>|--global) KEY1 [KEY2 ...]              Unset one or more config vars
+    config (<app>|--global), Display all global or app-specific config vars
+    config:get (<app>|--global) KEY, Display a global or app-specific config value
+    config:set (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...], Set one or more config vars
+    config:unset (<app>|--global) KEY1 [KEY2 ...], Unset one or more config vars
 EOF
     ;;
 
diff --git a/plugins/docker-options/commands b/plugins/docker-options/commands
index ad5946fed..83850e65e 100755
--- a/plugins/docker-options/commands
+++ b/plugins/docker-options/commands
@@ -141,10 +141,10 @@ case "$1" in
   # Display usage help
   help)
     cat && cat<<EOF
-    docker-options <app>                                       Display apps docker options for all phases
-    docker-options <app> <phase(s)>                            Display apps docker options for phase (comma-separated phase list)
-    docker-options:add <app> <phase(s)> OPTION                 Add docker option to app for phase (comma-separated phase list)
-    docker-options:remove <app> <phase(s)> OPTION              Remove docker option from app for phase (comma-separated phase list)
+    docker-options <app>, Display apps docker options for all phases
+    docker-options <app> <phase(s)>, Display apps docker options for phase (comma seperated phase list)
+    docker-options:add <app> <phase(s)> OPTION, Add docker option to app for phase (comma seperated phase list)
+    docker-options:remove <app> <phase(s)> OPTION, Remove docker option from app for phase (comma seperated phase list)
 EOF
   ;;
 
diff --git a/plugins/domains/commands b/plugins/domains/commands
index 4b2297bdf..9dfc86968 100755
--- a/plugins/domains/commands
+++ b/plugins/domains/commands
@@ -133,10 +133,10 @@ case "$1" in
 
   help | domains:help)
     cat && cat<<EOF
-    domains <app>                                              List custom domains for app
-    domains:add <app> DOMAIN                                   Add a custom domain to app
-    domains:clear <app>                                        Clear all custom domains for app
-    domains:remove <app> DOMAIN                                Remove a custom domain from app
+    domains <app>, List custom domains for app
+    domains:add <app> DOMAIN, Add a custom domain to app
+    domains:clear <app>, Clear all custom domains for app
+    domains:remove <app> DOMAIN, Remove a custom domain from app
 EOF
     ;;
 
diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands
index a1d955caa..a0ba50ebe 100755
--- a/plugins/nginx-vhosts/commands
+++ b/plugins/nginx-vhosts/commands
@@ -174,8 +174,8 @@ EOF
 
   help | nginx:help)
     cat && cat<<EOF
-    nginx:import-ssl <app>                                     Imports a tarball from stdin; should contain server.crt and server.key
-    nginx:build-config <app>                                   (Re)builds nginx config for given app
+    nginx:import-ssl <app>, Imports a tarball from stdin; should contain server.crt and server.key
+    nginx:build-config <app>, (Re)builds nginx config for given app
 EOF
     ;;
 
diff --git a/plugins/ps/commands b/plugins/ps/commands
index d19f0ec37..f0aea65b0 100755
--- a/plugins/ps/commands
+++ b/plugins/ps/commands
@@ -101,14 +101,14 @@ case "$1" in
 
   help | ps:help)
     cat && cat<<EOF
-    ps <app>                                                   List processes running in app container(s)
-    ps:scale <app> <proc>=<count> [<proc>=<count>]             Set how many processes of a given process to run
-    ps:start <app>                                             Start app container(s)
-    ps:stop <app>                                              Stop app container(s)
-    ps:rebuild <app>                                           Rebuild an app
-    ps:rebuildall                                              Rebuild all apps
-    ps:restart <app>                                           Restart app container(s)
-    ps:restartall                                              Restart all deployed app containers
+    ps <app>, List processes running in app container(s)
+    ps:scale <app> <proc>=<count> [<proc>=<count>], Set how many instances of a given process to run
+    ps:start <app>, Start app container(s)
+    ps:stop <app>, Stop app container(s)
+    ps:rebuild <app>, Rebuild an app
+    ps:rebuildall, Rebuild all apps
+    ps:restart <app>, Restart app container(s)
+    ps:restartall, Restart all deployed app containers
 EOF
     ;;
 
diff --git a/plugins/shell/commands b/plugins/shell/commands
index 3b1d6d60b..cdb05637a 100755
--- a/plugins/shell/commands
+++ b/plugins/shell/commands
@@ -48,7 +48,7 @@ case "$1" in
 
   help | shell:help)
     cat && cat<<EOF
-    shell                                                      Spawn dokku shell
+    shell, Spawn dokku shell
 EOF
     ;;