From 0292c4ee3bf642dbf44927a5946d371be256a4cc Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 29 Jul 2018 14:08:14 -0400
Subject: [PATCH] refactor: move get_cmd_from_procfile to ps/functions

Procfile handling should only be performed in the ps plugin
---
 plugins/common/functions                        | 11 -----------
 plugins/ps/functions                            | 11 +++++++++++
 plugins/scheduler-docker-local/scheduler-deploy |  1 +
 plugins/scheduler-docker-local/scheduler-run    |  2 +-
 tests/unit/10_ps-general.bats                   |  1 -
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/common/functions b/plugins/common/functions
index 8c572c2a5..fa0d63835 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -392,17 +392,6 @@ get_app_running_container_types() {
   echo "$CONTAINER_TYPES"
 }
 
-get_cmd_from_procfile() {
-  declare desc="parse cmd from app Procfile"
-  declare APP="$1" PROC_TYPE="$2" PORT="$3"
-  local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
-  local COMMAND
-  verify_app_name "$APP"
-
-  [[ ! -f $DOKKU_PROCFILE ]] && return
-  procfile-util show --procfile "$PROC_TYPE" --default-port "$PORT"
-}
-
 is_deployed() {
   declare desc="return 0 if given app has a running container"
   local APP="$1"
diff --git a/plugins/ps/functions b/plugins/ps/functions
index 1abbe0497..c1757f18c 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -3,6 +3,17 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
+get_cmd_from_procfile() {
+  declare desc="parse cmd from app Procfile"
+  declare APP="$1" PROC_TYPE="$2" PORT="$3"
+  local DOKKU_PROCFILE="$DOKKU_ROOT/$APP/DOKKU_PROCFILE"
+  local COMMAND
+  verify_app_name "$APP"
+
+  [[ ! -f $DOKKU_PROCFILE ]] && return
+  procfile-util show --procfile "$DOKKU_PROCFILE" --process-type "$PROC_TYPE" --default-port "$PORT"
+}
+
 print_dokku_scale_file() {
   declare desc="prints contents of DOKKU_SCALE file"
   local APP="$1"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
diff --git a/plugins/scheduler-docker-local/scheduler-deploy b/plugins/scheduler-docker-local/scheduler-deploy
index 0291dd43f..655d4e4cf 100755
--- a/plugins/scheduler-docker-local/scheduler-deploy
+++ b/plugins/scheduler-docker-local/scheduler-deploy
@@ -3,6 +3,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/checks/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
+source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 scheduler-docker-local-scheduler-deploy() {
   declare desc="deploys an image tag for a given application"
diff --git a/plugins/scheduler-docker-local/scheduler-run b/plugins/scheduler-docker-local/scheduler-run
index de53d95db..33929d80e 100755
--- a/plugins/scheduler-docker-local/scheduler-run
+++ b/plugins/scheduler-docker-local/scheduler-run
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
+source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 scheduler-docker-local-scheduler-run() {
   declare desc="runs command in container based on app image"
diff --git a/tests/unit/10_ps-general.bats b/tests/unit/10_ps-general.bats
index b43237c11..356cc50f4 100644
--- a/tests/unit/10_ps-general.bats
+++ b/tests/unit/10_ps-general.bats
@@ -13,7 +13,6 @@ teardown() {
 }
 
 @test "(ps:scale) procfile commands extraction" {
-  source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
   source "$PLUGIN_CORE_AVAILABLE_PATH/ps/functions"
   cat <<EOF > "$DOKKU_ROOT/$TEST_APP/DOKKU_PROCFILE"
 web: node web.js --port \$PORT