From cfcc2ac10a31a7bfc7b486bd66a7df942d9006dc Mon Sep 17 00:00:00 2001
From: Martin Nirtl <martin.nirtl@gmail.com>
Date: Sat, 1 Feb 2020 23:48:34 +0100
Subject: [PATCH] rename activeEnvironment to active in config file

---
 internal/commands/environmentscmd/init.go   | 4 ++--
 internal/commands/environmentscmd/list.go   | 2 +-
 internal/commands/environmentscmd/remove.go | 4 ++--
 internal/commands/environmentscmd/set.go    | 4 ++--
 internal/commands/root.go                   | 5 +++--
 internal/commands/upcmd/root.go             | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/internal/commands/environmentscmd/init.go b/internal/commands/environmentscmd/init.go
index b2d9da6..2bb83e8 100644
--- a/internal/commands/environmentscmd/init.go
+++ b/internal/commands/environmentscmd/init.go
@@ -84,9 +84,9 @@ var initCmd = &cobra.Command{
 		viper.Set(fmt.Sprintf("environments.%s.home", env), workingDir)
 		viper.Set(fmt.Sprintf("environments.%s.services", env), services)
 
-		oldEnv := viper.GetString("activeEnvironment")
+		oldEnv := viper.GetString("active")
 
-		viper.Set("activeEnvironment", env)
+		viper.Set("active", env)
 
 		if err := viper.WriteConfig(); err != nil {
 			fmt.Printf("%sError on initializing environment: %s (old: %s)%s\n", chalk.Red, env, oldEnv, chalk.ResetColor)
diff --git a/internal/commands/environmentscmd/list.go b/internal/commands/environmentscmd/list.go
index 0433003..adb19d0 100644
--- a/internal/commands/environmentscmd/list.go
+++ b/internal/commands/environmentscmd/list.go
@@ -18,7 +18,7 @@ var listCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		envs := utils.GetEnvironments()
 
-		activeEnv := viper.GetString("activeEnvironment")
+		activeEnv := viper.GetString("active")
 
 		if len(envs) > 0 {
 			for _, env := range envs {
diff --git a/internal/commands/environmentscmd/remove.go b/internal/commands/environmentscmd/remove.go
index da4fcd7..3e41c61 100644
--- a/internal/commands/environmentscmd/remove.go
+++ b/internal/commands/environmentscmd/remove.go
@@ -42,12 +42,12 @@ var removeCmd = &cobra.Command{
 			os.Exit(0)
 		}
 
-		activeEnv := viper.GetString("activeEnvironment")
+		activeEnv := viper.GetString("active")
 
 		if env == activeEnv {
 			fmt.Printf("%sRemoved active environment: %s%s\n\n", chalk.Yellow, env, chalk.ResetColor)
 
-			viper.Set("activeEnvironment", nil)
+			viper.Set("active", "-")
 
 			fmt.Printf("%sUnset active environment%s\n", chalk.Cyan, chalk.ResetColor)
 		} else {
diff --git a/internal/commands/environmentscmd/set.go b/internal/commands/environmentscmd/set.go
index c364aea..3b38675 100644
--- a/internal/commands/environmentscmd/set.go
+++ b/internal/commands/environmentscmd/set.go
@@ -30,7 +30,7 @@ var setCmd = &cobra.Command{
 			env = utils.GetEnvironment(args[0])
 		}
 
-		activeEnv := viper.GetString("activeEnvironment")
+		activeEnv := viper.GetString("active")
 
 		if env == activeEnv {
 			fmt.Printf("%sActive environment already set: %s%s\n", chalk.Yellow, activeEnv, chalk.ResetColor)
@@ -40,7 +40,7 @@ var setCmd = &cobra.Command{
 
 		fmt.Printf("%sNew active environment: %s%s (old: %s)\n", chalk.Green, env, chalk.ResetColor, activeEnv)
 
-		viper.Set("activeEnvironment", env)
+		viper.Set("active", env)
 
 		if err := viper.WriteConfig(); err != nil {
 			fmt.Printf("%sError setting active environment: %s%s\n", chalk.Red, env, chalk.ResetColor)
diff --git a/internal/commands/root.go b/internal/commands/root.go
index ba1de43..8e09595 100644
--- a/internal/commands/root.go
+++ b/internal/commands/root.go
@@ -54,9 +54,10 @@ func init() {
 		viper.SetDefault("home", path.Join(userHome, ".dockma"))
 	}
 
-	viper.SetDefault("logfile", "log.txt")
 	viper.SetDefault("username", "User")
-	viper.SetDefault("activeEnvironment", "-")
+	viper.SetDefault("logSubcommandOutput", false)
+	viper.SetDefault("logfile", "log.txt")
+	viper.SetDefault("active", "-")
 	viper.SetDefault("environments", map[string]interface{}{})
 }
 
diff --git a/internal/commands/upcmd/root.go b/internal/commands/upcmd/root.go
index ac705dd..9ab25f8 100644
--- a/internal/commands/upcmd/root.go
+++ b/internal/commands/upcmd/root.go
@@ -17,7 +17,7 @@ var UpCommand = &cobra.Command{
 		// logfileName := viper.GetString("logfile")
 		// filepath := utils.GetFullLogfilePath(logfileName)
 
-		activeEnv := viper.GetString("activeEnvironment")
+		activeEnv := viper.GetString("active")
 		envHomeDir := viper.GetString(fmt.Sprintf("environments.%s.home", activeEnv))
 		os.Chdir(envHomeDir)