Add command groups

cmd/action.go

@@ -5,8 +5,9 @@ import (
 )
 
 var actionCmd = &cobra.Command{
-	Use:   "action",
+	Use:     "action",
-	Short: "Manage and run source actions",
+	GroupID: sourceGroup.ID,
+	Short:   "Manage and run source actions",
 	Long: `Add, edit, delete, and run source actions on items.
 
 A feed source is updated by the "fetch" action, which receives no input and

cmd/channel.go

@@ -10,8 +10,9 @@ import (
 )
 
 var channelCmd = &cobra.Command{
-	Use:   "channel --channel name {--add source | --remove source | --delete [-y]}",
+	Use:     "channel --channel name {--add source | --remove source | --delete [-y]}",
-	Short: "Manage channels",
+	GroupID: sourceGroup.ID,
+	Short:   "Manage channels",
 	Long: `A channel is a group of sources that can be viewed together. Adding a source
 to a channel creates it and removing all sources from a channel deletes it.
 `,

cmd/deactivate.go

@@ -12,6 +12,7 @@ import (
 
 var deactivateCmd = &cobra.Command{
 	Use:     "deactivate --source source [--item item]",
+	GroupID: feedGroup.ID,
 	Aliases: []string{"deac"},
 	Short:   "Deactivate items",
 	Long: `Deactivate items, hiding them from feeds and marking them for deletion.

cmd/edit.go

@@ -7,8 +7,9 @@ import (
 )
 
 var editCmd = &cobra.Command{
-	Use:   "edit",
+	Use:     "edit",
-	Short: "Edit an item",
+	GroupID: feedGroup.ID,
+	Short:   "Edit an item",
 	Long: `
 `,
 	Run: func(cmd *cobra.Command, args []string) {

cmd/env.go

@@ -8,8 +8,9 @@ import (
 )
 
 var envCmd = &cobra.Command{
-	Use:   "env",
+	Use:     "env",
-	Short: "Manage source environment variables",
+	GroupID: sourceGroup.ID,
+	Short:   "Manage source environment variables",
 	Long: `Add, edit, list, or delete environment variables.
 
 --env KEY=VALUE will add or edit an environment variable to be set in all

cmd/feed.go

@@ -9,8 +9,9 @@ import (
 )
 
 var feedCmd = &cobra.Command{
-	Use:   "feed",
+	Use:     "feed",
-	Short: "Display the item feed",
+	GroupID: feedGroup.ID,
+	Short:   "Display the item feed",
 	Long: fmt.Sprintf(`Display the intake item feed in various formats.
 The default format is "headlines".
 

cmd/fetch.go

@@ -11,8 +11,9 @@ import (
 )
 
 var fetchCmd = &cobra.Command{
-	Use:   "fetch [--source name] [-n|--dry-run] [--env NAME-VALUE [-- env NAME=VALUE ...]] [-- argv...]",
+	Use:     "fetch [--source name] [-n|--dry-run] [--env NAME-VALUE [-- env NAME=VALUE ...]] [-- argv...]",
-	Short: "Fetch items for a source and update the feed",
+	GroupID: feedGroup.ID,
+	Short:   "Fetch items for a source and update the feed",
 	Long: fmt.Sprintf(`Fetch items for a source and update the feed.
 
 Items returned by a successful fetch will be used to update the source.

cmd/item.go

@@ -10,8 +10,9 @@ import (
 )
 
 var itemCmd = &cobra.Command{
-	Use:   "item",
+	Use:     "item",
-	Short: "Add an item",
+	GroupID: feedGroup.ID,
+	Short:   "Add an item",
 	Long: `Create an ad-hoc item in a source.
 
 By default, the item is created in the "default" source, which is created

cmd/list.go

@@ -12,6 +12,7 @@ import (
 
 var listCmd = &cobra.Command{
 	Use:     "list",
+	GroupID: sourceGroup.ID,
 	Aliases: []string{"ls"},
 	Short:   "List sources, channels, or actions",
 	Long: `List sources, channels, or actions.

cmd/monitor.go

@@ -9,8 +9,9 @@ import (
 )
 
 var monitorCmd = &cobra.Command{
-	Use:   "monitor",
+	Use:     "monitor",
-	Short: "Run continuously and update sources according to their fetch schedule",
+	GroupID: webGroup.ID,
+	Short:   "Run continuously and update sources according to their fetch schedule",
 	Long: `Run continuously and update sources.
 
 Sources are monitored and fetched according to the schedule specified by

cmd/passwd.go

@@ -11,8 +11,9 @@ import (
 )
 
 var passwdCmd = &cobra.Command{
-	Use:   "passwd",
+	Use:     "passwd",
-	Short: "Set the password for the web interface",
+	GroupID: webGroup.ID,
+	Short:   "Set the password for the web interface",
 	Long: `Set the password for the web interface.
 
 Access through the command line should be controlled by standard filesystem

cmd/root.go

@@ -25,10 +25,18 @@ func Execute() {
 
 var dataPath string
 
+var sourceGroup = &cobra.Group{ID: "manage", Title: "Source management:"}
+var feedGroup = &cobra.Group{ID: "feed", Title: "Feed management:"}
+var webGroup = &cobra.Group{ID: "web", Title: "Service management:"}
+
 func init() {
 	// Disable the automatic help command
 	rootCmd.SetHelpCommand(&cobra.Command{Hidden: true})
 
+	rootCmd.AddGroup(sourceGroup)
+	rootCmd.AddGroup(feedGroup)
+	rootCmd.AddGroup(webGroup)
+
 	// All commands need to operate on a database
 	// Setting the env-derived path as the default allows the command line to override the env
 	dbPathFromEnv := core.ResolveEnvDataDir()

cmd/serve.go

@@ -11,8 +11,9 @@ import (
 )
 
 var serveCmd = &cobra.Command{
-	Use:   "serve",
+	Use:     "serve",
-	Short: "Serve the web interface",
+	GroupID: webGroup.ID,
+	Short:   "Serve the web interface",
 	Long: `Serve the intake web interface.
 `,
 	Run: func(cmd *cobra.Command, args []string) {

cmd/source.go

@@ -8,8 +8,9 @@ import (
 )
 
 var sourceCmd = &cobra.Command{
-	Use:   "source",
+	Use:     "source",
-	Short: "Manage sources",
+	GroupID: sourceGroup.ID,
+	Short:   "Manage sources",
 	Long: `Manage sources.
 
 A source represents a single content feed that generates discrete feed items.