Refactoring commands

cmd/root.go

@@ -4,7 +4,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/iq2i/aergie/internal/cmd/root"
+	completionCmd "github.com/iq2i/aergie/internal/cmd/completion"
+	helpCmd "github.com/iq2i/aergie/internal/cmd/help"
+	userCmd "github.com/iq2i/aergie/internal/cmd/user"
+	versionCmd "github.com/iq2i/aergie/internal/cmd/version"
 	"github.com/spf13/cobra"
 )
 
@@ -38,15 +41,15 @@ func Execute(version string) {
 	}
 
 	rootCmd.PersistentFlags().Bool("help", false, "Show help for command")
-	rootCmd.SetHelpFunc(root.HelpFunc)
+	rootCmd.SetHelpFunc(helpCmd.Format)
 	rootCmd.SetHelpCommand(&cobra.Command{Hidden: true})
 
 	rootCmd.PersistentFlags().Bool("version", false, "Show ae version")
-	rootCmd.SetVersionTemplate(versionFormat(version))
+	rootCmd.SetVersionTemplate(versionCmd.Format(version))
 
-	rootCmd.AddCommand(newVersionCommand(version))
-	rootCmd.AddCommand(newCompletionCommand())
-	rootCmd.AddCommand(newUserCommands()...)
+	rootCmd.AddCommand(versionCmd.NewVersionCommand(version))
+	rootCmd.AddCommand(completionCmd.NewCompletionCommand())
+	rootCmd.AddCommand(userCmd.NewUserCommands()...)
 
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Println(err)

cmd/completion.go → internal/cmd/completion/completion.go

@@ -1,12 +1,12 @@
-package cmd
+package completion
 
 import (
 	"os"
 
 	"github.com/spf13/cobra"
 )
 
-func newCompletionCommand() *cobra.Command {
+func NewCompletionCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:    "completion [bash|zsh]",
 		Short:  "Generate completion script",

internal/cmd/root/help.go → internal/cmd/help/help.go

@@ -1,4 +1,4 @@
-package root
+package help
 
 import (
 	"fmt"
@@ -8,8 +8,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// HelpFunc prints help text
-func HelpFunc(cmd *cobra.Command, args []string) {
+// Format prints help text
+func Format(cmd *cobra.Command, args []string) {
 	commands := []string{}
 	for _, c := range cmd.Commands() {
 		if !c.IsAvailableCommand() {

cmd/user.go → internal/cmd/user/user.go

@@ -1,4 +1,4 @@
-package cmd
+package user
 
 import (
 	"fmt"
@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func newUserCommands() []*cobra.Command {
+func NewUserCommands() []*cobra.Command {
 	var cmds = make([]*cobra.Command, 0)
 
 	for _, configCmd := range config.AppConfig.Commands {

cmd/version.go → internal/cmd/version/version.go

@@ -1,4 +1,4 @@
-package cmd
+package version
 
 import (
 	"fmt"
@@ -7,21 +7,21 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func newVersionCommand(version string) *cobra.Command {
+func NewVersionCommand(version string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:    "version",
 		Hidden: true,
 
 		RunE: func(cmd *cobra.Command, args []string) error {
-			fmt.Fprint(cmd.OutOrStdout(), versionFormat(version))
+			fmt.Fprint(cmd.OutOrStdout(), Format(version))
 			return nil
 		},
 	}
 
 	return cmd
 }
 
-func versionFormat(version string) string {
+func Format(version string) string {
 	return fmt.Sprintf("ae version %s\n%s\n", version, changelogURL(version))
 }
 

cmd/version_test.go → internal/cmd/version/version_test.go

@@ -1,12 +1,12 @@
-package cmd
+package version
 
 import (
 	"testing"
 )
 
 func TestFormat(t *testing.T) {
 	expects := "ae version 1.0.0\nhttps://github.com/IQ2i/aergie/releases/tag/v1.0.0\n"
-	if got := versionFormat("1.0.0"); got != expects {
+	if got := Format("1.0.0"); got != expects {
 		t.Errorf("versionFormat() = %q, wants %q", got, expects)
 	}
 }