Better help (#2733)

* Wrap command and flag descriptions for cleaner help output

* Move help command to root, group commands

* Add deprecation warnings, hide long deprecated commands

* Wrap command and flag descriptions for cleaner help output

* Move help command to root, group commands

* Add deprecation warnings, hide long deprecated commands

* Add subcommands to root command output

* Deprecate history

* Fix wrapping for unauthenticated message

* tweak wording

* Fix broken docker secrets docs url

Author: michaeldwan

go.mod

@@ -32,6 +32,7 @@ require (
 	github.com/inancgumus/screen v0.0.0-20190314163918-06e984b86ed3
 	github.com/jinzhu/copier v0.3.5
 	github.com/jpillora/backoff v1.0.0
+	github.com/kr/text v0.2.0
 	github.com/loadsmart/calver-go v0.0.0-20230323142215-56cf73a68e8a
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/mattn/go-colorable v0.1.13

internal/cli/cli.go

@@ -5,15 +5,22 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"html/template"
+	"os"
 	"runtime/debug"
+	"strings"
 	"time"
 
 	"github.com/AlecAivazis/survey/v2/terminal"
+	"github.com/MakeNowJust/heredoc/v2"
+	"github.com/kr/text"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 	"github.com/superfly/flyctl/internal/flag/flagnames"
 	"github.com/superfly/flyctl/internal/flyerr"
 	"github.com/superfly/flyctl/internal/metrics"
 	"github.com/superfly/flyctl/internal/task"
+	"golang.org/x/term"
 
 	"github.com/superfly/flyctl/iostreams"
 	"github.com/superfly/graphql"
@@ -56,6 +63,14 @@ func Run(ctx context.Context, io *iostreams.IOStreams, args ...string) int {
 	cmd.SetArgs(args)
 	cmd.SilenceErrors = true
 
+	// configure help templates and helpers
+	cobra.AddTemplateFuncs(template.FuncMap{
+		"wrapFlagUsages": wrapFlagUsages,
+		"wrapText":       wrapText,
+	})
+	cmd.SetUsageTemplate(usageTemplate)
+	cmd.SetHelpTemplate(helpTemplate)
+
 	cs := io.ColorScheme()
 
 	cmd, err = cmd.ExecuteContextC(ctx)
@@ -132,3 +147,66 @@ func printError(io *iostreams.IOStreams, cs *iostreams.ColorScheme, cmd *cobra.C
 func NewRootCommand() *cobra.Command {
 	return root.New()
 }
+
+func wrapFlagUsages(cmd *pflag.FlagSet) string {
+	width := helpWidth()
+
+	return cmd.FlagUsagesWrapped(width - 1)
+}
+
+func wrapText(s string) string {
+	width := helpWidth()
+
+	return strings.TrimSpace(text.Wrap(heredoc.Doc(s), width-1))
+}
+
+func helpWidth() int {
+	fd := int(os.Stdout.Fd())
+	width := 80
+
+	// Get the terminal width and dynamically set
+	termWidth, _, err := term.GetSize(fd)
+	if err == nil {
+		width = termWidth
+	}
+
+	return min(120, width)
+}
+
+// identical to the default cobra help template, but utilizes wrapText
+// https://github.com/spf13/cobra/blob/fd865a44e3c48afeb6a6dbddadb8a5519173e029/command.go#L580-L582
+const helpTemplate = `{{with (or .Long .Short)}}{{. | trimTrailingWhitespaces | wrapText}}
+
+{{end}}{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`
+
+// identical to the default cobra usage template, but utilizes wrapFlagUsages
+// https://github.com/spf13/cobra/blob/fd865a44e3c48afeb6a6dbddadb8a5519173e029/command.go#L539-L568
+const usageTemplate = `Usage:{{if .Runnable}}
+  {{.UseLine}}{{end}}{{if .HasAvailableSubCommands}}
+  {{.CommandPath}} [command]{{end}}{{if gt (len .Aliases) 0}}
+
+Aliases:
+  {{.NameAndAliases}}{{end}}{{if .HasExample}}
+
+Examples:
+{{.Example}}{{end}}{{if .HasAvailableSubCommands}}{{$cmds := .Commands}}{{if eq (len .Groups) 0}}
+
+Available Commands:{{range $cmds}}{{if (or .IsAvailableCommand (eq .Name "help"))}}
+  {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{else}}{{range $group := .Groups}}
+
+{{.Title}}{{range $cmds}}{{if (and (eq .GroupID $group.ID) (or .IsAvailableCommand (eq .Name "help")))}}
+  {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{if not .AllChildCommandsHaveGroup}}
+
+Additional Commands:{{range $cmds}}{{if (and (eq .GroupID "") (or .IsAvailableCommand (eq .Name "help")))}}
+  {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{end}}{{end}}{{if .HasAvailableLocalFlags}}
+
+Flags:
+{{wrapFlagUsages .LocalFlags | trimTrailingWhitespaces}}{{end}}{{if .HasAvailableInheritedFlags}}
+
+Global Flags:
+{{wrapFlagUsages .InheritedFlags | trimTrailingWhitespaces}}{{end}}{{if .HasHelpSubCommands}}
+
+Additional help topics:{{range .Commands}}{{if .IsAdditionalHelpTopicCommand}}
+  {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{if .HasAvailableSubCommands}}
+
+Use "{{.CommandPath}} [command] --help" for more information about a command.{{end}}`

internal/command/command.go

@@ -12,7 +12,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/MakeNowJust/heredoc/v2"
 	"github.com/logrusorgru/aurora"
 	"github.com/spf13/cobra"
 	"github.com/superfly/flyctl/api"
@@ -39,7 +38,7 @@ func New(usage, short, long string, fn Runner, p ...preparers.Preparer) *cobra.C
 	return &cobra.Command{
 		Use:   usage,
 		Short: short,
-		Long:  heredoc.Doc(long),
+		Long:  long,
 		RunE:  newRunE(fn, p...),
 	}
 }

internal/command/create/create.go

@@ -10,7 +10,7 @@ func New() (cmd *cobra.Command) {
 	cmd = &cobra.Command{
 		Use:        "create",
 		Hidden:     true,
-		Deprecated: "replaced by 'apps create'",
+		Deprecated: "use `fly apps create` instead",
 	}
 
 	flag.Add(cmd,

internal/command/curl/curl.go

@@ -37,6 +37,8 @@ func New() (cmd *cobra.Command) {
 	cmd = command.New("curl <URL>", short, long, run,
 		command.RequireSession,
 	)
+	cmd.Deprecated = "`fly curl` will be removed in a future release"
+	cmd.Hidden = true
 
 	cmd.Args = cobra.ExactArgs(1)
 

internal/command/destroy/destroy.go

@@ -20,6 +20,8 @@ from the Fly platform.
 
 	destroy := command.New(usage, short, long, apps.RunDestroy,
 		command.RequireSession)
+	destroy.Hidden = true
+	destroy.Deprecated = "use `fly apps destroy` instead"
 
 	destroy.Args = cobra.ExactArgs(1)
 

internal/command/dnsrecords/root.go

@@ -24,6 +24,8 @@ func New() *cobra.Command {
 		long  = "Manage DNS records within a domain"
 	)
 	cmd := command.New("dns-records", short, long, nil)
+	cmd.Deprecated = "`fly dns-records` will be removed in a future release"
+	cmd.Hidden = true
 	cmd.AddCommand(
 		newDNSRecordsList(),
 		newDNSRecordsExport(),
@@ -40,6 +42,7 @@ func newDNSRecordsList() *cobra.Command {
 	cmd := command.New("list <domain>", short, long, runDNSRecordsList,
 		command.RequireSession,
 	)
+	cmd.Deprecated = "`fly dns-records list` will be removed in a future release"
 	flag.Add(cmd,
 		flag.JSONOutput(),
 	)
@@ -55,6 +58,7 @@ func newDNSRecordsExport() *cobra.Command {
 	cmd := command.New("export <domain> [filename]", short, long, runDNSRecordsExport,
 		command.RequireSession,
 	)
+	cmd.Deprecated = "`fly dns-records export` will be removed in a future release"
 	cmd.Args = cobra.RangeArgs(1, 2)
 	return cmd
 }
@@ -67,6 +71,7 @@ func newDNSRecordsImport() *cobra.Command {
 	cmd := command.New("import <domain> [filename]", short, long, runDNSRecordsImport,
 		command.RequireSession,
 	)
+	cmd.Deprecated = "`fly dns-records import` will be removed in a future release"
 	cmd.Args = cobra.RangeArgs(1, 2)
 	return cmd
 }

internal/command/domains/root.go

@@ -28,6 +28,8 @@ Notice: this feature is deprecated and no longer supported.
 You can still view existing domains, but registration is no longer possible.`
 	)
 	cmd := command.New("domains", short, long, nil)
+	cmd.Deprecated = "`fly domains` will be removed in a future release"
+	cmd.Hidden = true
 	cmd.AddCommand(
 		newDomainsList(),
 		newDomainsShow(),

internal/command/help/help.go

@@ -30,6 +30,8 @@ events and their results.
 		command.RequireSession,
 		command.RequireAppName,
 	)
+	cmd.Deprecated = "Use `flyctl apps releases` instead"
+	cmd.Hidden = true
 
 	cmd.Args = cobra.NoArgs