commands: Make the list commands non-global

See #4598

diff --git a/commands/genchromastyles.go b/commands/genchromastyles.go
index 66a2b50a6ec23abdb968db5a882cbdcd7dcf64f8..6d7b8b5cbee9e47c2f44e9ef678c16457628bb34 100644 (file)
--- a/commands/genchromastyles.go
+++ b/commands/genchromastyles.go
@@ -22,6 +22,10 @@ import (
        "github.com/spf13/cobra"
 )
 
+var (
+       _ cmder = (*genChromaStyles)(nil)
+)
+
 type genChromaStyles struct {
        style          string
        highlightStyle string
@@ -29,6 +33,10 @@ type genChromaStyles struct {
        cmd            *cobra.Command
 }
 
+func (c *genChromaStyles) getCommand() *cobra.Command {
+       return c.cmd
+}
+
 // TODO(bep) highlight
 func createGenChromaStyles() *genChromaStyles {
        g := &genChromaStyles{

diff --git a/commands/gendocshelper.go b/commands/gendocshelper.go
index ca781242ee7bec1d6a0e73765ef74869c674b7a3..e98bfde7947fa318f385049c8922d81cf8835326 100644 (file)
--- a/commands/gendocshelper.go
+++ b/commands/gendocshelper.go
@@ -23,11 +23,19 @@ import (
        "github.com/spf13/cobra"
 )
 
+var (
+       _ cmder = (*genDocsHelper)(nil)
+)
+
 type genDocsHelper struct {
        target string
        cmd    *cobra.Command
 }
 
+func (c *genDocsHelper) getCommand() *cobra.Command {
+       return c.cmd
+}
+
 func createGenDocsHelper() *genDocsHelper {
        g := &genDocsHelper{
                cmd: &cobra.Command{

diff --git a/commands/hugo.go b/commands/hugo.go
index 6e3dc488dac6f177ad0b7dac06675053794707f1..30670a30e7733391a90cd03aab818040c43023a7 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -201,15 +201,15 @@ func AddCommands() {
        HugoCmd.AddCommand(newBenchmarkCmd().getCommand())
        HugoCmd.AddCommand(newConvertCmd().getCommand())
        HugoCmd.AddCommand(newNewCmd().getCommand())
-       HugoCmd.AddCommand(listCmd)
+       HugoCmd.AddCommand(newListCmd().getCommand())
        HugoCmd.AddCommand(newImportCmd().getCommand())
 
        HugoCmd.AddCommand(genCmd)
        genCmd.AddCommand(genautocompleteCmd)
        genCmd.AddCommand(gendocCmd)
        genCmd.AddCommand(genmanCmd)
-       genCmd.AddCommand(createGenDocsHelper().cmd)
-       genCmd.AddCommand(createGenChromaStyles().cmd)
+       genCmd.AddCommand(createGenDocsHelper().getCommand())
+       genCmd.AddCommand(createGenChromaStyles().getCommand())
 
 }
 

diff --git a/commands/list.go b/commands/list.go
index b391f204e3169c642a729b0d29711b753fd766f9..c21158f642f2e025290d6462cee3af3159b48cc3 100644 (file)
--- a/commands/list.go
+++ b/commands/list.go
@@ -21,129 +21,140 @@ import (
        jww "github.com/spf13/jwalterweatherman"
 )
 
-func init() {
-       listCmd.AddCommand(listDraftsCmd)
-       listCmd.AddCommand(listFutureCmd)
-       listCmd.AddCommand(listExpiredCmd)
-       listCmd.PersistentFlags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
-       listCmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
-}
-
-var listCmd = &cobra.Command{
-       Use:   "list",
-       Short: "Listing out various types of content",
-       Long: `Listing out various types of content.
+var _ cmder = (*listCmd)(nil)
 
-List requires a subcommand, e.g. ` + "`hugo list drafts`.",
-       RunE: nil,
+type listCmd struct {
+       cmd *cobra.Command
 }
 
-var listDraftsCmd = &cobra.Command{
-       Use:   "drafts",
-       Short: "List all drafts",
-       Long:  `List all of the drafts in your content directory.`,
-       RunE: func(cmd *cobra.Command, args []string) error {
-               cfgInit := func(c *commandeer) error {
-                       c.Set("buildDrafts", true)
-                       return nil
-               }
-               c, err := InitializeConfig(false, cfgInit)
-               if err != nil {
-                       return err
-               }
-
-               sites, err := hugolib.NewHugoSites(*c.DepsCfg)
-
-               if err != nil {
-                       return newSystemError("Error creating sites", err)
-               }
-
-               if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-                       return newSystemError("Error Processing Source Content", err)
-               }
-
-               for _, p := range sites.Pages() {
-                       if p.IsDraft() {
-                               jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
-                       }
-
-               }
-
-               return nil
-
-       },
+func (c *listCmd) getCommand() *cobra.Command {
+       return c.cmd
 }
 
-var listFutureCmd = &cobra.Command{
-       Use:   "future",
-       Short: "List all posts dated in the future",
-       Long: `List all of the posts in your content directory which will be
-posted in the future.`,
-       RunE: func(cmd *cobra.Command, args []string) error {
-               cfgInit := func(c *commandeer) error {
-                       c.Set("buildFuture", true)
-                       return nil
-               }
-               c, err := InitializeConfig(false, cfgInit)
-               if err != nil {
-                       return err
-               }
-
-               sites, err := hugolib.NewHugoSites(*c.DepsCfg)
-
-               if err != nil {
-                       return newSystemError("Error creating sites", err)
-               }
-
-               if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-                       return newSystemError("Error Processing Source Content", err)
-               }
-
-               for _, p := range sites.Pages() {
-                       if p.IsFuture() {
-                               jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
-                       }
+func newListCmd() *listCmd {
+       cc := &listCmd{}
 
-               }
+       cc.cmd = &cobra.Command{
+               Use:   "list",
+               Short: "Listing out various types of content",
+               Long: `Listing out various types of content.
 
-               return nil
+List requires a subcommand, e.g. ` + "`hugo list drafts`.",
+               RunE: nil,
+       }
+
+       cc.cmd.AddCommand(
+               &cobra.Command{
+                       Use:   "drafts",
+                       Short: "List all drafts",
+                       Long:  `List all of the drafts in your content directory.`,
+                       RunE: func(cmd *cobra.Command, args []string) error {
+                               cfgInit := func(c *commandeer) error {
+                                       c.Set("buildDrafts", true)
+                                       return nil
+                               }
+                               c, err := InitializeConfig(false, cfgInit)
+                               if err != nil {
+                                       return err
+                               }
+
+                               sites, err := hugolib.NewHugoSites(*c.DepsCfg)
+
+                               if err != nil {
+                                       return newSystemError("Error creating sites", err)
+                               }
+
+                               if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+                                       return newSystemError("Error Processing Source Content", err)
+                               }
+
+                               for _, p := range sites.Pages() {
+                                       if p.IsDraft() {
+                                               jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+                                       }
+
+                               }
+
+                               return nil
+
+                       },
+               },
+               &cobra.Command{
+                       Use:   "future",
+                       Short: "List all posts dated in the future",
+                       Long: `List all of the posts in your content directory which will be
+posted in the future.`,
+                       RunE: func(cmd *cobra.Command, args []string) error {
+                               cfgInit := func(c *commandeer) error {
+                                       c.Set("buildFuture", true)
+                                       return nil
+                               }
+                               c, err := InitializeConfig(false, cfgInit)
+                               if err != nil {
+                                       return err
+                               }
+
+                               sites, err := hugolib.NewHugoSites(*c.DepsCfg)
+
+                               if err != nil {
+                                       return newSystemError("Error creating sites", err)
+                               }
+
+                               if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+                                       return newSystemError("Error Processing Source Content", err)
+                               }
+
+                               for _, p := range sites.Pages() {
+                                       if p.IsFuture() {
+                                               jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+                                       }
+
+                               }
+
+                               return nil
+
+                       },
+               },
+               &cobra.Command{
+                       Use:   "expired",
+                       Short: "List all posts already expired",
+                       Long: `List all of the posts in your content directory which has already
+expired.`,
+                       RunE: func(cmd *cobra.Command, args []string) error {
+                               cfgInit := func(c *commandeer) error {
+                                       c.Set("buildExpired", true)
+                                       return nil
+                               }
+                               c, err := InitializeConfig(false, cfgInit)
+                               if err != nil {
+                                       return err
+                               }
 
-       },
-}
+                               sites, err := hugolib.NewHugoSites(*c.DepsCfg)
 
-var listExpiredCmd = &cobra.Command{
-       Use:   "expired",
-       Short: "List all posts already expired",
-       Long: `List all of the posts in your content directory which has already
-expired.`,
-       RunE: func(cmd *cobra.Command, args []string) error {
-               cfgInit := func(c *commandeer) error {
-                       c.Set("buildExpired", true)
-                       return nil
-               }
-               c, err := InitializeConfig(false, cfgInit)
-               if err != nil {
-                       return err
-               }
+                               if err != nil {
+                                       return newSystemError("Error creating sites", err)
+                               }
 
-               sites, err := hugolib.NewHugoSites(*c.DepsCfg)
+                               if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
+                                       return newSystemError("Error Processing Source Content", err)
+                               }
 
-               if err != nil {
-                       return newSystemError("Error creating sites", err)
-               }
+                               for _, p := range sites.Pages() {
+                                       if p.IsExpired() {
+                                               jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
+                                       }
 
-               if err := sites.Build(hugolib.BuildCfg{SkipRender: true}); err != nil {
-                       return newSystemError("Error Processing Source Content", err)
-               }
+                               }
 
-               for _, p := range sites.Pages() {
-                       if p.IsExpired() {
-                               jww.FEEDBACK.Println(filepath.Join(p.File.Dir(), p.File.LogicalName()))
-                       }
+                               return nil
 
-               }
+                       },
+               },
+       )
 
-               return nil
+       cc.cmd.PersistentFlags().StringVarP(&source, "source", "s", "", "filesystem path to read files relative from")
+       cc.cmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
 
-       },
+       return cc
 }