merge master to get latest changes

urfave · Aug 3, 2019 · 06acc4f · 06acc4f
1 parent 842e3fe
commit 06acc4f
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *.coverprofile
 node_modules/
+vendor
diff --git a/altsrc/flag.go b/altsrc/flag.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"syscall"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 // FlagInputSourceExtension is an extension interface of cli.Flag that

diff --git a/altsrc/flag_generated.go b/altsrc/flag_generated.go
@@ -3,7 +3,7 @@ package altsrc
 import (
 	"flag"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 // WARNING: This file is generated!

diff --git a/altsrc/flag_test.go b/altsrc/flag_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 type testApplyInputSource struct {

diff --git a/altsrc/input_source_context.go b/altsrc/input_source_context.go
@@ -3,7 +3,7 @@ package altsrc
 import (
 	"time"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 // InputSourceContext is an interface used to allow

diff --git a/altsrc/json_command_test.go b/altsrc/json_command_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 const (

diff --git a/altsrc/json_source_context.go b/altsrc/json_source_context.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 // NewJSONSourceFromFlagFunc returns a func that takes a cli.Context

diff --git a/altsrc/map_input_source.go b/altsrc/map_input_source.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 // MapInputSource implements InputSourceContext to return

diff --git a/altsrc/toml_command_test.go b/altsrc/toml_command_test.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"testing"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 func TestCommandTomFileTest(t *testing.T) {

diff --git a/altsrc/toml_file_loader.go b/altsrc/toml_file_loader.go
@@ -10,7 +10,7 @@ import (
 	"reflect"
 
 	"github.com/BurntSushi/toml"
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 type tomlMap struct {

diff --git a/altsrc/yaml_command_test.go b/altsrc/yaml_command_test.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"testing"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 func TestCommandYamlFileTest(t *testing.T) {

diff --git a/altsrc/yaml_file_loader.go b/altsrc/yaml_file_loader.go
@@ -14,7 +14,7 @@ import (
 	"runtime"
 	"strings"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 
 	"gopkg.in/yaml.v2"
 )

diff --git a/flaggen/main.go b/flaggen/main.go
@@ -0,0 +1,28 @@
+package main
+
+import (
+	"github.com/urfave/cli"
+	"log"
+	"os"
+)
+
+func main() {
+	app := cli.NewApp()
+
+	app.Name = "flaggen"
+	app.Usage = "Generate flag type code!"
+
+	app.Flags = []cli.Flag{
+		cli.StringFlag{
+			Name:  "package, p",
+			Value: "cli",
+			Usage: "`Name of the package` for which the flag types will be generated",
+		},
+	}
+
+	err := app.Run(os.Args)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+}
diff --git a/go.mod b/go.mod
@@ -0,0 +1,8 @@
+module github.com/urfave/cli
+
+go 1.12
+
+require (
+	github.com/BurntSushi/toml v0.3.1
+	gopkg.in/yaml.v2 v2.2.2
+)
diff --git a/go.sum b/go.sum
@@ -0,0 +1,6 @@
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/help.go b/help.go
@@ -237,10 +237,8 @@ func printHelpCustom(out io.Writer, templ string, data interface{}, customFunc m
 	funcMap := template.FuncMap{
 		"join": strings.Join,
 	}
-	if customFunc != nil {
-		for key, value := range customFunc {
-			funcMap[key] = value
-		}
+	for key, value := range customFunc {
+		funcMap[key] = value
 	}
 
 	w := tabwriter.NewWriter(out, 1, 8, 2, ' ', 0)
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ import ( @@
     	"os"
     	"testing"
-    	"gopkg.in/urfave/cli.v1"
+    	"github.com/urfave/cli"
     )
     const (
@@ Expand Down @@