x/urfave-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into author-improvement

Browse Source
This commit is contained in:
lynn [they] 2019-11-19 22:32:31 -08:00 committed by GitHub
commit d126101d1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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. **Warning**: `v2` is in a beta state.
``` ```
$ go get github.com/urfave/cli.v2 $ go get github.com/urfave/cli/v2
``` ```
```go ```go

1
build.go
View File

@ -137,6 +137,7 @@ func GfmrunActionFunc(c *cli.Context) error {
if err != nil { if err != nil {
return err return err
} }
defer file.Close()
var counter int var counter int
scanner := bufio.NewScanner(file) scanner := bufio.NewScanner(file)

4
context.go
View File

@ -114,8 +114,8 @@ func (c *Context) Lineage() []*Context {
return lineage return lineage
} }
// value returns the value of the flag corresponding to `name` // Value returns the value of the flag corresponding to `name`
func (c *Context) value(name string) interface{} { func (c *Context) Value(name string) interface{} {
return c.flagSet.Lookup(name).Value.(flag.Getter).Get() return c.flagSet.Lookup(name).Value.(flag.Getter).Get()
} }

4
context_test.go
View File

@ -3,8 +3,8 @@ package cli
import ( import (
"context" "context"
"flag" "flag"
"sort"
"os" "os"
"sort"
"strings" "strings"
"testing" "testing"
"time" "time"
@ -328,7 +328,7 @@ func TestContextPropagation(t *testing.T) {
parent := NewContext(nil, nil, nil) parent := NewContext(nil, nil, nil)
parent.Context = context.WithValue(context.Background(), "key", "val") parent.Context = context.WithValue(context.Background(), "key", "val")
ctx := NewContext(nil, nil, parent) ctx := NewContext(nil, nil, parent)
val := ctx.Value("key") val := ctx.Context.Value("key")
if val == nil { if val == nil {
t.Fatal("expected a parent context to be inherited but got nil") t.Fatal("expected a parent context to be inherited but got nil")
} }

4
flag_test.go
View File

@ -121,8 +121,8 @@ func TestFlagsFromEnv(t *testing.T) {
a := App{ a := App{
Flags: []Flag{test.flag}, Flags: []Flag{test.flag},
Action: func(ctx *Context) error { Action: func(ctx *Context) error {
if !reflect.DeepEqual(ctx.value(test.flag.Names()[0]), test.output) { 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])) 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 return nil
}, },