Skip to content

Commit

Permalink
mix: added flags and help command
Browse files Browse the repository at this point in the history
also support user specs for tasks with `mix.<task>.yaml`
  • Loading branch information
rsteube committed Nov 26, 2024
1 parent 4286d32 commit 2f38d8b
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 12 deletions.
23 changes: 23 additions & 0 deletions completers/mix_completer/cmd/help.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package cmd

import (
"github.com/carapace-sh/carapace"
"github.com/carapace-sh/carapace-bin/pkg/actions/tools/mix"
"github.com/spf13/cobra"
)

var helpCmd = &cobra.Command{
Use: "help",
Short: "prints documentation for a given task",
Run: func(cmd *cobra.Command, args []string) {},
}

func init() {
carapace.Gen(helpCmd).Standalone()

rootCmd.AddCommand(helpCmd)

carapace.Gen(helpCmd).PositionalCompletion(
mix.ActionMixTasks(),
)
}
11 changes: 11 additions & 0 deletions completers/mix_completer/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cmd
import (
"github.com/carapace-sh/carapace"
"github.com/carapace-sh/carapace-bin/pkg/actions/tools/mix"
"github.com/carapace-sh/carapace-bridge/pkg/actions/bridge"
"github.com/spf13/cobra"
)

Expand All @@ -19,8 +20,18 @@ func Execute() error {

func init() {
carapace.Gen(rootCmd).Standalone()
rootCmd.Flags().SetInterspersed(false)

rootCmd.Flags().BoolP("help", "h", false, "show help")
rootCmd.Flags().BoolP("version", "v", false, "show version")

carapace.Gen(rootCmd).PositionalCompletion(
mix.ActionMixTasks(),
)

carapace.Gen(rootCmd).PositionalAnyCompletion(
carapace.ActionCallback(func(c carapace.Context) carapace.Action {
return bridge.ActionCarapaceBin("mix." + c.Args[0]).Shift(1)
}),
)
}
22 changes: 10 additions & 12 deletions pkg/actions/tools/mix/mix.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,15 @@ import (
// install
// deps.get
func ActionMixTasks() carapace.Action {
return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
return carapace.ActionExecCommand("mix", "help")(func(output []byte) carapace.Action {
lines := strings.Split(string(output), "\n")
r := regexp.MustCompile(`^mix (\S+)\s*# (.*)`)
vals := make([]string, 0)
for _, line := range lines {
if matches := r.FindStringSubmatch(line); matches != nil {
vals = append(vals, matches[1], matches[2])
}
return carapace.ActionExecCommand("mix", "help")(func(output []byte) carapace.Action {
lines := strings.Split(string(output), "\n")
r := regexp.MustCompile(`^mix (\S+)\s*# (.*)`)
vals := make([]string, 0)
for _, line := range lines {
if matches := r.FindStringSubmatch(line); matches != nil {
vals = append(vals, matches[1], matches[2])
}
return carapace.ActionValuesDescribed(vals...)
})
})
}
return carapace.ActionValuesDescribed(vals...)
}).Tag("tasks")
}

0 comments on commit 2f38d8b

Please sign in to comment.