Complete configuration command, fixes 2

Author: Mehdi Cheracher

commands/config.go

@@ -70,7 +70,7 @@ func GetAction(context *cli.Context) error {
 		fmt.Println("Current configuration: ")
 		color.Green("server.port\t\t %d\n", configuration.Server.Port)
 		color.Green("lang.default\t\t %s\n", configuration.Lang.Default)
-		color.Green("author\t\t %s\n", configuration.Author)
+		color.Green("author      \t\t %s\n", configuration.Author)
 		return nil
 	} else {
 		value, err := config.GetConfigurationValue(configuration, context.Args().First())

config/config.go

@@ -2,10 +2,15 @@ package config
 
 import (
 	"bytes"
-	"gopkg.in/yaml.v2"
+	"errors"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path"
+	"strconv"
+	"strings"
+
+	"gopkg.in/yaml.v2"
 )
 
 // The configuration of the CLI
@@ -34,7 +39,7 @@ func createDefaultConfiguration() *Config {
 		Server: struct {
 			Port int `yaml:"port"`
 		}{
-			Port: 12,
+			Port: 1200,
 		},
 		Lang: struct {
 			Default string `yaml:"default"`
@@ -49,14 +54,14 @@ func createDefaultConfiguration() *Config {
 // This function is called when the configuration file does not exist already
 // This will create the configuration file in the user config dir, with a minimalistic
 // default configuration
-func saveDefaultConfiguration() error {
+func SaveConfiguration(config *Config) error {
 	location, err := getDefaultConfigLocation()
 	if err != nil {
 		return err
 	}
 	var buffer bytes.Buffer
 	encoder := yaml.NewEncoder(&buffer)
-	err = encoder.Encode(createDefaultConfiguration())
+	err = encoder.Encode(config)
 	if err != nil {
 		return err
 	}
@@ -89,10 +94,25 @@ func LoadDefaultConfiguration() (*Config, error) {
 	}
 	if _, err := os.Stat(location); err != nil {
 		if os.IsNotExist(err) {
-			if err := saveDefaultConfiguration(); err != nil {
+			config := createDefaultConfiguration()
+			if err := SaveConfiguration(config); err != nil {
 				return nil, err
 			}
 		}
 	}
 	return LoadConfiguration(location)
 }
+
+// Gets the configuration value associated with the given key
+func GetConfigurationValue(config *Config, key string) (string, error) {
+	lowerKey := strings.ToLower(key)
+	if lowerKey == "server.port" {
+		return strconv.Itoa(config.Server.Port), nil
+	} else if lowerKey == "lang.default" {
+		return config.Lang.Default, nil
+	} else if lowerKey == "author" {
+		return config.Author, nil
+	} else {
+		return "", errors.New(fmt.Sprintf("Unknown config key %s", key))
+	}
+}

config/config_test.go

@@ -2,12 +2,13 @@ package config
 
 import (
 	"bytes"
-	"github.com/stretchr/testify/assert"
-	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"os"
 	"path"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"gopkg.in/yaml.v2"
 )
 
 func getDefaultConfiguration() *Config {
@@ -59,3 +60,14 @@ func deleteFakeConfigFile() {
 	configPath := getConfigPath()
 	_ = os.Remove(configPath)
 }
+
+func TestGetConfigurationValue(t *testing.T) {
+	config := createDefaultConfiguration()
+
+	value, err := GetConfigurationValue(config, "server.port")
+	assert.NoError(t, err, "No error should be thrown when getting an existing key")
+	assert.Equal(t, value, "1200")
+
+	_, err = GetConfigurationValue(config, "unknown.key")
+	assert.Error(t, err, "An error is returned if the configuration key is not known")
+}

main.go

@@ -2,12 +2,13 @@ package main
 
 import (
 	"bytes"
-	"github.com/chermehdi/egor/commands"
-	"github.com/chermehdi/egor/config"
-	"github.com/urfave/cli/v2"
 	"html/template"
 	"log"
 	"os"
+
+	"github.com/chermehdi/egor/commands"
+	"github.com/chermehdi/egor/config"
+	"github.com/urfave/cli/v2"
 )
 
 const Egor = `
@@ -42,6 +43,7 @@ func main() {
 		UsageText:   "Run egor <subcommand> [--flags]*",
 		Commands: []*cli.Command{
 			&commands.ParseCommand,
+			&commands.ConfigCommand,
 		},
 	}