cmdio/ctr: Always execute with standard input enabled

ctr/cmd.go

@@ -37,6 +37,13 @@ func (c *cmd) Attach() error {
 	return nil
 }
 
+func (c *cmd) Close() error {
+	if cl, ok := c.ReadWriter.(io.Closer); ok {
+		return cl.Close()
+	}
+	return nil
+}
+
 func (c *cmd) String() string {
 	if s, ok := c.ReadWriter.(fmt.Stringer); ok {
 		return s.String()
@@ -45,9 +52,9 @@ func (c *cmd) String() string {
 }
 
 func (c *cmd) setCmd(attach bool) {
-	cmd := []string{"container", "exec"}
+	cmd := []string{"container", "exec", "-i"}
 	if attach {
-		cmd = append(cmd, "-ti")
+		cmd = append(cmd, "-t")
 	}
 	if c.env["PWD"] != "" {
 		cmd = append(cmd, "-w", c.env["PWD"])

ctr/runner_test.go

@@ -30,7 +30,7 @@ func TestString(t *testing.T) {
 	defer rnr.Close()
 
 	cmd := rnr.Command("echo", "hello world")
-	str := fmt.Sprintf("docker container exec %s echo 'hello world'",
+	str := fmt.Sprintf("docker container exec -i %s echo 'hello world'",
 		rnr.Commander.(*cdr).ctrid)
 	if got, want := fmt.Sprintf("%v", cmd), str; got != want {
 		t.Errorf("Sprintf(cmd) = %q, want = %q", got, want)

runner_suite_test.go

@@ -3,9 +3,9 @@ package cmdio_test
 import (
 	"context"
 	"errors"
-	"io"
 	"reflect"
 	"testing"
+	"time"
 
 	"lesiw.io/cmdio"
 	"lesiw.io/cmdio/ctr"
@@ -18,7 +18,13 @@ var runners = map[string]*cmdio.Runner{
 }
 
 func TestRunners(t *testing.T) {
-	cmdio.Trace = io.Discard
+	t.Cleanup(func() {
+		for _, rnr := range runners {
+			if err := rnr.Close(); err != nil {
+				panic(err)
+			}
+		}
+	})
 	for name, rnr := range runners {
 		suite := reflect.TypeOf(rnrtests{})
 		for i := 0; i < suite.NumMethod(); i++ {
@@ -31,14 +37,27 @@ func TestRunners(t *testing.T) {
 				})
 			})
 		}
-		if err := rnr.Close(); err != nil {
-			t.Fatal(err)
-		}
 	}
 }
 
 type rnrtests struct{}
 
+func (rnrtests) TestPipe(t *testing.T, rnr *cmdio.Runner) {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	rnr = rnr.WithContext(ctx)
+	r, err := cmdio.GetPipe(
+		rnr.Command("echo", "hello world"),
+		rnr.Command("tr", "a-z", "A-Z"),
+	)
+	if err != nil {
+		t.Error(err)
+	}
+	if got, want := r.Out, "HELLO WORLD"; got != want {
+		t.Errorf("[echo hello world] | [tr a-z A-Z] = %q, want %q", got, want)
+	}
+	cancel()
+}
+
 func (rnrtests) TestPipeToCompletedCommand(t *testing.T, rnr *cmdio.Runner) {
 	err := cmdio.Pipe(
 		rnr.Command("sleep", "0.001"),