Merge pull request #253 from carapace-sh/detect

rsteube · web-flow · commit 88cc9a62e4d3 · 2025-06-22T14:38:29.000+02:00
added detect
diff --git a/.docker/argcomplete.yaml b/.docker/argcomplete.yaml
@@ -0,0 +1,8 @@
+services:
+  argcomplete:
+    build:
+      context: argcomplete
+    image: ghcr.io/carapace-sh/carapace-bridge:argcomplete
+    hostname: carapace-bridge:argcomplete_az
+    volumes:
+      - '..:/carapace-bridge:ro'
diff --git a/.docker/argcomplete/Dockerfile b/.docker/argcomplete/Dockerfile
@@ -0,0 +1,10 @@
+FROM bitnami/azure-cli
+
+USER root
+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 argcomplete az|slurp)" > ~/.config/elvish/rc.elv
+ENV PATH="/carapace-bridge/cmd/carapace-bridge:$PATH"
+
+ENTRYPOINT /usr/local/bin/elvish
diff --git a/.docker/click.yaml b/.docker/click.yaml
@@ -0,0 +1,8 @@
+services:
+  click:
+    build:
+      context: click
+    image: ghcr.io/carapace-sh/carapace-bridge:click
+    hostname: carapace-bridge:click_watson
+    volumes:
+      - '..:/carapace-bridge:ro'
diff --git a/.docker/click/Dockerfile b/.docker/click/Dockerfile
@@ -0,0 +1,13 @@
+FROM alpine
+
+RUN apk add --no-cache curl libc6-compat py3-pip
+
+RUN curl -so - https://dl.elv.sh/linux-amd64/elvish-v0.21.0.tar.gz | tar -xzvC /usr/local/bin
+
+RUN pip install --break-system-packages td-watson
+
+RUN mkdir -p ~/.config/elvish \
+ && echo -e "set paths = [ /carapace-bridge/cmd/carapace-bridge \$@paths ]\neval (carapace-bridge _carapace|slurp)\neval (carapace-bridge click watson|slurp)" > ~/.config/elvish/rc.elv
+ENV PATH="/carapace-bridge/cmd/carapace-bridge:$PATH"
+
+ENTRYPOINT /usr/local/bin/elvish
diff --git a/.docker/cobra.yaml b/.docker/cobra.yaml
@@ -0,0 +1,8 @@
+services:
+  cobra:
+    build:
+      context: cobra
+    image: ghcr.io/carapace-sh/carapace-bridge:cobra
+    hostname: carapace-bridge:cobra_gh
+    volumes:
+      - '..:/carapace-bridge:ro'
diff --git a/.docker/cobra/Dockerfile b/.docker/cobra/Dockerfile
@@ -0,0 +1,11 @@
+FROM alpine
+
+RUN apk add --no-cache curl github-cli libc6-compat
+
+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 cobra gh|slurp)" > ~/.config/elvish/rc.elv
+ENV PATH="/carapace-bridge/cmd/carapace-bridge:$PATH"
+
+ENTRYPOINT /usr/local/bin/elvish
diff --git a/.docker/complete.yaml b/.docker/complete.yaml
@@ -0,0 +1,8 @@
+services:
+  complete:
+    build:
+      context: complete
+    image: ghcr.io/carapace-sh/carapace-bridge:complete
+    hostname: carapace-bridge:complete_terraform
+    volumes:
+      - '..:/carapace-bridge:ro'
diff --git a/.docker/complete/Dockerfile b/.docker/complete/Dockerfile
@@ -0,0 +1,11 @@
+FROM hashicorp/terraform
+
+RUN apk add --no-cache curl libc6-compat
+
+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 complete terraform|slurp)" > ~/.config/elvish/rc.elv
+ENV PATH="/carapace-bridge/cmd/carapace-bridge:$PATH"
+
+ENTRYPOINT /usr/local/bin/elvish
diff --git a/.docker/kingpin.yaml b/.docker/kingpin.yaml
@@ -0,0 +1,8 @@
+services:
+  kingpin:
+    build:
+      context: kingpin
+    image: ghcr.io/carapace-sh/carapace-bridge:kingpin
+    hostname: carapace-bridge:kingpin_tsh
+    volumes:
+      - '..:/carapace-bridge:ro'
diff --git a/.docker/kingpin/Dockerfile b/.docker/kingpin/Dockerfile
@@ -0,0 +1,13 @@
+FROM alpine
+
+RUN apk add --no-cache bash curl libc6-compat
+
+RUN curl -so - https://dl.elv.sh/linux-amd64/elvish-v0.21.0.tar.gz | tar -xzvC /usr/local/bin
+
+RUN curl https://cdn.teleport.dev/install.sh | bash -s 17.5.2 oss
+
+RUN mkdir -p ~/.config/elvish \
+ && echo -e "set paths = [ /carapace-bridge/cmd/carapace-bridge \$@paths ]\neval (carapace-bridge _carapace|slurp)\neval (carapace-bridge kingpin tsh|slurp)" > ~/.config/elvish/rc.elv
+ENV PATH="/carapace-bridge/cmd/carapace-bridge:$PATH"
+
+ENTRYPOINT /usr/local/bin/elvish
diff --git a/.docker/urfavecli.yaml b/.docker/urfavecli.yaml
@@ -0,0 +1,8 @@
+services:
+  urfavecli:
+    build:
+      context: urfavecli
+    image: ghcr.io/carapace-sh/carapace-bridge:urfavecli
+    hostname: carapace-bridge:urfavecli_tea
+    volumes:
+      - '..:/carapace-bridge:ro'
diff --git a/.docker/urfavecli/Dockerfile b/.docker/urfavecli/Dockerfile
@@ -0,0 +1,11 @@
+FROM alpine
+
+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 tea|slurp)" > ~/.config/elvish/rc.elv
+ENV PATH="/carapace-bridge/cmd/carapace-bridge:$PATH"
+
+ENTRYPOINT /usr/local/bin/elvish
diff --git a/.docker/yargs.yaml b/.docker/yargs.yaml
@@ -0,0 +1,8 @@
+services:
+  yargs:
+    build:
+      context: yargs
+    image: ghcr.io/carapace-sh/carapace-bridge:yargs
+    hostname: carapace-bridge:yargs_ng
+    volumes:
+      - '..:/carapace-bridge:ro'
diff --git a/.docker/yargs/Dockerfile b/.docker/yargs/Dockerfile
@@ -0,0 +1,12 @@
+FROM alpine
+
+RUN apk add --no-cache curl libc6-compat npm
+
+RUN curl -so - https://dl.elv.sh/linux-amd64/elvish-v0.21.0.tar.gz | tar -xzvC /usr/local/bin
+
+RUN npm install -g @angular/cli@17
+RUN mkdir -p ~/.config/elvish \
+ && echo -e "set paths = [ /carapace-bridge/cmd/carapace-bridge \$@paths ]\neval (carapace-bridge _carapace|slurp)\neval (carapace-bridge yargs ng|slurp)" > ~/.config/elvish/rc.elv
+ENV PATH="/carapace-bridge/cmd/carapace-bridge:$PATH"
+
+ENTRYPOINT /usr/local/bin/elvish
diff --git a/cmd/carapace-bridge/cmd/detect.go b/cmd/carapace-bridge/cmd/detect.go
@@ -0,0 +1,33 @@
+package cmd
+
+import (
+	"os"
+
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bridge/pkg/actions/bridge"
+	"github.com/spf13/cobra"
+)
+
+var detectCmd = &cobra.Command{
+	Use:   "detect command",
+	Short: "detect bridge by invoking command",
+	Args:  cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		if bridge, ok := bridge.Detect(args[0]); ok {
+			cmd.Println(bridge.Name)
+		} else {
+			cmd.PrintErrln("none detected")
+			os.Exit(1)
+		}
+	},
+}
+
+func init() {
+	carapace.Gen(detectCmd).Standalone()
+
+	rootCmd.AddCommand(detectCmd)
+
+	carapace.Gen(detectCmd).PositionalCompletion(
+		carapace.ActionExecutables(),
+	)
+}
diff --git a/cmd/carapace-bridge/cmd/root.go b/cmd/carapace-bridge/cmd/root.go
@@ -39,7 +39,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("argcomplete-legacy", "bridges https://github.com/kislyuk/argcomplete", bridge.ActionArgcompleteLegacy)
+	addSubCommand("argcomplete@v1", "bridges https://github.com/kislyuk/argcomplete", bridge.ActionArgcompleteV1)
 	addSubCommand("bash", "bridges completions registered in bash", bridge.ActionBash)
 	addSubCommand("carapace-bin", "bridges completions registered in carapace-bin", bridge.ActionCarapaceBin)
 	addSubCommand("carapace", "bridges https://github.com/carapace-sh/carapace", bridge.ActionCarapace)
diff --git a/compose.yaml b/compose.yaml
@@ -0,0 +1,8 @@
+include:
+  - ./.docker/argcomplete.yaml
+  - ./.docker/click.yaml
+  - ./.docker/cobra.yaml
+  - ./.docker/complete.yaml
+  - ./.docker/kingpin.yaml
+  - ./.docker/urfavecli.yaml
+  - ./.docker/yargs.yaml
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/pkg/actions/bridge/argcomplete.go b/pkg/actions/bridge/argcomplete.go
@@ -31,6 +31,10 @@ import (
 //		)
 //	}
 func ActionArgcomplete(command ...string) carapace.Action {
+	return actionArgcompleteV3(command...)
+}
+
+func actionArgcompleteV3(command ...string) carapace.Action {
 	return actionCommand(command...)(func(command ...string) carapace.Action {
 		return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 			if _, err := exec.LookPath(command[0]); err != nil {
@@ -118,3 +122,78 @@ func ActionArgcomplete(command ...string) carapace.Action {
 		})
 	})
 }
+
+// Deprecated: Old version which uses fd 8/9 (not available on powershell/windows).
+func ActionArgcompleteV1(command ...string) carapace.Action {
+	return actionCommand(command...)(func(command ...string) carapace.Action {
+		return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			if _, err := exec.LookPath(command[0]); err != nil {
+				return carapace.ActionMessage(err.Error())
+			}
+
+			args := append(command[1:], c.Args...)
+			current := c.Value
+
+			prefix := ""
+			if strings.HasPrefix(current, "--") {
+				if strings.Contains(current, "=") { // optarg flag which is handled as normal arg by the completer
+					splitted := strings.SplitN(current, "=", 2)
+					prefix = splitted[0] + "="
+					args = append(args, splitted[0]) // add flag as arg
+					current = ""                     // seem partial optarg value isn't completed
+
+				} else {
+					current = "--" // seems partial flag names aren't completed so get all
+				}
+			} else {
+				current = "" // seems partial positional arguments aren't completed as well
+			}
+
+			compLine := command[0] + " " + strings.Join(append(args, current), " ") // TODO escape/quote special characters
+			c.Setenv("_ARGCOMPLETE", "1")
+			c.Setenv("_ARGCOMPLETE_DFS", "\t")
+			c.Setenv("_ARGCOMPLETE_IFS", "\n")
+			c.Setenv("_ARGCOMPLETE_SHELL", "fish")
+			c.Setenv("_ARGCOMPLETE_SUPPRESS_SPACE", "1") // TODO needed? relevant for nospace detection?
+			// c.Setenv("_ARGCOMPLETE_COMP_WORDBREAKS", " ") // TODO set to space-only for multiparts?
+			c.Setenv("_ARGCOMPLETE", "1")
+			c.Setenv("COMP_LINE", compLine)
+			c.Setenv("COMP_POINT", strconv.Itoa(len(compLine)))
+			nospace := false
+			a := carapace.ActionExecCommand("sh", "-c", command[0]+" 8>&1 9>&2 1>/dev/null 2>/dev/null")(func(output []byte) carapace.Action {
+				lines := strings.Split(string(output), "\n")
+				vals := make([]string, 0)
+				isFlag := strings.HasPrefix(c.Value, "-")
+				for _, line := range lines[:len(lines)-1] {
+					if !isFlag && strings.HasPrefix(line, "-") {
+						continue
+					}
+					if strings.HasSuffix(line, "=") ||
+						strings.HasSuffix(line, "/") ||
+						strings.HasSuffix(line, ",") {
+						nospace = true
+					}
+					if splitted := strings.SplitN(line, "\t", 2); splitted[0] != "" {
+						vals = append(vals, splitted...)
+						if len(splitted) < 2 {
+							vals = append(vals, "")
+						}
+					}
+				}
+
+				if len(vals) == 0 {
+					// fallback to file completions when no values returned
+					if index := strings.Index(c.Value, "="); index > -1 {
+						return carapace.ActionFiles().Invoke(carapace.Context{Value: c.Value[index+1:]}).ToA()
+					}
+					return carapace.ActionFiles()
+				}
+				return carapace.ActionValuesDescribed(vals...)
+			}).Invoke(c).Prefix(prefix).ToA() // re-add optarg prefix
+			if nospace {
+				return a.NoSpace()
+			}
+			return a
+		})
+	})
+}
diff --git a/pkg/actions/bridge/argcomplete_legacy.go b/pkg/actions/bridge/argcomplete_legacy.go
diff --git a/pkg/actions/bridge/bridge.go b/pkg/actions/bridge/bridge.go
diff --git a/pkg/actions/bridge/detect.go b/pkg/actions/bridge/detect.go
