go/task
go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2024-12-14 10:52:43 +02:00
Code Issues Releases Activity

replace usages of ioutil with io and os

Browse Source
This commit is contained in:
nichady 2021-12-20 20:00:34 -06:00
parent b2efebce96
commit 9a5d49774e
3 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
init.go
View File

@ -3,7 +3,6 @@ package task
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
) )
@ -30,7 +29,7 @@ func InitTaskfile(w io.Writer, dir string) error {
return ErrTaskfileAlreadyExists return ErrTaskfileAlreadyExists
} }
if err := ioutil.WriteFile(f, []byte(defaultTaskfile), 0644); err != nil { if err := os.WriteFile(f, []byte(defaultTaskfile), 0644); err != nil {
return err return err
} }
fmt.Fprintf(w, "Taskfile.yml created in the current directory\n") fmt.Fprintf(w, "Taskfile.yml created in the current directory\n")

5
internal/status/checksum.go
View File

@ -4,7 +4,6 @@ import (
"crypto/md5" "crypto/md5"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"regexp" "regexp"
@ -30,7 +29,7 @@ func (c *Checksum) IsUpToDate() (bool, error) {
checksumFile := c.checksumFilePath() checksumFile := c.checksumFilePath()
data, _ := ioutil.ReadFile(checksumFile) data, _ := os.ReadFile(checksumFile)
oldMd5 := strings.TrimSpace(string(data)) oldMd5 := strings.TrimSpace(string(data))
sources, err := globs(c.TaskDir, c.Sources) sources, err := globs(c.TaskDir, c.Sources)
@ -45,7 +44,7 @@ func (c *Checksum) IsUpToDate() (bool, error) {
if !c.Dry { if !c.Dry {
_ = os.MkdirAll(filepath.Join(c.BaseDir, ".task", "checksum"), 0755) _ = os.MkdirAll(filepath.Join(c.BaseDir, ".task", "checksum"), 0755)
if err = ioutil.WriteFile(checksumFile, []byte(newMd5+"\n"), 0644); err != nil { if err = os.WriteFile(checksumFile, []byte(newMd5+"\n"), 0644); err != nil {
return false, err return false, err
} }
} }

56
task_test.go
View File

@ -4,7 +4,7 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"io/ioutil" "io"
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
@ -41,15 +41,15 @@ func (fct fileContentTest) Run(t *testing.T) {
e := &task.Executor{ e := &task.Executor{
Dir: fct.Dir, Dir: fct.Dir,
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
} }
assert.NoError(t, e.Setup(), "e.Setup()") assert.NoError(t, e.Setup(), "e.Setup()")
assert.NoError(t, e.Run(context.Background(), taskfile.Call{Task: fct.Target}), "e.Run(target)") assert.NoError(t, e.Run(context.Background(), taskfile.Call{Task: fct.Target}), "e.Run(target)")
for name, expectContent := range fct.Files { for name, expectContent := range fct.Files {
t.Run(fct.name(name), func(t *testing.T) { t.Run(fct.name(name), func(t *testing.T) {
b, err := ioutil.ReadFile(filepath.Join(fct.Dir, name)) b, err := os.ReadFile(filepath.Join(fct.Dir, name))
assert.NoError(t, err, "Error reading file") assert.NoError(t, err, "Error reading file")
s := string(b) s := string(b)
if fct.TrimSpace { if fct.TrimSpace {
@ -63,8 +63,8 @@ func (fct fileContentTest) Run(t *testing.T) {
func TestEmptyTask(t *testing.T) { func TestEmptyTask(t *testing.T) {
e := &task.Executor{ e := &task.Executor{
Dir: "testdata/empty_task", Dir: "testdata/empty_task",
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
} }
assert.NoError(t, e.Setup(), "e.Setup()") assert.NoError(t, e.Setup(), "e.Setup()")
assert.NoError(t, e.Run(context.Background(), taskfile.Call{Task: "default"})) assert.NoError(t, e.Run(context.Background(), taskfile.Call{Task: "default"}))
@ -168,8 +168,8 @@ func TestVarsInvalidTmpl(t *testing.T) {
e := &task.Executor{ e := &task.Executor{
Dir: dir, Dir: dir,
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
} }
assert.NoError(t, e.Setup(), "e.Setup()") assert.NoError(t, e.Setup(), "e.Setup()")
assert.EqualError(t, e.Run(context.Background(), taskfile.Call{Task: target}), expectError, "e.Run(target)") assert.EqualError(t, e.Run(context.Background(), taskfile.Call{Task: target}), expectError, "e.Run(target)")
@ -183,8 +183,8 @@ func TestConcurrency(t *testing.T) {
e := &task.Executor{ e := &task.Executor{
Dir: dir, Dir: dir,
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
Concurrency: 1, Concurrency: 1,
} }
assert.NoError(t, e.Setup(), "e.Setup()") assert.NoError(t, e.Setup(), "e.Setup()")
@ -236,8 +236,8 @@ func TestDeps(t *testing.T) {
e := &task.Executor{ e := &task.Executor{
Dir: dir, Dir: dir,
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
} }
assert.NoError(t, e.Setup()) assert.NoError(t, e.Setup())
assert.NoError(t, e.Run(context.Background(), taskfile.Call{Task: "default"})) assert.NoError(t, e.Run(context.Background(), taskfile.Call{Task: "default"}))
@ -557,7 +557,7 @@ func TestInit(t *testing.T) {
t.Errorf("Taskfile.yml should not exist") t.Errorf("Taskfile.yml should not exist")
} }
if err := task.InitTaskfile(ioutil.Discard, dir); err != nil { if err := task.InitTaskfile(io.Discard, dir); err != nil {
t.Error(err) t.Error(err)
} }
@ -571,8 +571,8 @@ func TestCyclicDep(t *testing.T) {
e := task.Executor{ e := task.Executor{
Dir: dir, Dir: dir,
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
} }
assert.NoError(t, e.Setup()) assert.NoError(t, e.Setup())
assert.IsType(t, &task.MaximumTaskCallExceededError{}, e.Run(context.Background(), taskfile.Call{Task: "task-1"})) assert.IsType(t, &task.MaximumTaskCallExceededError{}, e.Run(context.Background(), taskfile.Call{Task: "task-1"}))
@ -590,8 +590,8 @@ func TestTaskVersion(t *testing.T) {
t.Run(test.Dir, func(t *testing.T) { t.Run(test.Dir, func(t *testing.T) {
e := task.Executor{ e := task.Executor{
Dir: test.Dir, Dir: test.Dir,
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
} }
assert.NoError(t, e.Setup()) assert.NoError(t, e.Setup())
assert.Equal(t, test.Version, e.Taskfile.Version) assert.Equal(t, test.Version, e.Taskfile.Version)
@ -605,8 +605,8 @@ func TestTaskIgnoreErrors(t *testing.T) {
e := task.Executor{ e := task.Executor{
Dir: dir, Dir: dir,
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
} }
assert.NoError(t, e.Setup()) assert.NoError(t, e.Setup())
@ -668,8 +668,8 @@ func TestDryChecksum(t *testing.T) {
e := task.Executor{ e := task.Executor{
Dir: dir, Dir: dir,
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
Dry: true, Dry: true,
} }
assert.NoError(t, e.Setup()) assert.NoError(t, e.Setup())
@ -769,8 +769,8 @@ func TestIncludesOptional(t *testing.T) {
func TestIncludesOptionalImplicitFalse(t *testing.T) { func TestIncludesOptionalImplicitFalse(t *testing.T) {
e := task.Executor{ e := task.Executor{
Dir: "testdata/includes_optional_implicit_false", Dir: "testdata/includes_optional_implicit_false",
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
} }
err := e.Setup() err := e.Setup()
@ -781,8 +781,8 @@ func TestIncludesOptionalImplicitFalse(t *testing.T) {
func TestIncludesOptionalExplicitFalse(t *testing.T) { func TestIncludesOptionalExplicitFalse(t *testing.T) {
e := task.Executor{ e := task.Executor{
Dir: "testdata/includes_optional_explicit_false", Dir: "testdata/includes_optional_explicit_false",
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
} }
err := e.Setup() err := e.Setup()
@ -804,7 +804,7 @@ func TestSummary(t *testing.T) {
assert.NoError(t, e.Setup()) assert.NoError(t, e.Setup())
assert.NoError(t, e.Run(context.Background(), taskfile.Call{Task: "task-with-summary"}, taskfile.Call{Task: "other-task-with-summary"})) assert.NoError(t, e.Run(context.Background(), taskfile.Call{Task: "task-with-summary"}, taskfile.Call{Task: "other-task-with-summary"}))
data, err := ioutil.ReadFile(filepath.Join(dir, "task-with-summary.txt")) data, err := os.ReadFile(filepath.Join(dir, "task-with-summary.txt"))
assert.NoError(t, err) assert.NoError(t, err)
expectedOutput := string(data) expectedOutput := string(data)
@ -895,8 +895,8 @@ func TestDynamicVariablesShouldRunOnTheTaskDir(t *testing.T) {
func TestDisplaysErrorOnUnsupportedVersion(t *testing.T) { func TestDisplaysErrorOnUnsupportedVersion(t *testing.T) {
e := task.Executor{ e := task.Executor{
Dir: "testdata/version/v1", Dir: "testdata/version/v1",
Stdout: ioutil.Discard, Stdout: io.Discard,
Stderr: ioutil.Discard, Stderr: io.Discard,
} }
err := e.Setup() err := e.Setup()
assert.Error(t, err) assert.Error(t, err)