tmp

Author: rsteube

.docker/urfavecliV1.yaml .docker/urfavecli_v1.yaml.docker/urfavecliV1.yaml renamed to .docker/urfavecli_v1.yaml

@@ -1,5 +1,5 @@
 services:
-  urfavecliV1:
+  urfavecli_v1:
     build:
       context: urfavecliV1
     image: ghcr.io/carapace-sh/carapace-bridge:urfavecliV1

.docker/urfavecliV1/Dockerfile .docker/urfavecli_v1/Dockerfile.docker/urfavecliV1/Dockerfile renamed to .docker/urfavecli_v1/Dockerfile

@@ -5,7 +5,7 @@ RUN apk add --no-cache curl libc6-compat tea
 RUN curl -so - https://dl.elv.sh/linux-amd64/elvish-v0.21.0.tar.gz | tar -xzvC /usr/local/bin
 
 RUN mkdir -p ~/.config/elvish \
- && echo -e "set paths = [ /carapace-bridge/cmd/carapace-bridge \$@paths ]\neval (carapace-bridge _carapace|slurp)\neval (carapace-bridge urfavecli@v1 tea|slurp)" > ~/.config/elvish/rc.elv
+ && echo -e "set paths = [ /carapace-bridge/cmd/carapace-bridge \$@paths ]\neval (carapace-bridge _carapace|slurp)\neval (carapace-bridge urfavecli_v1 tea|slurp)" > ~/.config/elvish/rc.elv
 ENV PATH="/carapace-bridge/cmd/carapace-bridge:$PATH"
 
 ENTRYPOINT /usr/local/bin/elvish

cmd/carapace-bridge/cmd/root.go

@@ -40,7 +40,7 @@ func init() {
 	carapace.Gen(rootCmd)
 	rootCmd.AddGroup(&cobra.Group{ID: "bridge", Title: "Bridge Commands"})
 	addSubCommand("argcomplete", "bridges https://github.com/kislyuk/argcomplete", bridge.ActionArgcomplete)
-	addSubCommand("argcompleteV1", "bridges https://github.com/kislyuk/argcomplete", bridge.ActionArgcompleteV1)
+	addSubCommand("argcomplete_v1", "bridges https://github.com/kislyuk/argcomplete", bridge.ActionArgcompleteV1)
 	addSubCommand("aws", "bridges https://github.com/aws/aws-cli", bridge.ActionAws)
 	addSubCommand("bash", "bridges completions registered in bash", bridge.ActionBash)
 	addSubCommand("bridge", "", bridge.ActionBridge) // TODO description
@@ -58,7 +58,7 @@ func init() {
 	addSubCommand("macro", "bridges macros exposed with https://github.com/carapace-sh/carapace-spec", bridge.ActionMacro)
 	addSubCommand("powershell", "bridges completions registered in powershell", bridge.ActionPowershell)
 	addSubCommand("urfavecli", "bridges https://github.com/urfave/cli (v2)", bridge.ActionUrfavecli)
-	addSubCommand("urfavecliV1", "bridges https://github.com/urfave/cli (v3)", bridge.ActionUrfavecliV1)
+	addSubCommand("urfavecli_v1", "bridges https://github.com/urfave/cli (v3)", bridge.ActionUrfavecliV1)
 	addSubCommand("yargs", "bridges https://github.com/yargs/yargs", bridge.ActionYargs)
 	addSubCommand("zsh", "bridges completions registered in zsh", bridge.ActionZsh)
 }

compose.yaml

@@ -1,11 +1,12 @@
 include:
   - ./.docker/argcomplete.yaml
+  # TODO argcomplete_v1
   - ./.docker/click.yaml
   - ./.docker/cobra.yaml
   - ./.docker/complete.yaml
   - ./.docker/kingpin.yaml
   - ./.docker/urfavecli.yaml
-  - ./.docker/urfavecliV1.yaml
+  - ./.docker/urfavecli_v1.yaml
   - ./.docker/yargs.yaml
 
   - ./.docker/inshellisense.yaml

pkg/actions/bridge/bridge.go

@@ -12,26 +12,26 @@ import (
 )
 
 var bridgeActions = map[string]func(command ...string) carapace.Action{
-	"argcomplete":   ActionArgcomplete,
-	"argcompleteV1": ActionArgcompleteV1,
-	"aws":           ActionAws,
-	"bash":          ActionBash,
-	"carapace":      ActionCarapace,
-	"carapace-bin":  ActionCarapaceBin,
-	"clap":          ActionClap,
-	"click":         ActionClick,
-	"cobra":         ActionCobra,
-	"complete":      ActionComplete,
-	"fish":          ActionFish,
-	"gcloud":        ActionGcloud,
-	"inshellisense": ActionInshellisense,
-	"kingpin":       ActionKingpin,
-	"kitten":        ActionKitten,
-	"powershell":    ActionPowershell,
-	"urfavecli":     ActionUrfavecli,
-	"urfavecliV1":   ActionUrfavecliV1,
-	"yargs":         ActionYargs,
-	"zsh":           ActionZsh,
+	"argcomplete":    ActionArgcomplete,
+	"argcomplete_v1": ActionArgcompleteV1,
+	"aws":            ActionAws,
+	"bash":           ActionBash,
+	"carapace":       ActionCarapace,
+	"carapace-bin":   ActionCarapaceBin,
+	"clap":           ActionClap,
+	"click":          ActionClick,
+	"cobra":          ActionCobra,
+	"complete":       ActionComplete,
+	"fish":           ActionFish,
+	"gcloud":         ActionGcloud,
+	"inshellisense":  ActionInshellisense,
+	"kingpin":        ActionKingpin,
+	"kitten":         ActionKitten,
+	"powershell":     ActionPowershell,
+	"urfavecli":      ActionUrfavecli,
+	"urfavecli_v1":   ActionUrfavecliV1,
+	"yargs":          ActionYargs,
+	"zsh":            ActionZsh,
 }
 
 // TODO experimental
@@ -49,7 +49,7 @@ func ActionBridges(name string) carapace.Action {
 		return carapace.Batch(
 			carapace.ActionValuesDescribed(
 				"argcomplete", "bridges https://github.com/kislyuk/argcomplete",
-				"argcompleteV1", "bridges https://github.com/kislyuk/argcomplete",
+				"argcomplete_v1", "bridges https://github.com/kislyuk/argcomplete",
 				"carapace", "bridges https://github.com/carapace-sh/carapace",
 				"clap", "bridges https://github.com/clap-rs/clap",
 				"click", "bridges https://github.com/pallets/click",
@@ -58,7 +58,7 @@ func ActionBridges(name string) carapace.Action {
 				"kingpin", "bridges https://github.com/alecthomas/kingpin",
 				"macro", "bridges macros exposed with https://github.com/carapace-sh/carapace-spec",
 				"urfavecli", "bridges https://github.com/urfave/cli (v2)",
-				"urfavecliV1", "bridges https://github.com/urfave/cli (v3)",
+				"urfavecli_v1", "bridges https://github.com/urfave/cli (v3)",
 				"yargs", "bridges https://github.com/yargs/yargs",
 			).Style(style.Dim),
 			carapace.ActionValuesDescribed(

pkg/actions/bridge/detect.go

@@ -21,11 +21,11 @@ var candidates = []string{
 	"complete",
 	"kingpin",
 	"urfavecli",
-	"urfavecli@v1",
+	"urfavecli_v1",
 
 	// python
 	"argcomplete",
-	"argcomplete@v1",
+	"argcomplete_v1",
 	"click",
 
 	// rust