fix: parent cmd is null (#120)

Signed-off-by: Carlos A Becker <[email protected]>
goreleaser · Feb 5, 2023 · 453cefb · 453cefb
1 parent 66fb671
commit 453cefb
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 24 deletions.
diff --git a/cmd/chglog/main.go b/cmd/chglog/main.go
@@ -45,8 +45,13 @@ func main() {
 		return config.ReadInConfig()
 	}
 
-	cmds := commands.AllCommands(config)
-	cmdRoot.AddCommand(cmds...)
+	cmdRoot.AddCommand(
+		commands.AddCmd(config),
+		commands.InitCmd(config),
+		commands.VersionCmd(config),
+		commands.ConfigCmd(config),
+		commands.FormatCmd(config),
+	)
 
 	if err := cmdRoot.Execute(); err != nil {
 		// nolint: gomnd, gocritic

diff --git a/pkg/commands/add.go b/pkg/commands/add.go
@@ -15,7 +15,7 @@ import (
 )
 
 // nolint: gocognit, funlen, gocritic
-func setupAddCmd(config *viper.Viper) (cmd *cobra.Command) {
+func AddCmd(config *viper.Viper) (cmd *cobra.Command) {
 	var (
 		input,
 		output,

diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go
@@ -7,19 +7,6 @@ import (
 	"github.com/spf13/viper"
 )
 
-// AllCommands returns all commands supported.
-func AllCommands(config *viper.Viper) (cmds []*cobra.Command) {
-	cmds = append(cmds,
-		setupVersionCmd(config),
-		setupConfigCmd(config),
-		setupAddCmd(config),
-		setupInitCmd(config),
-		setupFormatCmd(config),
-	)
-
-	return cmds
-}
-
 func commonFlags(cmd *cobra.Command, config *viper.Viper) (*cobra.Command, *viper.Viper) {
 	var (
 		urgency, owner      string

diff --git a/pkg/commands/config.go b/pkg/commands/config.go
@@ -5,7 +5,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-func setupConfigCmd(config *viper.Viper) (cmd *cobra.Command) {
+func ConfigCmd(config *viper.Viper) (cmd *cobra.Command) {
 	var pkg string
 	cmd = &cobra.Command{
 		Use:   "config",

diff --git a/pkg/commands/format.go b/pkg/commands/format.go
@@ -16,7 +16,7 @@ import (
 var ErrTemplateFlags = errors.New("--template and --template-file are mutually exclusive")
 
 // nolint: funlen, gocritic
-func setupFormatCmd(config *viper.Viper) (cmd *cobra.Command) {
+func FormatCmd(config *viper.Viper) (cmd *cobra.Command) {
 	var input,
 		output,
 		pkg,

diff --git a/pkg/commands/init.go b/pkg/commands/init.go
@@ -15,7 +15,7 @@ import (
 // ErrNoTags happens when a repository has no tags.
 var ErrNoTags = errors.New("no versioned releases found, check the output of `git tag`")
 
-func setupInitCmd(config *viper.Viper) (cmd *cobra.Command) {
+func InitCmd(config *viper.Viper) (cmd *cobra.Command) {
 	var output string
 	cmd = &cobra.Command{
 		Use:   "init [PATH]",
@@ -31,10 +31,6 @@ func setupInitCmd(config *viper.Viper) (cmd *cobra.Command) {
 		"changelog.yml",
 		"file to save the new changelog to")
 
-	cmd.PersistentPreRun = func(c *cobra.Command, args []string) {
-		cmd.Parent().PersistentPreRun(c, args)
-	}
-
 	cmd.RunE = func(c *cobra.Command, args []string) (err error) {
 		var (
 			repoPath string

diff --git a/pkg/commands/version.go b/pkg/commands/version.go
@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-func setupVersionCmd(config *viper.Viper) (cmd *cobra.Command) {
+func VersionCmd(config *viper.Viper) (cmd *cobra.Command) {
 	cmd = &cobra.Command{
 		Use:   "version",
 		Short: "display version info",
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ import ( @@
     )
     // nolint: gocognit, funlen, gocritic
-    func setupAddCmd(config *viper.Viper) (cmd *cobra.Command) {
+    func AddCmd(config *viper.Viper) (cmd *cobra.Command) {
     	var (
     		input,
     		output,
@@ Expand Down @@