Refactor configuration file loading

cmd/lume/main.go

@@ -11,14 +11,21 @@ import (
 	"github.com/BurntSushi/toml"
 )
 
-const lumercFile = ".lumerc"
+const lumercFile string = ".lumerc"
 
 func main() {
 	var config lumecmd.Config
-	config = loadConfig()
 
-	if config.AccessToken == "" {
+	configPath := getConfigPath()
-		config.AccessToken = os.Getenv("LIFX_ACCESS_TOKEN")
+	if _, err := toml.DecodeFile(configPath, &config); err != nil {
+		fmt.Printf("fatal: failed to parse %s\n", configPath)
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	envAccessToken := os.Getenv("LIFX_ACCESS_TOKEN")
+	if envAccessToken != "" {
+		config.AccessToken = envAccessToken
 	}
 
 	if config.AccessToken == "" {
@@ -45,7 +52,7 @@ func main() {
 	fs := cmd.Flags
 	fs.Parse(os.Args[2:])
 
-	cmdArgs.Flags = lumecmd.Flags{fs}
+	cmdArgs.Flags = lumecmd.Flags{FlagSet: fs}
 	exitCode, err := cmd.Func(cmdArgs)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "fatal: %s\n", err)
@@ -53,10 +60,10 @@ func main() {
 	os.Exit(exitCode)
 }
 
-func loadConfig() lumecmd.Config {
+func getConfigPath() string {
-	var config lumecmd.Config
 	var tryPath, configPath string
 
+	// ~/.lumerc
 	homeDir, err := os.UserHomeDir()
 	if err == nil {
 		tryPath = path.Join(homeDir, lumercFile)
@@ -65,6 +72,7 @@ func loadConfig() lumecmd.Config {
 		}
 	}
 
+	// ./.lumerc
 	cwd, err := os.Getwd()
 	if err == nil {
 		tryPath = path.Join(cwd, lumercFile)
@@ -73,9 +81,5 @@ func loadConfig() lumecmd.Config {
 		}
 	}
 
-	if configPath != "" {
+	return configPath
-		toml.DecodeFile(configPath, &config)
-	}
-
-	return config
 }