From 14333b13422b6b43deaa4f17ee2f7b94da0f2024 Mon Sep 17 00:00:00 2001
From: Ryan Cavicchioni <ryan@cavi.cc>
Date: Sat, 16 Jan 2021 00:38:10 -0600
Subject: [PATCH] Move lume main into the lumecmd package

---
 cmd/lume/main.go | 81 +------------------------------------------
 cmd/main.go      | 89 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 80 deletions(-)
 create mode 100644 cmd/main.go

diff --git a/cmd/lume/main.go b/cmd/lume/main.go
index fae0c5f..5279183 100644
--- a/cmd/lume/main.go
+++ b/cmd/lume/main.go
@@ -1,90 +1,11 @@
 package main
 
 import (
-	"flag"
-	"fmt"
 	"os"
-	"path"
 
-	lifx "git.kill0.net/chill9/lume"
 	lumecmd "git.kill0.net/chill9/lume/cmd"
-	"github.com/BurntSushi/toml"
 )
 
-const lumercFile string = ".lumerc"
-
 func main() {
-	var config lumecmd.Config
-
-	configPath := getConfigPath()
-	if configPath == "" {
-		fmt.Println("fatal: ~/.lumerc was not found")
-		os.Exit(1)
-	}
-
-	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 == "" {
-		fmt.Println("access token is not set")
-		os.Exit(1)
-	}
-
-	flag.Parse()
-
-	command := flag.Arg(0)
-
-	c := lifx.NewClient(config.AccessToken)
-
-	cmdArgs := lumecmd.CmdArgs{
-		Client: c,
-		Config: config,
-	}
-
-	cmd, ok := lumecmd.GetCommand(command)
-	if !ok {
-		fmt.Printf("lume: '%s' is not lume command. See 'lume help'\n", command)
-		os.Exit(1)
-	}
-	fs := cmd.Flags
-	fs.Parse(os.Args[2:])
-
-	cmdArgs.Flags = lumecmd.Flags{FlagSet: fs}
-	exitCode, err := cmd.Func(cmdArgs)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "fatal: %s\n", err)
-	}
-	os.Exit(exitCode)
-}
-
-func getConfigPath() string {
-	var tryPath, configPath string
-
-	// ~/.lumerc
-	homeDir, err := os.UserHomeDir()
-	if err == nil {
-		tryPath = path.Join(homeDir, lumercFile)
-		if _, err := os.Stat(tryPath); !os.IsNotExist(err) {
-			configPath = tryPath
-		}
-	}
-
-	// ./.lumerc
-	cwd, err := os.Getwd()
-	if err == nil {
-		tryPath = path.Join(cwd, lumercFile)
-		if _, err := os.Stat(tryPath); !os.IsNotExist(err) {
-			configPath = tryPath
-		}
-	}
-
-	return configPath
+	lumecmd.Main(os.Args)
 }
diff --git a/cmd/main.go b/cmd/main.go
new file mode 100644
index 0000000..d5d6463
--- /dev/null
+++ b/cmd/main.go
@@ -0,0 +1,89 @@
+package lumecmd
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"path"
+
+	lifx "git.kill0.net/chill9/lume"
+	"github.com/BurntSushi/toml"
+)
+
+const lumercFile string = ".lumerc"
+
+func Main(args []string) {
+	var config Config
+
+	configPath := getConfigPath()
+	if configPath == "" {
+		fmt.Println("fatal: ~/.lumerc was not found")
+		os.Exit(1)
+	}
+
+	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 == "" {
+		fmt.Println("access token is not set")
+		os.Exit(1)
+	}
+
+	flag.Parse()
+
+	command := flag.Arg(0)
+
+	c := lifx.NewClient(config.AccessToken)
+
+	cmdArgs := CmdArgs{
+		Client: c,
+		Config: config,
+	}
+
+	cmd, ok := GetCommand(command)
+	if !ok {
+		fmt.Printf("lume: '%s' is not lume command. See 'lume help'\n", command)
+		os.Exit(1)
+	}
+	fs := cmd.Flags
+	fs.Parse(args[2:])
+
+	cmdArgs.Flags = Flags{FlagSet: fs}
+	exitCode, err := cmd.Func(cmdArgs)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "fatal: %s\n", err)
+	}
+	os.Exit(exitCode)
+}
+
+func getConfigPath() string {
+	var tryPath, configPath string
+
+	// ~/.lumerc
+	homeDir, err := os.UserHomeDir()
+	if err == nil {
+		tryPath = path.Join(homeDir, lumercFile)
+		if _, err := os.Stat(tryPath); !os.IsNotExist(err) {
+			configPath = tryPath
+		}
+	}
+
+	// ./.lumerc
+	cwd, err := os.Getwd()
+	if err == nil {
+		tryPath = path.Join(cwd, lumercFile)
+		if _, err := os.Stat(tryPath); !os.IsNotExist(err) {
+			configPath = tryPath
+		}
+	}
+
+	return configPath
+}