Skip to content

Commit 986577a

Browse files
bbkanebbkane
committed
Update warg to v0.40.2
1 parent 912b170 commit 986577a

6 files changed

Lines changed: 34 additions & 24 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
55

66
Note the the latest version is usually work in progress and may have not yet been released.
77

8+
# v5.0.1
9+
10+
## Changed
11+
12+
- Updated warg to v0.40.2, adding bash/fish completion and changes to default command help output
13+
814
# v5.0.0
915

1016
## Changed

‎config.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"os"
88

99
"github.com/bbkane/glib"
10+
"go.bbkane.com/gocolor"
1011
"go.bbkane.com/logos"
1112
"go.bbkane.com/warg"
1213
"go.bbkane.com/warg/path"
@@ -28,7 +29,7 @@ func editConfig(ctx warg.CmdContext) error {
2829
Compress: false,
2930
}
3031

31-
color, err := warg.ConditionallyEnableColor(ctx.Flags, os.Stdout)
32+
color, err := gocolor.Prepare(warg.ColorEnabled(ctx.Flags, ctx.Stdout))
3233
if err != nil {
3334
fmt.Fprintf(os.Stderr, "Error enabling color, continuing without: %s", err.Error())
3435
}

‎go.mod‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
module go.bbkane.com/grabbit/v5
22

3-
go 1.24
3+
go 1.25.0
44

55
require (
66
github.com/bbkane/glib v0.1.1
77
github.com/goccy/go-yaml v1.19.2
88
github.com/pkg/errors v0.9.1
99
github.com/vartanbeno/go-reddit/v2 v2.0.1
1010
go.bbkane.com/logos v0.4.0
11-
go.bbkane.com/warg v0.40.0
11+
go.bbkane.com/warg v0.40.2
1212
go.uber.org/zap v1.27.1
1313
gopkg.in/natefinch/lumberjack.v2 v2.2.1
1414
)
1515

1616
require (
1717
github.com/davecgh/go-spew v1.1.1 // indirect
18-
github.com/mattn/go-shellwords v1.0.12 // indirect
18+
github.com/mattn/go-shellwords v1.0.13 // indirect
1919
github.com/pmezard/go-difflib v1.0.0 // indirect
20-
github.com/reeflective/readline v1.1.3 // indirect
20+
github.com/reeflective/readline v1.1.4 // indirect
2121
github.com/rivo/uniseg v0.4.4 // indirect
2222
github.com/rogpeppe/go-internal v1.14.1 // indirect
23+
golang.org/x/term v0.43.0 // indirect
2324
gopkg.in/yaml.v3 v3.0.1 // indirect
2425
)
2526

2627
require (
2728
github.com/google/go-querystring v1.1.0 // indirect
28-
github.com/mattn/go-isatty v0.0.20 // indirect
29+
github.com/mattn/go-isatty v0.0.22 // indirect
2930
github.com/mitchellh/go-homedir v1.1.0 // indirect
3031
github.com/stretchr/testify v1.11.1
3132
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
32-
go.bbkane.com/gocolor v0.0.5 // indirect
33+
go.bbkane.com/gocolor v0.0.7
3334
go.uber.org/multierr v1.11.0 // indirect
3435
golang.org/x/net v0.26.0 // indirect
3536
golang.org/x/oauth2 v0.21.0 // indirect
36-
golang.org/x/sys v0.35.0 // indirect
37+
golang.org/x/sys v0.44.0 // indirect
3738
)

‎go.sum‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
1717
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
1818
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
1919
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
20-
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
21-
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
22-
github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
23-
github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
20+
github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
21+
github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
22+
github.com/mattn/go-shellwords v1.0.13 h1:DC0OMEpGjm6LfNFU4ckYcvbQKyp2vE8atyFGXNtDcf4=
23+
github.com/mattn/go-shellwords v1.0.13/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
2424
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
2525
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
2626
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
2727
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
2828
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2929
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
30-
github.com/reeflective/readline v1.1.3 h1:meGkuEmujZHmalJ9eT3pYkwtkufH5EwYFPTnaph0T0s=
31-
github.com/reeflective/readline v1.1.3/go.mod h1:CwNkh9BmFBBCSO6mdDaNWb34rOqQsI9eYbxyqvOEazY=
30+
github.com/reeflective/readline v1.1.4 h1:HEdVYiPZ7e2CrP3uU/l6wApQdpkY0MjR8lINNboVtFk=
31+
github.com/reeflective/readline v1.1.4/go.mod h1:CwNkh9BmFBBCSO6mdDaNWb34rOqQsI9eYbxyqvOEazY=
3232
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
3333
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
3434
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
@@ -41,12 +41,12 @@ github.com/vartanbeno/go-reddit/v2 v2.0.1 h1:P6ITpf5YHjdy7DHZIbUIDn/iNAoGcEoDQnM
4141
github.com/vartanbeno/go-reddit/v2 v2.0.1/go.mod h1:758/S10hwZSLm43NPtwoNQdZFSg3sjB5745Mwjb0ANI=
4242
github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
4343
github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
44-
go.bbkane.com/gocolor v0.0.5 h1:WrdijR+XIH9QXXYUYTPH7m8QGIp7wLdMFWKL+8bK38Q=
45-
go.bbkane.com/gocolor v0.0.5/go.mod h1:7AEOm8kyPlpj9qr/SL9mEXSceh8xM2w+eBm4deMRNHk=
44+
go.bbkane.com/gocolor v0.0.7 h1:yCzXpG4eQif3XYQPiekcb1wxQ0H6bVHIIZZTkoKTL5Q=
45+
go.bbkane.com/gocolor v0.0.7/go.mod h1:s6FCzoswoDwZHorFK5tYKHgMTGCNw4qdxpwp1/Tiz/Y=
4646
go.bbkane.com/logos v0.4.0 h1:7k6mQiSK7ZXJa/OGZATxCeNgZX9D0qPx+NwWwEb2NwA=
4747
go.bbkane.com/logos v0.4.0/go.mod h1:sxAz5z3jxSA3GQ2z6NL7wmGXISGQKCuA7XM0DGY+fKE=
48-
go.bbkane.com/warg v0.40.0 h1:pveWh8/EYJngYS9M0BzpHRKK0sgko8W/qOeZ7+7QM8s=
49-
go.bbkane.com/warg v0.40.0/go.mod h1:rXKbGwUtZ2QcD42uUdRa2o1iVc6I+ubmZi9NQvc7EAs=
48+
go.bbkane.com/warg v0.40.2 h1:2S1xH9el9nCVLv4RPEHSIYr9B2DlOkg8PB/PE7WtM+A=
49+
go.bbkane.com/warg v0.40.2/go.mod h1:aB9mLQ54Lj2UPUgWpTDFJo6ep/PLb49a5xL4PxmS/80=
5050
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
5151
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
5252
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
@@ -61,9 +61,10 @@ golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4Iltr
6161
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
6262
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
6363
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
64-
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
65-
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
66-
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
64+
golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
65+
golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
66+
golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
67+
golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
6768
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6869
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6970
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

‎grab.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/goccy/go-yaml"
1919
"github.com/pkg/errors"
2020
"github.com/vartanbeno/go-reddit/v2/reddit"
21+
"go.bbkane.com/gocolor"
2122
"go.bbkane.com/logos"
2223
"go.bbkane.com/warg"
2324
"go.bbkane.com/warg/path"
@@ -364,8 +365,8 @@ func grab(ctx warg.CmdContext) error {
364365
LocalTime: true,
365366
Compress: false,
366367
}
368+
color, err := gocolor.Prepare(warg.ColorEnabled(ctx.Flags, ctx.Stdout))
367369

368-
color, err := warg.ConditionallyEnableColor(ctx.Flags, os.Stdout)
369370
if err != nil {
370371
fmt.Fprintf(os.Stderr, "Error enabling color, continuing without: %s", err.Error())
371372
}

‎grab_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestGrabE2E(t *testing.T) {
2525

2626
app := app()
2727
args := []string{
28-
"grabbit", "grab",
28+
"grab",
2929
// 2026-01-17: for some reason "day" is returning an empty list
3030
"--subreddit-info", "wallpapers,week,1",
3131
"--destination", dir,
@@ -35,7 +35,7 @@ func TestGrabE2E(t *testing.T) {
3535
}
3636

3737
parsed, err := app.Parse(
38-
warg.ParseWithArgs(args),
38+
args,
3939
warg.ParseWithLookupEnv(warg.LookupMap(nil)),
4040
)
4141
require.Nil(t, err)

0 commit comments

Comments
 (0)