Merge branch 'master' into author-improvement
This commit is contained in:
commit
d126101d1b
@ -25,7 +25,7 @@ Usage documentation exists for each major version. Don't know what version you'r
|
||||
**Warning**: `v2` is in a beta state.
|
||||
|
||||
```
|
||||
$ go get github.com/urfave/cli.v2
|
||||
$ go get github.com/urfave/cli/v2
|
||||
```
|
||||
|
||||
```go
|
||||
|
1
build.go
1
build.go
@ -137,6 +137,7 @@ func GfmrunActionFunc(c *cli.Context) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
var counter int
|
||||
scanner := bufio.NewScanner(file)
|
||||
|
@ -114,8 +114,8 @@ func (c *Context) Lineage() []*Context {
|
||||
return lineage
|
||||
}
|
||||
|
||||
// value returns the value of the flag corresponding to `name`
|
||||
func (c *Context) value(name string) interface{} {
|
||||
// Value returns the value of the flag corresponding to `name`
|
||||
func (c *Context) Value(name string) interface{} {
|
||||
return c.flagSet.Lookup(name).Value.(flag.Getter).Get()
|
||||
}
|
||||
|
||||
|
@ -3,8 +3,8 @@ package cli
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"sort"
|
||||
"os"
|
||||
"sort"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
@ -328,7 +328,7 @@ func TestContextPropagation(t *testing.T) {
|
||||
parent := NewContext(nil, nil, nil)
|
||||
parent.Context = context.WithValue(context.Background(), "key", "val")
|
||||
ctx := NewContext(nil, nil, parent)
|
||||
val := ctx.Value("key")
|
||||
val := ctx.Context.Value("key")
|
||||
if val == nil {
|
||||
t.Fatal("expected a parent context to be inherited but got nil")
|
||||
}
|
||||
|
@ -121,8 +121,8 @@ func TestFlagsFromEnv(t *testing.T) {
|
||||
a := App{
|
||||
Flags: []Flag{test.flag},
|
||||
Action: func(ctx *Context) error {
|
||||
if !reflect.DeepEqual(ctx.value(test.flag.Names()[0]), test.output) {
|
||||
t.Errorf("ex:%01d expected %q to be parsed as %#v, instead was %#v", i, test.input, test.output, ctx.value(test.flag.Names()[0]))
|
||||
if !reflect.DeepEqual(ctx.Value(test.flag.Names()[0]), test.output) {
|
||||
t.Errorf("ex:%01d expected %q to be parsed as %#v, instead was %#v", i, test.input, test.output, ctx.Value(test.flag.Names()[0]))
|
||||
}
|
||||
return nil
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user