Skip to content

Commit

Permalink
Merge pull request #1979 from urfave/v1-update-deps
Browse files Browse the repository at this point in the history
Update dependencies in v1-maint
  • Loading branch information
meatballhat authored Oct 13, 2024
2 parents 1c29f69 + e33bf2d commit 77bdfab
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion fish_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func expectFileContent(t *testing.T, file, expected string) {
data, err := os.ReadFile(file)
require.Nil(t, err)

require.Equal(t, strings.ReplaceAll(string(data), "\r\n", "\n"), expected)
require.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(strings.ReplaceAll(string(data), "\r\n", "\n")))
}

func TestFishCompletion(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/urfave/cli
go 1.11

require (
github.com/BurntSushi/toml v1.3.2
github.com/cpuguy83/go-md2man/v2 v2.0.4
github.com/BurntSushi/toml v1.4.0
github.com/cpuguy83/go-md2man/v2 v2.0.5
github.com/stretchr/testify v1.9.0
gopkg.in/yaml.v2 v2.4.0
)
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
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=
Expand Down
11 changes: 2 additions & 9 deletions testdata/expected-doc-full.man
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
.SH Harrison

.SH NAME
.PP
greet - Some app
greet \- Some app


.SH SYNOPSIS
.PP
greet

.EX
Expand All @@ -20,7 +18,6 @@ greet


.SH DESCRIPTION
.PP
app [first_arg] [second_arg]

.PP
Expand All @@ -32,7 +29,6 @@ greet [GLOBAL OPTIONS] command [COMMAND OPTIONS] [ARGUMENTS...]


.SH GLOBAL OPTIONS
.PP
\fB--another-flag, -b\fP: another usage text

.PP
Expand All @@ -44,7 +40,6 @@ greet [GLOBAL OPTIONS] command [COMMAND OPTIONS] [ARGUMENTS...]

.SH COMMANDS
.SH config, c
.PP
another usage test

.PP
Expand All @@ -54,7 +49,6 @@ another usage test
\fB--flag, --fl, -f\fP="":

.SS sub-config, s, ss
.PP
another usage test

.PP
Expand All @@ -64,7 +58,6 @@ another usage test
\fB--sub-flag, --sub-fl, -s\fP="":

.SH info, i, in
.PP
retrieve generic information

.SH some-command
.SH some-command

0 comments on commit 77bdfab

Please sign in to comment.