rename envscmd to envcmd pkg and add pullCmd

internal/commands/envscmd/init.go → internal/commands/envcmd/init.go

@@ -1,4 +1,4 @@
-package envscmd
+package envcmd
 
 import (
 	"errors"
@@ -48,7 +48,10 @@ var initCmd = &cobra.Command{
 			os.Exit(0)
 		}
 
-		autoPull := survey.Confirm(fmt.Sprintf("Run %sgit pull%s before %sdockma up%s", chalk.Cyan, chalk.Reset, chalk.Cyan, chalk.ResetColor), false)
+		autoPull := "off"
+		if _, err := os.Stat(".git"); os.IsExist(err) {
+			autoPull = survey.Select(fmt.Sprintf("Run %sgit pull%s before %sdockma up%s", chalk.Cyan, chalk.Reset, chalk.Cyan, chalk.ResetColor), []string{"auto", "optional", "manual", "off"})
+		}
 
 		proceed := survey.Confirm(fmt.Sprintf("Add new environment %s%s%s (location: %s)", chalk.Cyan, env, chalk.ResetColor, workingDir), true)
 
@@ -74,5 +77,5 @@ var initCmd = &cobra.Command{
 }
 
 func init() {
-	EnvsCommand.AddCommand(initCmd)
+	EnvCommand.AddCommand(initCmd)
 }

internal/commands/envscmd/list.go → internal/commands/envcmd/list.go

@@ -1,4 +1,4 @@
-package envscmd
+package envcmd
 
 import (
 	"fmt"
@@ -36,5 +36,5 @@ var listCmd = &cobra.Command{
 }
 
 func init() {
-	EnvsCommand.AddCommand(listCmd)
+	EnvCommand.AddCommand(listCmd)
 }

internal/commands/pullcmd/root.go → internal/commands/envcmd/pull.go

@@ -1,4 +1,4 @@
-package pullcmd
+package envcmd
 
 import (
 	"errors"
@@ -14,6 +14,33 @@ import (
 	"github.com/ttacon/chalk"
 )
 
+var pullCommand = &cobra.Command{
+	Use:   "pull",
+	Short: "Run 'git pull' in active environment home dir.",
+	Long:  "Run 'git pull' in active environment home dir.",
+	Args:  cobra.NoArgs,
+	Run: func(cmd *cobra.Command, args []string) {
+
+		activeEnv := config.GetActiveEnv()
+
+		if activeEnv == "-" {
+			utils.NoEnvs()
+		}
+
+		envHomeDir := config.GetEnvHomeDir(activeEnv)
+
+		err := Pull(envHomeDir, true)
+
+		utils.Error(err)
+
+		utils.Success(fmt.Sprintf("Successfully pulled env: %s", activeEnv))
+	},
+}
+
+func init() {
+	EnvCommand.AddCommand(pullCommand)
+}
+
 // Pull runs git pull in given path and optionally logs output
 func Pull(path string, log bool) error {
 	err := os.Chdir(path)
@@ -38,27 +65,7 @@ func Pull(path string, log bool) error {
 		return errors.New("Could not execute 'git pull' in active environment home dir")
 	}
 
-	return nil
-}
-
-// PullCommand implements the top level pull command
-var PullCommand = &cobra.Command{
-	Use:   "pull",
-	Short: "Run 'git pull' in active environment home dir.",
-	Long:  "Run 'git pull' in active environment home dir.",
-	Args:  cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
-
-		activeEnv := config.GetActiveEnv()
-
-		if activeEnv == "-" {
-			utils.NoEnvs()
-		}
-
-		envHomeDir := config.GetEnvHomeDir(activeEnv)
+	// config.SetEnvUpdated() // TODO make config to object
 
-		err := Pull(envHomeDir, true)
-
-		utils.Error(err)
-	},
+	return nil
 }

internal/commands/envscmd/remove.go → internal/commands/envcmd/remove.go

@@ -1,4 +1,4 @@
-package envscmd
+package envcmd
 
 import (
 	"fmt"
@@ -56,5 +56,5 @@ var removeCmd = &cobra.Command{
 }
 
 func init() {
-	EnvsCommand.AddCommand(removeCmd)
+	EnvCommand.AddCommand(removeCmd)
 }

internal/commands/envcmd/rename.go

@@ -0,0 +1 @@
+package envcmd

internal/commands/envscmd/root.go → internal/commands/envcmd/root.go

@@ -1,11 +1,11 @@
-package envscmd
+package envcmd
 
 import (
 	"github.com/spf13/cobra"
 )
 
-// EnvsCommand implements the top level envs command
-var EnvsCommand = &cobra.Command{
+// EnvCommand implements the top level envs command
+var EnvCommand = &cobra.Command{
 	Use:     "env",
 	Aliases: []string{"environment"},
 	Short:   "Environments reflect docker-compose based projects.",

internal/commands/envscmd/set.go → internal/commands/envcmd/set.go

@@ -1,4 +1,4 @@
-package envscmd
+package envcmd
 
 import (
 	"fmt"
@@ -42,5 +42,5 @@ var setCmd = &cobra.Command{
 }
 
 func init() {
-	EnvsCommand.AddCommand(setCmd)
+	EnvCommand.AddCommand(setCmd)
 }

internal/commands/root.go

@@ -9,13 +9,12 @@ import (
 
 	"github.com/martinnirtl/dockma/internal/commands/configcmd"
 	"github.com/martinnirtl/dockma/internal/commands/downcmd"
-	"github.com/martinnirtl/dockma/internal/commands/envscmd"
+	"github.com/martinnirtl/dockma/internal/commands/envcmd"
 	"github.com/martinnirtl/dockma/internal/commands/initcmd"
 	"github.com/martinnirtl/dockma/internal/commands/inspectcmd"
 	"github.com/martinnirtl/dockma/internal/commands/logscmd"
 	"github.com/martinnirtl/dockma/internal/commands/profilecmd"
 	"github.com/martinnirtl/dockma/internal/commands/pscmd"
-	"github.com/martinnirtl/dockma/internal/commands/pullcmd"
 	"github.com/martinnirtl/dockma/internal/commands/upcmd"
 	"github.com/martinnirtl/dockma/internal/commands/versioncmd"
 	"github.com/mitchellh/go-homedir"
@@ -35,13 +34,12 @@ var RootCommand = &cobra.Command{
 func init() {
 	RootCommand.AddCommand(configcmd.ConfigCommand)
 	RootCommand.AddCommand(downcmd.DownCommand)
-	RootCommand.AddCommand(envscmd.EnvsCommand)
+	RootCommand.AddCommand(envcmd.EnvCommand)
 	RootCommand.AddCommand(initcmd.InitCommand)
 	RootCommand.AddCommand(inspectcmd.InspectCommand)
 	RootCommand.AddCommand(logscmd.LogsCommand)
 	RootCommand.AddCommand(profilecmd.ProfileCommand)
 	RootCommand.AddCommand(pscmd.PSCommand)
-	RootCommand.AddCommand(pullcmd.PullCommand)
 	RootCommand.AddCommand(upcmd.UpCommand)
 	RootCommand.AddCommand(versioncmd.VersionCommand)
 
@@ -65,7 +63,7 @@ func init() {
 	}
 
 	viper.SetDefault("username", "User")
-	viper.SetDefault("hidesubcommandoutput", false)
+	viper.SetDefault("hidesubcommandoutput", true)
 	viper.SetDefault("logfile", "log.txt")
 	viper.SetDefault("active", "-")
 	viper.SetDefault("envs", map[string]interface{}{})