refactor: minimise the main package
All checks were successful
REUSE Compliance Check / check (push) Successful in 5s
All checks were successful
REUSE Compliance Check / check (push) Successful in 5s
Minimise the main package by moving all flag parsing to the Execute function.
This commit is contained in:
parent
6e5e0c4c5a
commit
3c8633ff04
3 changed files with 62 additions and 50 deletions
|
@ -11,22 +11,46 @@ package executor
|
||||||
{{ print "" }}
|
{{ print "" }}
|
||||||
{{ print "" }}
|
{{ print "" }}
|
||||||
import "fmt"
|
import "fmt"
|
||||||
|
import "flag"
|
||||||
|
import "os"
|
||||||
import "codeflow.dananglin.me.uk/apollo/enbas/internal/config"
|
import "codeflow.dananglin.me.uk/apollo/enbas/internal/config"
|
||||||
|
import internalFlag "codeflow.dananglin.me.uk/apollo/enbas/internal/flag"
|
||||||
import "codeflow.dananglin.me.uk/apollo/enbas/internal/printer"
|
import "codeflow.dananglin.me.uk/apollo/enbas/internal/printer"
|
||||||
|
import "codeflow.dananglin.me.uk/apollo/enbas/internal/usage"
|
||||||
{{ print "" }}
|
{{ print "" }}
|
||||||
{{ print "" }}
|
{{ print "" }}
|
||||||
func Execute(
|
func Execute() error {
|
||||||
command string,
|
|
||||||
args []string,
|
|
||||||
noColor bool,
|
|
||||||
configDir string,
|
|
||||||
) error {
|
|
||||||
var (
|
var (
|
||||||
|
configDir string
|
||||||
|
noColorFlag internalFlag.BoolPtrValue
|
||||||
|
noColor bool
|
||||||
enbasConfig *config.Config
|
enbasConfig *config.Config
|
||||||
enbasPrinter *printer.Printer
|
enbasPrinter *printer.Printer
|
||||||
err error
|
err error
|
||||||
)
|
)
|
||||||
|
|
||||||
|
flag.StringVar(&configDir, "config-dir", "", "The path to your configuration directory")
|
||||||
|
flag.Var(&noColorFlag, "no-color", "Set to true to disable ANSI colour output when displaying text on screen")
|
||||||
|
|
||||||
|
flag.Usage = usage.AppUsageFunc()
|
||||||
|
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
|
if flag.NArg() < 1 {
|
||||||
|
flag.Usage()
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if noColorFlag.Value != nil {
|
||||||
|
noColor = *noColorFlag.Value
|
||||||
|
} else if os.Getenv("NO_COLOR") != "" {
|
||||||
|
noColor = true
|
||||||
|
}
|
||||||
|
|
||||||
|
command := flag.Arg(0)
|
||||||
|
args := flag.Args()[1:]
|
||||||
|
|
||||||
switch command {
|
switch command {
|
||||||
case "init", "version":
|
case "init", "version":
|
||||||
enbasPrinter = printer.NewPrinter(noColor, "", 0)
|
enbasPrinter = printer.NewPrinter(noColor, "", 0)
|
||||||
|
@ -94,7 +118,7 @@ func execute(
|
||||||
|
|
||||||
exe, ok := executorMap[command]
|
exe, ok := executorMap[command]
|
||||||
if !ok {
|
if !ok {
|
||||||
return UnknownCommandError{Command: command}
|
return UnknownCommandError{command: command}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := exe.Parse(args); err != nil {
|
if err := exe.Parse(args); err != nil {
|
||||||
|
|
|
@ -1,49 +1,13 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"flag"
|
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"codeflow.dananglin.me.uk/apollo/enbas/internal/executor"
|
"codeflow.dananglin.me.uk/apollo/enbas/internal/executor"
|
||||||
internalFlag "codeflow.dananglin.me.uk/apollo/enbas/internal/flag"
|
|
||||||
"codeflow.dananglin.me.uk/apollo/enbas/internal/usage"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
if err := run(); err != nil {
|
if err := executor.Execute(); err != nil {
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func run() error {
|
|
||||||
var (
|
|
||||||
configDir string
|
|
||||||
noColorFlag internalFlag.BoolPtrValue
|
|
||||||
)
|
|
||||||
|
|
||||||
flag.StringVar(&configDir, "config-dir", "", "Specify your config directory")
|
|
||||||
flag.Var(&noColorFlag, "no-color", "Disable ANSI colour output when displaying text on screen")
|
|
||||||
|
|
||||||
flag.Usage = usage.AppUsageFunc()
|
|
||||||
|
|
||||||
flag.Parse()
|
|
||||||
|
|
||||||
if flag.NArg() < 1 {
|
|
||||||
flag.Usage()
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var noColor bool
|
|
||||||
|
|
||||||
if noColorFlag.Value != nil {
|
|
||||||
noColor = *noColorFlag.Value
|
|
||||||
} else if os.Getenv("NO_COLOR") != "" {
|
|
||||||
noColor = true
|
|
||||||
}
|
|
||||||
|
|
||||||
command := flag.Arg(0)
|
|
||||||
args := flag.Args()[1:]
|
|
||||||
|
|
||||||
return executor.Execute(command, args, noColor, configDir) //nolint:wrapcheck
|
|
||||||
}
|
|
||||||
|
|
|
@ -6,24 +6,48 @@
|
||||||
package executor
|
package executor
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
"codeflow.dananglin.me.uk/apollo/enbas/internal/config"
|
"codeflow.dananglin.me.uk/apollo/enbas/internal/config"
|
||||||
|
internalFlag "codeflow.dananglin.me.uk/apollo/enbas/internal/flag"
|
||||||
"codeflow.dananglin.me.uk/apollo/enbas/internal/printer"
|
"codeflow.dananglin.me.uk/apollo/enbas/internal/printer"
|
||||||
|
"codeflow.dananglin.me.uk/apollo/enbas/internal/usage"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Execute(
|
func Execute() error {
|
||||||
command string,
|
|
||||||
args []string,
|
|
||||||
noColor bool,
|
|
||||||
configDir string,
|
|
||||||
) error {
|
|
||||||
var (
|
var (
|
||||||
|
configDir string
|
||||||
|
noColorFlag internalFlag.BoolPtrValue
|
||||||
|
noColor bool
|
||||||
enbasConfig *config.Config
|
enbasConfig *config.Config
|
||||||
enbasPrinter *printer.Printer
|
enbasPrinter *printer.Printer
|
||||||
err error
|
err error
|
||||||
)
|
)
|
||||||
|
|
||||||
|
flag.StringVar(&configDir, "config-dir", "", "The path to your configuration directory")
|
||||||
|
flag.Var(&noColorFlag, "no-color", "Set to true to disable ANSI colour output when displaying text on screen")
|
||||||
|
|
||||||
|
flag.Usage = usage.AppUsageFunc()
|
||||||
|
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
|
if flag.NArg() < 1 {
|
||||||
|
flag.Usage()
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if noColorFlag.Value != nil {
|
||||||
|
noColor = *noColorFlag.Value
|
||||||
|
} else if os.Getenv("NO_COLOR") != "" {
|
||||||
|
noColor = true
|
||||||
|
}
|
||||||
|
|
||||||
|
command := flag.Arg(0)
|
||||||
|
args := flag.Args()[1:]
|
||||||
|
|
||||||
switch command {
|
switch command {
|
||||||
case "init", "version":
|
case "init", "version":
|
||||||
enbasPrinter = printer.NewPrinter(noColor, "", 0)
|
enbasPrinter = printer.NewPrinter(noColor, "", 0)
|
||||||
|
|
Loading…
Reference in a new issue