Merge branch 'v2' into f-default-value-text

This commit is contained in:
Jake Champlin 2016-08-30 10:53:16 -04:00 committed by GitHub
commit 33b5174be4
12 changed files with 13 additions and 11 deletions

View File

@ -5,7 +5,7 @@ import (
"os" "os"
"strconv" "strconv"
"github.com/urfave/cli" "gopkg.in/urfave/cli.v2"
) )
// FlagInputSourceExtension is an extension interface of cli.Flag that // FlagInputSourceExtension is an extension interface of cli.Flag that

View File

@ -3,7 +3,7 @@ package altsrc
import ( import (
"flag" "flag"
"github.com/urfave/cli" "gopkg.in/urfave/cli.v2"
) )
// WARNING: This file is generated! // WARNING: This file is generated!

View File

@ -8,7 +8,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/urfave/cli" "gopkg.in/urfave/cli.v2"
) )
type testApplyInputSource struct { type testApplyInputSource struct {

View File

@ -3,7 +3,7 @@ package altsrc
import ( import (
"time" "time"
"github.com/urfave/cli" "gopkg.in/urfave/cli.v2"
) )
// InputSourceContext is an interface used to allow // InputSourceContext is an interface used to allow

View File

@ -6,7 +6,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/urfave/cli" "gopkg.in/urfave/cli.v2"
) )
const ( const (

View File

@ -8,7 +8,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/urfave/cli" "gopkg.in/urfave/cli.v2"
) )
// NewJSONSourceFromFlagFunc returns a func that takes a cli.Context // NewJSONSourceFromFlagFunc returns a func that takes a cli.Context

View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/urfave/cli" "gopkg.in/urfave/cli.v2"
) )
// MapInputSource implements InputSourceContext to return // MapInputSource implements InputSourceContext to return

View File

@ -11,7 +11,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/urfave/cli" "gopkg.in/urfave/cli.v2"
) )
func TestCommandTomFileTest(t *testing.T) { func TestCommandTomFileTest(t *testing.T) {

View File

@ -10,7 +10,7 @@ import (
"reflect" "reflect"
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/urfave/cli" "gopkg.in/urfave/cli.v2"
) )
type tomlMap struct { type tomlMap struct {

View File

@ -11,7 +11,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/urfave/cli" "gopkg.in/urfave/cli.v2"
) )
func TestCommandYamlFileTest(t *testing.T) { func TestCommandYamlFileTest(t *testing.T) {

View File

@ -12,7 +12,7 @@ import (
"net/url" "net/url"
"os" "os"
"github.com/urfave/cli" "gopkg.in/urfave/cli.v2"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

View File

@ -194,6 +194,8 @@ def _write_altsrc_flag_types(outfile, types):
_fwrite(outfile, """\ _fwrite(outfile, """\
package altsrc package altsrc
import "gopkg.in/urfave/cli.v2"
// WARNING: This file is generated! // WARNING: This file is generated!
""") """)