go/task
go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-04-23 12:18:57 +02:00
Code Issues Releases Activity

Merge pull request #200 from go-task/fix-output-issues

Browse Source 
Fixes some bugs relatated to commands output handling
This commit is contained in:
Andrey Nering 2019-04-21 17:05:21 -03:00 committed by GitHub
commit 20725c69bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/output/group.go
View File

@ -7,7 +7,7 @@ import (
type Group struct{} type Group struct{}
func (Group) WrapWriter(w io.Writer, _ string) io.WriteCloser { func (Group) WrapWriter(w io.Writer, _ string) io.Writer {
return &groupWriter{writer: w} return &groupWriter{writer: w}
} }

16
internal/output/interleaved.go
View File

@ -6,18 +6,6 @@ import (
type Interleaved struct{} type Interleaved struct{}
func (Interleaved) WrapWriter(w io.Writer, _ string) io.WriteCloser { func (Interleaved) WrapWriter(w io.Writer, _ string) io.Writer {
return nopWriterCloser{w: w} return w
}
type nopWriterCloser struct {
w io.Writer
}
func (wc nopWriterCloser) Write(p []byte) (int, error) {
return wc.w.Write(p)
}
func (wc nopWriterCloser) Close() error {
return nil
} }

2
internal/output/output.go
View File

@ -5,5 +5,5 @@ import (
) )
type Output interface { type Output interface {
WrapWriter(w io.Writer, prefix string) io.WriteCloser WrapWriter(w io.Writer, prefix string) io.Writer
} }

5
internal/output/output_test.go
View File

@ -3,6 +3,7 @@ package output_test
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io"
"testing" "testing"
"github.com/go-task/task/v2/internal/output" "github.com/go-task/task/v2/internal/output"
@ -24,7 +25,7 @@ func TestInterleaved(t *testing.T) {
func TestGroup(t *testing.T) { func TestGroup(t *testing.T) {
var b bytes.Buffer var b bytes.Buffer
var o output.Output = output.Group{} var o output.Output = output.Group{}
var w = o.WrapWriter(&b, "") var w = o.WrapWriter(&b, "").(io.WriteCloser)
fmt.Fprintln(w, "foo\nbar") fmt.Fprintln(w, "foo\nbar")
assert.Equal(t, "", b.String()) assert.Equal(t, "", b.String())
@ -37,7 +38,7 @@ func TestGroup(t *testing.T) {
func TestPrefixed(t *testing.T) { func TestPrefixed(t *testing.T) {
var b bytes.Buffer var b bytes.Buffer
var o output.Output = output.Prefixed{} var o output.Output = output.Prefixed{}
var w = o.WrapWriter(&b, "prefix") var w = o.WrapWriter(&b, "prefix").(io.WriteCloser)
t.Run("simple use cases", func(t *testing.T) { t.Run("simple use cases", func(t *testing.T) {
b.Reset() b.Reset()

2
internal/output/prefixed.go
View File

@ -9,7 +9,7 @@ import (
type Prefixed struct{} type Prefixed struct{}
func (Prefixed) WrapWriter(w io.Writer, prefix string) io.WriteCloser { func (Prefixed) WrapWriter(w io.Writer, prefix string) io.Writer {
return &prefixWriter{writer: w, prefix: prefix} return &prefixWriter{writer: w, prefix: prefix}
} }

14
task.go
View File

@ -248,8 +248,18 @@ func (e *Executor) runCommand(ctx context.Context, t *taskfile.Task, call taskfi
stdOut := e.Output.WrapWriter(e.Stdout, t.Prefix) stdOut := e.Output.WrapWriter(e.Stdout, t.Prefix)
stdErr := e.Output.WrapWriter(e.Stderr, t.Prefix) stdErr := e.Output.WrapWriter(e.Stderr, t.Prefix)
defer stdOut.Close() defer func() {
defer stdErr.Close() if _, ok := stdOut.(*os.File); !ok {
if closer, ok := stdOut.(io.Closer); ok {
closer.Close()
}
}
if _, ok := stdErr.(*os.File); !ok {
if closer, ok := stdErr.(io.Closer); ok {
closer.Close()
}
}
}()
err := execext.RunCommand(ctx, &execext.RunCommandOptions{ err := execext.RunCommand(ctx, &execext.RunCommandOptions{
Command: cmd.Cmd, Command: cmd.Cmd,