Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gum for openSUSE:Factory checked in
at 2024-07-11 20:32:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gum (Old)
and /work/SRC/openSUSE:Factory/.gum.new.17339 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gum"
Thu Jul 11 20:32:59 2024 rev:4 rq:1186718 version:0.14.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/gum/gum.changes 2024-05-03 10:29:04.687529613
+0200
+++ /work/SRC/openSUSE:Factory/.gum.new.17339/gum.changes 2024-07-11
20:33:40.665959597 +0200
@@ -1,0 +2,13 @@
+Thu Jul 11 00:17:31 UTC 2024 - Joshua Smith <smolsh...@opensuse.org>
+
+- Switch from deprecated %setup to %autosetup
+- Update to 0.14.1:
+ New:
+ * Show help with Huh?
+ * Support using the Home/End keys in pager
+ Fixes:
+ * Handle huh? user aborted error
+ * Cursor styling
+ * Re-introduce ESC for gum write
+
+-------------------------------------------------------------------
Old:
----
gum-0.14.0.tar.gz
New:
----
gum-0.14.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gum.spec ++++++
--- /var/tmp/diff_new_pack.cOL1wg/_old 2024-07-11 20:33:41.317983195 +0200
+++ /var/tmp/diff_new_pack.cOL1wg/_new 2024-07-11 20:33:41.317983195 +0200
@@ -18,7 +18,7 @@
%global _lto_cflags %nil
Name: gum
-Version: 0.14.0
+Version: 0.14.1
Release: 0
Summary: Tool for glamorous shell scripts
License: MIT
@@ -62,7 +62,7 @@
Zsh command-line completion support for %{name}.
%prep
-%setup -qa1
+%autosetup -a1
%build
%ifarch ppc64
++++++ gum-0.14.0.tar.gz -> gum-0.14.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/.github/workflows/lint-soft.yml
new/gum-0.14.1/.github/workflows/lint-soft.yml
--- old/gum-0.14.0/.github/workflows/lint-soft.yml 2024-04-26
23:04:25.000000000 +0200
+++ new/gum-0.14.1/.github/workflows/lint-soft.yml 2024-05-25
20:56:32.000000000 +0200
@@ -20,7 +20,7 @@
- uses: actions/checkout@v4
- name: golangci-lint
- uses: golangci/golangci-lint-action@v4
+ uses: golangci/golangci-lint-action@v6
with:
# Optional: golangci-lint command line arguments.
args: --config .golangci-soft.yml --issues-exit-code=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/.github/workflows/lint.yml
new/gum-0.14.1/.github/workflows/lint.yml
--- old/gum-0.14.0/.github/workflows/lint.yml 2024-04-26 23:04:25.000000000
+0200
+++ new/gum-0.14.1/.github/workflows/lint.yml 2024-05-25 20:56:32.000000000
+0200
@@ -20,7 +20,7 @@
- uses: actions/checkout@v4
- name: golangci-lint
- uses: golangci/golangci-lint-action@v4
+ uses: golangci/golangci-lint-action@v6
with:
# Optional: golangci-lint command line arguments.
#args:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/.golangci-soft.yml
new/gum-0.14.1/.golangci-soft.yml
--- old/gum-0.14.0/.golangci-soft.yml 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/.golangci-soft.yml 2024-05-25 20:56:32.000000000 +0200
@@ -31,10 +31,10 @@
- noctx
- nolintlint
- prealloc
- - wrapcheck
# disable default linters, they are already enabled in .golangci.yml
disable:
+ - wrapcheck
- deadcode
- errcheck
- gosimple
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/README.md new/gum-0.14.1/README.md
--- old/gum-0.14.0/README.md 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/README.md 2024-05-25 20:56:32.000000000 +0200
@@ -68,6 +68,7 @@
nix-env -iA nixpkgs.gum
# Windows (via WinGet or Scoop)
+winget install charmbracelet.gum
scoop install charm-gum
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/choose/command.go
new/gum-0.14.1/choose/command.go
--- old/gum-0.14.0/choose/command.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/choose/command.go 2024-05-25 20:56:32.000000000 +0200
@@ -14,6 +14,8 @@
"github.com/charmbracelet/gum/internal/stdin"
)
+const widthBuffer = 2
+
// Run provides a shell script interface for choosing between different through
// options.
func (o Options) Run() error {
@@ -22,7 +24,7 @@
if input == "" {
return errors.New("no options provided, see `gum choose
--help`")
}
- o.Options = strings.Split(strings.TrimSuffix(input, "\n"), "\n")
+ o.Options = strings.Split(input, "\n")
}
if o.SelectIfOne && len(o.Options) == 1 {
@@ -55,36 +57,33 @@
}
width := max(widest(o.Options)+
- max(lipgloss.Width(o.SelectedPrefix),
lipgloss.Width(o.UnselectedPrefix))+
- lipgloss.Width(o.Cursor)+1, lipgloss.Width(o.Header)+1)
+
max(lipgloss.Width(o.SelectedPrefix)+lipgloss.Width(o.UnselectedPrefix))+
+ lipgloss.Width(o.Cursor)+1,
lipgloss.Width(o.Header)+widthBuffer)
if o.Limit > 1 {
var choices []string
- err := huh.NewForm(
- huh.NewGroup(
- huh.NewMultiSelect[string]().
- Options(options...).
- Title(o.Header).
- Filterable(false).
- Height(o.Height).
- Limit(o.Limit).
- Value(&choices),
- ),
- ).
+
+ field := huh.NewMultiSelect[string]().
+ Options(options...).
+ Title(o.Header).
+ Height(o.Height).
+ Limit(o.Limit).
+ Value(&choices)
+
+ form := huh.NewForm(huh.NewGroup(field))
+
+ err := form.
WithWidth(width).
- WithShowHelp(false).
+ WithShowHelp(o.ShowHelp).
WithTheme(theme).
Run()
+
if err != nil {
return err
}
if len(choices) > 0 {
s := strings.Join(choices, "\n")
- if isatty.IsTerminal(os.Stdout.Fd()) {
- fmt.Println(s)
- } else {
- fmt.Print(ansi.Strip(s))
- }
+ ansiprint(s)
}
return nil
}
@@ -102,7 +101,7 @@
).
WithWidth(width).
WithTheme(theme).
- WithShowHelp(false).
+ WithShowHelp(o.ShowHelp).
Run()
if err != nil {
@@ -128,3 +127,11 @@
}
return max
}
+
+func ansiprint(s string) {
+ if isatty.IsTerminal(os.Stdout.Fd()) {
+ fmt.Println(s)
+ } else {
+ fmt.Print(ansi.Strip(s))
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/choose/options.go
new/gum-0.14.1/choose/options.go
--- old/gum-0.14.0/choose/options.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/choose/options.go 2024-05-25 20:56:32.000000000 +0200
@@ -14,7 +14,8 @@
Ordered bool `help:"Maintain the order of the
selected options" env:"GUM_CHOOSE_ORDERED"`
Height int `help:"Height of the list" default:"10"
env:"GUM_CHOOSE_HEIGHT"`
Cursor string `help:"Prefix to show on item that
corresponds to the cursor position" default:"> " env:"GUM_CHOOSE_CURSOR"`
- Header string `help:"Header value" default:""
env:"GUM_CHOOSE_HEADER"`
+ ShowHelp bool `help:"Show help keybinds"
default:"true" negatable:"true" env:"GUM_CHOOSE_SHOW_HELP"`
+ Header string `help:"Header value" default:"Choose:"
env:"GUM_CHOOSE_HEADER"`
CursorPrefix string `help:"Prefix to show on the cursor
item (hidden if limit is 1)" default:"⢠" env:"GUM_CHOOSE_CURSOR_PREFIX"`
SelectedPrefix string `help:"Prefix to show on selected items
(hidden if limit is 1)" default:"â " env:"GUM_CHOOSE_SELECTED_PREFIX"`
UnselectedPrefix string `help:"Prefix to show on unselected
items (hidden if limit is 1)" default:"⢠" env:"GUM_CHOOSE_UNSELECTED_PREFIX"`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/confirm/command.go
new/gum-0.14.1/confirm/command.go
--- old/gum-0.14.0/confirm/command.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/confirm/command.go 2024-05-25 20:56:32.000000000 +0200
@@ -5,14 +5,12 @@
"os"
"github.com/charmbracelet/huh"
- "github.com/charmbracelet/lipgloss"
)
// Run provides a shell script interface for prompting a user to confirm an
// action with an affirmative or negative answer.
func (o Options) Run() error {
theme := huh.ThemeCharm()
- theme.Focused.Base = lipgloss.NewStyle().Margin(0, 1)
theme.Focused.Title = o.PromptStyle.ToLipgloss()
theme.Focused.FocusedButton = o.SelectedStyle.ToLipgloss()
theme.Focused.BlurredButton = o.UnselectedStyle.ToLipgloss()
@@ -29,7 +27,7 @@
),
).
WithTheme(theme).
- WithShowHelp(false).
+ WithShowHelp(o.ShowHelp).
Run()
if err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/confirm/options.go
new/gum-0.14.1/confirm/options.go
--- old/gum-0.14.0/confirm/options.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/confirm/options.go 2024-05-25 20:56:32.000000000 +0200
@@ -8,14 +8,16 @@
// Options is the customization options for the confirm command.
type Options struct {
- Default bool `help:"Default confirmation action"
default:"true"`
- Affirmative string `help:"The title of the affirmative action"
default:"Yes"`
- Negative string `help:"The title of the negative action"
default:"No"`
- Prompt string `arg:"" help:"Prompt to display." default:"Are
you sure?"`
- PromptStyle style.Styles `embed:"" prefix:"prompt." help:"The style of
the prompt" set:"defaultMargin=1 0 0 1" envprefix:"GUM_CONFIRM_PROMPT_"`
+ Default bool `help:"Default confirmation action" default:"true"`
+ Affirmative string `help:"The title of the affirmative action"
default:"Yes"`
+ Negative string `help:"The title of the negative action"
default:"No"`
+ Prompt string `arg:"" help:"Prompt to display." default:"Are you
sure?"`
+ //nolint:staticcheck
+ PromptStyle style.Styles `embed:"" prefix:"prompt." help:"The style of
the prompt" set:"defaultMargin=0 0 0 1" set:"defaultForeground=#7571F9"
set:"defaultBold=true" envprefix:"GUM_CONFIRM_PROMPT_"`
//nolint:staticcheck
SelectedStyle style.Styles `embed:"" prefix:"selected." help:"The style
of the selected action" set:"defaultBackground=212" set:"defaultForeground=230"
set:"defaultPadding=0 3" set:"defaultMargin=0 1"
envprefix:"GUM_CONFIRM_SELECTED_"`
//nolint:staticcheck
UnselectedStyle style.Styles `embed:"" prefix:"unselected." help:"The
style of the unselected action" set:"defaultBackground=235"
set:"defaultForeground=254" set:"defaultPadding=0 3" set:"defaultMargin=0 1"
envprefix:"GUM_CONFIRM_UNSELECTED_"`
+ ShowHelp bool `help:"Show help key binds" negatable:""
default:"true" env:"GUM_CONFIRM_SHOW_HELP"`
Timeout time.Duration `help:"Timeout until confirm returns
selected value or default if provided" default:"0" env:"GUM_CONFIRM_TIMEOUT"`
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/default.nix new/gum-0.14.1/default.nix
--- old/gum-0.14.0/default.nix 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/default.nix 2024-05-25 20:56:32.000000000 +0200
@@ -1,7 +1,12 @@
{ pkgs }:
-pkgs.buildGoModule {
- name = "gum";
+pkgs.buildGoModule rec {
+ pname = "gum";
+ version = "0.14.0";
+
src = ./.;
- vendorSha256 = "sha256-rOBwhPXo4sTSI3j3rn3c5qWGnGFgkpeFUKgtzKBltbg=";
+
+ vendorHash = "sha256-gDDaKrwlrJyyDzgyGf9iP/XPnOAwpkvIyzCXobXrlF4=";
+
+ ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/examples/test.sh
new/gum-0.14.1/examples/test.sh
--- old/gum-0.14.0/examples/test.sh 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/examples/test.sh 2024-05-25 20:56:32.000000000 +0200
@@ -40,7 +40,7 @@
# Write
gum write
-gum write --width 40 --height 3 --placeholder "Type whatever you want"
--prompt "| " --show-cursor-line --show-line-numbers --value "Something..."
--base.padding 1 --cursor.foreground 99 --prompt.foreground 99
+gum write --width 40 --height 6 --placeholder "Type whatever you want"
--prompt "| " --show-cursor-line --show-line-numbers --value "Something..."
--base.padding 1 --cursor.foreground 99 --prompt.foreground 99
# Table
gum table < table/example.csv
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/file/command.go
new/gum-0.14.1/file/command.go
--- old/gum-0.14.0/file/command.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/file/command.go 2024-05-25 20:56:32.000000000 +0200
@@ -30,6 +30,9 @@
theme.Focused.Directory = o.DirectoryStyle.ToLipgloss()
theme.Focused.SelectedOption = o.SelectedStyle.ToLipgloss()
+ keymap := huh.NewDefaultKeyMap()
+ keymap.FilePicker.Open.SetEnabled(false)
+
// XXX: These should be file selected specific.
theme.Focused.TextInput.Placeholder = o.PermissionsStyle.ToLipgloss()
theme.Focused.TextInput.Prompt = o.CursorStyle.ToLipgloss()
@@ -46,7 +49,8 @@
Value(&path),
),
).
- WithShowHelp(false).
+ WithShowHelp(o.ShowHelp).
+ WithKeyMap(keymap).
WithTheme(theme).
Run()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/file/options.go
new/gum-0.14.1/file/options.go
--- old/gum-0.14.0/file/options.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/file/options.go 2024-05-25 20:56:32.000000000 +0200
@@ -15,6 +15,7 @@
All bool `short:"a" help:"Show hidden and 'dot' files"
default:"false" env:"GUM_FILE_ALL"`
File bool `help:"Allow files selection" default:"true"
env:"GUM_FILE_FILE"`
Directory bool `help:"Allow directories selection" default:"false"
env:"GUM_FILE_DIRECTORY"`
+ ShowHelp bool `help:"Show help key binds" negatable:""
default:"true" env:"GUM_FILE_SHOW_HELP"`
Height int `help:"Maximum number of files to
display" default:"10" env:"GUM_FILE_HEIGHT"`
CursorStyle style.Styles `embed:"" prefix:"cursor." help:"The
cursor style" set:"defaultForeground=212" envprefix:"GUM_FILE_CURSOR_"`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/filter/command.go
new/gum-0.14.1/filter/command.go
--- old/gum-0.14.0/filter/command.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/filter/command.go 2024-05-25 20:56:32.000000000 +0200
@@ -34,7 +34,7 @@
if len(o.Options) == 0 {
if input, _ := stdin.Read(); input != "" {
- o.Options = strings.Split(strings.TrimSuffix(input,
"\n"), "\n")
+ o.Options = strings.Split(input, "\n")
} else {
o.Options = files.List()
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/flake.lock new/gum-0.14.1/flake.lock
--- old/gum-0.14.0/flake.lock 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/flake.lock 2024-05-25 20:56:32.000000000 +0200
@@ -1,12 +1,15 @@
{
"nodes": {
"flake-utils": {
+ "inputs": {
+ "systems": "systems"
+ },
"locked": {
- "lastModified": 1659877975,
- "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+ "lastModified": 1710146030,
+ "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+ "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@@ -17,16 +20,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1664107978,
- "narHash": "sha256-31I9XnIjXkUa62BM1Zr/ylKMf9eVO5PtoX2mGpmB7/U=",
+ "lastModified": 1715447595,
+ "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "72783a2d0dbbf030bff1537873dd5b85b3fb332f",
+ "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-22.05",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -36,6 +39,21 @@
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
+ },
+ "systems": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
}
},
"root": "root",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/flake.nix new/gum-0.14.1/flake.nix
--- old/gum-0.14.0/flake.nix 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/flake.nix 2024-05-25 20:56:32.000000000 +0200
@@ -2,8 +2,8 @@
description = "A tool for glamorous shell scripts";
inputs = {
- nixpkgs.url = github:nixos/nixpkgs/nixos-22.05;
- flake-utils.url = github:numtide/flake-utils;
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/go.mod new/gum-0.14.1/go.mod
--- old/gum-0.14.0/go.mod 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/go.mod 2024-05-25 20:56:32.000000000 +0200
@@ -6,10 +6,10 @@
github.com/alecthomas/kong v0.9.0
github.com/alecthomas/mango-kong v0.1.0
github.com/charmbracelet/bubbles v0.18.0
- github.com/charmbracelet/bubbletea v0.25.0
+ github.com/charmbracelet/bubbletea v0.26.3
github.com/charmbracelet/glamour v0.7.0
- github.com/charmbracelet/huh v0.3.1-0.20240404200615-66118a2cb3cf
- github.com/charmbracelet/lipgloss v0.10.0
+ github.com/charmbracelet/huh v0.4.2
+ github.com/charmbracelet/lipgloss v0.11.0
github.com/charmbracelet/log v0.4.0
github.com/mattn/go-isatty v0.0.20
github.com/muesli/reflow v0.3.0
@@ -19,15 +19,19 @@
)
require (
- github.com/alecthomas/chroma/v2 v2.13.0 // indirect
+ github.com/alecthomas/chroma/v2 v2.14.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/catppuccin/go v0.2.0 // indirect
- github.com/charmbracelet/x/exp/strings
v0.0.0-20240405134957-07f093a22d1c // indirect
- github.com/containerd/console v1.0.4 // indirect
+ github.com/charmbracelet/x/ansi v0.1.1 // indirect
+ github.com/charmbracelet/x/exp/strings
v0.0.0-20240525152034-77596eb8760e // indirect
+ github.com/charmbracelet/x/input v0.1.1 // indirect
+ github.com/charmbracelet/x/term v0.1.1 // indirect
+ github.com/charmbracelet/x/windows v0.1.2 // indirect
github.com/dlclark/regexp2 v1.11.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
+ github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f //
indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/gorilla/css v1.0.1 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
@@ -39,12 +43,12 @@
github.com/muesli/mango v0.2.0 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
+ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
github.com/yuin/goldmark v1.7.1 // indirect
github.com/yuin/goldmark-emoji v1.0.2 // indirect
- golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
- golang.org/x/net v0.24.0 // indirect
+ golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d // indirect
+ golang.org/x/net v0.25.0 // indirect
golang.org/x/sync v0.7.0 // indirect
- golang.org/x/sys v0.19.0 // indirect
- golang.org/x/term v0.19.0 // indirect
- golang.org/x/text v0.14.0 // indirect
+ golang.org/x/sys v0.20.0 // indirect
+ golang.org/x/text v0.15.0 // indirect
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/go.sum new/gum-0.14.1/go.sum
--- old/gum-0.14.0/go.sum 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/go.sum 2024-05-25 20:56:32.000000000 +0200
@@ -1,9 +1,7 @@
-github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
-github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod
h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
-github.com/alecthomas/assert/v2 v2.6.0
h1:o3WJwILtexrEUk3cUVal3oiQY2tfgr/FHWiz/v2n4FU=
-github.com/alecthomas/assert/v2 v2.6.0/go.mod
h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/chroma/v2 v2.13.0
h1:VP72+99Fb2zEcYM0MeaWJmV+xQvz5v5cxRHd+ooU1lI=
-github.com/alecthomas/chroma/v2 v2.13.0/go.mod
h1:BUGjjsD+ndS6eX37YgTchSEG+Jg9Jv1GiZs9sqPqztk=
+github.com/alecthomas/assert/v2 v2.7.0
h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE=
+github.com/alecthomas/assert/v2 v2.7.0/go.mod
h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
+github.com/alecthomas/chroma/v2 v2.14.0
h1:R3+wzpnUArGcQz7fCETQBzO5n9IMNi13iIs46aU4V9E=
+github.com/alecthomas/chroma/v2 v2.14.0/go.mod
h1:QolEbTfmUHIMVpBqxeDnNBj2uoeI4EbYP4i6n68SG4I=
github.com/alecthomas/kong v0.9.0
h1:G5diXxc85KvoV2f0ZRVuMsi45IrBgx9zDNGNj165aPA=
github.com/alecthomas/kong v0.9.0/go.mod
h1:Y47y5gKfHp1hDc7CH7OeXgLIpp+Q2m1Ni0L5s3bI8Os=
github.com/alecthomas/mango-kong v0.1.0
h1:iFVfP1k1K4qpml3JUQmD5I8MCQYfIvsD9mRdrw7jJC4=
@@ -20,28 +18,36 @@
github.com/catppuccin/go v0.2.0/go.mod
h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc=
github.com/charmbracelet/bubbles v0.18.0
h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0=
github.com/charmbracelet/bubbles v0.18.0/go.mod
h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw=
-github.com/charmbracelet/bubbletea v0.25.0
h1:bAfwk7jRz7FKFl9RzlIULPkStffg5k6pNt5dywy4TcM=
-github.com/charmbracelet/bubbletea v0.25.0/go.mod
h1:EN3QDR1T5ZdWmdfDzYcqOCAps45+QIJbLOBxmVNWNNg=
+github.com/charmbracelet/bubbletea v0.26.3
h1:iXyGvI+FfOWqkB2V07m1DF3xxQijxjY2j8PqiXYqasg=
+github.com/charmbracelet/bubbletea v0.26.3/go.mod
h1:bpZHfDHTYJC5g+FBK+ptJRCQotRC+Dhh3AoMxa/2+3Q=
github.com/charmbracelet/glamour v0.7.0
h1:2BtKGZ4iVJCDfMF229EzbeR1QRKLWztO9dMtjmqZSng=
github.com/charmbracelet/glamour v0.7.0/go.mod
h1:jUMh5MeihljJPQbJ/wf4ldw2+yBP59+ctV36jASy7ps=
-github.com/charmbracelet/huh v0.3.1-0.20240404200615-66118a2cb3cf
h1:+9fHRq6kLZs4xebUCgMBNUY8d0rd05jeNMPcbYsEDnY=
-github.com/charmbracelet/huh v0.3.1-0.20240404200615-66118a2cb3cf/go.mod
h1:XTzRYgVSGt89DsCAUpCYTTgMPLrWuNtRYJHZs/TU0iY=
-github.com/charmbracelet/lipgloss v0.10.0
h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=
-github.com/charmbracelet/lipgloss v0.10.0/go.mod
h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE=
+github.com/charmbracelet/huh v0.4.2
h1:5wLkwrA58XDAfEZsJzNQlfJ+K8N9+wYwvR5FOM7jXFM=
+github.com/charmbracelet/huh v0.4.2/go.mod
h1:g9OXBgtY3zRV4ahnVih9bZE+1yGYN+y2C9Q6L2P+WM0=
+github.com/charmbracelet/lipgloss v0.11.0
h1:UoAcbQ6Qml8hDwSWs0Y1cB5TEQuZkDPH/ZqwWWYTG4g=
+github.com/charmbracelet/lipgloss v0.11.0/go.mod
h1:1UdRTH9gYgpcdNN5oBtjbu/IzNKtzVtb7sqN1t9LNn8=
github.com/charmbracelet/log v0.4.0
h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
github.com/charmbracelet/log v0.4.0/go.mod
h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
-github.com/charmbracelet/x/exp/strings v0.0.0-20240405134957-07f093a22d1c
h1:gELpu2vuZkXCFD43Pqp+xvZzG2IRxtgZK1eNsnnTrAI=
-github.com/charmbracelet/x/exp/strings
v0.0.0-20240405134957-07f093a22d1c/go.mod
h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ=
-github.com/charmbracelet/x/exp/term v0.0.0-20240321133156-7faadd06c281
h1:ZYwrF0GAd859tU6oF63T2pIkZVQ4z9BosDVD7jYu93A=
-github.com/charmbracelet/x/exp/term v0.0.0-20240321133156-7faadd06c281/go.mod
h1:madZtB2OVDOG+ZnLruGITVZceYy047W+BLQ1MNQzbWg=
-github.com/containerd/console v1.0.4
h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
-github.com/containerd/console v1.0.4/go.mod
h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
+github.com/charmbracelet/x/ansi v0.1.1
h1:CGAduulr6egay/YVbGc8Hsu8deMg1xZ/bkaXTPi1JDk=
+github.com/charmbracelet/x/ansi v0.1.1/go.mod
h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
+github.com/charmbracelet/x/exp/strings v0.0.0-20240525152034-77596eb8760e
h1:DhvN6ye3nHLhRtNHtlrQ0Zk+vmeN7YtEnyIRfcl7e0E=
+github.com/charmbracelet/x/exp/strings
v0.0.0-20240525152034-77596eb8760e/go.mod
h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ=
+github.com/charmbracelet/x/exp/term v0.0.0-20240524151031-ff83003bf67a
h1:k/s6UoOSVynWiw7PlclyGO2VdVs5ZLbMIHiGp4shFZE=
+github.com/charmbracelet/x/exp/term v0.0.0-20240524151031-ff83003bf67a/go.mod
h1:YBotIGhfoWhHDlnUpJMkjebGV2pdGRCn1Y4/Nk/vVcU=
+github.com/charmbracelet/x/input v0.1.1
h1:YDOJaTUKCqtGnq9PHzx3pkkl4pXDOANUHmhH3DqMtM4=
+github.com/charmbracelet/x/input v0.1.1/go.mod
h1:jvdTVUnNWj/RD6hjC4FsoB0SeZCJ2ZBkiuFP9zXvZI0=
+github.com/charmbracelet/x/term v0.1.1
h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI=
+github.com/charmbracelet/x/term v0.1.1/go.mod
h1:wB1fHt5ECsu3mXYusyzcngVWWlu1KKUmmLhfgr/Flxw=
+github.com/charmbracelet/x/windows v0.1.2
h1:Iumiwq2G+BRmgoayww/qfcvof7W/3uLoelhxojXlRWg=
+github.com/charmbracelet/x/windows v0.1.2/go.mod
h1:GLEO/l+lizvFDBPLIOk+49gdX49L9YWMB5t+DZd0jkQ=
github.com/davecgh/go-spew v1.1.1
h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dlclark/regexp2 v1.11.0
h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
github.com/dlclark/regexp2 v1.11.0/go.mod
h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
github.com/dustin/go-humanize v1.0.1
h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod
h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f
h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod
h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
github.com/go-logfmt/logfmt v0.6.0
h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
github.com/go-logfmt/logfmt v0.6.0/go.mod
h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
@@ -86,24 +92,24 @@
github.com/sahilm/fuzzy v0.1.1/go.mod
h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
github.com/stretchr/testify v1.9.0
h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod
h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e
h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
+github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod
h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
github.com/yuin/goldmark v1.3.7/go.mod
h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U=
github.com/yuin/goldmark v1.7.1/go.mod
h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
github.com/yuin/goldmark-emoji v1.0.2
h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GAsO5s=
github.com/yuin/goldmark-emoji v1.0.2/go.mod
h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY=
-golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0
h1:985EYyeCOxTpcgOTJpflJUwOeEz0CQOdPt73OzpE9F8=
-golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod
h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d
h1:N0hmiNbwsSNwHBAvR3QB5w25pUwH4tK0Y/RltD1j1h4=
+golang.org/x/exp v0.0.0-20240525044651-4c93da0ed11d/go.mod
h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
-golang.org/x/term v0.19.0/go.mod
h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod
h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.15.0/go.mod
h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/input/command.go
new/gum-0.14.1/input/command.go
--- old/gum-0.14.0/input/command.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/input/command.go 2024-05-25 20:56:32.000000000 +0200
@@ -2,8 +2,10 @@
import (
"fmt"
+
"os"
+ "github.com/charmbracelet/bubbles/key"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/huh"
"github.com/charmbracelet/lipgloss"
@@ -23,11 +25,15 @@
theme := huh.ThemeCharm()
theme.Focused.Base = lipgloss.NewStyle()
- // theme.Focused.TextInput.Cursor = o.CursorStyle.ToLipgloss()
+ theme.Focused.TextInput.Cursor = o.CursorStyle.ToLipgloss()
theme.Focused.TextInput.Placeholder = o.PlaceholderStyle.ToLipgloss()
theme.Focused.TextInput.Prompt = o.PromptStyle.ToLipgloss()
theme.Focused.Title = o.HeaderStyle.ToLipgloss()
+ // Keep input keymap backwards compatible
+ keymap := huh.NewDefaultKeyMap()
+ keymap.Quit = key.NewBinding(key.WithKeys("ctrl+c", "esc"))
+
var echoMode huh.EchoMode
if o.Password {
@@ -50,6 +56,8 @@
WithShowHelp(false).
WithWidth(o.Width).
WithTheme(theme).
+ WithKeyMap(keymap).
+ WithShowHelp(o.ShowHelp).
WithProgramOptions(tea.WithOutput(os.Stderr)).
Run()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/input/options.go
new/gum-0.14.1/input/options.go
--- old/gum-0.14.0/input/options.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/input/options.go 2024-05-25 20:56:32.000000000 +0200
@@ -18,6 +18,7 @@
CharLimit int `help:"Maximum value length (0 for no
limit)" default:"400"`
Width int `help:"Input width (0 for terminal
width)" default:"40" env:"GUM_INPUT_WIDTH"`
Password bool `help:"Mask input characters"
default:"false"`
+ ShowHelp bool `help:"Show help keybinds"
default:"true" negatable:"true" env:"GUM_INPUT_SHOW_HELP"`
Header string `help:"Header value" default:""
env:"GUM_INPUT_HEADER"`
HeaderStyle style.Styles `embed:"" prefix:"header."
set:"defaultForeground=240" envprefix:"GUM_INPUT_HEADER_"`
Timeout time.Duration `help:"Timeout until input aborts"
default:"0" env:"GUM_INPUT_TIMEOUT"`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/internal/stdin/stdin.go
new/gum-0.14.1/internal/stdin/stdin.go
--- old/gum-0.14.0/internal/stdin/stdin.go 2024-04-26 23:04:25.000000000
+0200
+++ new/gum-0.14.1/internal/stdin/stdin.go 2024-05-25 20:56:32.000000000
+0200
@@ -28,7 +28,7 @@
}
}
- return b.String(), nil
+ return strings.TrimSuffix(b.String(), "\n"), nil
}
// IsEmpty returns whether stdin is empty.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/log/command.go
new/gum-0.14.1/log/command.go
--- old/gum-0.14.0/log/command.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/log/command.go 2024-05-25 20:56:32.000000000 +0200
@@ -46,9 +46,9 @@
"stampmilli": time.StampMilli,
"stampmicro": time.StampMicro,
"stampnano": time.StampNano,
- "datetime": "2006-01-02 15:04:05",
- "dateonly": "2006-01-02",
- "timeonly": "15:04:05",
+ "datetime": time.DateTime,
+ "dateonly": time.DateOnly,
+ "timeonly": time.TimeOnly,
}
tf, ok := timeFormats[strings.ToLower(o.Time)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/main.go new/gum-0.14.1/main.go
--- old/gum-0.14.0/main.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/main.go 2024-05-25 20:56:32.000000000 +0200
@@ -7,6 +7,7 @@
"runtime/debug"
"github.com/alecthomas/kong"
+ "github.com/charmbracelet/huh"
"github.com/charmbracelet/lipgloss"
"github.com/muesli/termenv"
@@ -72,7 +73,7 @@
},
)
if err := ctx.Run(); err != nil {
- if errors.Is(err, exit.ErrAborted) {
+ if errors.Is(err, exit.ErrAborted) || errors.Is(err,
huh.ErrUserAborted) {
os.Exit(exit.StatusAborted)
}
fmt.Println(err)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/pager/pager.go
new/gum-0.14.1/pager/pager.go
--- old/gum-0.14.0/pager/pager.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/pager/pager.go 2024-05-25 20:56:32.000000000 +0200
@@ -1,6 +1,6 @@
// Package pager provides a pager (similar to less) for the terminal.
//
-// $ cat file.txt | gum page
+// $ cat file.txt | gum pager
package pager
import (
@@ -120,9 +120,9 @@
}
} else {
switch key.String() {
- case "g":
+ case "g", "home":
m.viewport.GotoTop()
- case "G":
+ case "G", "end":
m.viewport.GotoBottom()
case "/":
m.search.Begin()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/spin/command.go
new/gum-0.14.1/spin/command.go
--- old/gum-0.14.0/spin/command.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/spin/command.go 2024-05-25 20:56:32.000000000 +0200
@@ -43,6 +43,7 @@
// If the command succeeds, and we are printing output and we are in a
TTY then push the STDOUT we got to the actual
// STDOUT for piping or other things.
+ //nolint:nestif
if m.status == 0 {
if o.ShowOutput {
// BubbleTea writes the View() to stderr.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/style/command.go
new/gum-0.14.1/style/command.go
--- old/gum-0.14.0/style/command.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/style/command.go 2024-05-25 20:56:32.000000000 +0200
@@ -24,7 +24,6 @@
if text == "" {
return errors.New("no input provided, see `gum style
--help`")
}
- text = strings.TrimSuffix(text, "\n")
}
fmt.Println(o.Style.ToLipgloss().Render(text))
return nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/write/command.go
new/gum-0.14.1/write/command.go
--- old/gum-0.14.0/write/command.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/write/command.go 2024-05-25 20:56:32.000000000 +0200
@@ -25,6 +25,9 @@
theme.Focused.TextInput.Placeholder = o.PlaceholderStyle.ToLipgloss()
theme.Focused.TextInput.Prompt = o.PromptStyle.ToLipgloss()
+ keymap := huh.NewDefaultKeyMap()
+ keymap.Text.NewLine.SetHelp("ctrl+j", "new line")
+
err := huh.NewForm(
huh.NewGroup(
huh.NewText().
@@ -37,7 +40,10 @@
).
WithWidth(o.Width).
WithHeight(o.Height).
- WithShowHelp(false).Run()
+ WithTheme(theme).
+ WithKeyMap(keymap).
+ WithShowHelp(o.ShowHelp).
+ Run()
if err != nil {
return err
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/gum-0.14.0/write/options.go
new/gum-0.14.1/write/options.go
--- old/gum-0.14.0/write/options.go 2024-04-26 23:04:25.000000000 +0200
+++ new/gum-0.14.1/write/options.go 2024-05-25 20:56:32.000000000 +0200
@@ -13,6 +13,7 @@
ShowLineNumbers bool `help:"Show line numbers" default:"false"
env:"GUM_WRITE_SHOW_LINE_NUMBERS"`
Value string `help:"Initial value (can be passed via stdin)"
default:"" env:"GUM_WRITE_VALUE"`
CharLimit int `help:"Maximum value length (0 for no limit)"
default:"400"`
+ ShowHelp bool `help:"Show help key binds" negatable:""
default:"true" env:"GUM_WRITE_SHOW_HELP"`
CursorMode string `prefix:"cursor." name:"mode" help:"Cursor mode"
default:"blink" enum:"blink,hide,static" env:"GUM_WRITE_CURSOR_MODE"`
BaseStyle style.Styles `embed:"" prefix:"base."
envprefix:"GUM_WRITE_BASE_"`
++++++ vendor.tar.zst ++++++
++++ 38329 lines of diff (skipped)
