Merge pull request #1639 from rsteube/remove-execute-funcs

replace execute funcs with bridge action

completers/aplay_completer/cmd/root.go

@@ -18,11 +18,6 @@ func Execute() error {
 	return rootCmd.Execute()
 }
 
-func ExecuteArecord() error {
-	rootCmd.Use = "arecord"
-	return rootCmd.Execute()
-}
-
 func init() {
 	carapace.Gen(rootCmd).Standalone()
 

completers/arecord_completer/cmd/root.go

@@ -1,16 +1,27 @@
 package cmd
 
 import (
-	"github.com/rsteube/carapace-bin/completers/aplay_completer/cmd"
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
+	"github.com/spf13/cobra"
 )
 
-/**
-Description for go:generate
-	Use: "arecord",
-	Short: "command-line sound recorder and player for ALSA soundcard driver",
-	Long: "https://linux.die.net/man/1/arecord",
-*/
+var rootCmd = &cobra.Command{
+	Use:                "arecord",
+	Short:              "command-line sound recorder and player for ALSA soundcard driver",
+	Long:               "https://linux.die.net/man/1/arecord",
+	Run:                func(cmd *cobra.Command, args []string) {},
+	DisableFlagParsing: true,
+}
 
 func Execute() error {
-	return cmd.ExecuteArecord()
+	return rootCmd.Execute()
+}
+
+func init() {
+	carapace.Gen(rootCmd).Standalone()
+
+	carapace.Gen(rootCmd).PositionalAnyCompletion(
+		bridge.ActionCarapaceBin("aplay"),
+	)
 }

completers/brotli_completer/cmd/root.go

@@ -16,11 +16,6 @@ func Execute() error {
 	return rootCmd.Execute()
 }
 
-func ExecuteUnbrotli() error {
-	rootCmd.Use = "unbrotli"
-	return rootCmd.Execute()
-}
-
 func init() {
 	carapace.Gen(rootCmd).Standalone()
 

completers/chromium_completer/cmd/root.go

@@ -1,16 +1,27 @@
 package cmd
 
 import (
-	"github.com/rsteube/carapace-bin/completers/google-chrome_completer/cmd"
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
+	"github.com/spf13/cobra"
 )
 
-/**
-Description for go:generate
-	Use: "chromium",
-	Short: "chromium browser",
-	Long: "https://www.chromium.org/Home",
-*/
+var rootCmd = &cobra.Command{
+	Use:                "chromium",
+	Short:              "chromium browser",
+	Long:               "https://www.chromium.org/Home",
+	Run:                func(cmd *cobra.Command, args []string) {},
+	DisableFlagParsing: true,
+}
 
 func Execute() error {
-	return cmd.ExecuteAlias("chromium")
+	return rootCmd.Execute()
+}
+
+func init() {
+	carapace.Gen(rootCmd).Standalone()
+
+	carapace.Gen(rootCmd).PositionalAnyCompletion(
+		bridge.ActionCarapaceBin("google-chrome"),
+	)
 }

completers/code-insiders_completer/cmd/root.go

@@ -1,16 +1,27 @@
 package cmd
 
 import (
-	"github.com/rsteube/carapace-bin/completers/code_completer/cmd"
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
+	"github.com/spf13/cobra"
 )
 
-/**
-Description for go:generate
-	Use: "code-insiders",
-	Short: "Visual Studio Code Insiders",
-	Long: "https://code.visualstudio.com/insiders/",
-*/
+var rootCmd = &cobra.Command{
+	Use:                "code-insiders",
+	Short:              "Visual Studio Code Insiders",
+	Long:               "https://code.visualstudio.com/insiders/",
+	Run:                func(cmd *cobra.Command, args []string) {},
+	DisableFlagParsing: true,
+}
 
 func Execute() error {
-	return cmd.ExecuteInsiders()
+	return rootCmd.Execute()
+}
+
+func init() {
+	carapace.Gen(rootCmd).Standalone()
+
+	carapace.Gen(rootCmd).PositionalAnyCompletion(
+		bridge.ActionCarapaceBin("code"),
+	)
 }

completers/code_completer/cmd/root.go

@@ -20,11 +20,6 @@ func Execute() error {
 	return rootCmd.Execute()
 }
 
-func ExecuteInsiders() error {
-	rootCmd.Use = "code-insiders"
-	return rootCmd.Execute()
-}
-
 func init() {
 	carapace.Gen(rootCmd).Standalone()
 

completers/egrep_completer/cmd/root.go

@@ -1,16 +1,27 @@
 package cmd
 
 import (
-	"github.com/rsteube/carapace-bin/completers/grep_completer/cmd"
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
+	"github.com/spf13/cobra"
 )
 
-/**
-Description for go:generate
-	Use: "egrep",
-	Short: "print lines that match patterns",
-	Long: "https://linux.die.net/man/1/grep",
-*/
+var rootCmd = &cobra.Command{
+	Use:                "egrep",
+	Short:              "print lines that match patterns",
+	Long:               "https://linux.die.net/man/1/grep",
+	Run:                func(cmd *cobra.Command, args []string) {},
+	DisableFlagParsing: true,
+}
 
 func Execute() error {
-	return cmd.ExecuteOverride("egrep")
+	return rootCmd.Execute()
+}
+
+func init() {
+	carapace.Gen(rootCmd).Standalone()
+
+	carapace.Gen(rootCmd).PositionalAnyCompletion(
+		bridge.ActionCarapaceBin("grep"),
+	)
 }

completers/fgrep_completer/cmd/root.go

@@ -1,16 +1,27 @@
 package cmd
 
 import (
-	"github.com/rsteube/carapace-bin/completers/grep_completer/cmd"
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
+	"github.com/spf13/cobra"
 )
 
-/**
-Description for go:generate
-	Use: "fgrep",
-	Short: "print lines that match patterns",
-	Long: "https://en.wikipedia.org/wiki/Grep",
-*/
+var rootCmd = &cobra.Command{
+	Use:                "fgrep",
+	Short:              "print lines that match patterns",
+	Long:               "https://en.wikipedia.org/wiki/Grep",
+	Run:                func(cmd *cobra.Command, args []string) {},
+	DisableFlagParsing: true,
+}
 
 func Execute() error {
-	return cmd.ExecuteOverride("fgrep")
+	return rootCmd.Execute()
+}
+
+func init() {
+	carapace.Gen(rootCmd).Standalone()
+
+	carapace.Gen(rootCmd).PositionalAnyCompletion(
+		bridge.ActionCarapaceBin("grep"),
+	)
 }

completers/google-chrome_completer/cmd/root.go

@@ -16,11 +16,6 @@ func Execute() error {
 	return rootCmd.Execute()
 }
 
-func ExecuteAlias(alias string) error {
-	rootCmd.Use = alias
-	return rootCmd.Execute()
-}
-
 func init() {
 	carapace.Gen(rootCmd).Standalone()
 

completers/grep_completer/cmd/root.go

@@ -17,12 +17,6 @@ func Execute() error {
 	return rootCmd.Execute()
 }
 
-// ExecuteOverride overrides Use before execution
-func ExecuteOverride(use string) error {
-	rootCmd.Use = use
-	return rootCmd.Execute()
-}
-
 func init() {
 	carapace.Gen(rootCmd).Standalone()
 

completers/halt_completer/cmd/root.go

@@ -16,18 +16,6 @@ func Execute() error {
 	return rootCmd.Execute()
 }
 
-func ExecutePoweroff() error {
-	rootCmd.Use = "poweroff"
-	rootCmd.Short = "poweroff the machine"
-	return Execute()
-}
-
-func ExecuteReboot() error {
-	rootCmd.Use = "reboot"
-	rootCmd.Short = "reboot the machine"
-	return Execute()
-}
-
 func init() {
 	carapace.Gen(rootCmd).Standalone()
 

completers/helix_completer/cmd/root.go

@@ -17,11 +17,6 @@ func Execute() error {
 	return rootCmd.Execute()
 }
 
-func ExecuteHx() error {
-	rootCmd.Use = "hx"
-	return rootCmd.Execute()
-}
-
 func init() {
 	carapace.Gen(rootCmd).Standalone()
 

completers/http_completer/cmd/root.go

@@ -21,12 +21,6 @@ func Execute() error {
 	return rootCmd.Execute()
 }
 
-// ExecuteHttps replace Use with `https` before execution (https alias command for httpie)
-func ExecuteHttps() error {
-	rootCmd.Use = "https" // TODO works for now
-	return rootCmd.Execute()
-}
-
 func init() {
 	carapace.Gen(rootCmd).Standalone()
 

completers/https_completer/cmd/root.go

@@ -1,16 +1,27 @@
 package cmd
 
 import (
-	"github.com/rsteube/carapace-bin/completers/http_completer/cmd"
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
+	"github.com/spf13/cobra"
 )
 
-/**
-Description for go:generate
-	Use: "https",
-	Short: "command-line HTTP client for the API era",
-	Long: "https://httpie.io/",
-*/
+var rootCmd = &cobra.Command{
+	Use:                "https",
+	Short:              "command-line HTTP client for the API era",
+	Long:               "https://httpie.io/",
+	Run:                func(cmd *cobra.Command, args []string) {},
+	DisableFlagParsing: true,
+}
 
 func Execute() error {
-	return cmd.ExecuteHttps()
+	return rootCmd.Execute()
+}
+
+func init() {
+	carapace.Gen(rootCmd).Standalone()
+
+	carapace.Gen(rootCmd).PositionalAnyCompletion(
+		bridge.ActionCarapaceBin("http"),
+	)
 }

completers/hx_completer/cmd/root.go

@@ -1,16 +1,27 @@
 package cmd
 
 import (
-	"github.com/rsteube/carapace-bin/completers/helix_completer/cmd"
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
+	"github.com/spf13/cobra"
 )
 
-/**
-Description for go:generate
-	Use: "hx",
-	Short: "A post-modern text editor",
-	Long:  "https://helix-editor.com/",
-*/
+var rootCmd = &cobra.Command{
+	Use:                "hx",
+	Short:              "A post-modern text editor",
+	Long:               "https://helix-editor.com/",
+	Run:                func(cmd *cobra.Command, args []string) {},
+	DisableFlagParsing: true,
+}
 
 func Execute() error {
-	return cmd.ExecuteHx()
+	return rootCmd.Execute()
+}
+
+func init() {
+	carapace.Gen(rootCmd).Standalone()
+
+	carapace.Gen(rootCmd).PositionalAnyCompletion(
+		bridge.ActionCarapaceBin("helix"),
+	)
 }

completers/lzcat_completer/cmd/root.go

@@ -1,16 +1,27 @@
 package cmd
 
 import (
-	"github.com/rsteube/carapace-bin/completers/xz_completer/cmd"
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
+	"github.com/spf13/cobra"
 )
 
-/**
-Description for go:generate
-	Use: "lzcat",
-	Short: "Compress or decompress .xz and .lzma files",
-	Long: "https://linux.die.net/man/1/xz",
-*/
+var rootCmd = &cobra.Command{
+	Use:                "lzcat",
+	Short:              "Compress or decompress .xz and .lzma files",
+	Long:               "https://linux.die.net/man/1/xz",
+	Run:                func(cmd *cobra.Command, args []string) {},
+	DisableFlagParsing: true,
+}
 
 func Execute() error {
-	return cmd.ExecuteAlias("lzcat")
+	return rootCmd.Execute()
+}
+
+func init() {
+	carapace.Gen(rootCmd).Standalone()
+
+	carapace.Gen(rootCmd).PositionalAnyCompletion(
+		bridge.ActionCarapaceBin("xz"),
+	)
 }