refactored cmd & config into their own packages

Author: phiros

cmd.go renamed to cmd/cmd.go

@@ -1,23 +1,25 @@
-package main
+package cmd
 
 import (
-	"fmt"
-	"os"
-
+	"github.com/leanovate/mite-go/config"
 	"github.com/spf13/cobra"
 )
 
+type dependencies struct {
+	conf config.Config
+}
+
+var deps dependencies
+
+func HandleCommands(c config.Config) error {
+	deps = dependencies{conf: c}
+	return rootCmd.Execute()
+}
+
 var rootCmd = &cobra.Command{
 	Use:   "mite-go",
 	Short: "cli client for mite time tracking",
 	Run: func(cmd *cobra.Command, args []string) {
 		// list entries for last 7 days
 	},
 }
-
-func cmdLineHandler() {
-	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-}

cmd-config.go renamed to cmd/config.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ var configCommand = &cobra.Command{
 	Short: "sets or reads a config property",
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) == 0 {
-			configPrintAll()
+			deps.conf.PrintAll()
 			return
 		}
 
@@ -34,9 +34,9 @@ var configCommand = &cobra.Command{
 			configKeyValue := strings.Split(firstArgument, "=")
 			configKey := configKeyValue[0]
 			configValue := configKeyValue[1]
-			configSet(configKey, configValue)
+			deps.conf.Set(configKey, configValue)
 			return
 		}
-		fmt.Println(configGet(configKey))
+		fmt.Println(deps.conf.Get(configKey))
 	},
 }

cmd-entries.go renamed to cmd/entries.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
@@ -36,7 +36,7 @@ var entriesListCommand = &cobra.Command{
 	Use:   "list",
 	Short: "list time entries",
 	Run: func(cmd *cobra.Command, args []string) {
-		api := mite.NewMiteApi(configGetApiUrl(), configGetApiKey())
+		api := mite.NewMiteApi(deps.conf.GetApiUrl(), deps.conf.GetApiKey())
 
 		direction := listOrder
 

cmd-projects.go renamed to cmd/projects.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
@@ -23,7 +23,7 @@ var listProjectsCommand = &cobra.Command{
 	Use:   "list",
 	Short: "list projects",
 	Run: func(cmd *cobra.Command, args []string) {
-		api := mite.NewMiteApi(configGetApiUrl(), configGetApiKey())
+		api := mite.NewMiteApi(deps.conf.GetApiUrl(), deps.conf.GetApiKey())
 		projects, err := api.Projects()
 		if err != nil {
 			_, _ = fmt.Fprintln(os.Stderr, err)

list-services.go renamed to cmd/services.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"fmt"
@@ -23,7 +23,7 @@ var listServicesCommand = &cobra.Command{
 	Use:   "list",
 	Short: "list services",
 	Run: func(cmd *cobra.Command, args []string) {
-		api := mite.NewMiteApi(configGetApiUrl(), configGetApiKey())
+		api := mite.NewMiteApi(deps.conf.GetApiUrl(), deps.conf.GetApiKey())
 		services, err := api.Services()
 		if err != nil {
 			_, _ = fmt.Fprintln(os.Stderr, err)

config.go

@@ -0,0 +1,71 @@
+package config
+
+import (
+	"fmt"
+	"github.com/spf13/viper"
+	"os"
+	"path/filepath"
+)
+
+type Config interface {
+	GetApiUrl() string
+	GetApiKey() string
+	Get(key string) string
+	Set(key string, value string)
+	PrintAll()
+}
+
+type config struct {
+	fileName string
+	filePath string
+	fileType string
+}
+
+func NewConfig(fileName, filePath, fileType string) Config {
+	viper.AddConfigPath("$HOME")
+	viper.SetConfigName(fileName)
+	viper.SetConfigType(fileType)
+	return &config{fileName: fileName, filePath: filePath, fileType: fileType}
+}
+
+func (c *config) GetApiUrl() string {
+	return c.Get("api.url")
+}
+
+func (c *config) GetApiKey() string {
+	return c.Get("api.key")
+}
+
+func (c *config) Get(key string) string {
+	err := viper.ReadInConfig()
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+	}
+	return viper.GetString(key)
+}
+
+func (c *config) Set(key string, value string) {
+	err := viper.ReadInConfig()
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+	}
+
+	viper.Set(key, value)
+	err = viper.MergeInConfig()
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+	}
+	err = viper.WriteConfigAs(filepath.Join(c.filePath, c.fileName))
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+	}
+}
+
+func (c *config) PrintAll() {
+	err := viper.ReadInConfig()
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+	}
+	wholeConfig := viper.AllSettings()
+	fmt.Printf("%v\n", wholeConfig)
+}

config/config.go

@@ -1,15 +1,26 @@
 package main
 
 import (
-	"github.com/spf13/viper"
+	"fmt"
+	"github.com/leanovate/mite-go/cmd"
+	"github.com/leanovate/mite-go/config"
+	"github.com/mitchellh/go-homedir"
+	"os"
 )
 
-const configFileName = ".mite-go.toml"
-const configPath = "$HOME"
+const configFileName = ".mite-go"
+const configType = "toml"
 
 func main() {
-	viper.AddConfigPath(configPath)
-	viper.SetConfigName(".mite-go")
-	viper.SetConfigType("toml")
-	cmdLineHandler()
+	homeDirectory, err := homedir.Dir()
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+	}
+	c := config.NewConfig(configFileName, homeDirectory, configType)
+
+	err = cmd.HandleCommands(c)
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
 }