Add Executor WithTaskfile() to support Package API use cases.

Author: trulede

executor.go

@@ -53,8 +53,10 @@ type (
 		Stdout io.Writer
 		Stderr io.Writer
 
+		// Taskfile
+		Taskfile *ast.Taskfile
+
 		// Internal
-		Taskfile           *ast.Taskfile
 		Logger             *logger.Logger
 		Compiler           *Compiler
 		Output             output.Output
@@ -86,6 +88,7 @@ func NewExecutor(opts ...ExecutorOption) *Executor {
 		Stdin:                os.Stdin,
 		Stdout:               os.Stdout,
 		Stderr:               os.Stderr,
+		Taskfile:             nil,
 		Logger:               nil,
 		Compiler:             nil,
 		Output:               nil,
@@ -502,3 +505,16 @@ type versionCheckOption struct {
 func (o *versionCheckOption) ApplyToExecutor(e *Executor) {
 	e.EnableVersionCheck = o.enableVersionCheck
 }
+
+// WithTaskfile set the [Executor]'s Taskfile to the provided [ast.Taskfile].
+func WithTaskfile(taskfile *ast.Taskfile) ExecutorOption {
+	return &taskfileOption{taskfile}
+}
+
+type taskfileOption struct {
+	taskfile *ast.Taskfile
+}
+
+func (o *taskfileOption) ApplyToExecutor(e *Executor) {
+	e.Taskfile = o.taskfile
+}

executor_test.go

@@ -37,6 +37,7 @@ type (
 		wantSetupError  bool
 		wantRunError    bool
 		wantStatusError bool
+		callbackFunc    func(e *task.Executor)
 	}
 )
 
@@ -113,6 +114,21 @@ func (opt *statusErrorTestOption) applyToExecutorTest(t *ExecutorTest) {
 	t.wantStatusError = true
 }
 
+// WithCallback calls the provided function after the the test execution.
+func WithCallback(f func(e *task.Executor)) ExecutorTestOption {
+	return &callbackTestOption{
+		callback: f,
+	}
+}
+
+type callbackTestOption struct {
+	callback func(e *task.Executor)
+}
+
+func (opt *callbackTestOption) applyToExecutorTest(t *ExecutorTest) {
+	t.callbackFunc = opt.callback
+}
+
 // Helpers
 
 // writeFixtureErrRun is a wrapper for writing the output of an error during the
@@ -161,6 +177,11 @@ func (tt *ExecutorTest) run(t *testing.T) {
 
 		// Set up the task executor
 		e := task.NewExecutor(opts...)
+		if tt.callbackFunc != nil {
+			defer func() {
+				tt.callbackFunc(e)
+			}()
+		}
 
 		// Create a golden fixture file for the output
 		g := goldie.New(t,
@@ -996,3 +1017,30 @@ func TestIncludeChecksum(t *testing.T) {
 		WithFixtureTemplating(),
 	)
 }
+
+func TestWithTaskfile(t *testing.T) {
+	t.Parallel()
+
+	// Build an ast.Taskfile (using an executor).
+	var executor *task.Executor
+	NewExecutorTest(t,
+		WithName("WithTaskfile build"),
+		WithExecutorOptions(
+			task.WithDir("testdata/with_taskfile/build"),
+			task.WithDry(true),
+		),
+		WithCallback(func(e *task.Executor) {
+			executor = e
+		}),
+	)
+	require.NotNil(t, executor)
+
+	// Run executor using the pre-built ast.Taskfile.
+	NewExecutorTest(t,
+		WithName("WithTaskfile run"),
+		WithExecutorOptions(
+			task.WithDir("testdata/with_taskfile/run"),
+			task.WithTaskfile(executor.Taskfile),
+		),
+	)
+}

setup.go

@@ -26,15 +26,17 @@ import (
 
 func (e *Executor) Setup() error {
 	e.setupLogger()
-	node, err := e.getRootNode()
-	if err != nil {
-		return err
-	}
 	if err := e.setupTempDir(); err != nil {
 		return err
 	}
-	if err := e.readTaskfile(node); err != nil {
-		return err
+	if e.Taskfile == nil {
+		node, err := e.getRootNode()
+		if err != nil {
+			return err
+		}
+		if err := e.readTaskfile(node); err != nil {
+			return err
+		}
 	}
 	e.setupFuzzyModel()
 	e.setupStdFiles()

testdata/with_taskfile/build/Taskfile.yml

@@ -0,0 +1,6 @@
+version: "3"
+
+tasks:
+  default:
+    cmds:
+      - echo "Fubar"

testdata/with_taskfile/build/testdata/TestWithTaskfile-WithTaskfile_build.golden

@@ -0,0 +1 @@
+task: [default] echo "Fubar"

testdata/with_taskfile/run/.gitkeep

@@ -0,0 +1,2 @@
+task: [default] echo "Fubar"
+Fubar