Fix duplicated values for <OPT>...

README.md

@@ -14,7 +14,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {
@@ -31,7 +31,7 @@ Usage:
 Options:
   -h --help     Show this screen.
   --version     Show version.
-  --speed=<kn>  Speed in knots [default: 10].
+  --speed=<kn>  Speed in knots [default: 10, env: SPEED].
   --moored      Moored (anchored) mine.
   --drifting    Drifting mine.`
 
@@ -47,13 +47,13 @@ Options:
 ⚠ Use the alias "docopt-go". To use docopt in your Go code:
 
 ```go
-import "github.com/docopt/docopt-go"
+import "github.com/ps78674/docopt.go"
 ```
 
 To install docopt in your `$GOPATH`:
 
 ```console
-$ go get github.com/docopt/docopt-go
+$ go get github.com/ps78674/docopt.go
 ```
 
 ## API
@@ -103,7 +103,7 @@ var config struct {
 opts.Bind(&config)
 ```
 
-More documentation is available at [godoc.org](https://godoc.org/github.com/docopt/docopt-go).
+More documentation is available at [godoc.org](https://godoc.org/github.com/ps78674/docopt.go).
 
 ## Unit Testing
 

docopt.go

@@ -287,7 +287,8 @@ func parseOption(optionDescription string) *pattern {
 	var value interface{}
 	value = false
 
-	reDefault := regexp.MustCompile(`(?i)\[default: (.*)\]`)
+	reDefault := regexp.MustCompile(`(?i)\[.*default: ([^,]*).*[\]]`)
+	reEnv := regexp.MustCompile(`(?i)\[.*env: ([^,]*).*[\]]`)
 	for _, s := range strings.Fields(options) {
 		if strings.HasPrefix(s, "--") {
 			long = s
@@ -297,10 +298,16 @@ func parseOption(optionDescription string) *pattern {
 			argcount = 1
 		}
 		if argcount > 0 {
-			matched := reDefault.FindAllStringSubmatch(description, -1)
-			if len(matched) > 0 {
+			if matched := reDefault.FindAllStringSubmatch(description, -1); len(matched) > 0 {
 				value = matched[0][1]
-			} else {
+			}
+			if matched := reEnv.FindAllStringSubmatch(description, -1); len(matched) > 0 {
+				v, ok := os.LookupEnv(matched[0][1])
+				if ok {
+					value = v
+				}
+			}
+			if value == false {
 				value = nil
 			}
 		}

docopt_test.go

@@ -1267,6 +1267,15 @@ func TestDefaultValueForPositionalArguments(t *testing.T) {
 	}
 }
 
+func TestEnvValueForPositionalArguments(t *testing.T) {
+	os.Setenv("DATA", "a b")
+	defer os.Unsetenv("DATA")
+	doc := "Usage: prog [--data=<data>...]\nOptions:\n\t-d --data=<arg>    Input data [env: DATA]"
+	if v, err := testParser.ParseArgs(doc, []string{}, ""); reflect.DeepEqual(v, Opts{"--data": []string{"a", "b"}}) != true {
+		t.Error(err)
+	}
+}
+
 func TestIssue59(t *testing.T) {
 	if v, err := testParser.ParseArgs("usage: prog --long=<a>", []string{"--long="}, ""); reflect.DeepEqual(v, Opts{"--long": ""}) != true {
 		t.Error(err)

examples/arguments/arguments.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 var usage = `Usage: arguments [-vqrh] [FILE] ...

examples/arguments/arguments_test.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/docopt/docopt-go/examples"
+	"github.com/ps78674/docopt.go/examples"
 )
 
 func Example() {

examples/calculator/calculator.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 var usage = `Not a serious example.

examples/calculator/calculator_test.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/docopt/docopt-go/examples"
+	"github.com/ps78674/docopt.go/examples"
 )
 
 func Example() {

examples/config_file/config_file.go

@@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 	"strings"
 )
 

examples/counted/counted.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 var usage = `Usage: counted --help

examples/counted/counted_test.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/docopt/docopt-go/examples"
+	"github.com/ps78674/docopt.go/examples"
 )
 
 func Example() {

examples/examples.go

@@ -5,7 +5,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 // TestUsage is a helper used to test the output from the examples in this folder.

examples/fake-git/branch/git_branch.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {

examples/fake-git/checkout/git_checkout.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {

examples/fake-git/clone/git_clone.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {

examples/fake-git/fakegit.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 	"os"
 	"os/exec"
 )

examples/fake-git/push/git_push.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {

examples/fake-git/remote/git_remote.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {

examples/naval_fate/naval_fate.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {

examples/odd_even/odd_even.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {

examples/options/options.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {

examples/options_shortcut/options_shortcut.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {

examples/quick/quick.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {

examples/type_assert/type_assert.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 )
 
 func main() {

examples/unit_test/unit_test.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/docopt/docopt-go"
+	"github.com/ps78674/docopt.go"
 	"reflect"
 	"testing"
 )

go.mod

@@ -0,0 +1,3 @@
+module github.com/ps78674/docopt.go
+
+go 1.17

opts.go

@@ -5,6 +5,7 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
+	"time"
 	"unicode"
 )
 
@@ -162,11 +163,12 @@ func (o Opts) Bind(v interface{}) error {
 			}
 			return newError("mapping of %q is not found in given struct, or is an unexported field", k)
 		}
-		fieldVal := structVal.Field(i)
-		zeroVal := reflect.Zero(fieldVal.Type())
-		if !reflect.DeepEqual(fieldVal.Interface(), zeroVal.Interface()) {
-			return newError("%q field is non-zero, will be overwritten by value of %q", structType.Field(i).Name, k)
-		}
+		// Allow use of non-zero struct fields for bind
+		// fieldVal := structVal.Field(i)
+		// zeroVal := reflect.Zero(fieldVal.Type())
+		// if !reflect.DeepEqual(fieldVal.Interface(), zeroVal.Interface()) {
+		// 	return newError("%q field is non-zero, will be overwritten by value of %q", structType.Field(i).Name, k)
+		// }
 		indexMap[k] = i
 	}
 
@@ -199,6 +201,15 @@ func (o Opts) Bind(v interface{}) error {
 		// Try to convert the value and assign if able.
 		switch field.Kind() {
 		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+			ft := field.Type()
+			if ft.PkgPath() == "time" && ft.Name() == "Duration" {
+				if s, err := o.String(k); err == nil {
+					if d, err := time.ParseDuration(s); err == nil {
+						field.SetInt(int64(d))
+						continue
+					}
+				}
+			}
 			if x, err := o.Int(k); err == nil {
 				field.SetInt(int64(x))
 				continue

opts_test.go

@@ -4,6 +4,7 @@ import (
 	"reflect"
 	"strings"
 	"testing"
+	"time"
 )
 
 func TestOptsUsage(t *testing.T) {
@@ -141,13 +142,14 @@ func TestOptsBind(t *testing.T) {
 type testTypedOptions struct {
 	secret int `docopt:"-s"`
 
-	V       bool
-	Number  int16
-	Idle    float32
-	Pointer uintptr     `docopt:"<ptr>"`
-	Ints    []int       `docopt:"<values>"`
-	Strings []string    `docopt:"STRINGS"`
-	Iface   interface{} `docopt:"IFACE"`
+	V        bool
+	Number   int16
+	Idle     float32
+	Pointer  uintptr     `docopt:"<ptr>"`
+	Ints     []int       `docopt:"<values>"`
+	Strings  []string    `docopt:"STRINGS"`
+	Iface    interface{} `docopt:"IFACE"`
+	Duration time.Duration
 }
 
 func TestBindErrors(t *testing.T) {
@@ -244,6 +246,10 @@ func TestBindSuccess(t *testing.T) {
 			`Usage: prog [--help]`,
 			`prog --help`,
 		},
+		{
+			`Usage: prog <duration>`,
+			`prog 10s`,
+		},
 	} {
 		argv := strings.Split(tc.command, " ")[1:]
 		opts, err := testParser.ParseArgs(tc.usage, argv, "")
@@ -273,17 +279,18 @@ func TestBindSimpleStruct(t *testing.T) {
 	}
 }
 
-func TestBindToStructWhichAlreadyHasValue(t *testing.T) {
-	var testParser = &Parser{HelpHandler: NoHelpHandler, SkipHelpFlags: true}
-	opts, err := testParser.ParseArgs("Usage: prog [--number=X]", []string{"--number=123"}, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	var opt = struct{ Number int }{1}
-	if err := opts.Bind(&opt); err == nil {
-		t.Fatal("error expected")
-	}
-}
+// Allow use of non-zero struct fields for bind
+// func TestBindToStructWhichAlreadyHasValue(t *testing.T) {
+// 	var testParser = &Parser{HelpHandler: NoHelpHandler, SkipHelpFlags: true}
+// 	opts, err := testParser.ParseArgs("Usage: prog [--number=X]", []string{"--number=123"}, "")
+// 	if err != nil {
+// 		t.Fatal(err)
+// 	}
+// 	var opt = struct{ Number int }{1}
+// 	if err := opts.Bind(&opt); err == nil {
+// 		t.Fatal("error expected")
+// 	}
+// }
 
 func TestBindDashTag(t *testing.T) {
 	var testParser = &Parser{HelpHandler: NoHelpHandler, SkipHelpFlags: true}