Skip to content

Commit

Permalink
gum: updates from v0.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rsteube committed Oct 12, 2022
1 parent 2a1dd92 commit 95e6361
Show file tree
Hide file tree
Showing 13 changed files with 357 additions and 35 deletions.
8 changes: 4 additions & 4 deletions completers/gum_completer/cmd/choose.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cmd

import (
"github.com/rsteube/carapace"
"github.com/rsteube/carapace-bin/completers/gum_completer/cmd/action"
"github.com/rsteube/carapace-bin/pkg/actions/tools/gum"
"github.com/spf13/cobra"
)

Expand All @@ -29,11 +29,11 @@ func init() {
rootCmd.AddCommand(chooseCmd)

carapace.Gen(chooseCmd).FlagCompletion(carapace.ActionMap{
"cursor.foreground": action.ActionColors(),
"item.foreground": action.ActionColors(),
"cursor.foreground": gum.ActionColors(),
"item.foreground": gum.ActionColors(),
"selected": carapace.ActionMultiParts(",", func(c carapace.Context) carapace.Action {
return carapace.ActionValues(c.Args...).Invoke(c).Filter(c.Parts).ToA()
}),
"selected.foreground": action.ActionColors(),
"selected.foreground": gum.ActionColors(),
})
}
8 changes: 4 additions & 4 deletions completers/gum_completer/cmd/confirm.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cmd

import (
"github.com/rsteube/carapace"
"github.com/rsteube/carapace-bin/completers/gum_completer/cmd/action"
"github.com/rsteube/carapace-bin/pkg/actions/tools/gum"
"github.com/spf13/cobra"
)

Expand All @@ -25,8 +25,8 @@ func init() {
rootCmd.AddCommand(confirmCmd)

carapace.Gen(confirmCmd).FlagCompletion(carapace.ActionMap{
"prompt.foreground": action.ActionColors(),
"selected.foreground": action.ActionColors(),
"unselected.foreground": action.ActionColors(),
"prompt.foreground": gum.ActionColors(),
"selected.foreground": gum.ActionColors(),
"unselected.foreground": gum.ActionColors(),
})
}
176 changes: 176 additions & 0 deletions completers/gum_completer/cmd/file.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
package cmd

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

var fileCmd = &cobra.Command{
Use: "file",
Short: "Pick a file from a folder",
Run: func(cmd *cobra.Command, args []string) {},
}

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

fileCmd.Flags().BoolP("all", "a", false, "Show hidden and 'dot' files")
fileCmd.Flags().StringP("cursor", "c", "", "The cursor character")
fileCmd.Flags().String("cursor.align", "", "Text Alignment")
fileCmd.Flags().String("cursor.background", "", "Background Color")
fileCmd.Flags().Bool("cursor.bold", false, "Bold text")
fileCmd.Flags().String("cursor.border", "", "Border Style")
fileCmd.Flags().String("cursor.border-background", "", "Border Background Color")
fileCmd.Flags().String("cursor.border-foreground", "", "Border Foreground Color")
fileCmd.Flags().Bool("cursor.faint", false, "Faint text")
fileCmd.Flags().String("cursor.foreground", "", "Foreground Color")
fileCmd.Flags().String("cursor.height", "", "Text height")
fileCmd.Flags().Bool("cursor.italic", false, "Italicize text")
fileCmd.Flags().String("cursor.margin", "", "Text margin")
fileCmd.Flags().String("cursor.padding", "", "Text padding")
fileCmd.Flags().Bool("cursor.strikethrough", false, "Strikethrough text")
fileCmd.Flags().Bool("cursor.underline", false, "Underline text")
fileCmd.Flags().String("cursor.width", "", "Text width")
fileCmd.Flags().String("directory.align", "", "Text Alignment")
fileCmd.Flags().String("directory.background", "", "Background Color")
fileCmd.Flags().Bool("directory.bold", false, "Bold text")
fileCmd.Flags().String("directory.border", "", "Border Style")
fileCmd.Flags().String("directory.border-background", "", "Border Background Color")
fileCmd.Flags().String("directory.border-foreground", "", "Border Foreground Color")
fileCmd.Flags().Bool("directory.faint", false, "Faint text")
fileCmd.Flags().String("directory.foreground", "", "Foreground Color")
fileCmd.Flags().String("directory.height", "", "Text height")
fileCmd.Flags().Bool("directory.italic", false, "Italicize text")
fileCmd.Flags().String("directory.margin", "", "Text margin")
fileCmd.Flags().String("directory.padding", "", "Text padding")
fileCmd.Flags().Bool("directory.strikethrough", false, "Strikethrough text")
fileCmd.Flags().Bool("directory.underline", false, "Underline text")
fileCmd.Flags().String("directory.width", "", "Text width")
fileCmd.Flags().String("file-size.align", "", "Text Alignment")
fileCmd.Flags().String("file-size.background", "", "Background Color")
fileCmd.Flags().Bool("file-size.bold", false, "Bold text")
fileCmd.Flags().String("file-size.border", "", "Border Style")
fileCmd.Flags().String("file-size.border-background", "", "Border Background Color")
fileCmd.Flags().String("file-size.border-foreground", "", "Border Foreground Color")
fileCmd.Flags().Bool("file-size.faint", false, "Faint text")
fileCmd.Flags().String("file-size.foreground", "", "Foreground Color")
fileCmd.Flags().String("file-size.height", "", "Text height")
fileCmd.Flags().Bool("file-size.italic", false, "Italicize text")
fileCmd.Flags().String("file-size.margin", "", "Text margin")
fileCmd.Flags().String("file-size.padding", "", "Text padding")
fileCmd.Flags().Bool("file-size.strikethrough", false, "Strikethrough text")
fileCmd.Flags().Bool("file-size.underline", false, "Underline text")
fileCmd.Flags().String("file-size.width", "", "Text width")
fileCmd.Flags().String("file.align", "", "Text Alignment")
fileCmd.Flags().String("file.background", "", "Background Color")
fileCmd.Flags().Bool("file.bold", false, "Bold text")
fileCmd.Flags().String("file.border", "", "Border Style")
fileCmd.Flags().String("file.border-background", "", "Border Background Color")
fileCmd.Flags().String("file.border-foreground", "", "Border Foreground Color")
fileCmd.Flags().Bool("file.faint", false, "Faint text")
fileCmd.Flags().String("file.foreground", "", "Foreground Color")
fileCmd.Flags().String("file.height", "", "Text height")
fileCmd.Flags().Bool("file.italic", false, "Italicize text")
fileCmd.Flags().String("file.margin", "", "Text margin")
fileCmd.Flags().String("file.padding", "", "Text padding")
fileCmd.Flags().Bool("file.strikethrough", false, "Strikethrough text")
fileCmd.Flags().Bool("file.underline", false, "Underline text")
fileCmd.Flags().String("file.width", "", "Text width")
fileCmd.Flags().String("height", "", "Maximum number of files to display")
fileCmd.Flags().String("permissions.align", "", "Text Alignment")
fileCmd.Flags().String("permissions.background", "", "Background Color")
fileCmd.Flags().Bool("permissions.bold", false, "Bold text")
fileCmd.Flags().String("permissions.border", "", "Border Style")
fileCmd.Flags().String("permissions.border-background", "", "Border Background Color")
fileCmd.Flags().String("permissions.border-foreground", "", "Border Foreground Color")
fileCmd.Flags().Bool("permissions.faint", false, "Faint text")
fileCmd.Flags().String("permissions.foreground", "", "Foreground Color")
fileCmd.Flags().String("permissions.height", "", "Text height")
fileCmd.Flags().Bool("permissions.italic", false, "Italicize text")
fileCmd.Flags().String("permissions.margin", "", "Text margin")
fileCmd.Flags().String("permissions.padding", "", "Text padding")
fileCmd.Flags().Bool("permissions.strikethrough", false, "Strikethrough text")
fileCmd.Flags().Bool("permissions.underline", false, "Underline text")
fileCmd.Flags().String("permissions.width", "", "Text width")
fileCmd.Flags().String("selected.align", "", "Text Alignment")
fileCmd.Flags().String("selected.background", "", "Background Color")
fileCmd.Flags().Bool("selected.bold", false, "Bold text")
fileCmd.Flags().String("selected.border", "", "Border Style")
fileCmd.Flags().String("selected.border-background", "", "Border Background Color")
fileCmd.Flags().String("selected.border-foreground", "", "Border Foreground Color")
fileCmd.Flags().Bool("selected.faint", false, "Faint text")
fileCmd.Flags().String("selected.foreground", "", "Foreground Color")
fileCmd.Flags().String("selected.height", "", "Text height")
fileCmd.Flags().Bool("selected.italic", false, "Italicize text")
fileCmd.Flags().String("selected.margin", "", "Text margin")
fileCmd.Flags().String("selected.padding", "", "Text padding")
fileCmd.Flags().Bool("selected.strikethrough", false, "Strikethrough text")
fileCmd.Flags().Bool("selected.underline", false, "Underline text")
fileCmd.Flags().String("selected.width", "", "Text width")
fileCmd.Flags().String("symlink.align", "", "Text Alignment")
fileCmd.Flags().String("symlink.background", "", "Background Color")
fileCmd.Flags().Bool("symlink.bold", false, "Bold text")
fileCmd.Flags().String("symlink.border", "", "Border Style")
fileCmd.Flags().String("symlink.border-background", "", "Border Background Color")
fileCmd.Flags().String("symlink.border-foreground", "", "Border Foreground Color")
fileCmd.Flags().Bool("symlink.faint", false, "Faint text")
fileCmd.Flags().String("symlink.foreground", "", "Foreground Color")
fileCmd.Flags().String("symlink.height", "", "Text height")
fileCmd.Flags().Bool("symlink.italic", false, "Italicize text")
fileCmd.Flags().String("symlink.margin", "", "Text margin")
fileCmd.Flags().String("symlink.padding", "", "Text padding")
fileCmd.Flags().Bool("symlink.strikethrough", false, "Strikethrough text")
fileCmd.Flags().Bool("symlink.underline", false, "Underline text")
fileCmd.Flags().String("symlink.width", "", "Text width")
rootCmd.AddCommand(fileCmd)

carapace.Gen(fileCmd).FlagCompletion(carapace.ActionMap{
"cursor.align": gum.ActionAlignments(),
"cursor.background": gum.ActionColors(),
"cursor.border": gum.ActionBorders(),
"cursor.border-background": gum.ActionColors(),
"cursor.border-foreground": gum.ActionColors(),
"cursor.foreground": gum.ActionColors(),
"directory.align": gum.ActionAlignments(),
"directory.background": gum.ActionColors(),
"directory.border": gum.ActionBorders(),
"directory.border-background": gum.ActionColors(),
"directory.border-foreground": gum.ActionColors(),
"directory.foreground": gum.ActionColors(),
"file-size.align": gum.ActionAlignments(),
"file-size.background": gum.ActionColors(),
"file-size.border": gum.ActionBorders(),
"file-size.border-background": gum.ActionColors(),
"file-size.border-foreground": gum.ActionColors(),
"file-size.foreground": gum.ActionColors(),
"file.align": gum.ActionAlignments(),
"file.background": gum.ActionColors(),
"file.border": gum.ActionBorders(),
"file.border-background": gum.ActionColors(),
"file.border-foreground": gum.ActionColors(),
"file.foreground": gum.ActionColors(),
"permissions.align": gum.ActionAlignments(),
"permissions.background": gum.ActionColors(),
"permissions.border": gum.ActionBorders(),
"permissions.border-background": gum.ActionColors(),
"permissions.border-foreground": gum.ActionColors(),
"permissions.foreground": gum.ActionColors(),
"selected.align": gum.ActionAlignments(),
"selected.background": gum.ActionColors(),
"selected.border": gum.ActionBorders(),
"selected.border-background": gum.ActionColors(),
"selected.border-foreground": gum.ActionColors(),
"selected.foreground": gum.ActionColors(),
"symlink.align": gum.ActionAlignments(),
"symlink.background": gum.ActionColors(),
"symlink.border": gum.ActionBorders(),
"symlink.border-background": gum.ActionColors(),
"symlink.border-foreground": gum.ActionColors(),
"symlink.foreground": gum.ActionColors(),
})

carapace.Gen(fileCmd).PositionalCompletion(
carapace.ActionDirectories(),
)
}
14 changes: 7 additions & 7 deletions completers/gum_completer/cmd/filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cmd

import (
"github.com/rsteube/carapace"
"github.com/rsteube/carapace-bin/completers/gum_completer/cmd/action"
"github.com/rsteube/carapace-bin/pkg/actions/tools/gum"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -34,11 +34,11 @@ func init() {
rootCmd.AddCommand(filterCmd)

carapace.Gen(filterCmd).FlagCompletion(carapace.ActionMap{
"indicator.foreground": action.ActionColors(),
"match.foreground": action.ActionColors(),
"prompt.foreground": action.ActionColors(),
"selected-indicator.foreground": action.ActionColors(),
"text.foreground": action.ActionColors(),
"unselected-prefix.foreground": action.ActionColors(),
"indicator.foreground": gum.ActionColors(),
"match.foreground": gum.ActionColors(),
"prompt.foreground": gum.ActionColors(),
"selected-indicator.foreground": gum.ActionColors(),
"text.foreground": gum.ActionColors(),
"unselected-prefix.foreground": gum.ActionColors(),
})
}
6 changes: 3 additions & 3 deletions completers/gum_completer/cmd/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cmd

import (
"github.com/rsteube/carapace"
"github.com/rsteube/carapace-bin/completers/gum_completer/cmd/action"
"github.com/rsteube/carapace-bin/pkg/actions/tools/gum"
"github.com/spf13/cobra"
)

Expand All @@ -26,7 +26,7 @@ func init() {
rootCmd.AddCommand(inputCmd)

carapace.Gen(inputCmd).FlagCompletion(carapace.ActionMap{
"cursor.foreground": action.ActionColors(),
"prompt.foreground": action.ActionColors(),
"cursor.foreground": gum.ActionColors(),
"prompt.foreground": gum.ActionColors(),
})
}
86 changes: 86 additions & 0 deletions completers/gum_completer/cmd/pager.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
package cmd

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

var pagerCmd = &cobra.Command{
Use: "pager",
Short: "Scroll through a file",
Run: func(cmd *cobra.Command, args []string) {},
}

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

pagerCmd.Flags().String("align", "", "Text Alignment")
pagerCmd.Flags().String("background", "", "Background Color")
pagerCmd.Flags().Bool("bold", false, "Bold text")
pagerCmd.Flags().String("border", "", "Border Style")
pagerCmd.Flags().String("border-background", "", "Border Background Color")
pagerCmd.Flags().String("border-foreground", "", "Border Foreground Color")
pagerCmd.Flags().Bool("faint", false, "Faint text")
pagerCmd.Flags().String("foreground", "", "Foreground Color")
pagerCmd.Flags().String("height", "", "Text height")
pagerCmd.Flags().String("help.align", "", "Text Alignment")
pagerCmd.Flags().String("help.background", "", "Background Color")
pagerCmd.Flags().Bool("help.bold", false, "Bold text")
pagerCmd.Flags().String("help.border", "", "Border Style")
pagerCmd.Flags().String("help.border-background", "", "Border Background Color")
pagerCmd.Flags().String("help.border-foreground", "", "Border Foreground Color")
pagerCmd.Flags().Bool("help.faint", false, "Faint text")
pagerCmd.Flags().String("help.foreground", "", "Foreground Color")
pagerCmd.Flags().String("help.height", "", "Text height")
pagerCmd.Flags().Bool("help.italic", false, "Italicize text")
pagerCmd.Flags().String("help.margin", "", "Text margin")
pagerCmd.Flags().String("help.padding", "", "Text padding")
pagerCmd.Flags().Bool("help.strikethrough", false, "Strikethrough text")
pagerCmd.Flags().Bool("help.underline", false, "Underline text")
pagerCmd.Flags().String("help.width", "", "Text width")
pagerCmd.Flags().Bool("italic", false, "Italicize text")
pagerCmd.Flags().String("line-number.align", "", "Text Alignment")
pagerCmd.Flags().String("line-number.background", "", "Background Color")
pagerCmd.Flags().Bool("line-number.bold", false, "Bold text")
pagerCmd.Flags().String("line-number.border", "", "Border Style")
pagerCmd.Flags().String("line-number.border-background", "", "Border Background Color")
pagerCmd.Flags().String("line-number.border-foreground", "", "Border Foreground Color")
pagerCmd.Flags().Bool("line-number.faint", false, "Faint text")
pagerCmd.Flags().String("line-number.foreground", "", "Foreground Color")
pagerCmd.Flags().String("line-number.height", "", "Text height")
pagerCmd.Flags().Bool("line-number.italic", false, "Italicize text")
pagerCmd.Flags().String("line-number.margin", "", "Text margin")
pagerCmd.Flags().String("line-number.padding", "", "Text padding")
pagerCmd.Flags().Bool("line-number.strikethrough", false, "Strikethrough text")
pagerCmd.Flags().Bool("line-number.underline", false, "Underline text")
pagerCmd.Flags().String("line-number.width", "", "Text width")
pagerCmd.Flags().String("margin", "", "Text margin")
pagerCmd.Flags().String("padding", "", "Text padding")
pagerCmd.Flags().Bool("show-line-numbers", false, "Show line numbers")
pagerCmd.Flags().Bool("strikethrough", false, "Strikethrough text")
pagerCmd.Flags().Bool("underline", false, "Underline text")
pagerCmd.Flags().String("width", "", "Text width")
rootCmd.AddCommand(pagerCmd)

carapace.Gen(pagerCmd).FlagCompletion(carapace.ActionMap{
"align": gum.ActionAlignments(),
"background": gum.ActionColors(),
"border": gum.ActionBorders(),
"border-background": gum.ActionColors(),
"border-foreground": gum.ActionColors(),
"foreground": gum.ActionColors(),
"help.align": gum.ActionAlignments(),
"help.background": gum.ActionColors(),
"help.border": gum.ActionBorders(),
"help.border-background": gum.ActionColors(),
"help.border-foreground": gum.ActionColors(),
"help.foreground": gum.ActionColors(),
"line-number.align": gum.ActionAlignments(),
"line-number.background": gum.ActionColors(),
"line-number.border": gum.ActionBorders(),
"line-number.border-background": gum.ActionColors(),
"line-number.border-foreground": gum.ActionColors(),
"line-number.foreground": gum.ActionColors(),
})
}
6 changes: 3 additions & 3 deletions completers/gum_completer/cmd/spin.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package cmd

import (
"github.com/rsteube/carapace"
"github.com/rsteube/carapace-bin/completers/gum_completer/cmd/action"
"github.com/rsteube/carapace-bin/pkg/actions/bridge"
"github.com/rsteube/carapace-bin/pkg/actions/os"
"github.com/rsteube/carapace-bin/pkg/actions/tools/gum"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -60,8 +60,8 @@ func _spinCmd() *cobra.Command {
carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
"align": carapace.ActionValues("left", "right"),
"spinner": carapace.ActionValues("line", "dot", "minidot", "jump", "pulse", "points", "globe", "moon", "monkey", "meter", "hamburger"),
"spinner.foreground": action.ActionColors(),
"title.foreground": action.ActionColors(),
"spinner.foreground": gum.ActionColors(),
"title.foreground": gum.ActionColors(),
})

carapace.Gen(cmd).PositionalCompletion(
Expand Down
Loading

0 comments on commit 95e6361

Please sign in to comment.