Default shell blocks to sh runner (#42)

internal/cmd/run.go

@@ -67,30 +67,15 @@ func runCmd() *cobra.Command {
 }
 
 func newExecutable(cmd *cobra.Command, block *document.CodeBlock) (runner.Executable, error) {
-	switch block.Executable() {
-	case "sh":
-		return &runner.Shell{
-			Cmds: block.Lines(),
-			Base: runner.Base{
-				Dir:    chdir,
-				Stdin:  cmd.InOrStdin(),
-				Stdout: cmd.OutOrStdout(),
-				Stderr: cmd.ErrOrStderr(),
-			},
-		}, nil
-	case "go":
-		return &runner.Go{
-			Source: block.Content(),
-			Base: runner.Base{
-				Dir:    chdir,
-				Stdin:  cmd.InOrStdin(),
-				Stdout: cmd.OutOrStdout(),
-				Stderr: cmd.ErrOrStderr(),
-			},
-		}, nil
-	default:
-		return nil, errors.Errorf("unknown executable: %q", block.Executable())
-	}
+	return runner.New(
+		block,
+		&runner.Base{
+			Dir:    chdir,
+			Stdin:  cmd.InOrStdin(),
+			Stdout: cmd.OutOrStdout(),
+			Stderr: cmd.ErrOrStderr(),
+		},
+	)
 }
 
 func sigCtxCancel(ctx context.Context) (context.Context, context.CancelFunc) {

internal/runner/executable.go

@@ -3,6 +3,9 @@ package runner
 import (
 	"context"
 	"io"
+
+	"github.com/pkg/errors"
+	"github.com/stateful/runme/internal/document"
 )
 
 type Executable interface {
@@ -16,3 +19,20 @@ type Base struct {
 	Stdout io.Writer
 	Stderr io.Writer
 }
+
+func New(block *document.CodeBlock, base *Base) (Executable, error) {
+	switch block.Executable() {
+	case "sh", "shell":
+		return &Shell{
+			Cmds: block.Lines(),
+			Base: base,
+		}, nil
+	case "go":
+		return &Go{
+			Source: block.Content(),
+			Base:   base,
+		}, nil
+	default:
+		return nil, errors.Errorf("unknown executable: %q", block.Executable())
+	}
+}

internal/runner/go.go

@@ -12,7 +12,7 @@ import (
 )
 
 type Go struct {
-	Base
+	*Base
 	Source string
 }
 

internal/runner/shell.go

@@ -14,7 +14,7 @@ import (
 )
 
 type Shell struct {
-	Base
+	*Base
 	Cmds []string
 }