Merge remote-tracking branch 'origin/v2' into declarativeness

app.go

@@ -128,13 +128,6 @@ func (a *App) Setup() {
 	}
 	a.Commands = newCmds
 
-	a.Categories = newCommandCategories()
-	for _, command := range a.Commands {
-		a.Categories.AddCommand(command.Category, command)
-	}
-	sort.Sort(a.Categories.(*commandCategories))
-
-	// append help to commands
 	if a.Command(helpCommand.Name) == nil && !a.HideHelp {
 		a.appendCommand(helpCommand)
 
@@ -143,7 +136,6 @@ func (a *App) Setup() {
 		}
 	}
 
-	//append version/help flags
 	if a.EnableBashCompletion {
 		a.appendFlag(BashCompletionFlag)
 	}
@@ -151,6 +143,12 @@ func (a *App) Setup() {
 	if !a.HideVersion {
 		a.appendFlag(VersionFlag)
 	}
+
+	a.Categories = newCommandCategories()
+	for _, command := range a.Commands {
+		a.Categories.AddCommand(command.Category, command)
+	}
+	sort.Sort(a.Categories.(*commandCategories))
 }
 
 // Run is the entry point to the cli app. Parses the arguments slice and routes

app_test.go

@@ -1132,6 +1132,7 @@ func TestApp_Run_Categories(t *testing.T) {
 
 	app := &App{
 		Name:     "categories",
+		HideHelp: true,
 		Commands: []*Command{
 			{
 				Name:     "command1",
@@ -1182,6 +1183,7 @@ func TestApp_Run_Categories(t *testing.T) {
 func TestApp_VisibleCategories(t *testing.T) {
 	app := &App{
 		Name:     "visible-categories",
+		HideHelp: true,
 		Commands: []*Command{
 			{
 				Name:     "command1",
@@ -1222,6 +1224,7 @@ func TestApp_VisibleCategories(t *testing.T) {
 
 	app = &App{
 		Name:     "visible-categories",
+		HideHelp: true,
 		Commands: []*Command{
 			{
 				Name:     "command1",
@@ -1257,6 +1260,7 @@ func TestApp_VisibleCategories(t *testing.T) {
 
 	app = &App{
 		Name:     "visible-categories",
+		HideHelp: true,
 		Commands: []*Command{
 			{
 				Name:     "command1",

help_test.go

@@ -140,6 +140,23 @@ func Test_helpCommand_Action_ErrorIfNoTopic(t *testing.T) {
 	}
 }
 
+func Test_helpCommand_InHelpOutput(t *testing.T) {
+	app := &App{}
+	output := &bytes.Buffer{}
+	app.Writer = output
+	app.Run([]string{"test", "--help"})
+
+	s := output.String()
+
+	if strings.Contains(s, "\nCOMMANDS:\nGLOBAL OPTIONS:\n") {
+		t.Fatalf("empty COMMANDS section detected: %q", s)
+	}
+
+	if !strings.Contains(s, "help, h") {
+		t.Fatalf("missing \"help, h\": %q", s)
+	}
+}
+
 func Test_helpSubcommand_Action_ErrorIfNoTopic(t *testing.T) {
 	app := &App{}