Merge branch 'master' into asahasrabuddhe-patch-1

.travis.yml

@@ -26,7 +26,6 @@ before_script:
   - go mod tidy
 
 script:
-  - go run build.go generate
   - go run build.go vet
   - go run build.go test
   - go run build.go gfmrun

appveyor.yml

@@ -14,13 +14,10 @@ install:
   - set PATH=%GOPATH%\bin;C:\go\bin;%PATH%
   - go version
   - go env
-  - go get github.com/shurcooL/vfsgen
-  - go get github.com/shurcooL/httpfs/union
   - go get github.com/urfave/gfmrun/...
   - go get -v -t ./...
 
 build_script:
-  - go run build.go generate
   - go run build.go vet
   - go run build.go test
   - go run build.go gfmrun

build.go

@@ -40,10 +40,6 @@ func main() {
 			Name:   "toc",
 			Action: TocActionFunc,
 		},
-		cli.Command{
-			Name:   "generate",
-			Action: GenActionFunc,
-		},
 	}
 
 	err := app.Run(os.Args)
@@ -166,22 +162,3 @@ func TocActionFunc(_ *cli.Context) error {
 
 	return nil
 }
-
-func GenActionFunc(_ *cli.Context) error {
-	err := runCmd("go", "generate", "flag-gen/main.go")
-	if err != nil {
-		return err
-	}
-
-	err = runCmd("go", "generate", "cli.go")
-	if err != nil {
-		return err
-	}
-
-	err = runCmd("git", "diff", "--exit-code")
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

context.go

@@ -313,9 +313,20 @@ func checkRequiredFlags(flags []Flag, context *Context) requiredFlagsErr {
 	var missingFlags []string
 	for _, f := range flags {
 		if rf, ok := f.(RequiredFlag); ok && rf.IsRequired() {
-			key := strings.Split(f.GetName(), ",")[0]
-			if !context.IsSet(key) {
-				missingFlags = append(missingFlags, key)
+			var flagPresent bool
+			var flagName string
+			for _, key := range strings.Split(f.GetName(), ",") {
+				if len(key) > 1 {
+					flagName = key
+				}
+
+				if context.IsSet(strings.TrimSpace(key)) {
+					flagPresent = true
+				}
+			}
+
+			if !flagPresent && flagName != "" {
+				missingFlags = append(missingFlags, flagName)
 			}
 		}
 	}

context_test.go

@@ -517,6 +517,20 @@ func TestCheckRequiredFlags(t *testing.T) {
 			},
 			parseInput: []string{"--requiredFlag", "myinput", "--requiredFlagTwo", "myinput"},
 		},
+		{
+			testCase: "required_flag_with_short_name",
+			flags: []Flag{
+				StringSliceFlag{Name: "names, N", Required: true},
+			},
+			parseInput: []string{"-N", "asd", "-N", "qwe"},
+		},
+		{
+			testCase: "required_flag_with_multiple_short_names",
+			flags: []Flag{
+				StringSliceFlag{Name: "names, N, n", Required: true},
+			},
+			parseInput: []string{"-n", "asd", "-n", "qwe"},
+		},
 	}
 	for _, test := range tdata {
 		t.Run(test.testCase, func(t *testing.T) {

docs_test.go

@@ -53,6 +53,9 @@ func testApp() *App {
 		Usage:   "retrieve generic information",
 	}, {
 		Name: "some-command",
+	}, {
+		Name:   "hidden-command",
+		Hidden: true,
 	}}
 	app.UsageText = "app [first_arg] [second_arg]"
 	app.Usage = "Some app"

fish.go

@@ -69,6 +69,10 @@ func (a *App) prepareFishCommands(commands []Command, allCommands *[]string, pre
 	for i := range commands {
 		command := &commands[i]
 
+		if command.Hidden {
+			continue
+		}
+
 		var completion strings.Builder
 		completion.WriteString(fmt.Sprintf(
 			"complete -r -c %s -n '%s' -a '%s'",