From 3fdc12d0fe7015ae6b7880955fc3638de4e5b6bd Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Mon, 6 May 2024 19:37:34 -0500
Subject: [PATCH 01/23] simplify implementation

---
 .examples/cli/{{ .ProjectKebab }}/main.go | 57 +++--------------------
 1 file changed, 6 insertions(+), 51 deletions(-)

diff --git a/.examples/cli/{{ .ProjectKebab }}/main.go b/.examples/cli/{{ .ProjectKebab }}/main.go
index d180297..da63cf5 100644
--- a/.examples/cli/{{ .ProjectKebab }}/main.go	
+++ b/.examples/cli/{{ .ProjectKebab }}/main.go	
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v2"
 )
@@ -26,52 +25,18 @@ func build() string {
 }
 
 func main() {
-	ctrl := &controller{}
-
 	app := &cli.App{
 		Name:    "{{ .Project }}",
 		Usage:   "{{ .Scaffold.description }}",
 		Version: build(),
-		Flags: []cli.Flag{
-			&cli.StringFlag{
-				Name:  "cwd",
-				Usage: "current working directory",
-				Value: ".",
-			},
-			&cli.StringFlag{
-				Name:  "log-level",
-				Usage: "log level (debug, info, warn, error, fatal, panic)",
-				Value: "panic",
-			},
-		},
-		Before: func(ctx *cli.Context) error {
-			log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
-
-			ctrl.cwd = ctx.String("cwd")
-			ctrl.logLevel = ctx.String("log-level")
-
-			switch ctrl.logLevel {
-			case "debug":
-				log.Level(zerolog.DebugLevel)
-			case "info":
-				log.Level(zerolog.InfoLevel)
-			case "warn":
-				log.Level(zerolog.WarnLevel)
-			case "error":
-				log.Level(zerolog.ErrorLevel)
-			case "fatal":
-				log.Level(zerolog.FatalLevel)
-			default:
-				log.Level(zerolog.PanicLevel)
-			}
-
-			return nil
-		},
 		Commands: []*cli.Command{
 			{
-				Name:   "hello",
-				Usage:  "Says hello world",
-				Action: ctrl.HelloWorld,
+				Name:  "hello",
+				Usage: "Says hello world",
+				Action: func(ctx *cli.Context) error {
+					fmt.Println("Hello, your favorite colors are {{ .Scaffold.colors | join `, ` }}")
+					return nil
+				},
 			},
 		},
 	}
@@ -80,13 +45,3 @@ func main() {
 		log.Fatal().Err(err).Msg("failed to run scaffold")
 	}
 }
-
-type controller struct {
-	cwd      string
-	logLevel string
-}
-
-func (c *controller) HelloWorld(ctx *cli.Context) error {
-	fmt.Println("Hello, your favorite colors are {{ .Scaffold.colors | join `, ` }}")
-	return nil
-}

From 2bfc986389a463dd71117e0f6beb58d91c9f7197 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Mon, 6 May 2024 19:38:17 -0500
Subject: [PATCH 02/23] add test mode to scaffold new command

---
 .examples/cli/scaffold.yaml           |   4 +
 .examples/role/scaffold.yaml          |  12 +-
 app/commands/controller.go            |   3 +-
 app/commands/new.go                   | 176 ++++++++++++++------------
 app/scaffold/merge.go                 |   9 ++
 app/scaffold/project.go               |  16 ++-
 app/scaffold/project_scaffold_file.go |  27 ++--
 app/scaffold/rc.go                    |   2 +-
 main.go                               |   8 +-
 taskfile.yml                          |  13 +-
 10 files changed, 146 insertions(+), 124 deletions(-)

diff --git a/.examples/cli/scaffold.yaml b/.examples/cli/scaffold.yaml
index 95a521e..99b5b29 100644
--- a/.examples/cli/scaffold.yaml
+++ b/.examples/cli/scaffold.yaml
@@ -24,3 +24,7 @@ questions:
         - "green"
         - "blue"
         - "yellow"
+
+test:
+  description: "Ths is a test description"
+  colors: ["red", "green"]
diff --git a/.examples/role/scaffold.yaml b/.examples/role/scaffold.yaml
index e337e45..a2cd299 100644
--- a/.examples/role/scaffold.yaml
+++ b/.examples/role/scaffold.yaml
@@ -23,10 +23,8 @@ rewrites:
 computed:
   snaked: "{{ snakecase .Scaffold.role_name }}"
   static: false
-inject:
-  - name: "add role to site.yaml"
-    path: site.yaml
-    at: "# $Scaffold.role_name"
-    template: |
-      - name: {{ .Scaffold.role_name }}
-        role: {{ .Computed.snaked }}
+
+test:
+  role_name: "test_role"
+  toggle: true
+  description: "This is a test role"
diff --git a/app/commands/controller.go b/app/commands/controller.go
index bf6e3e4..82b4a92 100644
--- a/app/commands/controller.go
+++ b/app/commands/controller.go
@@ -14,6 +14,7 @@ type Flags struct {
 	OutputDir      string
 	ScaffoldDirs   []string
 	Cwd            string
+	NoInteractive  bool
 }
 
 type Controller struct {
@@ -22,7 +23,7 @@ type Controller struct {
 
 	engine   *engine.Engine
 	rc       *scaffold.ScaffoldRC
-	vars     map[string]string
+	vars     map[string]any
 	prepared bool
 }
 
diff --git a/app/commands/new.go b/app/commands/new.go
index dfc7c63..8343a13 100644
--- a/app/commands/new.go
+++ b/app/commands/new.go
@@ -19,84 +19,9 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-func (ctrl *Controller) fuzzyFallBack(str string) ([]string, []string, error) {
-	systemScaffolds, err := pkgs.ListSystem(os.DirFS(ctrl.Flags.Cache))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	localScaffolds, err := pkgs.ListLocal(os.DirFS(ctrl.Flags.OutputDir))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	systemMatches := fuzzy.Find(str, systemScaffolds)
-	systemMatchesOutput := make([]string, len(systemMatches))
-	for i, match := range systemMatches {
-		systemMatchesOutput[i] = match.Str
-	}
-
-	localMatches := fuzzy.Find(str, localScaffolds)
-	localMatchesOutput := make([]string, len(localMatches))
-	for i, match := range localMatches {
-		localMatchesOutput[i] = match.Str
-	}
-
-	return systemMatchesOutput, localMatchesOutput, nil
-}
-
-var (
-	bold     = lipgloss.NewStyle().Bold(true)
-	colorRed = lipgloss.NewStyle().Foreground(lipgloss.Color("#dc2626"))
-)
-
-func didYouMeanPrompt(given, suggestion string) bool {
-	bldr := strings.Builder{}
-
-	// Couldn't find a scaffold named:
-	//   'foo'
-	//
-	// Did you mean:
-	//   'bar'?
-	//
-	// [y/n]:
+func (ctrl *Controller) New(ctx *cli.Context) error {
+	isTest := ctx.Bool("test")
 
-	bldr.WriteString("\n ")
-	bldr.WriteString(bold.Render(colorRed.Render("could not find a scaffold named")))
-	bldr.WriteString("\n    ")
-	bldr.WriteString(given)
-	bldr.WriteString("\n\n")
-	bldr.WriteString(" ")
-	bldr.WriteString(bold.Render("did you mean"))
-	bldr.WriteString("\n    ")
-	bldr.WriteString(suggestion)
-	bldr.WriteString("?\n\n ")
-	bldr.WriteString("[y/n]: ")
-
-	out := bldr.String()
-
-	var resp string
-
-	fmt.Print(out)
-	fmt.Scanln(&resp)
-
-	return resp == "y"
-}
-
-func basicAuthAuthorizer(pkgurl, username, password string) pkgs.AuthProviderFunc {
-	return func(url string) (transport.AuthMethod, bool) {
-		if url != pkgurl {
-			return nil, false
-		}
-
-		return &http.BasicAuth{
-			Username: username,
-			Password: password,
-		}, true
-	}
-}
-
-func (ctrl *Controller) Project(ctx *cli.Context) error {
 	argPath := ctx.Args().First()
 	if argPath == "" {
 		return fmt.Errorf("path is required")
@@ -176,14 +101,16 @@ func (ctrl *Controller) Project(ctx *cli.Context) error {
 
 	rest := ctx.Args().Tail()
 
-	ctrl.vars = make(map[string]string, len(rest))
 	for _, v := range rest {
+		if !strings.Contains(v, "=") {
+			return fmt.Errorf("variable %s is not in the form of key=value", v)
+		}
+
 		kv := strings.Split(v, "=")
 		ctrl.vars[kv[0]] = kv[1]
 	}
 
 	pfs := os.DirFS(path)
-
 	p, err := scaffold.LoadProject(pfs, scaffold.Options{
 		NoClobber: ctrl.Flags.NoClobber,
 	})
@@ -191,8 +118,6 @@ func (ctrl *Controller) Project(ctx *cli.Context) error {
 		return err
 	}
 
-	defaults := scaffold.MergeMaps(ctrl.vars, ctrl.rc.Defaults)
-
 	if p.Conf.Messages.Pre != "" {
 		out, err := glamour.RenderWithEnvironmentConfig(p.Conf.Messages.Pre)
 		if err != nil {
@@ -202,9 +127,15 @@ func (ctrl *Controller) Project(ctx *cli.Context) error {
 		fmt.Println(out)
 	}
 
-	vars, err := p.AskQuestions(defaults, ctrl.engine)
-	if err != nil {
-		return err
+	vars := scaffold.MergeMaps(ctrl.vars, ctrl.rc.Defaults)
+	if isTest {
+		// explicitly ignore rc.Defaults here
+		vars = scaffold.MergeMaps(ctrl.vars, p.Conf.Test)
+	} else {
+		vars, err = p.AskQuestions(vars, ctrl.engine)
+		if err != nil {
+			return err
+		}
 	}
 
 	args := &scaffold.RWFSArgs{
@@ -267,3 +198,80 @@ func httpAuthPrompt() (username string, password string, err error) {
 
 	return answers.Username, answers.Password, nil
 }
+
+func (ctrl *Controller) fuzzyFallBack(str string) ([]string, []string, error) {
+	systemScaffolds, err := pkgs.ListSystem(os.DirFS(ctrl.Flags.Cache))
+	if err != nil {
+		return nil, nil, err
+	}
+
+	localScaffolds, err := pkgs.ListLocal(os.DirFS(ctrl.Flags.OutputDir))
+	if err != nil {
+		return nil, nil, err
+	}
+
+	systemMatches := fuzzy.Find(str, systemScaffolds)
+	systemMatchesOutput := make([]string, len(systemMatches))
+	for i, match := range systemMatches {
+		systemMatchesOutput[i] = match.Str
+	}
+
+	localMatches := fuzzy.Find(str, localScaffolds)
+	localMatchesOutput := make([]string, len(localMatches))
+	for i, match := range localMatches {
+		localMatchesOutput[i] = match.Str
+	}
+
+	return systemMatchesOutput, localMatchesOutput, nil
+}
+
+var (
+	bold     = lipgloss.NewStyle().Bold(true)
+	colorRed = lipgloss.NewStyle().Foreground(lipgloss.Color("#dc2626"))
+)
+
+func didYouMeanPrompt(given, suggestion string) bool {
+	bldr := strings.Builder{}
+
+	// Couldn't find a scaffold named:
+	//   'foo'
+	//
+	// Did you mean:
+	//   'bar'?
+	//
+	// [y/n]:
+
+	bldr.WriteString("\n ")
+	bldr.WriteString(bold.Render(colorRed.Render("could not find a scaffold named")))
+	bldr.WriteString("\n    ")
+	bldr.WriteString(given)
+	bldr.WriteString("\n\n")
+	bldr.WriteString(" ")
+	bldr.WriteString(bold.Render("did you mean"))
+	bldr.WriteString("\n    ")
+	bldr.WriteString(suggestion)
+	bldr.WriteString("?\n\n ")
+	bldr.WriteString("[y/n]: ")
+
+	out := bldr.String()
+
+	var resp string
+
+	fmt.Print(out)
+	fmt.Scanln(&resp)
+
+	return resp == "y"
+}
+
+func basicAuthAuthorizer(pkgurl, username, password string) pkgs.AuthProviderFunc {
+	return func(url string) (transport.AuthMethod, bool) {
+		if url != pkgurl {
+			return nil, false
+		}
+
+		return &http.BasicAuth{
+			Username: username,
+			Password: password,
+		}, true
+	}
+}
diff --git a/app/scaffold/merge.go b/app/scaffold/merge.go
index b4b5fd8..8ac65c3 100644
--- a/app/scaffold/merge.go
+++ b/app/scaffold/merge.go
@@ -11,3 +11,12 @@ func MergeMaps[T any](maps ...map[string]T) map[string]T {
 	}
 	return out
 }
+
+// CastMap casts a map[string]T to a man[string]any map.
+func CastMap[T any](m map[string]T) map[string]any {
+	out := map[string]any{}
+	for k, v := range m {
+		out[k] = v
+	}
+	return out
+}
diff --git a/app/scaffold/project.go b/app/scaffold/project.go
index ab398a0..1d0651a 100644
--- a/app/scaffold/project.go
+++ b/app/scaffold/project.go
@@ -4,6 +4,7 @@ package scaffold
 import (
 	"fmt"
 	"io/fs"
+	"maps"
 	"strconv"
 
 	"github.com/AlecAivazis/survey/v2"
@@ -94,7 +95,7 @@ func (p *Project) validate() (str string, err error) {
 	return "", fmt.Errorf("{{ .Project }} directory does not exist")
 }
 
-func (p *Project) AskQuestions(def map[string]string, e *engine.Engine) (map[string]any, error) {
+func (p *Project) AskQuestions(def map[string]any, e *engine.Engine) (map[string]any, error) {
 	projectMode := p.NameTemplate != "templates"
 
 	if projectMode {
@@ -116,15 +117,16 @@ func (p *Project) AskQuestions(def map[string]string, e *engine.Engine) (map[str
 
 			p.Conf.Questions = append(pre, p.Conf.Questions...)
 		case true:
-			p.Name = name
+			nameStr, ok := name.(string)
+			if !ok {
+				return nil, fmt.Errorf("Project name must be a string")
+			}
+
+			p.Name = nameStr
 		}
 	}
 
-	vars := make(map[string]any)
-	// Copy default values
-	for k, v := range def {
-		vars[k] = v
-	}
+	vars := maps.Clone(def)
 
 	for _, q := range p.Conf.Questions {
 		if q.When != "" {
diff --git a/app/scaffold/project_scaffold_file.go b/app/scaffold/project_scaffold_file.go
index 27c8002..8554564 100644
--- a/app/scaffold/project_scaffold_file.go
+++ b/app/scaffold/project_scaffold_file.go
@@ -9,6 +9,20 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
+type ProjectScaffoldFile struct {
+	Skip      []string          `yaml:"skip"`
+	Questions []Question        `yaml:"questions"`
+	Rewrites  []Rewrite         `yaml:"rewrites"`
+	Computed  map[string]string `yaml:"computed"`
+	Messages  struct {
+		Pre  string `yaml:"pre"`
+		Post string `yaml:"post"`
+	} `yaml:"messages"`
+	Inject   []Injectable   `yaml:"inject"`
+	Features []Feature      `yaml:"features"`
+	Test     map[string]any `yaml:"test"`
+}
+
 type Rewrite struct {
 	From string `yaml:"from"`
 	To   string `yaml:"to"`
@@ -26,19 +40,6 @@ type Feature struct {
 	Globs []string `yaml:"globs"`
 }
 
-type ProjectScaffoldFile struct {
-	Skip      []string          `yaml:"skip"`
-	Questions []Question        `yaml:"questions"`
-	Rewrites  []Rewrite         `yaml:"rewrites"`
-	Computed  map[string]string `yaml:"computed"`
-	Messages  struct {
-		Pre  string `yaml:"pre"`
-		Post string `yaml:"post"`
-	} `yaml:"messages"`
-	Inject   []Injectable `yaml:"inject"`
-	Features []Feature    `yaml:"features"`
-}
-
 func ReadScaffoldFile(reader io.Reader) (*ProjectScaffoldFile, error) {
 	var out ProjectScaffoldFile
 
diff --git a/app/scaffold/rc.go b/app/scaffold/rc.go
index cdfb295..04f8a16 100644
--- a/app/scaffold/rc.go
+++ b/app/scaffold/rc.go
@@ -22,7 +22,7 @@ type ScaffoldRC struct {
 	//
 	// These are injected into the template as variables for
 	// every scaffold.
-	Defaults map[string]string `yaml:"defaults"`
+	Defaults map[string]any `yaml:"defaults"`
 
 	// Aliases define a alias for a repository.
 	// or filepath.
diff --git a/main.go b/main.go
index e797619..a729043 100644
--- a/main.go
+++ b/main.go
@@ -165,7 +165,13 @@ func main() {
 				Name:      "new",
 				Usage:     "create a new project from a scaffold",
 				UsageText: "scaffold new [scaffold (url | path)] [flags]",
-				Action:    ctrl.Project,
+				Flags: []cli.Flag{
+					&cli.BoolFlag{
+						Name:  "test",
+						Usage: "no prompts for user input and use test data from scaffold file",
+					},
+				},
+				Action: ctrl.New,
 			},
 			{
 				Name:      "list",
diff --git a/taskfile.yml b/taskfile.yml
index 6464a0f..2c0c146 100644
--- a/taskfile.yml
+++ b/taskfile.yml
@@ -61,18 +61,11 @@ tasks:
     desc: Runs the main.go program with the cli scaffold
     cmds:
       - rm -rf ./gen/*
-      - |
-        go run main.go \
-          new cli \
-          "project=TEST_PROJECT" \
-          "description"=TEST_PROJECT" \
-          "colors=red"
+      - go run main.go new --test cli
+      - go run ./gen/main.go hello
 
   do:role:
     desc: Runs the main.go program with the role scaffold
     cmds:
       - rm -rf ./gen/*
-      - |
-        go run main.go \
-          new role \
-          "Use Github Actions=true"
+      - go run main.go new --test role

From 929279612081a06b1cc99fd06ebe7f815594070a Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Mon, 6 May 2024 19:44:32 -0500
Subject: [PATCH 03/23] implement test example in ci

---
 .github/workflows/partial-tests.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.github/workflows/partial-tests.yml b/.github/workflows/partial-tests.yml
index 206e67a..b23755a 100644
--- a/.github/workflows/partial-tests.yml
+++ b/.github/workflows/partial-tests.yml
@@ -26,3 +26,23 @@ jobs:
 
       - name: Test
         run: go test ./... -race
+
+      - name: Test 'cli' example
+        run: |
+          go run main.go new --test hello
+          go run ./gen/main.go hello
+
+          # Run the command and store the output in a variable
+          output=$(gen run ./gen/main.go hello)
+
+          # Define the expected output
+          expected_output="Hello, your favorite colors are red, green"
+
+          # Compare the actual output with the expected output
+          if [ "$output" = "$expected_output" ]; then
+              echo "Test passed: Output matches the expected string."
+              exit 0
+          else
+              echo "Test failed: Output does not match the expected string."
+              exit 1
+          fi

From be2f8cffaf90c40f2cbdd55233a157055b1c462f Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Mon, 6 May 2024 19:45:38 -0500
Subject: [PATCH 04/23] change hello to cli

---
 .github/workflows/partial-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/partial-tests.yml b/.github/workflows/partial-tests.yml
index b23755a..a547d2e 100644
--- a/.github/workflows/partial-tests.yml
+++ b/.github/workflows/partial-tests.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Test 'cli' example
         run: |
-          go run main.go new --test hello
+          go run main.go new --test cli
           go run ./gen/main.go hello
 
           # Run the command and store the output in a variable

From 12098042d30804d462b5eae299c1bc576b70d1e6 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Mon, 6 May 2024 19:47:42 -0500
Subject: [PATCH 05/23] fix cli

---
 .github/workflows/partial-tests.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/partial-tests.yml b/.github/workflows/partial-tests.yml
index a547d2e..f4b40e6 100644
--- a/.github/workflows/partial-tests.yml
+++ b/.github/workflows/partial-tests.yml
@@ -7,7 +7,7 @@ jobs:
   Go:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
+      - uses: actions/checkout@4 # v4
 
       - name: Set up Go
         uses: actions/setup-go@v5
@@ -28,6 +28,10 @@ jobs:
         run: go test ./... -race
 
       - name: Test 'cli' example
+        env:
+          SCAFFOLD_NO_CLOBBER: true
+          SCAFFOLD_OUT: "gen"
+          SCAFFOLD_DIR: ".scaffold,.examples"
         run: |
           go run main.go new --test cli
           go run ./gen/main.go hello

From 48e46f84ff9d6b580b3fbbd39658d79dfc4e6817 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Mon, 6 May 2024 19:49:17 -0500
Subject: [PATCH 06/23] use proper version

---
 .github/workflows/partial-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/partial-tests.yml b/.github/workflows/partial-tests.yml
index f4b40e6..aaae1c4 100644
--- a/.github/workflows/partial-tests.yml
+++ b/.github/workflows/partial-tests.yml
@@ -7,7 +7,7 @@ jobs:
   Go:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@4 # v4
+      - uses: actions/checkout@v4
 
       - name: Set up Go
         uses: actions/setup-go@v5

From 54711f49035fff8f846dc215ac8337cca208c162 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Mon, 6 May 2024 19:50:21 -0500
Subject: [PATCH 07/23] duhhhh

---
 .github/workflows/partial-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/partial-tests.yml b/.github/workflows/partial-tests.yml
index aaae1c4..c6df9c5 100644
--- a/.github/workflows/partial-tests.yml
+++ b/.github/workflows/partial-tests.yml
@@ -37,7 +37,7 @@ jobs:
           go run ./gen/main.go hello
 
           # Run the command and store the output in a variable
-          output=$(gen run ./gen/main.go hello)
+          output=$(go run ./gen/main.go hello)
 
           # Define the expected output
           expected_output="Hello, your favorite colors are red, green"

From 975d01ca71e048d0a865a0a02988a817fc4bb95b Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Mon, 6 May 2024 19:57:31 -0500
Subject: [PATCH 08/23] pull out test into file

---
 .github/workflows/partial-tests.yml | 23 +----------------------
 taskfile.yml                        |  5 +++++
 tests/cli.test.sh                   | 22 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100755 tests/cli.test.sh

diff --git a/.github/workflows/partial-tests.yml b/.github/workflows/partial-tests.yml
index c6df9c5..3dccdf8 100644
--- a/.github/workflows/partial-tests.yml
+++ b/.github/workflows/partial-tests.yml
@@ -28,25 +28,4 @@ jobs:
         run: go test ./... -race
 
       - name: Test 'cli' example
-        env:
-          SCAFFOLD_NO_CLOBBER: true
-          SCAFFOLD_OUT: "gen"
-          SCAFFOLD_DIR: ".scaffold,.examples"
-        run: |
-          go run main.go new --test cli
-          go run ./gen/main.go hello
-
-          # Run the command and store the output in a variable
-          output=$(go run ./gen/main.go hello)
-
-          # Define the expected output
-          expected_output="Hello, your favorite colors are red, green"
-
-          # Compare the actual output with the expected output
-          if [ "$output" = "$expected_output" ]; then
-              echo "Test passed: Output matches the expected string."
-              exit 0
-          else
-              echo "Test failed: Output does not match the expected string."
-              exit 1
-          fi
+        run: ./tests/cli.test.sh
diff --git a/taskfile.yml b/taskfile.yml
index 2c0c146..f5b1b2b 100644
--- a/taskfile.yml
+++ b/taskfile.yml
@@ -57,6 +57,11 @@ tasks:
       - task: lint
       - task: test
 
+  test:scripts:
+    desc: Runs all go tests for the scripts
+    cmds:
+      - ./tests/cli.test.sh
+
   do:cli:
     desc: Runs the main.go program with the cli scaffold
     cmds:
diff --git a/tests/cli.test.sh b/tests/cli.test.sh
new file mode 100755
index 0000000..9d4da51
--- /dev/null
+++ b/tests/cli.test.sh
@@ -0,0 +1,22 @@
+#!/bin/bash 
+export SCAFFOLD_NO_CLOBBER="true" 
+export SCAFFOLD_OUT="gen" 
+export SCAFFOLD_DIR=".scaffold,.examples" 
+
+go run main.go new --test cli
+go run ./gen/main.go hello
+
+# Run the command and store the output in a variable
+output=$(go run ./gen/main.go hello)
+
+# Define the expected output
+expected_output="Hello, your favorite colors are red, green"
+
+# Compare the actual output with the expected output
+if [ "$output" = "$expected_output" ]; then
+    echo "Test passed: Output matches the expected string."
+    exit 0
+else
+    echo "Test failed: Output does not match the expected string."
+    exit 1
+fi

From 5d29bdfe8d82abff146621d4e1e9eb11104f4776 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Mon, 6 May 2024 21:02:47 -0500
Subject: [PATCH 09/23] docs for testing

---
 docs/docs/testing-scaffolds.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 docs/docs/testing-scaffolds.md

diff --git a/docs/docs/testing-scaffolds.md b/docs/docs/testing-scaffolds.md
new file mode 100644
index 0000000..99f27d9
--- /dev/null
+++ b/docs/docs/testing-scaffolds.md
@@ -0,0 +1,17 @@
+---
+title: Testing Scaffolds
+---
+
+Scaffold has some built-in support for testing scaffolds. This is done through with the `--test` flag when running the `scaffold new --test <template>` command, this will bypass the Q/A step of the scaffold and instead use the `test` property from the scaffold file.
+
+## Scaffold Test Property
+
+The `test` property is a map of key-value pairs that will be used to fill in the values of the scaffold. The key is the name of the variable in the scaffold file and the value is the value that will be used to fill in the variable.
+
+```yaml
+test:
+  Var1: "Value1"
+  Val:
+    - "Value1"
+    - "Value2"
+```

From ad1f21dc90ffa410f41055325b37d7f605a6b21f Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Tue, 7 May 2024 21:39:57 -0500
Subject: [PATCH 10/23] rework tests to support cases and AST output

---
 .examples/cli/scaffold.yaml                   |  7 +-
 app/commands/new.go                           | 99 +++++++------------
 app/commands/runner.go                        | 81 +++++++++++++++
 app/commands/test.go                          | 74 ++++++++++++++
 .../fsast/ast.go}                             | 16 ++-
 app/core/rwfs/mem.go                          | 15 +++
 app/scaffold/project_scaffold_file.go         |  6 +-
 app/scaffold/snapshot_test.go                 |  7 +-
 docs/docs/testing-scaffolds.md                | 33 +++++--
 main.go                                       | 47 ++++++---
 taskfile.yml                                  |  4 +-
 tests/cli.test.sh                             |  9 +-
 12 files changed, 295 insertions(+), 103 deletions(-)
 create mode 100644 app/commands/runner.go
 create mode 100644 app/commands/test.go
 rename app/{scaffold/snapshot_ast_test.go => core/fsast/ast.go} (81%)

diff --git a/.examples/cli/scaffold.yaml b/.examples/cli/scaffold.yaml
index 99b5b29..82b3960 100644
--- a/.examples/cli/scaffold.yaml
+++ b/.examples/cli/scaffold.yaml
@@ -25,6 +25,7 @@ questions:
         - "blue"
         - "yellow"
 
-test:
-  description: "Ths is a test description"
-  colors: ["red", "green"]
+tests:
+  default:
+    description: "Ths is a test description"
+    colors: ["red", "green"]
diff --git a/app/commands/new.go b/app/commands/new.go
index 8343a13..e37cd49 100644
--- a/app/commands/new.go
+++ b/app/commands/new.go
@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/charmbracelet/glamour"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/go-git/go-git/v5/plumbing/transport"
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
@@ -19,12 +18,9 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-func (ctrl *Controller) New(ctx *cli.Context) error {
-	isTest := ctx.Bool("test")
-
-	argPath := ctx.Args().First()
+func (ctrl *Controller) resolve(argPath string) (string, error) {
 	if argPath == "" {
-		return fmt.Errorf("path is required")
+		return "", fmt.Errorf("path is required")
 	}
 
 	// Status() call for go-git is too slow to be used here
@@ -33,7 +29,7 @@ func (ctrl *Controller) New(ctx *cli.Context) error {
 		ok := checkWorkingTree(ctrl.Flags.OutputDir)
 		if !ok {
 			log.Warn().Msg("working tree is dirty, use --force to apply changes")
-			return nil
+			return "", nil
 		}
 	}
 
@@ -51,17 +47,17 @@ func (ctrl *Controller) New(ctx *cli.Context) error {
 		case errors.Is(err, transport.ErrAuthenticationRequired):
 			username, password, err := httpAuthPrompt()
 			if err != nil {
-				return err
+				return "", err
 			}
 
 			path, err = resolver.Resolve(argPath, ctrl.Flags.ScaffoldDirs, basicAuthAuthorizer(argPath, username, password))
 			if err != nil {
-				return err
+				return "", err
 			}
 		default:
 			systemMatches, localMatches, err := ctrl.fuzzyFallBack(argPath)
 			if err != nil {
-				return err
+				return "", err
 			}
 
 			var first string
@@ -86,7 +82,7 @@ func (ctrl *Controller) New(ctx *cli.Context) error {
 
 					resolved, err := resolver.Resolve(first, ctrl.Flags.ScaffoldDirs, ctrl.rc)
 					if err != nil {
-						return err
+						return "", err
 					}
 
 					path = resolved
@@ -95,77 +91,56 @@ func (ctrl *Controller) New(ctx *cli.Context) error {
 		}
 
 		if path == "" {
-			return fmt.Errorf("failed to resolve path: %w", orgErr)
+			return "", fmt.Errorf("failed to resolve path: %w", orgErr)
 		}
 	}
 
-	rest := ctx.Args().Tail()
+	return path, nil
+}
 
-	for _, v := range rest {
+func parseArgVars(args []string) (map[string]any, error) {
+	vars := make(map[string]any, len(args))
+
+	for _, v := range args {
 		if !strings.Contains(v, "=") {
-			return fmt.Errorf("variable %s is not in the form of key=value", v)
+			return nil, fmt.Errorf("variable %s is not in the form of key=value", v)
 		}
 
 		kv := strings.Split(v, "=")
-		ctrl.vars[kv[0]] = kv[1]
-	}
-
-	pfs := os.DirFS(path)
-	p, err := scaffold.LoadProject(pfs, scaffold.Options{
-		NoClobber: ctrl.Flags.NoClobber,
-	})
-	if err != nil {
-		return err
-	}
-
-	if p.Conf.Messages.Pre != "" {
-		out, err := glamour.RenderWithEnvironmentConfig(p.Conf.Messages.Pre)
-		if err != nil {
-			return err
-		}
-
-		fmt.Println(out)
-	}
-
-	vars := scaffold.MergeMaps(ctrl.vars, ctrl.rc.Defaults)
-	if isTest {
-		// explicitly ignore rc.Defaults here
-		vars = scaffold.MergeMaps(ctrl.vars, p.Conf.Test)
-	} else {
-		vars, err = p.AskQuestions(vars, ctrl.engine)
-		if err != nil {
-			return err
-		}
+		vars[kv[0]] = kv[1]
 	}
 
-	args := &scaffold.RWFSArgs{
-		Project: p,
-		ReadFS:  pfs,
-		WriteFS: rwfs.NewOsWFS(ctrl.Flags.OutputDir),
-	}
+	return vars, nil
+}
 
-	vars, err = scaffold.BuildVars(ctrl.engine, args, vars)
+func (ctrl *Controller) New(ctx *cli.Context) error {
+	path, err := ctrl.resolve(ctx.Args().First())
 	if err != nil {
 		return err
 	}
 
-	err = scaffold.RenderRWFS(ctrl.engine, args, vars)
+	rest := ctx.Args().Tail()
+	argvars, err := parseArgVars(rest)
 	if err != nil {
 		return err
 	}
 
-	if p.Conf.Messages.Post != "" {
-		rendered, err := ctrl.engine.TmplString(p.Conf.Messages.Post, vars)
-		if err != nil {
-			return err
-		}
-
-		out, err := glamour.RenderWithEnvironmentConfig(rendered)
-		if err != nil {
-			return err
-		}
+	err = ctrl.runscaffold(runconf{
+		scaffolddir:  path,
+		showMessages: true,
+		varfunc: func(p *scaffold.Project) (map[string]any, error) {
+			vars := scaffold.MergeMaps(ctrl.vars, argvars, ctrl.rc.Defaults)
+			vars, err = p.AskQuestions(vars, ctrl.engine)
+			if err != nil {
+				return nil, err
+			}
 
-		fmt.Println(out)
+			return vars, nil
+		},
+		outputfs: rwfs.NewOsWFS(ctrl.Flags.OutputDir),
+	})
+	if err != nil {
+		return err
 	}
 
 	return nil
diff --git a/app/commands/runner.go b/app/commands/runner.go
new file mode 100644
index 0000000..b7309e3
--- /dev/null
+++ b/app/commands/runner.go
@@ -0,0 +1,81 @@
+package commands
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/charmbracelet/glamour"
+	"github.com/hay-kot/scaffold/app/core/rwfs"
+	"github.com/hay-kot/scaffold/app/scaffold"
+)
+
+type runconf struct {
+	// os path to the scaffold directory.
+	scaffolddir string
+	// showMessages is a flag to show pre/post messages.
+	showMessages bool
+	// varfunc is a function that returns a map of variables that is provided
+	// to the template engine.
+	varfunc func(*scaffold.Project) (map[string]any, error)
+	// outputdir is the output directory or filesystem.
+	outputfs rwfs.WriteFS
+}
+
+// runscaffold runs the scaffold. This method exists outside of the `new` receiver function
+// so that we can allow the `test` and `new` commands to share as much of the same code
+// as possible.
+func (ctrl *Controller) runscaffold(cfg runconf) error {
+	pfs := os.DirFS(cfg.scaffolddir)
+	p, err := scaffold.LoadProject(pfs, scaffold.Options{
+		NoClobber: ctrl.Flags.NoClobber,
+	})
+	if err != nil {
+		return err
+	}
+
+	if cfg.showMessages && p.Conf.Messages.Pre != "" {
+		out, err := glamour.RenderWithEnvironmentConfig(p.Conf.Messages.Pre)
+		if err != nil {
+			return err
+		}
+
+		fmt.Println(out)
+	}
+
+	vars, err := cfg.varfunc(p)
+	if err != nil {
+		return err
+	}
+
+	args := &scaffold.RWFSArgs{
+		Project: p,
+		ReadFS:  pfs,
+		WriteFS: cfg.outputfs,
+	}
+
+	vars, err = scaffold.BuildVars(ctrl.engine, args, vars)
+	if err != nil {
+		return err
+	}
+
+	err = scaffold.RenderRWFS(ctrl.engine, args, vars)
+	if err != nil {
+		return err
+	}
+
+	if cfg.showMessages && p.Conf.Messages.Post != "" {
+		rendered, err := ctrl.engine.TmplString(p.Conf.Messages.Post, vars)
+		if err != nil {
+			return err
+		}
+
+		out, err := glamour.RenderWithEnvironmentConfig(rendered)
+		if err != nil {
+			return err
+		}
+
+		fmt.Println(out)
+	}
+
+	return nil
+}
diff --git a/app/commands/test.go b/app/commands/test.go
new file mode 100644
index 0000000..241c037
--- /dev/null
+++ b/app/commands/test.go
@@ -0,0 +1,74 @@
+package commands
+
+import (
+	"fmt"
+	"math/rand"
+
+	"github.com/hay-kot/scaffold/app/core/fsast"
+	"github.com/hay-kot/scaffold/app/core/rwfs"
+	"github.com/hay-kot/scaffold/app/scaffold"
+)
+
+type FlagsTest struct {
+	Case  string `json:"case"`
+	MemFS bool   `json:"memfs"`
+	Ast   bool   `json:"ast"`
+}
+
+func (ctrl *Controller) Test(args []string, flags FlagsTest) error {
+	path, err := ctrl.resolve(args[0])
+	if err != nil {
+		return err
+	}
+
+	rest := args[1:]
+	argvars, err := parseArgVars(rest)
+	if err != nil {
+		return err
+	}
+
+	var outfs rwfs.WriteFS
+	if flags.MemFS {
+		outfs = rwfs.NewMemoryWFS()
+	} else {
+		outfs = rwfs.NewOsWFS(ctrl.Flags.OutputDir)
+	}
+
+	err = ctrl.runscaffold(runconf{
+		scaffolddir:  path,
+		showMessages: false,
+		varfunc: func(p *scaffold.Project) (map[string]any, error) {
+			caseVars, ok := p.Conf.Tests[flags.Case]
+			if !ok {
+				return nil, fmt.Errorf("case %s not found", flags.Case)
+			}
+
+			project, ok := caseVars["Project"].(string)
+			if !ok || project == "" {
+				// Generate 4 random digits
+				name := fmt.Sprintf("scaffold-test-%04d", rand.Intn(10000))
+				p.Name = name
+				caseVars["Project"] = name
+			}
+
+			// Test cases do not use rc.Defaults
+			vars := scaffold.MergeMaps(ctrl.vars, caseVars, argvars)
+			return vars, nil
+		},
+		outputfs: outfs,
+	})
+	if err != nil {
+		return err
+	}
+
+	if flags.Ast {
+		ast, err := fsast.New(outfs)
+		if err != nil {
+			return err
+		}
+
+		fmt.Println(ast.String())
+	}
+
+	return nil
+}
diff --git a/app/scaffold/snapshot_ast_test.go b/app/core/fsast/ast.go
similarity index 81%
rename from app/scaffold/snapshot_ast_test.go
rename to app/core/fsast/ast.go
index 52e55af..0409970 100644
--- a/app/scaffold/snapshot_ast_test.go
+++ b/app/core/fsast/ast.go
@@ -1,4 +1,5 @@
-package scaffold
+// Package fsast provides a way to build an abstract syntax tree (AST) of a file system.
+package fsast
 
 import (
 	"bytes"
@@ -45,7 +46,16 @@ func (n *AstNode) String() string {
 	return n.string(0)
 }
 
-func buildNodeTree(subFs fs.FS, root *AstNode) error {
+func New(subFs fs.FS) (*AstNode, error) {
+	root := &AstNode{
+		NodeType: DirNodeType,
+		Path:     "ROOT_NODE",
+	}
+
+	return root, Build(subFs, root)
+}
+
+func Build(subFs fs.FS, root *AstNode) error {
 	files, err := fs.ReadDir(subFs, ".")
 	if err != nil {
 		return err
@@ -60,7 +70,7 @@ func buildNodeTree(subFs fs.FS, root *AstNode) error {
 			node.NodeType = DirNodeType
 			subsubFS, _ := fs.Sub(subFs, file.Name())
 
-			err = buildNodeTree(subsubFS, node)
+			err = Build(subsubFS, node)
 			if err != nil {
 				return err
 			}
diff --git a/app/core/rwfs/mem.go b/app/core/rwfs/mem.go
index 06e6486..fa43a14 100644
--- a/app/core/rwfs/mem.go
+++ b/app/core/rwfs/mem.go
@@ -2,6 +2,7 @@ package rwfs
 
 import (
 	"io/fs"
+	"strings"
 
 	"github.com/psanford/memfs"
 )
@@ -19,6 +20,20 @@ type MemoryWFS struct {
 	*memfs.FS
 }
 
+func (m *MemoryWFS) MkdirAll(path string, perm fs.FileMode) error {
+	if path == "/" {
+		// special case root dir always exists
+		return nil
+	}
+
+	return m.FS.MkdirAll(path, perm)
+}
+
+func (m *MemoryWFS) WriteFile(path string, data []byte, perm fs.FileMode) error {
+	path = strings.TrimPrefix(path, "/")
+	return m.FS.WriteFile(path, data, perm)
+}
+
 func NewMemoryWFS() *MemoryWFS {
 	return &MemoryWFS{
 		FS: memfs.New(),
diff --git a/app/scaffold/project_scaffold_file.go b/app/scaffold/project_scaffold_file.go
index 8554564..a6c7524 100644
--- a/app/scaffold/project_scaffold_file.go
+++ b/app/scaffold/project_scaffold_file.go
@@ -18,9 +18,9 @@ type ProjectScaffoldFile struct {
 		Pre  string `yaml:"pre"`
 		Post string `yaml:"post"`
 	} `yaml:"messages"`
-	Inject   []Injectable   `yaml:"inject"`
-	Features []Feature      `yaml:"features"`
-	Test     map[string]any `yaml:"test"`
+	Inject   []Injectable              `yaml:"inject"`
+	Features []Feature                 `yaml:"features"`
+	Tests    map[string]map[string]any `yaml:"tests"`
 }
 
 type Rewrite struct {
diff --git a/app/scaffold/snapshot_test.go b/app/scaffold/snapshot_test.go
index a5ce5cb..f71f86b 100644
--- a/app/scaffold/snapshot_test.go
+++ b/app/scaffold/snapshot_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/bradleyjkemp/cupaloy/v2"
 	"github.com/hay-kot/scaffold/app/core/engine"
+	"github.com/hay-kot/scaffold/app/core/fsast"
 	"github.com/hay-kot/scaffold/app/core/rwfs"
 	"github.com/stretchr/testify/require"
 )
@@ -68,8 +69,8 @@ func Test_RenderRWFileSystem(t *testing.T) {
 				Project: tt.p,
 			}
 
-			root := &AstNode{
-				NodeType: DirNodeType,
+			root := &fsast.AstNode{
+				NodeType: fsast.DirNodeType,
 				Path:     "ROOT_NODE",
 			}
 
@@ -79,7 +80,7 @@ func Test_RenderRWFileSystem(t *testing.T) {
 			err = RenderRWFS(tEngine, args, vars)
 			require.NoError(t, err)
 
-			err = buildNodeTree(memFS, root)
+			err = fsast.Build(memFS, root)
 			require.NoError(t, err)
 
 			snapshot.SnapshotT(t, root.String())
diff --git a/docs/docs/testing-scaffolds.md b/docs/docs/testing-scaffolds.md
index 99f27d9..36e390a 100644
--- a/docs/docs/testing-scaffolds.md
+++ b/docs/docs/testing-scaffolds.md
@@ -2,16 +2,33 @@
 title: Testing Scaffolds
 ---
 
-Scaffold has some built-in support for testing scaffolds. This is done through with the `--test` flag when running the `scaffold new --test <template>` command, this will bypass the Q/A step of the scaffold and instead use the `test` property from the scaffold file.
+The Scaffold CLI has built in support for testing scaffold. The `scaffold test` command will run a case provided with the `--case` flag and render the templates as if those arguments were provided via the interactive interface. If a 'Project' key is not provided in the test case one will be generated in the pattern `scaffold-test-*`.
 
-## Scaffold Test Property
+The `test` command can also output an AST of the rendered scaffold to stdout.
 
-The `test` property is a map of key-value pairs that will be used to fill in the values of the scaffold. The key is the name of the variable in the scaffold file and the value is the value that will be used to fill in the variable.
+```bash
+scaffold test --log-level="panic" --case="default" --memfs --ast <scaffold-name>
+main.go:  (type=file)
+        package main
+
+        import (
+                "fmt"
+        )
+
+        func main() {
+                fmt.Println("Hello, World!")
+        }
+```
+
+## Test Cases
+
+Test cases can be defined in the `scaffold.yaml` file under the `tests` key.
 
 ```yaml
-test:
-  Var1: "Value1"
-  Val:
-    - "Value1"
-    - "Value2"
+tests:
+  default:
+    Var1: "Hello, World!"
+    Var2: "Hello, World!"
 ```
+
+The `default` key is the name of the test case. The values under the test case key are the values that will be passed to the scaffold when running the test case.
diff --git a/main.go b/main.go
index a729043..9df670f 100644
--- a/main.go
+++ b/main.go
@@ -102,21 +102,13 @@ func main() {
 				ScaffoldDirs:   ctx.StringSlice("scaffold-dir"),
 			}
 
-			switch ctx.String("log-level") {
-			case "debug":
-				log.Logger = log.Level(zerolog.DebugLevel)
-			case "info":
-				log.Logger = log.Level(zerolog.InfoLevel)
-			case "warn":
-				log.Logger = log.Level(zerolog.WarnLevel)
-			case "error":
-				log.Logger = log.Level(zerolog.ErrorLevel)
-			case "fatal":
-				log.Logger = log.Level(zerolog.FatalLevel)
-			default:
-				log.Logger = log.Level(zerolog.PanicLevel)
+			level, err := zerolog.ParseLevel(ctx.String("log-level"))
+			if err != nil {
+				return fmt.Errorf("failed to parse log level: %w", err)
 			}
 
+			log.Logger = log.Level(level)
+
 			dir := filepath.Dir(ctrl.Flags.ScaffoldRCPath)
 			if err := os.MkdirAll(dir, 0o755); err != nil {
 				return fmt.Errorf("failed to create scaffoldrc directory: %w", err)
@@ -165,13 +157,36 @@ func main() {
 				Name:      "new",
 				Usage:     "create a new project from a scaffold",
 				UsageText: "scaffold new [scaffold (url | path)] [flags]",
+				Action:    ctrl.New,
+			},
+			{
+				Name:      "test",
+				Usage:     "test a scaffold",
+				UsageText: "scaffold test [scaffold (url | path)] [flags]",
 				Flags: []cli.Flag{
+					&cli.StringFlag{
+						Name:  "case",
+						Usage: "test case from scaffoldrc to run",
+						Value: "default",
+					},
+					&cli.BoolFlag{
+						Name:  "memfs",
+						Usage: "use memory filesystem for testing",
+						Value: true,
+					},
 					&cli.BoolFlag{
-						Name:  "test",
-						Usage: "no prompts for user input and use test data from scaffold file",
+						Name:  "ast",
+						Usage: "print the ast of the scaffold",
+						Value: false,
 					},
 				},
-				Action: ctrl.New,
+				Action: func(ctx *cli.Context) error {
+					return ctrl.Test(ctx.Args().Slice(), commands.FlagsTest{
+						Case:  ctx.String("case"),
+						MemFS: ctx.Bool("memfs"),
+						Ast:   ctx.Bool("ast"),
+					})
+				},
 			},
 			{
 				Name:      "list",
diff --git a/taskfile.yml b/taskfile.yml
index f5b1b2b..11c0579 100644
--- a/taskfile.yml
+++ b/taskfile.yml
@@ -66,11 +66,11 @@ tasks:
     desc: Runs the main.go program with the cli scaffold
     cmds:
       - rm -rf ./gen/*
-      - go run main.go new --test cli
+      - go run main.go new cli
       - go run ./gen/main.go hello
 
   do:role:
     desc: Runs the main.go program with the role scaffold
     cmds:
       - rm -rf ./gen/*
-      - go run main.go new --test role
+      - go run main.go new role
diff --git a/tests/cli.test.sh b/tests/cli.test.sh
index 9d4da51..aa52b7b 100755
--- a/tests/cli.test.sh
+++ b/tests/cli.test.sh
@@ -1,14 +1,17 @@
 #!/bin/bash 
+set -euo pipefail 
 export SCAFFOLD_NO_CLOBBER="true" 
 export SCAFFOLD_OUT="gen" 
 export SCAFFOLD_DIR=".scaffold,.examples" 
 
-go run main.go new --test cli
-go run ./gen/main.go hello
+rm -rf gen/*
+
+go run main.go --log-level="error" test --case="default" --memfs="false" --ast="true" cli
 
 # Run the command and store the output in a variable
-output=$(go run ./gen/main.go hello)
+output=$(go run ./gen/scaffold-test*/main.go hello)
 
+echo "Output: '$output'"  
 # Define the expected output
 expected_output="Hello, your favorite colors are red, green"
 

From 509717a2cf6989a65b9a515d44c5128b8610c1ed Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Tue, 7 May 2024 21:43:09 -0500
Subject: [PATCH 11/23] fix output example

---
 docs/docs/testing-scaffolds.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/docs/testing-scaffolds.md b/docs/docs/testing-scaffolds.md
index 36e390a..de74034 100644
--- a/docs/docs/testing-scaffolds.md
+++ b/docs/docs/testing-scaffolds.md
@@ -8,16 +8,17 @@ The `test` command can also output an AST of the rendered scaffold to stdout.
 
 ```bash
 scaffold test --log-level="panic" --case="default" --memfs --ast <scaffold-name>
-main.go:  (type=file)
-        package main
+scaffold-test-3811:  (type=dir)
+        main.go:  (type=file)
+                package main
 
-        import (
-                "fmt"
-        )
+                import (
+                        "fmt"
+                )
 
-        func main() {
-                fmt.Println("Hello, World!")
-        }
+                func main() {
+                        fmt.Println("Hello, World!")
+                }
 ```
 
 ## Test Cases

From 47072f13f388a6ef6364df260b5c7f6b51cb125b Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Tue, 7 May 2024 21:58:37 -0500
Subject: [PATCH 12/23] re-org commands folder

---
 app/commands/{init.go => init_cmd.go}     |   0
 app/commands/{lint.go => lint_cmd.go}     |   0
 app/commands/{list.go => list_cmd.go}     |   0
 app/commands/new.go                       | 252 ----------------------
 app/commands/new_cmd.go                   | 102 +++++++++
 app/commands/prompts.go                   |  75 +++++++
 app/commands/resolve.go                   |  90 ++++++++
 app/commands/{test.go => test_cmd.go}     |   0
 app/commands/{update.go => update_cmd.go} |   0
 9 files changed, 267 insertions(+), 252 deletions(-)
 rename app/commands/{init.go => init_cmd.go} (100%)
 rename app/commands/{lint.go => lint_cmd.go} (100%)
 rename app/commands/{list.go => list_cmd.go} (100%)
 delete mode 100644 app/commands/new.go
 create mode 100644 app/commands/new_cmd.go
 create mode 100644 app/commands/prompts.go
 create mode 100644 app/commands/resolve.go
 rename app/commands/{test.go => test_cmd.go} (100%)
 rename app/commands/{update.go => update_cmd.go} (100%)

diff --git a/app/commands/init.go b/app/commands/init_cmd.go
similarity index 100%
rename from app/commands/init.go
rename to app/commands/init_cmd.go
diff --git a/app/commands/lint.go b/app/commands/lint_cmd.go
similarity index 100%
rename from app/commands/lint.go
rename to app/commands/lint_cmd.go
diff --git a/app/commands/list.go b/app/commands/list_cmd.go
similarity index 100%
rename from app/commands/list.go
rename to app/commands/list_cmd.go
diff --git a/app/commands/new.go b/app/commands/new.go
deleted file mode 100644
index e37cd49..0000000
--- a/app/commands/new.go
+++ /dev/null
@@ -1,252 +0,0 @@
-package commands
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/charmbracelet/lipgloss"
-	"github.com/go-git/go-git/v5/plumbing/transport"
-	"github.com/go-git/go-git/v5/plumbing/transport/http"
-	"github.com/hay-kot/scaffold/app/core/rwfs"
-	"github.com/hay-kot/scaffold/app/scaffold"
-	"github.com/hay-kot/scaffold/app/scaffold/pkgs"
-	"github.com/rs/zerolog/log"
-	"github.com/sahilm/fuzzy"
-	"github.com/urfave/cli/v2"
-)
-
-func (ctrl *Controller) resolve(argPath string) (string, error) {
-	if argPath == "" {
-		return "", fmt.Errorf("path is required")
-	}
-
-	// Status() call for go-git is too slow to be used here
-	// https://github.com/go-git/go-git/issues/181
-	if !ctrl.Flags.Force {
-		ok := checkWorkingTree(ctrl.Flags.OutputDir)
-		if !ok {
-			log.Warn().Msg("working tree is dirty, use --force to apply changes")
-			return "", nil
-		}
-	}
-
-	resolver := pkgs.NewResolver(ctrl.rc.Shorts, ctrl.Flags.Cache, ".")
-
-	if v, ok := ctrl.rc.Aliases[argPath]; ok {
-		argPath = v
-	}
-
-	path, err := resolver.Resolve(argPath, ctrl.Flags.ScaffoldDirs, ctrl.rc)
-	if err != nil {
-		orgErr := err
-
-		switch {
-		case errors.Is(err, transport.ErrAuthenticationRequired):
-			username, password, err := httpAuthPrompt()
-			if err != nil {
-				return "", err
-			}
-
-			path, err = resolver.Resolve(argPath, ctrl.Flags.ScaffoldDirs, basicAuthAuthorizer(argPath, username, password))
-			if err != nil {
-				return "", err
-			}
-		default:
-			systemMatches, localMatches, err := ctrl.fuzzyFallBack(argPath)
-			if err != nil {
-				return "", err
-			}
-
-			var first string
-			var isSystemMatch bool
-			if len(systemMatches) > 0 {
-				first = systemMatches[0]
-				isSystemMatch = true
-			}
-
-			if len(localMatches) > 0 {
-				first = localMatches[0]
-			}
-
-			if first != "" {
-				useMatch := didYouMeanPrompt(argPath, first)
-
-				if useMatch {
-					if isSystemMatch {
-						// prepend https:// so it resolves to the correct path
-						first = "https://" + first
-					}
-
-					resolved, err := resolver.Resolve(first, ctrl.Flags.ScaffoldDirs, ctrl.rc)
-					if err != nil {
-						return "", err
-					}
-
-					path = resolved
-				}
-			}
-		}
-
-		if path == "" {
-			return "", fmt.Errorf("failed to resolve path: %w", orgErr)
-		}
-	}
-
-	return path, nil
-}
-
-func parseArgVars(args []string) (map[string]any, error) {
-	vars := make(map[string]any, len(args))
-
-	for _, v := range args {
-		if !strings.Contains(v, "=") {
-			return nil, fmt.Errorf("variable %s is not in the form of key=value", v)
-		}
-
-		kv := strings.Split(v, "=")
-		vars[kv[0]] = kv[1]
-	}
-
-	return vars, nil
-}
-
-func (ctrl *Controller) New(ctx *cli.Context) error {
-	path, err := ctrl.resolve(ctx.Args().First())
-	if err != nil {
-		return err
-	}
-
-	rest := ctx.Args().Tail()
-	argvars, err := parseArgVars(rest)
-	if err != nil {
-		return err
-	}
-
-	err = ctrl.runscaffold(runconf{
-		scaffolddir:  path,
-		showMessages: true,
-		varfunc: func(p *scaffold.Project) (map[string]any, error) {
-			vars := scaffold.MergeMaps(ctrl.vars, argvars, ctrl.rc.Defaults)
-			vars, err = p.AskQuestions(vars, ctrl.engine)
-			if err != nil {
-				return nil, err
-			}
-
-			return vars, nil
-		},
-		outputfs: rwfs.NewOsWFS(ctrl.Flags.OutputDir),
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func httpAuthPrompt() (username string, password string, err error) {
-	qs := []*survey.Question{
-		{
-			Name:     "username",
-			Prompt:   &survey.Input{Message: "Username:"},
-			Validate: survey.Required,
-		},
-		{
-			Name: "password",
-			Prompt: &survey.Password{
-				Message: "Password/Access Token:",
-			},
-		},
-	}
-
-	answers := struct {
-		Username string
-		Password string
-	}{}
-
-	err = survey.Ask(qs, &answers)
-	if err != nil {
-		return "", "", fmt.Errorf("failed to parse http auth input: %w", err)
-	}
-
-	return answers.Username, answers.Password, nil
-}
-
-func (ctrl *Controller) fuzzyFallBack(str string) ([]string, []string, error) {
-	systemScaffolds, err := pkgs.ListSystem(os.DirFS(ctrl.Flags.Cache))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	localScaffolds, err := pkgs.ListLocal(os.DirFS(ctrl.Flags.OutputDir))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	systemMatches := fuzzy.Find(str, systemScaffolds)
-	systemMatchesOutput := make([]string, len(systemMatches))
-	for i, match := range systemMatches {
-		systemMatchesOutput[i] = match.Str
-	}
-
-	localMatches := fuzzy.Find(str, localScaffolds)
-	localMatchesOutput := make([]string, len(localMatches))
-	for i, match := range localMatches {
-		localMatchesOutput[i] = match.Str
-	}
-
-	return systemMatchesOutput, localMatchesOutput, nil
-}
-
-var (
-	bold     = lipgloss.NewStyle().Bold(true)
-	colorRed = lipgloss.NewStyle().Foreground(lipgloss.Color("#dc2626"))
-)
-
-func didYouMeanPrompt(given, suggestion string) bool {
-	bldr := strings.Builder{}
-
-	// Couldn't find a scaffold named:
-	//   'foo'
-	//
-	// Did you mean:
-	//   'bar'?
-	//
-	// [y/n]:
-
-	bldr.WriteString("\n ")
-	bldr.WriteString(bold.Render(colorRed.Render("could not find a scaffold named")))
-	bldr.WriteString("\n    ")
-	bldr.WriteString(given)
-	bldr.WriteString("\n\n")
-	bldr.WriteString(" ")
-	bldr.WriteString(bold.Render("did you mean"))
-	bldr.WriteString("\n    ")
-	bldr.WriteString(suggestion)
-	bldr.WriteString("?\n\n ")
-	bldr.WriteString("[y/n]: ")
-
-	out := bldr.String()
-
-	var resp string
-
-	fmt.Print(out)
-	fmt.Scanln(&resp)
-
-	return resp == "y"
-}
-
-func basicAuthAuthorizer(pkgurl, username, password string) pkgs.AuthProviderFunc {
-	return func(url string) (transport.AuthMethod, bool) {
-		if url != pkgurl {
-			return nil, false
-		}
-
-		return &http.BasicAuth{
-			Username: username,
-			Password: password,
-		}, true
-	}
-}
diff --git a/app/commands/new_cmd.go b/app/commands/new_cmd.go
new file mode 100644
index 0000000..dd181f1
--- /dev/null
+++ b/app/commands/new_cmd.go
@@ -0,0 +1,102 @@
+package commands
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/go-git/go-git/v5/plumbing/transport"
+	"github.com/go-git/go-git/v5/plumbing/transport/http"
+	"github.com/hay-kot/scaffold/app/core/rwfs"
+	"github.com/hay-kot/scaffold/app/scaffold"
+	"github.com/hay-kot/scaffold/app/scaffold/pkgs"
+	"github.com/sahilm/fuzzy"
+	"github.com/urfave/cli/v2"
+)
+
+func parseArgVars(args []string) (map[string]any, error) {
+	vars := make(map[string]any, len(args))
+
+	for _, v := range args {
+		if !strings.Contains(v, "=") {
+			return nil, fmt.Errorf("variable %s is not in the form of key=value", v)
+		}
+
+		kv := strings.Split(v, "=")
+		vars[kv[0]] = kv[1]
+	}
+
+	return vars, nil
+}
+
+func (ctrl *Controller) New(ctx *cli.Context) error {
+	path, err := ctrl.resolve(ctx.Args().First())
+	if err != nil {
+		return err
+	}
+
+	rest := ctx.Args().Tail()
+	argvars, err := parseArgVars(rest)
+	if err != nil {
+		return err
+	}
+
+	err = ctrl.runscaffold(runconf{
+		scaffolddir:  path,
+		showMessages: true,
+		varfunc: func(p *scaffold.Project) (map[string]any, error) {
+			vars := scaffold.MergeMaps(ctrl.vars, argvars, ctrl.rc.Defaults)
+			vars, err = p.AskQuestions(vars, ctrl.engine)
+			if err != nil {
+				return nil, err
+			}
+
+			return vars, nil
+		},
+		outputfs: rwfs.NewOsWFS(ctrl.Flags.OutputDir),
+	})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (ctrl *Controller) fuzzyFallBack(str string) ([]string, []string, error) {
+	systemScaffolds, err := pkgs.ListSystem(os.DirFS(ctrl.Flags.Cache))
+	if err != nil {
+		return nil, nil, err
+	}
+
+	localScaffolds, err := pkgs.ListLocal(os.DirFS(ctrl.Flags.OutputDir))
+	if err != nil {
+		return nil, nil, err
+	}
+
+	systemMatches := fuzzy.Find(str, systemScaffolds)
+	systemMatchesOutput := make([]string, len(systemMatches))
+	for i, match := range systemMatches {
+		systemMatchesOutput[i] = match.Str
+	}
+
+	localMatches := fuzzy.Find(str, localScaffolds)
+	localMatchesOutput := make([]string, len(localMatches))
+	for i, match := range localMatches {
+		localMatchesOutput[i] = match.Str
+	}
+
+	return systemMatchesOutput, localMatchesOutput, nil
+}
+
+func basicAuthAuthorizer(pkgurl, username, password string) pkgs.AuthProviderFunc {
+	return func(url string) (transport.AuthMethod, bool) {
+		if url != pkgurl {
+			return nil, false
+		}
+
+		return &http.BasicAuth{
+			Username: username,
+			Password: password,
+		}, true
+	}
+}
diff --git a/app/commands/prompts.go b/app/commands/prompts.go
new file mode 100644
index 0000000..ed2dd25
--- /dev/null
+++ b/app/commands/prompts.go
@@ -0,0 +1,75 @@
+package commands
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/AlecAivazis/survey/v2"
+	"github.com/charmbracelet/lipgloss"
+)
+
+var (
+	bold     = lipgloss.NewStyle().Bold(true)
+	colorRed = lipgloss.NewStyle().Foreground(lipgloss.Color("#dc2626"))
+)
+
+func httpAuthPrompt() (username string, password string, err error) {
+	qs := []*survey.Question{
+		{
+			Name:     "username",
+			Prompt:   &survey.Input{Message: "Username:"},
+			Validate: survey.Required,
+		},
+		{
+			Name: "password",
+			Prompt: &survey.Password{
+				Message: "Password/Access Token:",
+			},
+		},
+	}
+
+	answers := struct {
+		Username string
+		Password string
+	}{}
+
+	err = survey.Ask(qs, &answers)
+	if err != nil {
+		return "", "", fmt.Errorf("failed to parse http auth input: %w", err)
+	}
+
+	return answers.Username, answers.Password, nil
+}
+
+func didYouMeanPrompt(given, suggestion string) bool {
+	bldr := strings.Builder{}
+
+	// Couldn't find a scaffold named:
+	//   'foo'
+	//
+	// Did you mean:
+	//   'bar'?
+	//
+	// [y/n]:
+
+	bldr.WriteString("\n ")
+	bldr.WriteString(bold.Render(colorRed.Render("could not find a scaffold named")))
+	bldr.WriteString("\n    ")
+	bldr.WriteString(given)
+	bldr.WriteString("\n\n")
+	bldr.WriteString(" ")
+	bldr.WriteString(bold.Render("did you mean"))
+	bldr.WriteString("\n    ")
+	bldr.WriteString(suggestion)
+	bldr.WriteString("?\n\n ")
+	bldr.WriteString("[y/n]: ")
+
+	out := bldr.String()
+
+	var resp string
+
+	fmt.Print(out)
+	fmt.Scanln(&resp)
+
+	return resp == "y"
+}
diff --git a/app/commands/resolve.go b/app/commands/resolve.go
new file mode 100644
index 0000000..d6c494b
--- /dev/null
+++ b/app/commands/resolve.go
@@ -0,0 +1,90 @@
+package commands
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/go-git/go-git/v5/plumbing/transport"
+	"github.com/hay-kot/scaffold/app/scaffold/pkgs"
+	"github.com/rs/zerolog/log"
+)
+
+func (ctrl *Controller) resolve(argPath string) (string, error) {
+	if argPath == "" {
+		return "", fmt.Errorf("path is required")
+	}
+
+	// Status() call for go-git is too slow to be used here
+	// https://github.com/go-git/go-git/issues/181
+	if !ctrl.Flags.Force {
+		ok := checkWorkingTree(ctrl.Flags.OutputDir)
+		if !ok {
+			log.Warn().Msg("working tree is dirty, use --force to apply changes")
+			return "", nil
+		}
+	}
+
+	resolver := pkgs.NewResolver(ctrl.rc.Shorts, ctrl.Flags.Cache, ".")
+
+	if v, ok := ctrl.rc.Aliases[argPath]; ok {
+		argPath = v
+	}
+
+	path, err := resolver.Resolve(argPath, ctrl.Flags.ScaffoldDirs, ctrl.rc)
+	if err != nil {
+		orgErr := err
+
+		switch {
+		case errors.Is(err, transport.ErrAuthenticationRequired):
+			username, password, err := httpAuthPrompt()
+			if err != nil {
+				return "", err
+			}
+
+			path, err = resolver.Resolve(argPath, ctrl.Flags.ScaffoldDirs, basicAuthAuthorizer(argPath, username, password))
+			if err != nil {
+				return "", err
+			}
+		default:
+			systemMatches, localMatches, err := ctrl.fuzzyFallBack(argPath)
+			if err != nil {
+				return "", err
+			}
+
+			var first string
+			var isSystemMatch bool
+			if len(systemMatches) > 0 {
+				first = systemMatches[0]
+				isSystemMatch = true
+			}
+
+			if len(localMatches) > 0 {
+				first = localMatches[0]
+			}
+
+			if first != "" {
+				useMatch := didYouMeanPrompt(argPath, first)
+
+				if useMatch {
+					if isSystemMatch {
+						// prepend https:// so it resolves to the correct path
+						first = "https://" + first
+					}
+
+					resolved, err := resolver.Resolve(first, ctrl.Flags.ScaffoldDirs, ctrl.rc)
+					if err != nil {
+						return "", err
+					}
+
+					path = resolved
+				}
+			}
+		}
+
+		if path == "" {
+			return "", fmt.Errorf("failed to resolve path: %w", orgErr)
+		}
+	}
+
+	return path, nil
+}
diff --git a/app/commands/test.go b/app/commands/test_cmd.go
similarity index 100%
rename from app/commands/test.go
rename to app/commands/test_cmd.go
diff --git a/app/commands/update.go b/app/commands/update_cmd.go
similarity index 100%
rename from app/commands/update.go
rename to app/commands/update_cmd.go

From 301f08e070541a6acc30f64ffb166a60e9e684ea Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Wed, 8 May 2024 08:33:35 -0500
Subject: [PATCH 13/23] guard against out of bounds access

---
 app/commands/new_cmd.go  | 34 +++++++++++++++++++---------------
 app/commands/test_cmd.go |  4 ++++
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/commands/new_cmd.go b/app/commands/new_cmd.go
index dd181f1..1954242 100644
--- a/app/commands/new_cmd.go
+++ b/app/commands/new_cmd.go
@@ -14,27 +14,16 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-func parseArgVars(args []string) (map[string]any, error) {
-	vars := make(map[string]any, len(args))
-
-	for _, v := range args {
-		if !strings.Contains(v, "=") {
-			return nil, fmt.Errorf("variable %s is not in the form of key=value", v)
-		}
-
-		kv := strings.Split(v, "=")
-		vars[kv[0]] = kv[1]
-	}
-
-	return vars, nil
-}
-
 func (ctrl *Controller) New(ctx *cli.Context) error {
 	path, err := ctrl.resolve(ctx.Args().First())
 	if err != nil {
 		return err
 	}
 
+	if path == "" {
+		return fmt.Errorf("missing scaffold path")
+	}
+
 	rest := ctx.Args().Tail()
 	argvars, err := parseArgVars(rest)
 	if err != nil {
@@ -100,3 +89,18 @@ func basicAuthAuthorizer(pkgurl, username, password string) pkgs.AuthProviderFun
 		}, true
 	}
 }
+
+func parseArgVars(args []string) (map[string]any, error) {
+	vars := make(map[string]any, len(args))
+
+	for _, v := range args {
+		if !strings.Contains(v, "=") {
+			return nil, fmt.Errorf("variable %s is not in the form of key=value", v)
+		}
+
+		kv := strings.Split(v, "=")
+		vars[kv[0]] = kv[1]
+	}
+
+	return vars, nil
+}
diff --git a/app/commands/test_cmd.go b/app/commands/test_cmd.go
index 241c037..b56db78 100644
--- a/app/commands/test_cmd.go
+++ b/app/commands/test_cmd.go
@@ -16,6 +16,10 @@ type FlagsTest struct {
 }
 
 func (ctrl *Controller) Test(args []string, flags FlagsTest) error {
+	if len(args) == 0 {
+		return fmt.Errorf("missing scaffold path")
+	}
+
 	path, err := ctrl.resolve(args[0])
 	if err != nil {
 		return err

From 89320dcc765e9682cc9c4566553316f21b008faf Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Wed, 8 May 2024 10:27:11 -0500
Subject: [PATCH 14/23] revert back to new command with more generic
 implementation

---
 .examples/cli/scaffold.yaml               |  2 +-
 app/commands/{init_cmd.go => cmd_init.go} |  0
 app/commands/{lint_cmd.go => cmd_lint.go} |  0
 app/commands/{list_cmd.go => cmd_list.go} |  0
 app/commands/{new_cmd.go => cmd_new.go}   | 85 +++++++++++++++++++----
 app/commands/controller.go                | 16 +++--
 app/commands/resolve.go                   | 10 ++-
 app/commands/test_cmd.go                  | 78 ---------------------
 app/core/rwfs/rwfs.go                     |  8 ---
 app/scaffold/project_scaffold_file.go     |  2 +-
 main.go                                   | 40 +++++------
 tests/cli.test.sh                         |  2 +-
 12 files changed, 114 insertions(+), 129 deletions(-)
 rename app/commands/{init_cmd.go => cmd_init.go} (100%)
 rename app/commands/{lint_cmd.go => cmd_lint.go} (100%)
 rename app/commands/{list_cmd.go => cmd_list.go} (100%)
 rename app/commands/{new_cmd.go => cmd_new.go} (55%)
 delete mode 100644 app/commands/test_cmd.go

diff --git a/.examples/cli/scaffold.yaml b/.examples/cli/scaffold.yaml
index 82b3960..c1c0719 100644
--- a/.examples/cli/scaffold.yaml
+++ b/.examples/cli/scaffold.yaml
@@ -25,7 +25,7 @@ questions:
         - "blue"
         - "yellow"
 
-tests:
+presets:
   default:
     description: "Ths is a test description"
     colors: ["red", "green"]
diff --git a/app/commands/init_cmd.go b/app/commands/cmd_init.go
similarity index 100%
rename from app/commands/init_cmd.go
rename to app/commands/cmd_init.go
diff --git a/app/commands/lint_cmd.go b/app/commands/cmd_lint.go
similarity index 100%
rename from app/commands/lint_cmd.go
rename to app/commands/cmd_lint.go
diff --git a/app/commands/list_cmd.go b/app/commands/cmd_list.go
similarity index 100%
rename from app/commands/list_cmd.go
rename to app/commands/cmd_list.go
diff --git a/app/commands/new_cmd.go b/app/commands/cmd_new.go
similarity index 55%
rename from app/commands/new_cmd.go
rename to app/commands/cmd_new.go
index 1954242..2803e67 100644
--- a/app/commands/new_cmd.go
+++ b/app/commands/cmd_new.go
@@ -2,20 +2,30 @@ package commands
 
 import (
 	"fmt"
+	"math/rand"
 	"os"
 	"strings"
 
 	"github.com/go-git/go-git/v5/plumbing/transport"
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
-	"github.com/hay-kot/scaffold/app/core/rwfs"
+	"github.com/hay-kot/scaffold/app/core/fsast"
 	"github.com/hay-kot/scaffold/app/scaffold"
 	"github.com/hay-kot/scaffold/app/scaffold/pkgs"
 	"github.com/sahilm/fuzzy"
-	"github.com/urfave/cli/v2"
 )
 
-func (ctrl *Controller) New(ctx *cli.Context) error {
-	path, err := ctrl.resolve(ctx.Args().First())
+type FlagsNew struct {
+	NoPrompt bool
+	Preset   string
+	Snapshot string
+}
+
+func (ctrl *Controller) New(args []string, flags FlagsNew) error {
+	if len(args) == 0 {
+		return fmt.Errorf("missing scaffold name")
+	}
+
+	path, err := ctrl.resolve(args[0], flags.NoPrompt)
 	if err != nil {
 		return err
 	}
@@ -24,30 +34,81 @@ func (ctrl *Controller) New(ctx *cli.Context) error {
 		return fmt.Errorf("missing scaffold path")
 	}
 
-	rest := ctx.Args().Tail()
+	rest := args[1:]
 	argvars, err := parseArgVars(rest)
 	if err != nil {
 		return err
 	}
 
-	err = ctrl.runscaffold(runconf{
-		scaffolddir:  path,
-		showMessages: true,
-		varfunc: func(p *scaffold.Project) (map[string]any, error) {
-			vars := scaffold.MergeMaps(ctrl.vars, argvars, ctrl.rc.Defaults)
+	var varfunc func(*scaffold.Project) (map[string]any, error)
+	switch {
+	case flags.NoPrompt:
+		varfunc = func(p *scaffold.Project) (map[string]any, error) {
+			caseVars, ok := p.Conf.Presets[flags.Preset]
+			if !ok {
+				return nil, fmt.Errorf("case %s not found", flags.Preset)
+			}
+
+			project, ok := caseVars["Project"].(string)
+			if !ok || project == "" {
+				// Generate 4 random digits
+				name := fmt.Sprintf("scaffold-test-%04d", rand.Intn(10000))
+				p.Name = name
+				caseVars["Project"] = name
+			}
+
+			// Test cases do not use rc.Defaults
+			vars := scaffold.MergeMaps(caseVars, argvars)
+			return vars, nil
+		}
+
+	default:
+		varfunc = func(p *scaffold.Project) (map[string]any, error) {
+			vars := scaffold.MergeMaps(argvars, ctrl.rc.Defaults)
 			vars, err = p.AskQuestions(vars, ctrl.engine)
 			if err != nil {
 				return nil, err
 			}
 
 			return vars, nil
-		},
-		outputfs: rwfs.NewOsWFS(ctrl.Flags.OutputDir),
+		}
+	}
+
+	outfs := ctrl.Flags.OutputFS()
+
+	err = ctrl.runscaffold(runconf{
+		scaffolddir:  path,
+		showMessages: !flags.NoPrompt,
+		varfunc:      varfunc,
+		outputfs:     outfs,
 	})
 	if err != nil {
 		return err
 	}
 
+	if flags.Snapshot != "" {
+		ast, err := fsast.New(outfs)
+		if err != nil {
+			return err
+		}
+
+		if flags.Snapshot == "stdout" {
+			fmt.Println(ast.String())
+		} else {
+			file, err := os.Create(flags.Snapshot)
+			if err != nil {
+				return err
+			}
+
+			defer file.Close()
+
+			_, err = file.WriteString(ast.String())
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	return nil
 }
 
diff --git a/app/commands/controller.go b/app/commands/controller.go
index 82b4a92..e110e0f 100644
--- a/app/commands/controller.go
+++ b/app/commands/controller.go
@@ -3,6 +3,7 @@ package commands
 
 import (
 	"github.com/hay-kot/scaffold/app/core/engine"
+	"github.com/hay-kot/scaffold/app/core/rwfs"
 	"github.com/hay-kot/scaffold/app/scaffold"
 )
 
@@ -13,17 +14,24 @@ type Flags struct {
 	Cache          string
 	OutputDir      string
 	ScaffoldDirs   []string
-	Cwd            string
-	NoInteractive  bool
+}
+
+// OutputFS returns a WriteFS based on the OutputDir flag
+func (f Flags) OutputFS() rwfs.WriteFS {
+	if f.OutputDir == ":memory:" {
+		return rwfs.NewMemoryWFS()
+	}
+
+	return rwfs.NewOsWFS(f.OutputDir)
 }
 
 type Controller struct {
-	// Global Flags
+	// Flags contains the CLI flags
+	// that are from the root command
 	Flags Flags
 
 	engine   *engine.Engine
 	rc       *scaffold.ScaffoldRC
-	vars     map[string]any
 	prepared bool
 }
 
diff --git a/app/commands/resolve.go b/app/commands/resolve.go
index d6c494b..80b33a4 100644
--- a/app/commands/resolve.go
+++ b/app/commands/resolve.go
@@ -9,7 +9,7 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-func (ctrl *Controller) resolve(argPath string) (string, error) {
+func (ctrl *Controller) resolve(argPath string, noPrompt bool) (string, error) {
 	if argPath == "" {
 		return "", fmt.Errorf("path is required")
 	}
@@ -36,6 +36,10 @@ func (ctrl *Controller) resolve(argPath string) (string, error) {
 
 		switch {
 		case errors.Is(err, transport.ErrAuthenticationRequired):
+			if noPrompt {
+				return "", err
+			}
+
 			username, password, err := httpAuthPrompt()
 			if err != nil {
 				return "", err
@@ -46,6 +50,10 @@ func (ctrl *Controller) resolve(argPath string) (string, error) {
 				return "", err
 			}
 		default:
+			if noPrompt {
+				return "", err
+			}
+
 			systemMatches, localMatches, err := ctrl.fuzzyFallBack(argPath)
 			if err != nil {
 				return "", err
diff --git a/app/commands/test_cmd.go b/app/commands/test_cmd.go
deleted file mode 100644
index b56db78..0000000
--- a/app/commands/test_cmd.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package commands
-
-import (
-	"fmt"
-	"math/rand"
-
-	"github.com/hay-kot/scaffold/app/core/fsast"
-	"github.com/hay-kot/scaffold/app/core/rwfs"
-	"github.com/hay-kot/scaffold/app/scaffold"
-)
-
-type FlagsTest struct {
-	Case  string `json:"case"`
-	MemFS bool   `json:"memfs"`
-	Ast   bool   `json:"ast"`
-}
-
-func (ctrl *Controller) Test(args []string, flags FlagsTest) error {
-	if len(args) == 0 {
-		return fmt.Errorf("missing scaffold path")
-	}
-
-	path, err := ctrl.resolve(args[0])
-	if err != nil {
-		return err
-	}
-
-	rest := args[1:]
-	argvars, err := parseArgVars(rest)
-	if err != nil {
-		return err
-	}
-
-	var outfs rwfs.WriteFS
-	if flags.MemFS {
-		outfs = rwfs.NewMemoryWFS()
-	} else {
-		outfs = rwfs.NewOsWFS(ctrl.Flags.OutputDir)
-	}
-
-	err = ctrl.runscaffold(runconf{
-		scaffolddir:  path,
-		showMessages: false,
-		varfunc: func(p *scaffold.Project) (map[string]any, error) {
-			caseVars, ok := p.Conf.Tests[flags.Case]
-			if !ok {
-				return nil, fmt.Errorf("case %s not found", flags.Case)
-			}
-
-			project, ok := caseVars["Project"].(string)
-			if !ok || project == "" {
-				// Generate 4 random digits
-				name := fmt.Sprintf("scaffold-test-%04d", rand.Intn(10000))
-				p.Name = name
-				caseVars["Project"] = name
-			}
-
-			// Test cases do not use rc.Defaults
-			vars := scaffold.MergeMaps(ctrl.vars, caseVars, argvars)
-			return vars, nil
-		},
-		outputfs: outfs,
-	})
-	if err != nil {
-		return err
-	}
-
-	if flags.Ast {
-		ast, err := fsast.New(outfs)
-		if err != nil {
-			return err
-		}
-
-		fmt.Println(ast.String())
-	}
-
-	return nil
-}
diff --git a/app/core/rwfs/rwfs.go b/app/core/rwfs/rwfs.go
index cb21906..c9bbbf3 100644
--- a/app/core/rwfs/rwfs.go
+++ b/app/core/rwfs/rwfs.go
@@ -3,7 +3,6 @@
 package rwfs
 
 import (
-	"io"
 	"io/fs"
 )
 
@@ -11,13 +10,6 @@ import (
 // a file system. It is a alias for fs.FS.
 type ReadFS = fs.FS
 
-// WFile is a file that can be written to. It is a alias for fs.File.
-// that also implements io.Writer.
-type WFile interface {
-	fs.File
-	io.Writer
-}
-
 // WriteFS is a file system that can be used to read and write files.
 // It is a alias for fs.FS that also implements Mkdir, MkdirAll and Create.
 type WriteFS interface {
diff --git a/app/scaffold/project_scaffold_file.go b/app/scaffold/project_scaffold_file.go
index a6c7524..9767923 100644
--- a/app/scaffold/project_scaffold_file.go
+++ b/app/scaffold/project_scaffold_file.go
@@ -20,7 +20,7 @@ type ProjectScaffoldFile struct {
 	} `yaml:"messages"`
 	Inject   []Injectable              `yaml:"inject"`
 	Features []Feature                 `yaml:"features"`
-	Tests    map[string]map[string]any `yaml:"tests"`
+	Presets    map[string]map[string]any `yaml:"presets"`
 }
 
 type Rewrite struct {
diff --git a/main.go b/main.go
index 9df670f..bb772e7 100644
--- a/main.go
+++ b/main.go
@@ -81,7 +81,7 @@ func main() {
 			},
 			&cli.StringFlag{
 				Name:    "output-dir",
-				Usage:   "current working directory (where scaffold will be created)",
+				Usage:   "scaffold output directory (use ':memory:' for in-memory filesystem)",
 				Value:   ".",
 				EnvVars: []string{"SCAFFOLD_OUT"},
 			},
@@ -157,34 +157,28 @@ func main() {
 				Name:      "new",
 				Usage:     "create a new project from a scaffold",
 				UsageText: "scaffold new [scaffold (url | path)] [flags]",
-				Action:    ctrl.New,
-			},
-			{
-				Name:      "test",
-				Usage:     "test a scaffold",
-				UsageText: "scaffold test [scaffold (url | path)] [flags]",
 				Flags: []cli.Flag{
-					&cli.StringFlag{
-						Name:  "case",
-						Usage: "test case from scaffoldrc to run",
-						Value: "default",
-					},
-					&cli.BoolFlag{
-						Name:  "memfs",
-						Usage: "use memory filesystem for testing",
-						Value: true,
-					},
 					&cli.BoolFlag{
-						Name:  "ast",
-						Usage: "print the ast of the scaffold",
+						Name:  "no-prompt",
+						Usage: "disable interactive mode",
 						Value: false,
 					},
+					&cli.StringFlag{
+						Name:  "preset",
+						Usage: "preset to use for the scaffold",
+						Value: "",
+					},
+					&cli.StringFlag{
+						Name:  "snapshot",
+						Usage: "path or `stdout` to save the output ast",
+						Value: "",
+					},
 				},
 				Action: func(ctx *cli.Context) error {
-					return ctrl.Test(ctx.Args().Slice(), commands.FlagsTest{
-						Case:  ctx.String("case"),
-						MemFS: ctx.Bool("memfs"),
-						Ast:   ctx.Bool("ast"),
+					return ctrl.New(ctx.Args().Slice(), commands.FlagsNew{
+						NoPrompt: ctx.Bool("no-prompt"),
+						Preset:   ctx.String("preset"),
+						Snapshot: ctx.String("snapshot"),
 					})
 				},
 			},
diff --git a/tests/cli.test.sh b/tests/cli.test.sh
index aa52b7b..de622af 100755
--- a/tests/cli.test.sh
+++ b/tests/cli.test.sh
@@ -6,7 +6,7 @@ export SCAFFOLD_DIR=".scaffold,.examples"
 
 rm -rf gen/*
 
-go run main.go --log-level="error" test --case="default" --memfs="false" --ast="true" cli
+go run main.go --log-level="error" new --preset="default" --no-prompt --snapshot="stdout" cli
 
 # Run the command and store the output in a variable
 output=$(go run ./gen/scaffold-test*/main.go hello)

From 0d184d0c5bc9df2c53aa6e1c3403bfc3cb99ca5e Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Wed, 8 May 2024 10:28:15 -0500
Subject: [PATCH 15/23] ignore file close err

---
 app/commands/cmd_new.go               | 2 +-
 app/scaffold/project_scaffold_file.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/commands/cmd_new.go b/app/commands/cmd_new.go
index 2803e67..abab265 100644
--- a/app/commands/cmd_new.go
+++ b/app/commands/cmd_new.go
@@ -100,7 +100,7 @@ func (ctrl *Controller) New(args []string, flags FlagsNew) error {
 				return err
 			}
 
-			defer file.Close()
+			_ = file.Close()
 
 			_, err = file.WriteString(ast.String())
 			if err != nil {
diff --git a/app/scaffold/project_scaffold_file.go b/app/scaffold/project_scaffold_file.go
index 9767923..2b8b5a2 100644
--- a/app/scaffold/project_scaffold_file.go
+++ b/app/scaffold/project_scaffold_file.go
@@ -20,7 +20,7 @@ type ProjectScaffoldFile struct {
 	} `yaml:"messages"`
 	Inject   []Injectable              `yaml:"inject"`
 	Features []Feature                 `yaml:"features"`
-	Presets    map[string]map[string]any `yaml:"presets"`
+	Presets  map[string]map[string]any `yaml:"presets"`
 }
 
 type Rewrite struct {

From 10070385cf32bd4a07e35272e072bc0459d38117 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Wed, 8 May 2024 15:30:02 -0500
Subject: [PATCH 16/23] simplify test script for cli

---
 .examples/cli/scaffold.yaml               |  2 +-
 .examples/cli/{{ .ProjectKebab }}/main.go | 40 +----------------------
 taskfile.yml                              |  2 +-
 tests/cli.test.sh                         |  2 +-
 4 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/.examples/cli/scaffold.yaml b/.examples/cli/scaffold.yaml
index c1c0719..d777d4d 100644
--- a/.examples/cli/scaffold.yaml
+++ b/.examples/cli/scaffold.yaml
@@ -27,5 +27,5 @@ questions:
 
 presets:
   default:
-    description: "Ths is a test description"
+    description: "This is a test description"
     colors: ["red", "green"]
diff --git a/.examples/cli/{{ .ProjectKebab }}/main.go b/.examples/cli/{{ .ProjectKebab }}/main.go
index da63cf5..ff481ed 100644
--- a/.examples/cli/{{ .ProjectKebab }}/main.go	
+++ b/.examples/cli/{{ .ProjectKebab }}/main.go	
@@ -2,46 +2,8 @@ package main
 
 import (
 	"fmt"
-	"os"
-
-	"github.com/rs/zerolog/log"
-	"github.com/urfave/cli/v2"
-)
-
-var (
-	// Build information. Populated at build-time via -ldflags flag.
-	version = "dev"
-	commit  = "HEAD"
-	date    = "now"
 )
 
-func build() string {
-	short := commit
-	if len(commit) > 7 {
-		short = commit[:7]
-	}
-
-	return fmt.Sprintf("%s (%s) %s", version, short, date)
-}
-
 func main() {
-	app := &cli.App{
-		Name:    "{{ .Project }}",
-		Usage:   "{{ .Scaffold.description }}",
-		Version: build(),
-		Commands: []*cli.Command{
-			{
-				Name:  "hello",
-				Usage: "Says hello world",
-				Action: func(ctx *cli.Context) error {
-					fmt.Println("Hello, your favorite colors are {{ .Scaffold.colors | join `, ` }}")
-					return nil
-				},
-			},
-		},
-	}
-
-	if err := app.Run(os.Args); err != nil {
-		log.Fatal().Err(err).Msg("failed to run scaffold")
-	}
+	fmt.Println("colors={{ .Scaffold.colors | join `, ` }} description={{ .Scaffold.description }}")
 }
diff --git a/taskfile.yml b/taskfile.yml
index 11c0579..052fe40 100644
--- a/taskfile.yml
+++ b/taskfile.yml
@@ -67,7 +67,7 @@ tasks:
     cmds:
       - rm -rf ./gen/*
       - go run main.go new cli
-      - go run ./gen/main.go hello
+      - go run ./gen/main.go
 
   do:role:
     desc: Runs the main.go program with the role scaffold
diff --git a/tests/cli.test.sh b/tests/cli.test.sh
index de622af..d6b85c0 100755
--- a/tests/cli.test.sh
+++ b/tests/cli.test.sh
@@ -13,7 +13,7 @@ output=$(go run ./gen/scaffold-test*/main.go hello)
 
 echo "Output: '$output'"  
 # Define the expected output
-expected_output="Hello, your favorite colors are red, green"
+expected_output="colors=red, green description=This is a test description"
 
 # Compare the actual output with the expected output
 if [ "$output" = "$expected_output" ]; then

From 710f210eeacdd6b61b9cbaf40630db1d5809a419 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Wed, 8 May 2024 15:30:41 -0500
Subject: [PATCH 17/23] fix taskfile test

---
 taskfile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/taskfile.yml b/taskfile.yml
index 052fe40..d4c71a3 100644
--- a/taskfile.yml
+++ b/taskfile.yml
@@ -67,7 +67,7 @@ tasks:
     cmds:
       - rm -rf ./gen/*
       - go run main.go new cli
-      - go run ./gen/main.go
+      - go run ./gen/*/main.go
 
   do:role:
     desc: Runs the main.go program with the role scaffold

From ce6874a5d6db3df3a2489f7692477b6520188cee Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Fri, 10 May 2024 13:06:43 -0500
Subject: [PATCH 18/23] basic testing scaffold docs

---
 docs/docs/scaffold-file.md     | 18 ++++++++++++++++-
 docs/docs/testing-scaffolds.md | 35 +++++++++++++++++++---------------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/docs/docs/scaffold-file.md b/docs/docs/scaffold-file.md
index 7da714e..a8af825 100644
--- a/docs/docs/scaffold-file.md
+++ b/docs/docs/scaffold-file.md
@@ -226,4 +226,20 @@ features:
   - value: "{{ .Scaffold.database }}"
     globs:
       - "**/core/database/**/*"
-```
\ No newline at end of file
+```
+
+### Presets
+
+Presets are a way to define a set of default values for a scaffold. These can be overridden by the user when running the scaffold.
+
+```yaml
+presets:
+  default:
+    description: "A description of the project"
+    license: "MIT"
+    use_github_actions: true
+    colors: ["red", "green"]
+```
+
+!!! tip "Presets and Testing"
+    Presets can be used in conjunction with the `new` command for testing purposes. See [Testing Scaffolds](./testing-scaffolds.md) for more information.
\ No newline at end of file
diff --git a/docs/docs/testing-scaffolds.md b/docs/docs/testing-scaffolds.md
index de74034..9bbe016 100644
--- a/docs/docs/testing-scaffolds.md
+++ b/docs/docs/testing-scaffolds.md
@@ -2,13 +2,25 @@
 title: Testing Scaffolds
 ---
 
-The Scaffold CLI has built in support for testing scaffold. The `scaffold test` command will run a case provided with the `--case` flag and render the templates as if those arguments were provided via the interactive interface. If a 'Project' key is not provided in the test case one will be generated in the pattern `scaffold-test-*`.
+Scaffold does not have a test command or framework, *however* it does provide some tools that can be utilized to implement tests for your scaffolds.
 
-The `test` command can also output an AST of the rendered scaffold to stdout.
+## Testing with ASTs
+
+Scaffold provides a way to output an AST of the scaffolded files. This can be used with a diffing tool to compare the ASTs of the scaffolded files with the expected ASTs to ensure that the scaffolded files are correct.
 
 ```bash
-scaffold test --log-level="panic" --case="default" --memfs --ast <scaffold-name>
-scaffold-test-3811:  (type=dir)
+# Command
+scaffold \
+    --log-level="error" \     # set log level to error to avoid noise
+    --output-dir=":memory:" \ # render scaffold in memory
+    new \
+    --preset="default" \      # use scaffold preset
+    --no-prompt \             # disable interactive prompts
+    --snapshot="stdout" \     # write snapshot to stdout
+    <scaffold>
+
+# Output
+scaffold-test-5781:  (type=dir)
         main.go:  (type=file)
                 package main
 
@@ -17,19 +29,12 @@ scaffold-test-3811:  (type=dir)
                 )
 
                 func main() {
-                        fmt.Println("Hello, World!")
+                        fmt.Println("colors=red, green description=This is a test description")
                 }
 ```
 
-## Test Cases
-
-Test cases can be defined in the `scaffold.yaml` file under the `tests` key.
+## Testing with Outputs
 
-```yaml
-tests:
-  default:
-    Var1: "Hello, World!"
-    Var2: "Hello, World!"
-```
+An alternative approach is to test out output scaffolds by running whatever output is generated by the scaffold. For example, we use this approach to test our scaffolds by generating a Go program and running it to ensure that it compiles and runs as expected.
 
-The `default` key is the name of the test case. The values under the test case key are the values that will be passed to the scaffold when running the test case.
+See [cli.test.sh](https://github.com/hay-kot/scaffold/blob/main/tests/cli.test.sh) for an example of how to test scaffolds using this approach.
\ No newline at end of file

From becc41481951cea42e0332ba3845b609b8622dc9 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Fri, 10 May 2024 13:06:59 -0500
Subject: [PATCH 19/23] rework script tests

---
 taskfile.yml      |  2 +-
 tests/cli.test.sh | 24 ++++++++++--------------
 tests/runner.sh   | 25 +++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100755 tests/runner.sh

diff --git a/taskfile.yml b/taskfile.yml
index d4c71a3..83e96d3 100644
--- a/taskfile.yml
+++ b/taskfile.yml
@@ -60,7 +60,7 @@ tasks:
   test:scripts:
     desc: Runs all go tests for the scripts
     cmds:
-      - ./tests/cli.test.sh
+      - ./tests/runner.sh
 
   do:cli:
     desc: Runs the main.go program with the cli scaffold
diff --git a/tests/cli.test.sh b/tests/cli.test.sh
index d6b85c0..000371b 100755
--- a/tests/cli.test.sh
+++ b/tests/cli.test.sh
@@ -1,25 +1,21 @@
-#!/bin/bash 
-set -euo pipefail 
-export SCAFFOLD_NO_CLOBBER="true" 
-export SCAFFOLD_OUT="gen" 
-export SCAFFOLD_DIR=".scaffold,.examples" 
-
-rm -rf gen/*
-
-go run main.go --log-level="error" new --preset="default" --no-prompt --snapshot="stdout" cli
+go run main.go --log-level="error" \
+    new \
+    --preset="default" \
+    --no-prompt \
+    --snapshot="stdout" \
+    cli
 
 # Run the command and store the output in a variable
 output=$(go run ./gen/scaffold-test*/main.go hello)
 
-echo "Output: '$output'"  
-# Define the expected output
 expected_output="colors=red, green description=This is a test description"
 
-# Compare the actual output with the expected output
 if [ "$output" = "$expected_output" ]; then
-    echo "Test passed: Output matches the expected string."
+    echo "Test passed: output matches the expected string."
     exit 0
 else
-    echo "Test failed: Output does not match the expected string."
+    echo "Expected: $expected_output"
+    echo "Got:      $output"
+    echo "Test failed: output does not match the expected string."
     exit 1
 fi
diff --git a/tests/runner.sh b/tests/runner.sh
new file mode 100755
index 0000000..bdb76fe
--- /dev/null
+++ b/tests/runner.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+export SCAFFOLD_NO_CLOBBER="true"
+export SCAFFOLD_OUT="gen"
+export SCAFFOLD_DIR=".scaffold,.examples"
+
+checkmark="✓"
+crossmark="✗"
+
+echo "Running Script Tests"
+# run each test script in the tests directory
+for test_script in tests/*.test.sh; do
+    rm -rf ./gen
+
+    # if exit code of script is 0, print checkmark, else print crossmark
+    # and the output indented by 4 spaces
+    output=$($test_script 2>&1)
+
+    if [ $? -eq 0 ]; then
+        echo "  $checkmark $test_script"
+    else
+        echo "  $crossmark $test_script"
+        # Print each line of the output indented by 4 spaces
+        echo "$output" | sed 's/^/      /'
+    fi
+done
\ No newline at end of file

From ec26e60543aa63ac30476cbb9397844de1b9afad Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Fri, 10 May 2024 13:08:51 -0500
Subject: [PATCH 20/23] change ci runner

---
 .github/workflows/partial-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/partial-tests.yml b/.github/workflows/partial-tests.yml
index 3dccdf8..d8df88a 100644
--- a/.github/workflows/partial-tests.yml
+++ b/.github/workflows/partial-tests.yml
@@ -28,4 +28,4 @@ jobs:
         run: go test ./... -race
 
       - name: Test 'cli' example
-        run: ./tests/cli.test.sh
+        run: ./tests/runner.sh

From 6512deced5e47ddb3f7603f5c17d618fe6bef1b3 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Fri, 10 May 2024 13:25:07 -0500
Subject: [PATCH 21/23] fix and add tests for setting 'Project' var

---
 .examples/cli/scaffold.yaml   |  1 +
 app/commands/cmd_new.go       |  3 ++-
 tests/assert.sh               | 47 +++++++++++++++++++++++++++++++++++
 tests/cli-snapshot.test.sh    | 15 +++++++++++
 tests/cli.test.sh             | 16 ++++++------
 tests/snapshots/test_snapshot | 12 +++++++++
 6 files changed, 84 insertions(+), 10 deletions(-)
 create mode 100755 tests/assert.sh
 create mode 100755 tests/cli-snapshot.test.sh
 create mode 100644 tests/snapshots/test_snapshot

diff --git a/.examples/cli/scaffold.yaml b/.examples/cli/scaffold.yaml
index d777d4d..9676738 100644
--- a/.examples/cli/scaffold.yaml
+++ b/.examples/cli/scaffold.yaml
@@ -27,5 +27,6 @@ questions:
 
 presets:
   default:
+    Project: "scaffold-test-default"
     description: "This is a test description"
     colors: ["red", "green"]
diff --git a/app/commands/cmd_new.go b/app/commands/cmd_new.go
index abab265..f35553c 100644
--- a/app/commands/cmd_new.go
+++ b/app/commands/cmd_new.go
@@ -53,9 +53,10 @@ func (ctrl *Controller) New(args []string, flags FlagsNew) error {
 			if !ok || project == "" {
 				// Generate 4 random digits
 				name := fmt.Sprintf("scaffold-test-%04d", rand.Intn(10000))
-				p.Name = name
 				caseVars["Project"] = name
+				project = name
 			}
+			p.Name = project
 
 			// Test cases do not use rc.Defaults
 			vars := scaffold.MergeMaps(caseVars, argvars)
diff --git a/tests/assert.sh b/tests/assert.sh
new file mode 100755
index 0000000..84cb042
--- /dev/null
+++ b/tests/assert.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Function to compare output with expected output and print result
+assert_output() {
+    local output="$1"
+    local expected_output="$2"
+
+    if [ "$output" = "$expected_output" ]; then
+        echo "Test passed: output matches the expected string."
+        exit 0
+    else
+        echo "Expected: $expected_output"
+        echo "Got:      $output"
+        echo "Test failed: output does not match the expected string."
+        exit 1
+    fi
+}
+
+# Function to assert snapshots
+assert_snapshot() {
+    local snapshot_name="$1"
+    local output="$2"
+    local snapshots_dir="tests/snapshots"
+    local snapshot_file="$snapshots_dir/$snapshot_name"
+
+    # Create snapshots directory if it doesn't exist
+    mkdir -p "$snapshots_dir"
+
+    # Check if snapshot file exists
+    if [ -f "$snapshot_file" ]; then
+        # Compare current output with snapshot
+        diff_result=$(diff -u "$snapshot_file" <(echo "$output"))
+        if [ $? -eq 0 ]; then
+            echo "Test passed: output matches the snapshot '$snapshot_name'."
+            exit 0
+        else
+            echo "Test failed: output does not match the snapshot '$snapshot_name'. Diff:"
+            echo "$diff_result"
+            exit 1
+        fi
+    else
+        # Snapshot does not exist, create it
+        echo "$output" > "$snapshot_file"
+        echo "Snapshot '$snapshot_name' created."
+        exit 0
+    fi
+}
\ No newline at end of file
diff --git a/tests/cli-snapshot.test.sh b/tests/cli-snapshot.test.sh
new file mode 100755
index 0000000..42f3145
--- /dev/null
+++ b/tests/cli-snapshot.test.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Source the assert_snapshot function
+source tests/assert.sh
+
+# Your script continues as before...
+output=$(go run main.go --log-level="error" \
+    new \
+    --preset="default" \
+    --no-prompt \
+    --snapshot="stdout" \
+    cli)
+
+# Call the function to assert the snapshot
+assert_snapshot "test_snapshot" "$output"
\ No newline at end of file
diff --git a/tests/cli.test.sh b/tests/cli.test.sh
index 000371b..0aa16ba 100755
--- a/tests/cli.test.sh
+++ b/tests/cli.test.sh
@@ -1,3 +1,8 @@
+#!/bin/bash
+
+# Source the assertions file
+source tests/assert.sh
+
 go run main.go --log-level="error" \
     new \
     --preset="default" \
@@ -10,12 +15,5 @@ output=$(go run ./gen/scaffold-test*/main.go hello)
 
 expected_output="colors=red, green description=This is a test description"
 
-if [ "$output" = "$expected_output" ]; then
-    echo "Test passed: output matches the expected string."
-    exit 0
-else
-    echo "Expected: $expected_output"
-    echo "Got:      $output"
-    echo "Test failed: output does not match the expected string."
-    exit 1
-fi
+# Call the function to compare output with expected output
+assert_output "$output" "$expected_output"
\ No newline at end of file
diff --git a/tests/snapshots/test_snapshot b/tests/snapshots/test_snapshot
new file mode 100644
index 0000000..6df2e56
--- /dev/null
+++ b/tests/snapshots/test_snapshot
@@ -0,0 +1,12 @@
+scaffold-test-default:  (type=dir)
+	main.go:  (type=file)
+		package main
+		
+		import (
+			"fmt"
+		)
+		
+		func main() {
+			fmt.Println("colors=red, green description=This is a test description")
+		}
+		

From e22a2a357b2c9c4cc5646ac223212316ee1ebb84 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Fri, 10 May 2024 13:38:03 -0500
Subject: [PATCH 22/23] nested output tests

---
 .examples/nested/scaffold.yaml                | 25 +++++++++++++++++++
 .../{{ .ProjectKebab }}/child/child_1.txt     |  1 +
 .../child/subchild/child_2.txt                |  1 +
 .../child/subchild/subsubchild/child_3.txt    |  1 +
 .examples/nested/{{ .ProjectKebab }}/root.txt |  1 +
 tests/cli-snapshot.test.sh                    |  2 +-
 tests/nested-snapshot.test.sh                 | 15 +++++++++++
 .../{test_snapshot => cli.snapshot.txt}       |  0
 tests/snapshots/nested.snapshot.txt           | 12 +++++++++
 9 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 .examples/nested/scaffold.yaml
 create mode 100644 .examples/nested/{{ .ProjectKebab }}/child/child_1.txt
 create mode 100644 .examples/nested/{{ .ProjectKebab }}/child/subchild/child_2.txt
 create mode 100644 .examples/nested/{{ .ProjectKebab }}/child/subchild/subsubchild/child_3.txt
 create mode 100644 .examples/nested/{{ .ProjectKebab }}/root.txt
 create mode 100755 tests/nested-snapshot.test.sh
 rename tests/snapshots/{test_snapshot => cli.snapshot.txt} (100%)
 create mode 100644 tests/snapshots/nested.snapshot.txt

diff --git a/.examples/nested/scaffold.yaml b/.examples/nested/scaffold.yaml
new file mode 100644
index 0000000..37d4735
--- /dev/null
+++ b/.examples/nested/scaffold.yaml
@@ -0,0 +1,25 @@
+questions:
+  - name: "question_1"
+    prompt:
+      message: "Question 1"
+    required: true
+  - name: "question_2"
+    prompt:
+      message: "Question 2"
+    required: true
+  - name: "question_3"
+    prompt:
+      message: "Question 3"
+    required: true
+  - name: "question_4"
+    prompt:
+      message: "Question 4"
+    required: true
+
+presets:
+  default:
+    Project: "nested-defaults"
+    question_1: "Answer 1"
+    question_2: "Answer 2"
+    question_3: "Answer 3"
+    question_4: "Answer 4"
diff --git a/.examples/nested/{{ .ProjectKebab }}/child/child_1.txt b/.examples/nested/{{ .ProjectKebab }}/child/child_1.txt
new file mode 100644
index 0000000..da4c6e0
--- /dev/null
+++ b/.examples/nested/{{ .ProjectKebab }}/child/child_1.txt	
@@ -0,0 +1 @@
+{{ .Scaffold.question_2 }}
\ No newline at end of file
diff --git a/.examples/nested/{{ .ProjectKebab }}/child/subchild/child_2.txt b/.examples/nested/{{ .ProjectKebab }}/child/subchild/child_2.txt
new file mode 100644
index 0000000..c19d755
--- /dev/null
+++ b/.examples/nested/{{ .ProjectKebab }}/child/subchild/child_2.txt	
@@ -0,0 +1 @@
+{{ .Scaffold.question_3 }}
\ No newline at end of file
diff --git a/.examples/nested/{{ .ProjectKebab }}/child/subchild/subsubchild/child_3.txt b/.examples/nested/{{ .ProjectKebab }}/child/subchild/subsubchild/child_3.txt
new file mode 100644
index 0000000..f6994af
--- /dev/null
+++ b/.examples/nested/{{ .ProjectKebab }}/child/subchild/subsubchild/child_3.txt	
@@ -0,0 +1 @@
+{{ .Scaffold.question_4 }}
\ No newline at end of file
diff --git a/.examples/nested/{{ .ProjectKebab }}/root.txt b/.examples/nested/{{ .ProjectKebab }}/root.txt
new file mode 100644
index 0000000..8c01375
--- /dev/null
+++ b/.examples/nested/{{ .ProjectKebab }}/root.txt	
@@ -0,0 +1 @@
+{{ .Scaffold.question_1 }}
\ No newline at end of file
diff --git a/tests/cli-snapshot.test.sh b/tests/cli-snapshot.test.sh
index 42f3145..cf3a63b 100755
--- a/tests/cli-snapshot.test.sh
+++ b/tests/cli-snapshot.test.sh
@@ -12,4 +12,4 @@ output=$(go run main.go --log-level="error" \
     cli)
 
 # Call the function to assert the snapshot
-assert_snapshot "test_snapshot" "$output"
\ No newline at end of file
+assert_snapshot "cli.snapshot.txt" "$output"
\ No newline at end of file
diff --git a/tests/nested-snapshot.test.sh b/tests/nested-snapshot.test.sh
new file mode 100755
index 0000000..bc304f9
--- /dev/null
+++ b/tests/nested-snapshot.test.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Source the assert_snapshot function
+source tests/assert.sh
+
+# Your script continues as before...
+output=$(go run main.go --log-level="error" \
+    new \
+    --preset="default" \
+    --no-prompt \
+    --snapshot="stdout" \
+    nested)
+
+# Call the function to assert the snapshot
+assert_snapshot "nested.snapshot.txt" "$output"
\ No newline at end of file
diff --git a/tests/snapshots/test_snapshot b/tests/snapshots/cli.snapshot.txt
similarity index 100%
rename from tests/snapshots/test_snapshot
rename to tests/snapshots/cli.snapshot.txt
diff --git a/tests/snapshots/nested.snapshot.txt b/tests/snapshots/nested.snapshot.txt
new file mode 100644
index 0000000..8a78b7d
--- /dev/null
+++ b/tests/snapshots/nested.snapshot.txt
@@ -0,0 +1,12 @@
+nested-defaults:  (type=dir)
+	child:  (type=dir)
+		child_1.txt:  (type=file)
+			Answer 2
+		subchild:  (type=dir)
+			child_2.txt:  (type=file)
+				Answer 3
+			subsubchild:  (type=dir)
+				child_3.txt:  (type=file)
+					Answer 4
+	root.txt:  (type=file)
+		Answer 1

From b571337aec873b392585cad487abf76ec3bf588d Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Fri, 10 May 2024 14:22:51 -0500
Subject: [PATCH 23/23] reorder task files

---
 taskfile.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/taskfile.yml b/taskfile.yml
index 83e96d3..35b6079 100644
--- a/taskfile.yml
+++ b/taskfile.yml
@@ -28,6 +28,11 @@ tasks:
     cmds:
       - gotestsum --watch -- -v ./...
 
+  test:scripts:
+    desc: Runs all go tests for the scripts
+    cmds:
+      - ./tests/runner.sh
+
   coverage:
     desc: Runs all go tests with -race flag and generates a coverage report
     cmds:
@@ -57,11 +62,6 @@ tasks:
       - task: lint
       - task: test
 
-  test:scripts:
-    desc: Runs all go tests for the scripts
-    cmds:
-      - ./tests/runner.sh
-
   do:cli:
     desc: Runs the main.go program with the cli scaffold
     cmds: