Merge pull request #26 from clagraff/minor-fixes

added minor fixes to various things

README.md

@@ -30,17 +30,8 @@ import (
 	"github.com/clagraff/argparse"
 )
 
-func main() {
-	p := argparse.NewParser("Output a friendly greeting").Version("1.3.0a")
-	p.AddHelp().AddVersion() // Enable help and version flags
-
-	upperFlag := argparse.NewFlag("u", "upper", "Use uppercase text").Default("false")
-	nameOption := argparse.NewArg("n name", "name", "Name of person to greet").Default("John").Required()
-
-	p.AddOptions(upperFlag, nameOption)
-
-	// Parse all available program arguments (except for the program path).
-	if ns, leftovers, err := p.Parse(os.Args[1:]...); err != nil {
+func callback(p *argparse.Parser, ns *argparse.Namespace, leftovers []string, err error) {
+	if err != nil {
 		switch err.(type) {
 		case argparse.ShowHelpErr, argparse.ShowVersionErr:
 			// For either ShowHelpErr or ShowVersionErr, the parser has already
@@ -51,19 +42,34 @@ func main() {
 			fmt.Println(err, "\n")
 			p.ShowHelp()
 		}
-	} else {
-		name := ns.String("name")
-		upper := ns.String("upper") == "true"
 
-		if upper == true {
-			name = strings.ToUpper(name)
-		}
+		return // Exit program
+	}
 
-		fmt.Printf("Hello, %s!\n", name)
-		if len(leftovers) > 0 {
-			fmt.Println("\nUnused args:", leftovers)
-		}
+	name := ns.Get("name").(string)
+	upper := ns.Get("upper").(string) == "true"
+
+	if upper == true {
+		name = strings.ToUpper(name)
 	}
+
+	fmt.Printf("Hello, %s!\n", name)
+	if len(leftovers) > 0 {
+		fmt.Println("\nUnused args:", leftovers)
+	}
+}
+
+func main() {
+	p := argparse.NewParser("Output a friendly greeting", callback).Version("1.3.0a")
+	p.AddHelp().AddVersion() // Enable help and version flags
+
+	upperFlag := argparse.NewFlag("u", "upper", "Use uppercase text").Default("false")
+	nameOption := argparse.NewArg("n name", "name", "Name of person to greet").Default("John").Required()
+
+	p.AddOptions(upperFlag, nameOption)
+
+	// Parse all available program arguments (except for the program path).
+	p.Parse(os.Args[1:]...)
 }
 ```
 

actions.go

@@ -47,7 +47,11 @@ func Store(p *Parser, f *Option, args ...string) ([]string, error) {
 	} else if regexp.MustCompile(`^[1-9]+$`).MatchString(f.ArgNum) == true {
 		num, _ := strconv.Atoi(f.ArgNum)
 		if len(args) < num {
-			return args, TooFewArgsErr{*f}
+			if f.IsRequired == true {
+				return args, TooFewArgsErr{*f}
+			} else {
+				return args, nil
+			}
 		}
 
 		if num > 1 {

actions_test.go

@@ -6,7 +6,7 @@ import "testing"
 // return the appropriate args & error when operating upon a option with
 // one expected argument.
 func TestStore_OneNargs(t *testing.T) {
-	p := NewParser("parser")
+	p := NewParser("parser", emptyNamespace())
 	f := NewOption("option", "option", "option").Nargs("1")
 	args := []string{"foobar"}
 
@@ -25,7 +25,7 @@ func TestStore_OneNargs(t *testing.T) {
 	}
 
 	args = []string{}
-	_, err = Store(p, f, args...)
+	_, err = Store(p, f.Required(), args...)
 	if err == nil {
 		t.Error("An error was expected but did not occurr")
 	}
@@ -35,7 +35,7 @@ func TestStore_OneNargs(t *testing.T) {
 // return the appropriate args & error when operating upon a option with
 // three  expected arguments.
 func TestStore_ThreeNargs(t *testing.T) {
-	p := NewParser("parser")
+	p := NewParser("parser", emptyNamespace())
 	f := NewOption("option", "option", "option").Nargs("3")
 	args := []string{"foo", "bar", "fizzbuzz"}
 
@@ -54,7 +54,7 @@ func TestStore_ThreeNargs(t *testing.T) {
 	}
 
 	args = []string{}
-	_, err = Store(p, f, args...)
+	_, err = Store(p, f.Required(), args...)
 	if err == nil {
 		t.Error("An error was expected but did not occurr")
 	}
@@ -64,7 +64,7 @@ func TestStore_ThreeNargs(t *testing.T) {
 // return the appropriate args & error when operating upon a option with
 // any number of expected arguments.
 func TestStore_AnyNargs(t *testing.T) {
-	p := NewParser("parser")
+	p := NewParser("parser", emptyNamespace())
 	f := NewOption("option", "option", "option").Nargs("*")
 	args := []string{"foo", "bar", "fizz", "buzz", "hello", "world"}
 
@@ -93,7 +93,7 @@ func TestStore_AnyNargs(t *testing.T) {
 // return the appropriate args & error when operating upon a option with
 // at least one number of expected arguments.
 func TestStore_LeastOneNargs(t *testing.T) {
-	p := NewParser("parser")
+	p := NewParser("parser", emptyNamespace())
 	f := NewOption("option", "option", "option").Nargs("+")
 	args := []string{"foo", "fizz", "world"}
 
@@ -120,7 +120,7 @@ func TestStore_LeastOneNargs(t *testing.T) {
 
 // TestStoreConst tests the StoreConst Action will store a option's ConstValue.
 func TestStoreConst(t *testing.T) {
-	p := NewParser("parser")
+	p := NewParser("parser", emptyNamespace())
 	f := NewOption("option", "option", "option").Nargs("0").Const("hello world")
 	args := []string{}
 
@@ -141,7 +141,7 @@ func TestStoreConst(t *testing.T) {
 
 // TestStoreFalse tests the StoreFalse Action will store a false boolean.
 func TestStoreFalse(t *testing.T) {
-	p := NewParser("parser")
+	p := NewParser("parser", emptyNamespace())
 	f := NewOption("option", "option", "option").Nargs("0")
 	args := []string{}
 
@@ -162,7 +162,7 @@ func TestStoreFalse(t *testing.T) {
 
 // TestStoreTrue tests the StoreFalse Action will store a true boolean.
 func TestStoreTrue(t *testing.T) {
-	p := NewParser("parser")
+	p := NewParser("parser", emptyNamespace())
 	f := NewOption("option", "option", "option").Nargs("0")
 	args := []string{}
 
@@ -185,7 +185,7 @@ func TestStoreTrue(t *testing.T) {
 // return the appropriate args & error when operating upon a option with
 // one expected argument.
 func TestAppend_OneNargs(t *testing.T) {
-	p := NewParser("parser")
+	p := NewParser("parser", emptyNamespace())
 	f := NewOption("option", "option", "option").Nargs("1")
 	args := []string{"foobar"}
 
@@ -214,7 +214,7 @@ func TestAppend_OneNargs(t *testing.T) {
 // return the appropriate args & error when operating upon a option with
 // three  expected arguments.
 func TestAppend_ThreeNargs(t *testing.T) {
-	p := NewParser("parser")
+	p := NewParser("parser", emptyNamespace())
 	f := NewOption("option", "option", "option").Nargs("3")
 	args := []string{"foo", "bar", "fizzbuzz"}
 
@@ -243,7 +243,7 @@ func TestAppend_ThreeNargs(t *testing.T) {
 // return the appropriate args & error when operating upon a option with
 // any number of expected arguments.
 func TestAppend_AnyNargs(t *testing.T) {
-	p := NewParser("parser")
+	p := NewParser("parser", emptyNamespace())
 	f := NewOption("option", "option", "option").Nargs("*")
 	args := []string{"foo", "bar", "fizz", "buzz", "hello", "world"}
 
@@ -272,7 +272,7 @@ func TestAppend_AnyNargs(t *testing.T) {
 // return the appropriate args & error when operating upon a option with
 // at least one number of expected arguments.
 func TestAppend_LeastOneNargs(t *testing.T) {
-	p := NewParser("parser")
+	p := NewParser("parser", emptyNamespace())
 	f := NewOption("option", "option", "option").Nargs("+")
 	args := []string{"foo", "fizz", "world"}
 

errors.go

@@ -104,14 +104,14 @@ func (err MissingOneOrMoreArgsErr) Error() string {
 
 // MissingParserErr indicated that commands were available, but none were used.
 type MissingParserErr struct {
-	Parsers map[string]*Parser
+	Parsers []SubParser
 }
 
 // Error will return a string error message for the MissingParserErr
 func (err MissingParserErr) Error() string {
 	var names []string
-	for name, _ := range err.Parsers {
-		names = append(names, name)
+	for _, subP := range err.Parsers {
+		names = append(names, subP.Name)
 	}
 	msg := "must use an available command: %s"
 	return fmt.Sprintf(msg, join("", "{", join(",", names...), "}"))

option.go

@@ -11,7 +11,7 @@ import (
 // to StoreTrue, and its default value to false.
 func NewFlag(names, dest, help string) *Option {
 	opt := NewOption(names, dest, help)
-	opt.Nargs("0").Action(StoreTrue).Default("false")
+	opt.Nargs("0").Action(StoreTrue).Default("false").NotRequired()
 
 	return opt
 }