diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1ea5f00..9971974 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,6 +13,8 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 + with: + go-version: 1.17 - run: go build - uses: golangci/golangci-lint-action@v2 with: diff --git a/command_test.go b/command_test.go index 4f33ab2..67cd00e 100644 --- a/command_test.go +++ b/command_test.go @@ -2,7 +2,7 @@ package main import ( "bytes" - "io/ioutil" + "io" "regexp" "strings" "testing" @@ -17,10 +17,10 @@ func newTestCommand(fs billy.Filesystem, d string) *command { return newCommand( newArgumentParser(d), newFileFinder(newRepositoryFileFinder(fs), fs), - newFileRenamer(fs, ioutil.Discard), + newFileRenamer(fs, io.Discard), fs, - ioutil.Discard, - ioutil.Discard, + io.Discard, + io.Discard, ) } @@ -31,10 +31,10 @@ func TestCommandHelp(t *testing.T) { err := newCommand( newArgumentParser("."), newFileFinder(newRepositoryFileFinder(fs), fs), - newFileRenamer(fs, ioutil.Discard), + newFileRenamer(fs, io.Discard), fs, b, - ioutil.Discard, + io.Discard, ).Run([]string{"--help"}) assert.Nil(t, err) @@ -48,10 +48,10 @@ func TestCommandVersion(t *testing.T) { err := newCommand( newArgumentParser("."), newFileFinder(newRepositoryFileFinder(fs), fs), - newFileRenamer(fs, ioutil.Discard), + newFileRenamer(fs, io.Discard), fs, b, - ioutil.Discard, + io.Discard, ).Run([]string{"--version"}) assert.Nil(t, err) @@ -74,7 +74,7 @@ func TestCommandRenameWithoutPathOption(t *testing.T) { f, err := fs.Open("bar") assert.Nil(t, err) - bs, err := ioutil.ReadAll(f) + bs, err := io.ReadAll(f) assert.Nil(t, err) assert.Equal(t, "bar", string(bs)) @@ -94,7 +94,7 @@ func TestCommandRenameOnlyFile(t *testing.T) { f, err := fs.Open("foo") assert.Nil(t, err) - bs, err := ioutil.ReadAll(f) + bs, err := io.ReadAll(f) assert.Nil(t, err) assert.Equal(t, "blah", string(bs)) @@ -102,7 +102,7 @@ func TestCommandRenameOnlyFile(t *testing.T) { f, err = fs.Open("bar") assert.Nil(t, err) - bs, err = ioutil.ReadAll(f) + bs, err = io.ReadAll(f) assert.Nil(t, err) assert.Equal(t, "baz", string(bs)) @@ -126,7 +126,7 @@ func TestCommandRenameOnlyDirectory(t *testing.T) { f, err := fs.Open("foo/foo") assert.Nil(t, err) - bs, err := ioutil.ReadAll(f) + bs, err := io.ReadAll(f) assert.Nil(t, err) assert.Equal(t, "blah", string(bs)) @@ -134,7 +134,7 @@ func TestCommandRenameOnlyDirectory(t *testing.T) { f, err = fs.Open("bar") assert.Nil(t, err) - bs, err = ioutil.ReadAll(f) + bs, err = io.ReadAll(f) assert.Nil(t, err) assert.Equal(t, "baz", string(bs)) @@ -151,7 +151,7 @@ func TestCommandRenameWithBarePattern(t *testing.T) { f, err := fs.Open("foo") assert.Nil(t, err) - bs, err := ioutil.ReadAll(f) + bs, err := io.ReadAll(f) assert.Nil(t, err) assert.Equal(t, "bar()", string(bs)) @@ -171,7 +171,7 @@ func TestCommandRenameInDirectory(t *testing.T) { f, err := fs.Open("foo/bar") assert.Nil(t, err) - bs, err := ioutil.ReadAll(f) + bs, err := io.ReadAll(f) assert.Nil(t, err) assert.Equal(t, "bar", string(bs)) @@ -191,7 +191,7 @@ func TestCommandRenameInDirectoryWithFileSpecified(t *testing.T) { f, err := fs.Open("foo/bar") assert.Nil(t, err) - bs, err := ioutil.ReadAll(f) + bs, err := io.ReadAll(f) assert.Nil(t, err) assert.Equal(t, "bar", string(bs)) @@ -209,7 +209,7 @@ func TestCommandRenameWithRegularExpression(t *testing.T) { f, err := fs.Open("foe") assert.Nil(t, err) - bs, err := ioutil.ReadAll(f) + bs, err := io.ReadAll(f) assert.Nil(t, err) assert.Equal(t, "foe", string(bs)) diff --git a/file_renamer.go b/file_renamer.go index 0778a39..373b71e 100644 --- a/file_renamer.go +++ b/file_renamer.go @@ -4,7 +4,6 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "os" "path/filepath" @@ -56,7 +55,7 @@ func (r *fileRenamer) Rename(tr textRenamer, path string, baseDir string, verbos defer f.Close() - bs, err := ioutil.ReadAll(f) + bs, err := io.ReadAll(f) if err != nil { return err } diff --git a/file_renamer_test.go b/file_renamer_test.go index edb024f..8346577 100644 --- a/file_renamer_test.go +++ b/file_renamer_test.go @@ -2,7 +2,7 @@ package main import ( "bytes" - "io/ioutil" + "io" "os" "runtime" "testing" @@ -22,13 +22,13 @@ func TestFileRenamerRenameFileShrinkingAfterRenaming(t *testing.T) { tr, err := newCaseTextRenamer("bar baz", "bar", nil) assert.Nil(t, err) - err = newFileRenamer(fs, ioutil.Discard).Rename(tr, "foo", ".", false) + err = newFileRenamer(fs, io.Discard).Rename(tr, "foo", ".", false) assert.Nil(t, err) f, err := fs.Open("foo") assert.Nil(t, err) - bs, err := ioutil.ReadAll(f) + bs, err := io.ReadAll(f) assert.Nil(t, err) assert.Equal(t, "bar", string(bs)) @@ -66,7 +66,7 @@ func TestFileRenamerRenameSymlinkToFile(t *testing.T) { tr, err := newCaseTextRenamer("foo", "bar", nil) assert.Nil(t, err) - err = newFileRenamer(fs, ioutil.Discard).Rename(tr, "foo", ".", true) + err = newFileRenamer(fs, io.Discard).Rename(tr, "foo", ".", true) assert.Nil(t, err) i, err := fs.Lstat("bar") @@ -77,7 +77,7 @@ func TestFileRenamerRenameSymlinkToFile(t *testing.T) { f, err := fs.Open("bar") assert.Nil(t, err) - bs, err := ioutil.ReadAll(f) + bs, err := io.ReadAll(f) assert.Nil(t, err) assert.Equal(t, "bar", string(bs)) @@ -92,7 +92,7 @@ func TestFileRenamerFailToRenameDirectory(t *testing.T) { tr, err := newCaseTextRenamer("foo", "bar", nil) assert.Nil(t, err) - err = newFileRenamer(fs, ioutil.Discard).Rename(tr, "foo", ".", true) + err = newFileRenamer(fs, io.Discard).Rename(tr, "foo", ".", true) assert.Error(t, err) } @@ -108,7 +108,7 @@ func TestFileRenamerFailToRenameSymlinkToDirectory(t *testing.T) { tr, err := newCaseTextRenamer("foo", "bar", nil) assert.Nil(t, err) - err = newFileRenamer(fs, ioutil.Discard).Rename(tr, "foo", ".", true) + err = newFileRenamer(fs, io.Discard).Rename(tr, "foo", ".", true) assert.Error(t, err) } @@ -124,7 +124,7 @@ func TestFileRenamerFileInDirectory(t *testing.T) { tr, err := newCaseTextRenamer("foo", "bar", nil) assert.Nil(t, err) - err = newFileRenamer(fs, ioutil.Discard).Rename(tr, "foo/foo", "foo", true) + err = newFileRenamer(fs, io.Discard).Rename(tr, "foo/foo", "foo", true) assert.Nil(t, err) _, err = fs.Lstat("foo/bar") diff --git a/go.mod b/go.mod index 8fd5909..31b25d2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/raviqqe/rnm -go 1.15 +go 1.16 require ( github.com/bradleyjkemp/cupaloy v2.3.0+incompatible diff --git a/go.sum b/go.sum index 4f2a99f..3c27c84 100644 --- a/go.sum +++ b/go.sum @@ -17,7 +17,6 @@ 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/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=