JMS #4: Getting some cli tests going. Testing out flags

cli.go

@@ -22,11 +22,7 @@ var Action = ShowHelp
 func Run(args []string) {
 
   set := flagSet(Flags)
-  err := set.Parse(args[1:])
+  set.Parse(args[1:])
-  if err != nil {
-    println(err)
-    return
-  }
 
 	context := NewContext(set)
 	if len(args) > 1 {
@@ -43,13 +39,4 @@ func Run(args []string) {
 	Action(context)
 }
 
-type Command struct {
-	Name        string
-	ShortName   string
-	Usage       string
-	Description string
-	Action      Handler
-	Flags       []Flag
-}
-
 type Handler func(context *Context)

cli_test.go

@@ -0,0 +1,30 @@
+package cli
+
+import (
+  "reflect"
+  "testing"
+)
+
+func Test_SimpleCLIFlags(t *testing.T) {
+  Flags = []Flag{
+    StringFlag{"foo", "default", "a foo flag"},
+  }
+  Action = func(c *Context) {
+    expect(t, c.String("foo"), "hello world")
+  }
+  Run([]string{ "command", "--foo", "hello world" })
+}
+
+/* Helpers */
+
+func expect(t *testing.T, a interface{}, b interface{}) {
+	if a != b {
+		t.Errorf("Expected %v (type %v) - Got %v (type %v)", b, reflect.TypeOf(b), a, reflect.TypeOf(a))
+	}
+}
+
+func refute(t *testing.T, a interface{}, b interface{}) {
+	if a == b {
+		t.Errorf("Did not expect %v (type %v) - Got %v (type %v)", b, reflect.TypeOf(b), a, reflect.TypeOf(a))
+	}
+}

command.go

@@ -0,0 +1,10 @@
+package cli
+
+type Command struct {
+	Name        string
+	ShortName   string
+	Usage       string
+	Description string
+	Action      Handler
+	Flags       []Flag
+}

command_test.go

@@ -0,0 +1,12 @@
+package cli
+
+import (
+  "testing"
+)
+
+func Test_True(t *testing.T) {
+  expect(t, true, true)
+}
+
+func Test_Run(t *testing.T) {
+}

context.go

@@ -17,7 +17,7 @@ func NewContext(flagSet *flag.FlagSet) *Context {
 	return &Context{flagSet}
 }
 
-func (c *Context) IntFlag(name string) int {
+func (c *Context) Int(name string) int {
 	flag := c.flagSet.Lookup(name)
 	if flag != nil {
 		val, err := strconv.Atoi(flag.Value.String())
@@ -30,7 +30,7 @@ func (c *Context) IntFlag(name string) int {
 	}
 }
 
-func (c *Context) BoolFlag(name string) bool {
+func (c *Context) Bool(name string) bool {
 	flag := c.flagSet.Lookup(name)
 	if flag != nil {
 		val, err := strconv.ParseBool(flag.Value.String())
@@ -43,7 +43,7 @@ func (c *Context) BoolFlag(name string) bool {
 	}
 }
 
-func (c *Context) StringFlag(name string) string {
+func (c *Context) String(name string) string {
 	flag := c.flagSet.Lookup(name)
 	if flag != nil {
 		return flag.Value.String()

context_test.go

@@ -2,41 +2,28 @@ package cli
 
 import (
   "flag"
-  "reflect"
   "testing"
 )
 
-func expect(t *testing.T, a interface{}, b interface{}) {
+func Test_Int(t *testing.T) {
-	if a != b {
-		t.Errorf("Expected %v (type %v) - Got %v (type %v)", b, reflect.TypeOf(b), a, reflect.TypeOf(a))
-	}
-}
-
-func refute(t *testing.T, a interface{}, b interface{}) {
-	if a == b {
-		t.Errorf("Did not expect %v (type %v) - Got %v (type %v)", b, reflect.TypeOf(b), a, reflect.TypeOf(a))
-	}
-}
-
-func Test_IntFlag(t *testing.T) {
   set := flag.NewFlagSet("test", 0)
   set.Int("myflag", 12, "doc")
   c := NewContext(set)
-  expect(t, c.IntFlag("myflag"), 12)
+  expect(t, c.Int("myflag"), 12)
 }
 
-func Test_StringFlag(t *testing.T) {
+func Test_String(t *testing.T) {
   set := flag.NewFlagSet("test", 0)
   set.String("myflag", "hello world", "doc")
   c := NewContext(set)
-  expect(t, c.StringFlag("myflag"), "hello world")
+  expect(t, c.String("myflag"), "hello world")
 }
 
-func Test_BoolFlag(t *testing.T) {
+func Test_Bool(t *testing.T) {
   set := flag.NewFlagSet("test", 0)
   set.Bool("myflag", false, "doc")
   c := NewContext(set)
-  expect(t, c.BoolFlag("myflag"), false)
+  expect(t, c.Bool("myflag"), false)
 }
 
 func Test_Args(t *testing.T) {
@@ -45,5 +32,5 @@ func Test_Args(t *testing.T) {
   c := NewContext(set)
   set.Parse([]string{"--myflag", "bat", "baz"})
   expect(t, len(c.Args()), 2)
-  expect(t, c.BoolFlag("myflag"), true)
+  expect(t, c.Bool("myflag"), true)
 }

flag.go

@@ -36,7 +36,7 @@ func (f BoolFlag) Apply(set *flag.FlagSet) {
 }
 
 func flagSet(flags []Flag) *flag.FlagSet {
-  set := flag.NewFlagSet(Name, 0)
+  set := flag.NewFlagSet(Name, flag.ExitOnError)
   for _, f := range flags {
     f.Apply(set)
   }