Refactor functions

Author: mblaschke

command.go

@@ -2,7 +2,12 @@ package main
 
 import (
 	"strings"
+	"os"
+	"fmt"
+	"path"
 	"./sync"
+	"gopkg.in/AlecAivazis/survey.v1"
+
 )
 
 type AbstractCommand struct {
@@ -11,7 +16,7 @@ type AbstractCommand struct {
 
 func (command *AbstractCommand) GetConfig() *sync.SyncConfig {
 	Logger.Main("Initialisation")
-	configFile := findConfigFile()
+	configFile := command.findConfigFile()
 	if configFile == "" {
 		Logger.FatalExit(2, "Unable to find configuration file (searched  %s)", strings.Join(validConfigFiles, " "))
 	}
@@ -22,3 +27,48 @@ func (command *AbstractCommand) GetConfig() *sync.SyncConfig {
 
 	return config
 }
+
+func (command *AbstractCommand) findConfigFile() string {
+	pwd, err := os.Getwd()
+	if err != nil {
+		Logger.FatalErrorExit(1, err)
+		fmt.Println(err)
+	}
+
+	for true {
+		for _, filename := range validConfigFiles {
+			filepath := path.Join(pwd, filename)
+			if sync.FileExists(filepath) {
+				return filepath
+			}
+		}
+
+
+		// already found root, we finished here
+		if pwd == "/" {
+			break
+		}
+
+		pwd = path.Dir(pwd)
+
+		// oh, path seems to be empty.. stopping here now
+		if pwd == "." || pwd == "" {
+			break
+		}
+	}
+
+	return ""
+}
+
+
+func (command *AbstractCommand) getServerSelectionFromUser(config *sync.SyncConfig, confType string, userSelection string) string {
+	if userSelection == "" {
+		prompt := &survey.Select{
+			Message: "Choose configuration:",
+			Options: config.GetServerList(confType),
+		}
+		survey.AskOne(prompt, &userSelection, nil)
+	}
+
+	return userSelection
+}

command_deploy.go

@@ -13,7 +13,7 @@ type DeployCommand struct {
 // Run deployment command
 func (command *DeployCommand) Execute(args []string) error {
 	config := command.GetConfig()
-	server := getArgServer(config, "deploy", command.Positional.Server)
+	server := command.getServerSelectionFromUser(config, "deploy", command.Positional.Server)
 	confServer, err := config.GetDeployServer(server)
 	if err != nil {
 		Logger.FatalErrorExit(3, err)

command_sync.go

@@ -13,7 +13,7 @@ type SyncCommand struct {
 // Run sync command
 func (command *SyncCommand) Execute(args []string) error {
 	config := command.GetConfig()
-	server := getArgServer(config, "sync", command.Positional.Server)
+	server := command.getServerSelectionFromUser(config, "sync", command.Positional.Server)
 	confServer, err := config.GetSyncServer(server)
 	if err != nil {
 		Logger.FatalErrorExit(3, err)

main.go

@@ -4,12 +4,9 @@ import (
 	"os"
 	"log"
 	"fmt"
-	"path"
 	"runtime/debug"
 	flags "github.com/jessevdk/go-flags"
 	"github.com/webdevops/go-shell"
-	"gopkg.in/AlecAivazis/survey.v1"
-	"./sync"
 	"./logger"
 )
 
@@ -36,7 +33,7 @@ var validConfigFiles = []string{
 	".gosync.yaml",
 }
 
-func createArgparser() {
+func handleArgParser() {
 	var err error
 	argparser = flags.NewParser(&opts, flags.Default)
 	argparser.CommandHandler = func(command flags.Commander, args []string) error {
@@ -80,50 +77,6 @@ func createArgparser() {
 	}
 }
 
-func findConfigFile() string {
-	pwd, err := os.Getwd()
-	if err != nil {
-		Logger.FatalErrorExit(1, err)
-		fmt.Println(err)
-	}
-
-	for true {
-		for _, filename := range validConfigFiles {
-			filepath := path.Join(pwd, filename)
-			if sync.FileExists(filepath) {
-				return filepath
-			}
-		}
-
-
-		// already found root, we finished here
-		if pwd == "/" {
-			break
-		}
-
-		pwd = path.Dir(pwd)
-
-		// oh, path seems to be empty.. stopping here now
-		if pwd == "." || pwd == "" {
-			break
-		}
-	}
-
-	return ""
-}
-
-func getArgServer(config *sync.SyncConfig, confType string, userSelection string) string {
-	if userSelection == "" {
-		prompt := &survey.Select{
-			Message: "Choose configuration:",
-			Options: config.GetServerList(confType),
-		}
-		survey.AskOne(prompt, &userSelection, nil)
-	}
-
-	return userSelection
-}
-
 func main() {
 	defer func() {
 		if r := recover(); r != nil {
@@ -138,7 +91,7 @@ func main() {
 		}
 	}()
 
-	createArgparser()
+	handleArgParser()
 
 	os.Exit(0)
 }