From 2a33fda40fa6c1536dd5f6bb158f2ae677f6f6ec Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 15 May 2016 18:36:13 -0400
Subject: [PATCH 1/8] Move setting of PLUGIN_BASE_PATH to config

---
 commands | 4 ----
 config   | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/commands b/commands
index 8972f7f..d4ef9fc 100755
--- a/commands
+++ b/commands
@@ -3,10 +3,6 @@ source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
 [[ " help $PLUGIN_COMMAND_PREFIX:help " == *" $1 "* ]] || [[ "$1" == "$PLUGIN_COMMAND_PREFIX:"* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
-PLUGIN_BASE_PATH="$PLUGIN_PATH"
-if [[ -n $DOKKU_API_VERSION ]]; then
-  PLUGIN_BASE_PATH="$PLUGIN_ENABLED_PATH"
-fi
 source "$PLUGIN_BASE_PATH/common/functions"
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/functions"
 
diff --git a/config b/config
index c9defa4..4c541ca 100644
--- a/config
+++ b/config
@@ -12,3 +12,7 @@ export PLUGIN_IMAGE=$MYSQL_IMAGE
 export PLUGIN_IMAGE_VERSION=$MYSQL_IMAGE_VERSION
 export PLUGIN_SCHEME="mysql"
 export PLUGIN_SERVICE="MySQL"
+export PLUGIN_BASE_PATH="$PLUGIN_PATH"
+if [[ -n $DOKKU_API_VERSION ]]; then
+  export PLUGIN_BASE_PATH="$PLUGIN_ENABLED_PATH"
+fi

From 80bd81adfd54403235fd24c1062b77c195a2581b Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 15 May 2016 18:59:11 -0400
Subject: [PATCH 2/8] Fix test setup to create proper directory structure for
 plugin

---
 tests/setup.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/setup.sh b/tests/setup.sh
index 5bd208d..a3a5103 100644
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -12,9 +12,11 @@ echo "Dokku version $DOKKU_VERSION"
 git checkout $DOKKU_VERSION > /dev/null
 cd -
 
-rm -rf $DOKKU_ROOT/plugins/service
-mkdir -p $DOKKU_ROOT/plugins/service
-find ./ -maxdepth 1 -type f -exec cp '{}' $DOKKU_ROOT/plugins/service \;
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+rm -rf $DOKKU_ROOT/plugins/$PLUGIN_COMMAND_PREFIX
+mkdir -p $DOKKU_ROOT/plugins/$PLUGIN_COMMAND_PREFIX $DOKKU_ROOT/plugins/$PLUGIN_COMMAND_PREFIX/subcommands
+find ./ -maxdepth 1 -type f -exec cp '{}' $DOKKU_ROOT/plugins/$PLUGIN_COMMAND_PREFIX \;
+find ./subcommands -maxdepth 1 -type f -exec cp '{}' $DOKKU_ROOT/plugins/$PLUGIN_COMMAND_PREFIX/subcommands \;
 
 if [[ ! -f $BIN_STUBS/plugn ]]; then
   wget -O- "$PLUGN_URL" | tar xzf - -C "$BIN_STUBS"

From 24ce96067f73fc53d62d6ab15d9efcc019fb6fc7 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 15 May 2016 19:13:18 -0400
Subject: [PATCH 3/8] Upgrade help output for dokku 0.5.x

Also completely drop support for help output on 0.3.x
---
 commands | 57 +++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/commands b/commands
index d4ef9fc..40f2b82 100755
--- a/commands
+++ b/commands
@@ -208,30 +208,53 @@ case "$1" in
     ;;
 
   help | $PLUGIN_COMMAND_PREFIX:help)
-    HELP=$(cat<<EOF
+    help_content_func() {
+      # shellcheck disable=SC2034
+      declare desc="return $PLUGIN_COMMAND_PREFIX plugin help content"
+      cat<<help_content
+    $PLUGIN_COMMAND_PREFIX:clone <name> <new-name>, Create container <new-name> then copy data from <name> into <new-name>
+    $PLUGIN_COMMAND_PREFIX:connect <name>, Connect via mysql to a $PLUGIN_SERVICE service
     $PLUGIN_COMMAND_PREFIX:create <name>, Create a $PLUGIN_SERVICE service
     $PLUGIN_COMMAND_PREFIX:destroy <name>, Delete the $PLUGIN_SERVICE service and stop its container if there are no links left
-    $PLUGIN_COMMAND_PREFIX:link <name> <app>, Link the $PLUGIN_SERVICE service to the app
-    $PLUGIN_COMMAND_PREFIX:unlink <name> <app>, Unlink the $PLUGIN_SERVICE service from the app
     $PLUGIN_COMMAND_PREFIX:export <name>, Export a dump of the $PLUGIN_SERVICE service database
-    $PLUGIN_COMMAND_PREFIX:import <name> < <file>, Import a dump into the $PLUGIN_SERVICE service database
-    $PLUGIN_COMMAND_PREFIX:connect <name>, Connect via mysql to a $PLUGIN_SERVICE service
-    $PLUGIN_COMMAND_PREFIX:logs <name> [-t], Print the most recent log(s) for this service
-    $PLUGIN_COMMAND_PREFIX:restart <name>, Graceful shutdown and restart of the $PLUGIN_SERVICE service container
-    $PLUGIN_COMMAND_PREFIX:info <name>, Print the connection information
-    $PLUGIN_COMMAND_PREFIX:list, List all $PLUGIN_SERVICE services
-    $PLUGIN_COMMAND_PREFIX:clone <name> <new-name>, Create container <new-name> then copy data from <name> into <new-name>
     $PLUGIN_COMMAND_PREFIX:expose <name> [port], Expose a $PLUGIN_SERVICE service on custom port if provided (random port otherwise)
-    $PLUGIN_COMMAND_PREFIX:unexpose <name>, Unexpose a previously exposed $PLUGIN_SERVICE service
+    $PLUGIN_COMMAND_PREFIX:import <name> < <file>, Import a dump into the $PLUGIN_SERVICE service database
+    $PLUGIN_COMMAND_PREFIX:info <name>, Print the connection information
+    $PLUGIN_COMMAND_PREFIX:link <name> <app>, Link the $PLUGIN_SERVICE service to the app
+    $PLUGIN_COMMAND_PREFIX:list, List all $PLUGIN_SERVICE services
+    $PLUGIN_COMMAND_PREFIX:logs <name> [-t], Print the most recent log(s) for this service
+    $PLUGIN_COMMAND_PREFIX:promote <name> <app>, Promote service <name> as ${PLUGIN_DEFAULT_ALIAS}_URL in <app>
+    $PLUGIN_COMMAND_PREFIX:restart <name>, Graceful shutdown and restart of the $PLUGIN_SERVICE service container
     $PLUGIN_COMMAND_PREFIX:start <name>, Start a previously stopped $PLUGIN_SERVICE service
     $PLUGIN_COMMAND_PREFIX:stop <name>, Stop a running $PLUGIN_SERVICE service
-    $PLUGIN_COMMAND_PREFIX:promote <name> <app>, Promote service <name> as ${PLUGIN_DEFAULT_ALIAS}_URL in <app>
-EOF
-)
-    if [[ -n $DOKKU_API_VERSION ]]; then
-      echo "$HELP"
+    $PLUGIN_COMMAND_PREFIX:unexpose <name>, Unexpose a previously exposed $PLUGIN_SERVICE service
+    $PLUGIN_COMMAND_PREFIX:unlink <name> <app>, Unlink the $PLUGIN_SERVICE service from the app
+help_content
+    }
+
+    help_list_func() {
+      # shellcheck disable=SC2034
+      declare desc="return $PLUGIN_COMMAND_PREFIX plugin help content"
+      cat<<help_list
+      NAME, VERSION, STATUS, EXPOSED PORTS, LINKS
+      service-name, $PLUGIN_COMMAND_PREFIX:$PLUGIN_IMAGE_VERSION, running, -, app-name
+help_list
+    }
+
+    if [[ $1 = "$PLUGIN_COMMAND_PREFIX:help" ]] ; then
+      echo -e "Usage: dokku $PLUGIN_COMMAND_PREFIX[:COMMAND]"
+      echo ''
+      echo "List your $PLUGIN_COMMAND_PREFIX services."
+      echo ''
+      echo 'Example:'
+      echo ''
+      echo "\$ dokku $PLUGIN_COMMAND_PREFIX:list"
+      help_list_func | column -c5 -t -s,
+      echo ''
+      echo 'Additional commands:'
+      help_content_func | sort | column -c2 -t -s,
     else
-      cat && echo "$HELP"
+      help_content_func
     fi
     ;;
 

From 3e4409fcfb2e29db13522aa1f16c680404d9dac2 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 15 May 2016 19:29:45 -0400
Subject: [PATCH 4/8] Use docker-options functions directly to avoid setting
 DOKKU_APP_NAME twice

---
 functions | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/functions b/functions
index 6fdbb31..a78ad6d 100755
--- a/functions
+++ b/functions
@@ -2,6 +2,7 @@
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
+source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
 
 get_random_ports() {
   local iterations="${1:-1}"
@@ -91,7 +92,10 @@ service_link() {
   if [[ -n $DEFAULT_ALIAS ]]; then
     ALIAS=$(service_alternative_alias "$EXISTING_CONFIG")
   fi
-  dokku docker-options:add "$APP" build,deploy,run "--link $SERVICE_NAME:$SERVICE_ALIAS"
+
+  # shellcheck disable=SC2034
+  local passed_phases=(build deploy run)
+  add_passed_docker_option passed_phases[@] "--link $SERVICE_NAME:$SERVICE_ALIAS"
   config_set "$APP" "${ALIAS}_URL=$SERVICE_URL"
 }
 
@@ -296,7 +300,9 @@ service_unlink() {
   [[ -z ${LINK[*]} ]] && dokku_log_fail "Not linked to app $APP"
   remove_from_links_file "$SERVICE" "$APP"
 
-  dokku docker-options:remove "$APP" build,deploy,run "--link $SERVICE_NAME:$SERVICE_ALIAS"
+  # shellcheck disable=SC2034
+  local passed_phases=(build deploy run)
+  remove_passed_docker_option passed_phases[@] "--link $SERVICE_NAME:$SERVICE_ALIAS"
   config_unset "$APP" "${LINK[*]}"
 }
 

From f1731bac00248c99fe8e1ea3ff023b56dff9bb9e Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 15 May 2016 19:36:08 -0400
Subject: [PATCH 5/8] Remove call to dokku service:info in favor of
 service_info

---
 functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions b/functions
index a78ad6d..becaf39 100755
--- a/functions
+++ b/functions
@@ -267,7 +267,7 @@ service_create_container() {
   docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" dokkupaas/wait > /dev/null
 
   dokku_log_info2 "$PLUGIN_SERVICE container created: $SERVICE"
-  dokku "$PLUGIN_COMMAND_PREFIX:info" "$SERVICE"
+  service_info "$SERVICE"
 }
 
 service_stop() {

From fce29c7fc440b7cd425945eb846affc74369cf3c Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 15 May 2016 21:44:56 -0400
Subject: [PATCH 6/8] Move all commands into subcommand structure

---
 commands             | 222 ++++++++++---------------------------------
 subcommands/clone    |  19 ++++
 subcommands/connect  |  18 ++++
 subcommands/create   |  35 +++++++
 subcommands/destroy  |  49 ++++++++++
 subcommands/export   |  21 ++++
 subcommands/expose   |  13 +++
 subcommands/import   |  20 ++++
 subcommands/info     |  13 +++
 subcommands/link     |  15 +++
 subcommands/list     |  11 +++
 subcommands/logs     |  13 +++
 subcommands/promote  |  15 +++
 subcommands/restart  |  15 +++
 subcommands/start    |  13 +++
 subcommands/stop     |  13 +++
 subcommands/unexpose |  13 +++
 subcommands/unlink   |  15 +++
 18 files changed, 360 insertions(+), 173 deletions(-)
 create mode 100755 subcommands/clone
 create mode 100755 subcommands/connect
 create mode 100755 subcommands/create
 create mode 100755 subcommands/destroy
 create mode 100755 subcommands/export
 create mode 100755 subcommands/expose
 create mode 100755 subcommands/import
 create mode 100755 subcommands/info
 create mode 100755 subcommands/link
 create mode 100755 subcommands/list
 create mode 100755 subcommands/logs
 create mode 100755 subcommands/promote
 create mode 100755 subcommands/restart
 create mode 100755 subcommands/start
 create mode 100755 subcommands/stop
 create mode 100755 subcommands/unexpose
 create mode 100755 subcommands/unlink

diff --git a/commands b/commands
index 40f2b82..2d3e664 100755
--- a/commands
+++ b/commands
@@ -15,196 +15,72 @@ if [[ -d "$PLUGIN_DATA_ROOT/*" ]]; then
 fi
 
 case "$1" in
-  $PLUGIN_COMMAND_PREFIX:create)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    [[ ! -d "$PLUGIN_DATA_ROOT/$2" ]] || dokku_log_fail "$PLUGIN_SERVICE service $2 already exists"
-    SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"
-
-    if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q " $PLUGIN_IMAGE_VERSION " ; then
-      docker pull "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" || dokku_log_fail "$PLUGIN_SERVICE image $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION pull failed"
-    fi
-
-    mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
-    mkdir -p "$SERVICE_ROOT/data" || dokku_log_fail "Unable to create service data directory"
-    mkdir -p "$SERVICE_ROOT/config" || dokku_log_fail "Unable to create service config directory"
-    echo -e "[mysqld]\nperformance_schema = 0" > "$SERVICE_ROOT/config/disable_performance_schema.cnf"
-    rootpassword=$(openssl rand -hex 8)
-    password=$(openssl rand -hex 8)
-    echo "$rootpassword" > "$SERVICE_ROOT/ROOTPASSWORD"
-    echo "$password" > "$SERVICE_ROOT/PASSWORD"
-    chmod 640 "$SERVICE_ROOT/ROOTPASSWORD" "$SERVICE_ROOT/PASSWORD"
-    touch "$LINKS_FILE"
-
-    if [[ -n $MYSQL_CUSTOM_ENV ]]; then
-      echo "$MYSQL_CUSTOM_ENV" | tr ';' "\n" > "$SERVICE_ROOT/ENV"
-    else
-      echo "" > "$SERVICE_ROOT/ENV"
-    fi
-    service_create_container "$SERVICE"
-    ;;
-
-  $PLUGIN_COMMAND_PREFIX:destroy)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    verify_service_name "$2"
-    SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"
-    SERVICE_NAME="$(get_service_name "$SERVICE")"
-
-    [[ -s "$LINKS_FILE" ]] && dokku_log_fail "Cannot delete linked service"
-
-    [[ "$3" == "force" ]] && DOKKU_APPS_FORCE_DELETE=1
-    if [[ -z "$DOKKU_APPS_FORCE_DELETE" ]]; then
-      dokku_log_warn "WARNING: Potentially Destructive Action"
-      dokku_log_warn "This command will destroy $SERVICE $PLUGIN_SERVICE service."
-      dokku_log_warn "To proceed, type \"$SERVICE\""
-      echo ""
-
-      read -rp "> " service_name
-      if [[ "$service_name" != "$SERVICE" ]]; then
-        dokku_log_warn "Confirmation did not match $SERVICE. Aborted."
-        exit 1
-      fi
-    fi
-
-    dokku_log_info1 "Deleting $SERVICE"
-    if [[ -n $(docker ps -aq -f name="$SERVICE_NAME") ]]; then
-      dokku_log_verbose_quiet "Deleting container data"
-      service_stop "$SERVICE"
-      sleep 1
-
-      dokku_log_verbose_quiet "Removing container"
-      docker rm -v "$SERVICE_NAME" > /dev/null
-      sleep 1
-    else
-      dokku_log_verbose_quiet "No container exists for $SERVICE"
-    fi
-
-    dokku_log_verbose_quiet "Removing data"
-    docker run --rm -v "$SERVICE_ROOT/data:/data" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" chmod 777 -R /data
-    rm -rf "$SERVICE_ROOT"
-
-    dokku_log_info2 "$PLUGIN_SERVICE container deleted: $SERVICE"
-    ;;
-
-  $PLUGIN_COMMAND_PREFIX:link)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    [[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on"
-    verify_app_name "$3"
-    verify_service_name "$2"
-    service_link "$2" "$3"
-    ;;
-
-  $PLUGIN_COMMAND_PREFIX:unlink)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    [[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on"
-    verify_app_name "$3"
-    verify_service_name "$2"
-    service_unlink "$2" "$3"
-    ;;
-
-  $PLUGIN_COMMAND_PREFIX:export)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    verify_service_name "$2"
-    SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
-    SERVICE_NAME="$(get_service_name "$SERVICE")"
-    PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
-
-    [[ -n $SSH_TTY ]] && stty -opost
-    docker exec "$SERVICE_NAME" mysqldump --user=mysql --password="$PASSWORD" "$SERVICE"
-    status=$?
-    [[ -n $SSH_TTY ]] && stty opost
-    exit $status
-    ;;
-
-  $PLUGIN_COMMAND_PREFIX:import)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    verify_service_name "$2"
-    SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
-    SERVICE_NAME="$(get_service_name "$SERVICE")"
-    PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
-
-    if [[ -t 0 ]]; then
-      dokku_log_fail "No data provided on stdin."
-    fi
-    docker exec -i "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" "$SERVICE"
-    ;;
-
-  $PLUGIN_COMMAND_PREFIX:logs)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    verify_service_name "$2"
-    service_logs "$2" "$3"
-    ;;
-
-  $PLUGIN_COMMAND_PREFIX:start)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    verify_service_name "$2"
-    service_start "$2"
-    ;;
-
-  $PLUGIN_COMMAND_PREFIX:stop)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    verify_service_name "$2"
-    service_stop "$2"
-    ;;
-
-  $PLUGIN_COMMAND_PREFIX:restart)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    verify_service_name "$2"
-    service_stop "$2"
-    service_start "$2"
-    dokku_log_info1 "Please call dokku ps:restart on all linked apps"
+  $PLUGIN_COMMAND_PREFIX:clone)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/clone" "$@"
     ;;
 
   $PLUGIN_COMMAND_PREFIX:connect)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    verify_service_name "$2"
-    SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
-    SERVICE_NAME="$(get_service_name "$SERVICE")"
-    PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
-    has_tty && SERVICE_TTY_OPTS="-t"
-
-    docker exec -i $SERVICE_TTY_OPTS "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" --database="$SERVICE"
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/connect" "$@"
     ;;
 
-  $PLUGIN_COMMAND_PREFIX:info)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    verify_service_name "$2"
-    service_info "$2"
+  $PLUGIN_COMMAND_PREFIX:create)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/create" "$@"
     ;;
 
-  $PLUGIN_COMMAND_PREFIX:list)
-    service_list
+  $PLUGIN_COMMAND_PREFIX:destroy)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/destroy" "$@"
     ;;
 
-  $PLUGIN_COMMAND_PREFIX:clone)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    [[ -z $3 ]] && dokku_log_fail "Please specify a name for the new service"
-    verify_service_name "$2"
-    SERVICE="$2"
-    NEW_SERVICE="$3"
-    dokku "$PLUGIN_COMMAND_PREFIX:create" "$NEW_SERVICE"
-    dokku_log_info1 "Copying data from $SERVICE to $NEW_SERVICE"
-    dokku "$PLUGIN_COMMAND_PREFIX:export" "$SERVICE" | dokku "$PLUGIN_COMMAND_PREFIX:import" "$NEW_SERVICE" > /dev/null 2>&1 || true
-    dokku_log_info1 "Done"
+  $PLUGIN_COMMAND_PREFIX:export)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/export" "$@"
     ;;
 
   $PLUGIN_COMMAND_PREFIX:expose)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    verify_service_name "$2"
-    service_port_expose "$2" "${@:3}"
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/expose" "$@"
     ;;
 
-  $PLUGIN_COMMAND_PREFIX:unexpose)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    verify_service_name "$2"
-    service_port_unexpose "$2"
+  $PLUGIN_COMMAND_PREFIX:import)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/import" "$@"
+    ;;
+
+  $PLUGIN_COMMAND_PREFIX:info)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/info" "$@"
+    ;;
+
+  $PLUGIN_COMMAND_PREFIX:link)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/link" "$@"
+    ;;
+
+  $PLUGIN_COMMAND_PREFIX:list)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/list" "$@"
+    ;;
+
+  $PLUGIN_COMMAND_PREFIX:logs)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/logs" "$@"
     ;;
 
   $PLUGIN_COMMAND_PREFIX:promote)
-    [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-    [[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on"
-    verify_service_name "$2"
-    verify_app_name "$3"
-    promote "$2" "$3"
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/promote" "$@"
+    ;;
+
+  $PLUGIN_COMMAND_PREFIX:restart)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/restart" "$@"
+    ;;
+
+  $PLUGIN_COMMAND_PREFIX:start)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/start" "$@"
+    ;;
+
+  $PLUGIN_COMMAND_PREFIX:stop)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/stop" "$@"
+    ;;
+
+  $PLUGIN_COMMAND_PREFIX:unexpose)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/unexpose" "$@"
+    ;;
+
+  $PLUGIN_COMMAND_PREFIX:unlink)
+    "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/subcommands/unlink" "$@"
     ;;
 
   help | $PLUGIN_COMMAND_PREFIX:help)
diff --git a/subcommands/clone b/subcommands/clone
new file mode 100755
index 0000000..86413bb
--- /dev/null
+++ b/subcommands/clone
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-clone-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  [[ -z $3 ]] && dokku_log_fail "Please specify a name for the new service"
+  verify_service_name "$2"
+  SERVICE="$2"
+  NEW_SERVICE="$3"
+  dokku "$PLUGIN_COMMAND_PREFIX:create" "$NEW_SERVICE"
+  dokku_log_info1 "Copying data from $SERVICE to $NEW_SERVICE"
+  dokku "$PLUGIN_COMMAND_PREFIX:export" "$SERVICE" | dokku "$PLUGIN_COMMAND_PREFIX:import" "$NEW_SERVICE" > /dev/null 2>&1 || true
+  dokku_log_info1 "Done"
+}
+
+mysql-clone-cmd "$@"
diff --git a/subcommands/connect b/subcommands/connect
new file mode 100755
index 0000000..e4f52df
--- /dev/null
+++ b/subcommands/connect
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-connect-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$2"
+  SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  SERVICE_NAME="$(get_service_name "$SERVICE")"
+  PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
+  has_tty && SERVICE_TTY_OPTS="-t"
+
+  docker exec -i $SERVICE_TTY_OPTS "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" --database="$SERVICE"
+}
+
+mysql-connect-cmd "$@"
diff --git a/subcommands/create b/subcommands/create
new file mode 100755
index 0000000..ab16ae5
--- /dev/null
+++ b/subcommands/create
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-create-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  [[ ! -d "$PLUGIN_DATA_ROOT/$2" ]] || dokku_log_fail "$PLUGIN_SERVICE service $2 already exists"
+  SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"
+
+  if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q " $PLUGIN_IMAGE_VERSION " ; then
+    docker pull "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" || dokku_log_fail "$PLUGIN_SERVICE image $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION pull failed"
+  fi
+
+  mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
+  mkdir -p "$SERVICE_ROOT/data" || dokku_log_fail "Unable to create service data directory"
+  mkdir -p "$SERVICE_ROOT/config" || dokku_log_fail "Unable to create service config directory"
+  echo -e "[mysqld]\nperformance_schema = 0" > "$SERVICE_ROOT/config/disable_performance_schema.cnf"
+  rootpassword=$(openssl rand -hex 8)
+  password=$(openssl rand -hex 8)
+  echo "$rootpassword" > "$SERVICE_ROOT/ROOTPASSWORD"
+  echo "$password" > "$SERVICE_ROOT/PASSWORD"
+  chmod 640 "$SERVICE_ROOT/ROOTPASSWORD" "$SERVICE_ROOT/PASSWORD"
+  touch "$LINKS_FILE"
+
+  if [[ -n $MYSQL_CUSTOM_ENV ]]; then
+    echo "$MYSQL_CUSTOM_ENV" | tr ';' "\n" > "$SERVICE_ROOT/ENV"
+  else
+    echo "" > "$SERVICE_ROOT/ENV"
+  fi
+  service_create_container "$SERVICE"
+}
+
+mysql-create-cmd "$@"
diff --git a/subcommands/destroy b/subcommands/destroy
new file mode 100755
index 0000000..6a42941
--- /dev/null
+++ b/subcommands/destroy
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-destroy-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$2"
+  SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"
+  SERVICE_NAME="$(get_service_name "$SERVICE")"
+
+  [[ -s "$LINKS_FILE" ]] && dokku_log_fail "Cannot delete linked service"
+
+  [[ "$3" == "force" ]] && DOKKU_APPS_FORCE_DELETE=1
+  if [[ -z "$DOKKU_APPS_FORCE_DELETE" ]]; then
+    dokku_log_warn "WARNING: Potentially Destructive Action"
+    dokku_log_warn "This command will destroy $SERVICE $PLUGIN_SERVICE service."
+    dokku_log_warn "To proceed, type \"$SERVICE\""
+    echo ""
+
+    read -rp "> " service_name
+    if [[ "$service_name" != "$SERVICE" ]]; then
+      dokku_log_warn "Confirmation did not match $SERVICE. Aborted."
+      exit 1
+    fi
+  fi
+
+  dokku_log_info1 "Deleting $SERVICE"
+  if [[ -n $(docker ps -aq -f name="$SERVICE_NAME") ]]; then
+    dokku_log_verbose_quiet "Deleting container data"
+    service_stop "$SERVICE"
+    sleep 1
+
+    dokku_log_verbose_quiet "Removing container"
+    docker rm -v "$SERVICE_NAME" > /dev/null
+    sleep 1
+  else
+    dokku_log_verbose_quiet "No container exists for $SERVICE"
+  fi
+
+  dokku_log_verbose_quiet "Removing data"
+  docker run --rm -v "$SERVICE_ROOT/data:/data" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" chmod 777 -R /data
+  rm -rf "$SERVICE_ROOT"
+
+  dokku_log_info2 "$PLUGIN_SERVICE container deleted: $SERVICE"
+}
+
+mysql-destroy-cmd "$@"
diff --git a/subcommands/export b/subcommands/export
new file mode 100755
index 0000000..cccb052
--- /dev/null
+++ b/subcommands/export
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-export-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$2"
+  SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  SERVICE_NAME="$(get_service_name "$SERVICE")"
+  PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
+
+  [[ -n $SSH_TTY ]] && stty -opost
+  docker exec "$SERVICE_NAME" mysqldump --user=mysql --password="$PASSWORD" "$SERVICE"
+  status=$?
+  [[ -n $SSH_TTY ]] && stty opost
+  exit $status
+}
+
+mysql-export-cmd "$@"
diff --git a/subcommands/expose b/subcommands/expose
new file mode 100755
index 0000000..60011b6
--- /dev/null
+++ b/subcommands/expose
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-expose-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$2"
+  service_port_expose "$2" "${@:3}"
+}
+
+mysql-expose-cmd "$@"
diff --git a/subcommands/import b/subcommands/import
new file mode 100755
index 0000000..e34aaf8
--- /dev/null
+++ b/subcommands/import
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-import-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$2"
+  SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  SERVICE_NAME="$(get_service_name "$SERVICE")"
+  PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
+
+  if [[ -t 0 ]]; then
+    dokku_log_fail "No data provided on stdin."
+  fi
+  docker exec -i "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" "$SERVICE"
+}
+
+mysql-import-cmd "$@"
diff --git a/subcommands/info b/subcommands/info
new file mode 100755
index 0000000..e35bc46
--- /dev/null
+++ b/subcommands/info
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-info-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$2"
+  service_info "$2"
+}
+
+mysql-info-cmd "$@"
diff --git a/subcommands/link b/subcommands/link
new file mode 100755
index 0000000..49136db
--- /dev/null
+++ b/subcommands/link
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-link-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  [[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$3"
+  verify_service_name "$2"
+  service_link "$2" "$3"
+}
+
+mysql-link-cmd "$@"
diff --git a/subcommands/list b/subcommands/list
new file mode 100755
index 0000000..2c9233b
--- /dev/null
+++ b/subcommands/list
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-list-cmd() {
+  service_list
+}
+
+mysql-list-cmd "$@"
diff --git a/subcommands/logs b/subcommands/logs
new file mode 100755
index 0000000..9ef0a16
--- /dev/null
+++ b/subcommands/logs
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-logs-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$2"
+  service_logs "$2" "$3"
+}
+
+mysql-logs-cmd "$@"
diff --git a/subcommands/promote b/subcommands/promote
new file mode 100755
index 0000000..b88ec27
--- /dev/null
+++ b/subcommands/promote
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-promote-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  [[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_service_name "$2"
+  verify_app_name "$3"
+  promote "$2" "$3"
+}
+
+mysql-promote-cmd "$@"
diff --git a/subcommands/restart b/subcommands/restart
new file mode 100755
index 0000000..e335270
--- /dev/null
+++ b/subcommands/restart
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-restart-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$2"
+  service_stop "$2"
+  service_start "$2"
+  dokku_log_info1 "Please call dokku ps:restart on all linked apps"
+}
+
+mysql-restart-cmd "$@"
diff --git a/subcommands/start b/subcommands/start
new file mode 100755
index 0000000..717bdab
--- /dev/null
+++ b/subcommands/start
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-start-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$2"
+  service_start "$2"
+}
+
+mysql-start-cmd "$@"
diff --git a/subcommands/stop b/subcommands/stop
new file mode 100755
index 0000000..b907dcc
--- /dev/null
+++ b/subcommands/stop
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-stop-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$2"
+  service_stop "$2"
+}
+
+mysql-stop-cmd "$@"
diff --git a/subcommands/unexpose b/subcommands/unexpose
new file mode 100755
index 0000000..68e51d0
--- /dev/null
+++ b/subcommands/unexpose
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-unexpose-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$2"
+  service_port_unexpose "$2"
+}
+
+mysql-unexpose-cmd "$@"
diff --git a/subcommands/unlink b/subcommands/unlink
new file mode 100755
index 0000000..9c70931
--- /dev/null
+++ b/subcommands/unlink
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_BASE_PATH/common/functions"
+source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
+
+mysql-unlink-cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
+  [[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$3"
+  verify_service_name "$2"
+  service_unlink "$2" "$3"
+}
+
+mysql-unlink-cmd "$@"

From 0c71539f82a8f6d4f075af38705bfad2e3ecdd0b Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 15 May 2016 23:56:45 -0400
Subject: [PATCH 7/8] Conform to function declaration standards

- declare desc variable
- declare all positional arguments
- set the cmd
- properly handle DOKKU_APP_NAME
---
 subcommands/clone    | 13 ++++++++-----
 subcommands/connect  | 12 ++++++++----
 subcommands/create   | 10 +++++++---
 subcommands/destroy  | 12 ++++++++----
 subcommands/export   | 10 +++++++---
 subcommands/expose   | 10 +++++++---
 subcommands/import   | 10 +++++++---
 subcommands/info     | 10 +++++++---
 subcommands/link     | 15 ++++++++++-----
 subcommands/list     |  3 +++
 subcommands/logs     | 10 +++++++---
 subcommands/promote  | 15 ++++++++++-----
 subcommands/restart  | 12 ++++++++----
 subcommands/start    | 10 +++++++---
 subcommands/stop     | 10 +++++++---
 subcommands/unexpose | 10 +++++++---
 subcommands/unlink   | 15 ++++++++++-----
 17 files changed, 128 insertions(+), 59 deletions(-)

diff --git a/subcommands/clone b/subcommands/clone
index 86413bb..ee5bee1 100755
--- a/subcommands/clone
+++ b/subcommands/clone
@@ -5,11 +5,14 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-clone-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  [[ -z $3 ]] && dokku_log_fail "Please specify a name for the new service"
-  verify_service_name "$2"
-  SERVICE="$2"
-  NEW_SERVICE="$3"
+  declare desc="create container <new-name> then copy data from <name> into <new-name>"
+  local cmd="$PLUGIN_COMMAND_PREFIX:clone" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1" NEW_SERVICE="$2"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  [[ -z "$NEW_SERVICE" ]] && dokku_log_fail "Please specify a name for the new service"
+
+  verify_service_name "$SERVICE"
   dokku "$PLUGIN_COMMAND_PREFIX:create" "$NEW_SERVICE"
   dokku_log_info1 "Copying data from $SERVICE to $NEW_SERVICE"
   dokku "$PLUGIN_COMMAND_PREFIX:export" "$SERVICE" | dokku "$PLUGIN_COMMAND_PREFIX:import" "$NEW_SERVICE" > /dev/null 2>&1 || true
diff --git a/subcommands/connect b/subcommands/connect
index e4f52df..812dd52 100755
--- a/subcommands/connect
+++ b/subcommands/connect
@@ -5,11 +5,15 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-connect-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$2"
-  SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  declare desc="connect via mysql to a $PLUGIN_SERVICE service"
+  local cmd="$PLUGIN_COMMAND_PREFIX:connect" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$SERVICE"
+  SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
   SERVICE_NAME="$(get_service_name "$SERVICE")"
-  PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
+  PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")"
   has_tty && SERVICE_TTY_OPTS="-t"
 
   docker exec -i $SERVICE_TTY_OPTS "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" --database="$SERVICE"
diff --git a/subcommands/create b/subcommands/create
index ab16ae5..e896fc9 100755
--- a/subcommands/create
+++ b/subcommands/create
@@ -5,9 +5,13 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-create-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  [[ ! -d "$PLUGIN_DATA_ROOT/$2" ]] || dokku_log_fail "$PLUGIN_SERVICE service $2 already exists"
-  SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"
+  declare desc="create a $PLUGIN_SERVICE service"
+  local cmd="$PLUGIN_COMMAND_PREFIX:create" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  [[ ! -d "$PLUGIN_DATA_ROOT/$SERVICE" ]] || dokku_log_fail "$PLUGIN_SERVICE service $SERVICE already exists"
+  SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"
 
   if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q " $PLUGIN_IMAGE_VERSION " ; then
     docker pull "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" || dokku_log_fail "$PLUGIN_SERVICE image $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION pull failed"
diff --git a/subcommands/destroy b/subcommands/destroy
index 6a42941..39b59da 100755
--- a/subcommands/destroy
+++ b/subcommands/destroy
@@ -5,14 +5,18 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-destroy-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$2"
-  SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"
+  declare desc="delete the $PLUGIN_SERVICE service and stop its container if there are no links left"
+  local cmd="$PLUGIN_COMMAND_PREFIX:destroy" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1" FORCE_DESTROY="$2"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$SERVICE"
+  SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"
   SERVICE_NAME="$(get_service_name "$SERVICE")"
 
   [[ -s "$LINKS_FILE" ]] && dokku_log_fail "Cannot delete linked service"
 
-  [[ "$3" == "force" ]] && DOKKU_APPS_FORCE_DELETE=1
+  [[ "$FORCE_DESTROY" == "force" ]] && DOKKU_APPS_FORCE_DELETE=1
   if [[ -z "$DOKKU_APPS_FORCE_DELETE" ]]; then
     dokku_log_warn "WARNING: Potentially Destructive Action"
     dokku_log_warn "This command will destroy $SERVICE $PLUGIN_SERVICE service."
diff --git a/subcommands/export b/subcommands/export
index cccb052..102f506 100755
--- a/subcommands/export
+++ b/subcommands/export
@@ -5,9 +5,13 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-export-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$2"
-  SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  declare desc="export a dump of the $PLUGIN_SERVICE service database"
+  local cmd="$PLUGIN_COMMAND_PREFIX:export" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$SERVICE"
+  SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
   SERVICE_NAME="$(get_service_name "$SERVICE")"
   PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
 
diff --git a/subcommands/expose b/subcommands/expose
index 60011b6..1bc95ce 100755
--- a/subcommands/expose
+++ b/subcommands/expose
@@ -5,9 +5,13 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-expose-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$2"
-  service_port_expose "$2" "${@:3}"
+  declare desc="expose a $PLUGIN_SERVICE service on custom port if provided (random port otherwise)"
+  local cmd="$PLUGIN_COMMAND_PREFIX:expose" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$SERVICE"
+  service_port_expose "$SERVICE" "${@:2}"
 }
 
 mysql-expose-cmd "$@"
diff --git a/subcommands/import b/subcommands/import
index e34aaf8..7bb79b9 100755
--- a/subcommands/import
+++ b/subcommands/import
@@ -5,9 +5,13 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-import-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$2"
-  SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  declare desc="import a dump into the $PLUGIN_SERVICE service database"
+  local cmd="$PLUGIN_COMMAND_PREFIX:import" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$SERVICE"
+  SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
   SERVICE_NAME="$(get_service_name "$SERVICE")"
   PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
 
diff --git a/subcommands/info b/subcommands/info
index e35bc46..0d3569c 100755
--- a/subcommands/info
+++ b/subcommands/info
@@ -5,9 +5,13 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-info-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$2"
-  service_info "$2"
+  declare desc="print the connection information"
+  local cmd="$PLUGIN_COMMAND_PREFIX:info" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$SERVICE"
+  service_info "$SERVICE"
 }
 
 mysql-info-cmd "$@"
diff --git a/subcommands/link b/subcommands/link
index 49136db..03e3434 100755
--- a/subcommands/link
+++ b/subcommands/link
@@ -5,11 +5,16 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-link-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  [[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$3"
-  verify_service_name "$2"
-  service_link "$2" "$3"
+  declare desc="link the $PLUGIN_SERVICE service to the app"
+  local cmd="$PLUGIN_COMMAND_PREFIX:link" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1" APP="$2"
+  APP=${APP:="$DOKKU_APP_NAME"}
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
+  verify_service_name "$SERVICE"
+  service_link "$SERVICE" "$APP"
 }
 
 mysql-link-cmd "$@"
diff --git a/subcommands/list b/subcommands/list
index 2c9233b..a04a183 100755
--- a/subcommands/list
+++ b/subcommands/list
@@ -5,6 +5,9 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-list-cmd() {
+  declare desc="list all $PLUGIN_SERVICE services"
+  local cmd="$PLUGIN_COMMAND_PREFIX:list" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+
   service_list
 }
 
diff --git a/subcommands/logs b/subcommands/logs
index 9ef0a16..ae329e2 100755
--- a/subcommands/logs
+++ b/subcommands/logs
@@ -5,9 +5,13 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-logs-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$2"
-  service_logs "$2" "$3"
+  declare desc="print the most recent log(s) for this service"
+  local cmd="$PLUGIN_COMMAND_PREFIX:logs" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1" TAIL="$2"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$SERVICE"
+  service_logs "$SERVICE" "$TAIL"
 }
 
 mysql-logs-cmd "$@"
diff --git a/subcommands/promote b/subcommands/promote
index b88ec27..d12e94c 100755
--- a/subcommands/promote
+++ b/subcommands/promote
@@ -5,11 +5,16 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-promote-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  [[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_service_name "$2"
-  verify_app_name "$3"
-  promote "$2" "$3"
+  declare desc="promote service <name> as ${PLUGIN_DEFAULT_ALIAS}_URL in <app>"
+  local cmd="$PLUGIN_COMMAND_PREFIX:promote" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1" APP="$2"
+  APP=${APP:="$DOKKU_APP_NAME"}
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_service_name "$SERVICE"
+  verify_app_name "$APP"
+  promote "$SERVICE" "$APP"
 }
 
 mysql-promote-cmd "$@"
diff --git a/subcommands/restart b/subcommands/restart
index e335270..2e3c586 100755
--- a/subcommands/restart
+++ b/subcommands/restart
@@ -5,10 +5,14 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-restart-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$2"
-  service_stop "$2"
-  service_start "$2"
+  declare desc="graceful shutdown and restart of the $PLUGIN_SERVICE service container"
+  local cmd="$PLUGIN_COMMAND_PREFIX:restart" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$SERVICE"
+  service_stop "$SERVICE"
+  service_start "$SERVICE"
   dokku_log_info1 "Please call dokku ps:restart on all linked apps"
 }
 
diff --git a/subcommands/start b/subcommands/start
index 717bdab..8c29373 100755
--- a/subcommands/start
+++ b/subcommands/start
@@ -5,9 +5,13 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-start-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$2"
-  service_start "$2"
+  declare desc="start a previously stopped $PLUGIN_SERVICE service"
+  local cmd="$PLUGIN_COMMAND_PREFIX:start" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$SERVICE"
+  service_start "$SERVICE"
 }
 
 mysql-start-cmd "$@"
diff --git a/subcommands/stop b/subcommands/stop
index b907dcc..263b1c9 100755
--- a/subcommands/stop
+++ b/subcommands/stop
@@ -5,9 +5,13 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-stop-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$2"
-  service_stop "$2"
+  declare desc="stop a running $PLUGIN_SERVICE service"
+  local cmd="$PLUGIN_COMMAND_PREFIX:stop" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$SERVICE"
+  service_stop "$SERVICE"
 }
 
 mysql-stop-cmd "$@"
diff --git a/subcommands/unexpose b/subcommands/unexpose
index 68e51d0..bd1fc01 100755
--- a/subcommands/unexpose
+++ b/subcommands/unexpose
@@ -5,9 +5,13 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-unexpose-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  verify_service_name "$2"
-  service_port_unexpose "$2"
+  declare desc="unexpose a previously exposed $PLUGIN_SERVICE service"
+  local cmd="$PLUGIN_COMMAND_PREFIX:unexpose" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1"
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  verify_service_name "$SERVICE"
+  service_port_unexpose "$SERVICE"
 }
 
 mysql-unexpose-cmd "$@"
diff --git a/subcommands/unlink b/subcommands/unlink
index 9c70931..8fd977f 100755
--- a/subcommands/unlink
+++ b/subcommands/unlink
@@ -5,11 +5,16 @@ source "$PLUGIN_BASE_PATH/common/functions"
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/functions"
 
 mysql-unlink-cmd() {
-  [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
-  [[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$3"
-  verify_service_name "$2"
-  service_unlink "$2" "$3"
+  declare desc="unlink the $PLUGIN_SERVICE service from the app"
+  local cmd="$PLUGIN_COMMAND_PREFIX:unlink" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare SERVICE="$1" APP="$2"
+  APP=${APP:="$DOKKU_APP_NAME"}
+
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
+  verify_service_name "$SERVICE"
+  service_unlink "$SERVICE" "$APP"
 }
 
 mysql-unlink-cmd "$@"

From 69779da97d94c04a84a0cee5b123c10bfb0b11ef Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 16 May 2016 00:24:38 -0400
Subject: [PATCH 8/8] Remove remaining direct dokku calls

---
 functions          | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 subcommands/clone  |  4 ++--
 subcommands/create | 26 +---------------------
 subcommands/export | 10 +--------
 subcommands/import |  9 +-------
 5 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/functions b/functions
index becaf39..ba16d03 100755
--- a/functions
+++ b/functions
@@ -38,6 +38,19 @@ service_alias() {
   echo "$SERVICE_NAME" | tr ._ -
 }
 
+service_export() {
+  local SERVICE="$1"
+  local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  local SERVICE_NAME="$(get_service_name "$SERVICE")"
+  local PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
+
+  [[ -n $SSH_TTY ]] && stty -opost
+  docker exec "$SERVICE_NAME" mysqldump --user=mysql --password="$PASSWORD" "$SERVICE"
+  status=$?
+  [[ -n $SSH_TTY ]] && stty opost
+  exit $status
+}
+
 service_info() {
   local SERVICE="$1"
   local SERVICE_URL=$(service_url "$SERVICE")
@@ -45,6 +58,18 @@ service_info() {
   echo "       DSN: $SERVICE_URL"
 }
 
+service_import() {
+  local SERVICE="$1"
+  SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
+  SERVICE_NAME="$(get_service_name "$SERVICE")"
+  PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
+
+  if [[ -t 0 ]]; then
+    dokku_log_fail "No data provided on stdin."
+  fi
+  docker exec -i "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" "$SERVICE"
+}
+
 service_list() {
   local SERVICES=$(ls "$PLUGIN_DATA_ROOT" 2> /dev/null)
   if [[ -z $SERVICES ]]; then
@@ -253,6 +278,35 @@ service_start() {
   fi
 }
 
+service_create() {
+  local SERVICE="$1"
+  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
+  [[ ! -d "$PLUGIN_DATA_ROOT/$SERVICE" ]] || dokku_log_fail "$PLUGIN_SERVICE service $SERVICE already exists"
+  SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"
+
+  if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q " $PLUGIN_IMAGE_VERSION " ; then
+    docker pull "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" || dokku_log_fail "$PLUGIN_SERVICE image $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION pull failed"
+  fi
+
+  mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
+  mkdir -p "$SERVICE_ROOT/data" || dokku_log_fail "Unable to create service data directory"
+  mkdir -p "$SERVICE_ROOT/config" || dokku_log_fail "Unable to create service config directory"
+  echo -e "[mysqld]\nperformance_schema = 0" > "$SERVICE_ROOT/config/disable_performance_schema.cnf"
+  rootpassword=$(openssl rand -hex 8)
+  password=$(openssl rand -hex 8)
+  echo "$rootpassword" > "$SERVICE_ROOT/ROOTPASSWORD"
+  echo "$password" > "$SERVICE_ROOT/PASSWORD"
+  chmod 640 "$SERVICE_ROOT/ROOTPASSWORD" "$SERVICE_ROOT/PASSWORD"
+  touch "$LINKS_FILE"
+
+  if [[ -n $MYSQL_CUSTOM_ENV ]]; then
+    echo "$MYSQL_CUSTOM_ENV" | tr ';' "\n" > "$SERVICE_ROOT/ENV"
+  else
+    echo "" > "$SERVICE_ROOT/ENV"
+  fi
+  service_create_container "$SERVICE"
+}
+
 service_create_container() {
   local SERVICE="$1"
   local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
diff --git a/subcommands/clone b/subcommands/clone
index ee5bee1..8c1ad15 100755
--- a/subcommands/clone
+++ b/subcommands/clone
@@ -13,9 +13,9 @@ mysql-clone-cmd() {
   [[ -z "$NEW_SERVICE" ]] && dokku_log_fail "Please specify a name for the new service"
 
   verify_service_name "$SERVICE"
-  dokku "$PLUGIN_COMMAND_PREFIX:create" "$NEW_SERVICE"
+  service_create "$NEW_SERVICE"
   dokku_log_info1 "Copying data from $SERVICE to $NEW_SERVICE"
-  dokku "$PLUGIN_COMMAND_PREFIX:export" "$SERVICE" | dokku "$PLUGIN_COMMAND_PREFIX:import" "$NEW_SERVICE" > /dev/null 2>&1 || true
+  service_export "$SERVICE" | service_import "$NEW_SERVICE" > /dev/null 2>&1 || true
   dokku_log_info1 "Done"
 }
 
diff --git a/subcommands/create b/subcommands/create
index e896fc9..1006edc 100755
--- a/subcommands/create
+++ b/subcommands/create
@@ -9,31 +9,7 @@ mysql-create-cmd() {
   local cmd="$PLUGIN_COMMAND_PREFIX:create" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
   declare SERVICE="$1"
 
-  [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
-  [[ ! -d "$PLUGIN_DATA_ROOT/$SERVICE" ]] || dokku_log_fail "$PLUGIN_SERVICE service $SERVICE already exists"
-  SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS"
-
-  if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q " $PLUGIN_IMAGE_VERSION " ; then
-    docker pull "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" || dokku_log_fail "$PLUGIN_SERVICE image $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION pull failed"
-  fi
-
-  mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
-  mkdir -p "$SERVICE_ROOT/data" || dokku_log_fail "Unable to create service data directory"
-  mkdir -p "$SERVICE_ROOT/config" || dokku_log_fail "Unable to create service config directory"
-  echo -e "[mysqld]\nperformance_schema = 0" > "$SERVICE_ROOT/config/disable_performance_schema.cnf"
-  rootpassword=$(openssl rand -hex 8)
-  password=$(openssl rand -hex 8)
-  echo "$rootpassword" > "$SERVICE_ROOT/ROOTPASSWORD"
-  echo "$password" > "$SERVICE_ROOT/PASSWORD"
-  chmod 640 "$SERVICE_ROOT/ROOTPASSWORD" "$SERVICE_ROOT/PASSWORD"
-  touch "$LINKS_FILE"
-
-  if [[ -n $MYSQL_CUSTOM_ENV ]]; then
-    echo "$MYSQL_CUSTOM_ENV" | tr ';' "\n" > "$SERVICE_ROOT/ENV"
-  else
-    echo "" > "$SERVICE_ROOT/ENV"
-  fi
-  service_create_container "$SERVICE"
+  service_create "$SERVICE"
 }
 
 mysql-create-cmd "$@"
diff --git a/subcommands/export b/subcommands/export
index 102f506..b85268a 100755
--- a/subcommands/export
+++ b/subcommands/export
@@ -11,15 +11,7 @@ mysql-export-cmd() {
 
   [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
   verify_service_name "$SERVICE"
-  SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
-  SERVICE_NAME="$(get_service_name "$SERVICE")"
-  PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
-
-  [[ -n $SSH_TTY ]] && stty -opost
-  docker exec "$SERVICE_NAME" mysqldump --user=mysql --password="$PASSWORD" "$SERVICE"
-  status=$?
-  [[ -n $SSH_TTY ]] && stty opost
-  exit $status
+  service_export "$SERVICE"
 }
 
 mysql-export-cmd "$@"
diff --git a/subcommands/import b/subcommands/import
index 7bb79b9..2cf3563 100755
--- a/subcommands/import
+++ b/subcommands/import
@@ -11,14 +11,7 @@ mysql-import-cmd() {
 
   [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service"
   verify_service_name "$SERVICE"
-  SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
-  SERVICE_NAME="$(get_service_name "$SERVICE")"
-  PASSWORD=$(cat "$SERVICE_ROOT/PASSWORD")
-
-  if [[ -t 0 ]]; then
-    dokku_log_fail "No data provided on stdin."
-  fi
-  docker exec -i "$SERVICE_NAME" mysql --user=mysql --password="$PASSWORD" "$SERVICE"
+  service_import "$SERVICE"
 }
 
 mysql-import-cmd "$@"