From 9a0e23e833163b6e0d023c8a449bfb214f2ad799 Mon Sep 17 00:00:00 2001
From: Martin Nirtl <martin.nirtl@gmail.com>
Date: Sun, 16 Feb 2020 21:35:04 +0100
Subject: [PATCH] add helpers package to utils

---
 internal/commands/envcmd/remove.go |  5 +++--
 internal/commands/envcmd/set.go    |  5 +++--
 internal/utils/helpers/helpers.go  | 26 ++++++++++++++++++++++++++
 internal/utils/utils.go            | 19 -------------------
 4 files changed, 32 insertions(+), 23 deletions(-)
 create mode 100644 internal/utils/helpers/helpers.go

diff --git a/internal/commands/envcmd/remove.go b/internal/commands/envcmd/remove.go
index dc4c9c7..ed7efe8 100644
--- a/internal/commands/envcmd/remove.go
+++ b/internal/commands/envcmd/remove.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/martinnirtl/dockma/internal/survey"
 	"github.com/martinnirtl/dockma/internal/utils"
+	"github.com/martinnirtl/dockma/internal/utils/helpers"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/ttacon/chalk"
@@ -20,9 +21,9 @@ var removeCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		env := ""
 		if len(args) == 0 {
-			env = utils.GetEnvironment("")
+			env = helpers.GetEnvironment("")
 		} else {
-			env = utils.GetEnvironment(args[0])
+			env = helpers.GetEnvironment(args[0])
 		}
 
 		sure := survey.Confirm(fmt.Sprintf("Are you sure to remove '%s'", env), false)
diff --git a/internal/commands/envcmd/set.go b/internal/commands/envcmd/set.go
index d282883..6c96a56 100644
--- a/internal/commands/envcmd/set.go
+++ b/internal/commands/envcmd/set.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/martinnirtl/dockma/internal/utils"
+	"github.com/martinnirtl/dockma/internal/utils/helpers"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/ttacon/chalk"
@@ -18,9 +19,9 @@ var setCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		env := ""
 		if len(args) == 0 {
-			env = utils.GetEnvironment("")
+			env = helpers.GetEnvironment("")
 		} else {
-			env = utils.GetEnvironment(args[0])
+			env = helpers.GetEnvironment(args[0])
 		}
 
 		activeEnv := viper.GetString("active")
diff --git a/internal/utils/helpers/helpers.go b/internal/utils/helpers/helpers.go
new file mode 100644
index 0000000..cfd1717
--- /dev/null
+++ b/internal/utils/helpers/helpers.go
@@ -0,0 +1,26 @@
+package helpers
+
+import (
+	"fmt"
+
+	"github.com/martinnirtl/dockma/internal/config"
+	"github.com/martinnirtl/dockma/internal/survey"
+	"github.com/ttacon/chalk"
+)
+
+// GetEnvironment returns one environment
+func GetEnvironment(env string) string {
+	envs := config.GetEnvNames()
+
+	for _, envName := range envs {
+		if env == envName {
+			return env
+		}
+	}
+
+	fmt.Printf("%sNo such environment: %s%s\n", chalk.Yellow, env, chalk.ResetColor)
+
+	env = survey.Select("Choose an environment", envs)
+
+	return env
+}
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
index 938383a..cdf6d78 100644
--- a/internal/utils/utils.go
+++ b/internal/utils/utils.go
@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/martinnirtl/dockma/internal/config"
-	"github.com/martinnirtl/dockma/internal/survey"
 	"github.com/ttacon/chalk"
 )
 
@@ -54,23 +52,6 @@ func NoEnvs() {
 	os.Exit(0)
 }
 
-// GetEnvironment returns one environment
-func GetEnvironment(env string) string {
-	envs := config.GetEnvNames()
-
-	for _, envName := range envs {
-		if env == envName {
-			return env
-		}
-	}
-
-	fmt.Printf("%sNo such environment: %s%s\n", chalk.Yellow, env, chalk.ResetColor)
-
-	env = survey.Select("Choose an environment", envs)
-
-	return env
-}
-
 // Fallback returns fallback if val is nil
 func Fallback(val string, fallback string) string {
 	if val == "" {