set env to upper and flag to lower

master
Bel LaPointe 2019-03-23 15:38:45 -06:00
parent bcf1369f28
commit 5ee82f8fc1
2 changed files with 11 additions and 10 deletions

5
arg.go
View File

@ -3,6 +3,7 @@ package args
import ( import (
"fmt" "fmt"
"strconv" "strconv"
"strings"
"time" "time"
) )
@ -17,8 +18,8 @@ type Arg struct {
func NewArg(argType Type, key, help string, def interface{}) *Arg { func NewArg(argType Type, key, help string, def interface{}) *Arg {
return &Arg{ return &Arg{
Env: key, Env: strings.ToUpper(key),
Flag: key, Flag: strings.ToLower(key),
Help: help, Help: help,
Default: def, Default: def,
Value: def, Value: def,

View File

@ -22,19 +22,19 @@ func TestParse(t *testing.T) {
defer func() { defer func() {
os.Args = osArgs os.Args = osArgs
}() }()
os.Args = []string{"nothing", "-testkeyFlag", "5"} os.Args = []string{"nothing", "-flag", "5"}
os.Setenv("testkeyEnv", "9") os.Setenv("ENV", "9")
as := NewArgSet() as := NewArgSet()
as.Append(INT, "testkeyFlag", "help", 1) as.Append(INT, "flag", "help", 1)
as.Append(INT, "testkeyEnv", "help", 2) as.Append(INT, "env", "help", 2)
as.Append(INT, "testkeyDefault", "help", 3) as.Append(INT, "default", "help", 3)
if err := as.Parse(); err != nil { if err := as.Parse(); err != nil {
t.Fatalf("cannot parse legal: %v", err) t.Fatalf("cannot parse legal: %v", err)
} else if arg := as.Get("testkeyFlag"); arg == nil || arg.Value != 5 { } else if arg := as.Get("flag"); arg == nil || arg.Value != 5 {
t.Errorf("cannot set from flag: got %v", arg) t.Errorf("cannot set from flag: got %v", arg)
} else if arg := as.Get("testkeyEnv"); arg == nil || arg.Value != 9 { } else if arg := as.Get("env"); arg == nil || arg.Value != 9 {
t.Errorf("cannot set from env: got %v", arg) t.Errorf("cannot set from env: got %v", arg)
} else if arg := as.Get("testkeyDefault"); arg == nil || arg.Value != 3 { } else if arg := as.Get("default"); arg == nil || arg.Value != 3 {
t.Errorf("cannot set from default: got %v", arg) t.Errorf("cannot set from default: got %v", arg)
} }