From 9ffe203d4ae2ef3f107a502f59a3e65285955e10 Mon Sep 17 00:00:00 2001
From: Joshua Gilman <joshuagilman@gmail.com>
Date: Sat, 14 Sep 2024 11:40:09 -0700
Subject: [PATCH] refactor: cleanup

---
 forge/cli/cmd/cmds/run.go        | 1 -
 forge/cli/cmd/cmds/scan.go       | 2 +-
 forge/cli/cmd/cmds/util.go       | 9 +--------
 forge/cli/pkg/project/runtime.go | 8 ++++++++
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/forge/cli/cmd/cmds/run.go b/forge/cli/cmd/cmds/run.go
index f25446e3..bbaa8860 100644
--- a/forge/cli/cmd/cmds/run.go
+++ b/forge/cli/cmd/cmds/run.go
@@ -47,6 +47,5 @@ func (c *RunCmd) Run(logger *slog.Logger) error {
 	}
 
 	printJson(result, c.Pretty)
-
 	return nil
 }
diff --git a/forge/cli/cmd/cmds/scan.go b/forge/cli/cmd/cmds/scan.go
index 406f074f..ccd419d2 100644
--- a/forge/cli/cmd/cmds/scan.go
+++ b/forge/cli/cmd/cmds/scan.go
@@ -26,7 +26,7 @@ type ScanCmd struct {
 
 func (c *ScanCmd) Run(logger *slog.Logger) error {
 	walker := walker.NewDefaultFSWalker(logger)
-	loader := project.NewDefaultProjectLoader(loadRuntimes(logger), logger)
+	loader := project.NewDefaultProjectLoader(project.GetDefaultRuntimes(logger), logger)
 
 	var rootPath string
 	if c.Absolute {
diff --git a/forge/cli/cmd/cmds/util.go b/forge/cli/cmd/cmds/util.go
index dbfa923d..6ff1a09a 100644
--- a/forge/cli/cmd/cmds/util.go
+++ b/forge/cli/cmd/cmds/util.go
@@ -50,17 +50,10 @@ func generateOpts(flags *RunCmd) []earthly.EarthlyExecutorOption {
 
 // loadProject loads the project from the given root path.
 func loadProject(rootPath string, logger *slog.Logger) (project.Project, error) {
-	loader := project.NewDefaultProjectLoader(loadRuntimes(logger), logger)
+	loader := project.NewDefaultProjectLoader(project.GetDefaultRuntimes(logger), logger)
 	return loader.Load(rootPath)
 }
 
-// loadRuntimes loads the all runtime data collectors.
-func loadRuntimes(logger *slog.Logger) []project.RuntimeData {
-	return []project.RuntimeData{
-		project.NewGitRuntime(logger),
-	}
-}
-
 // printJson prints the given data as a JSON string.
 func printJson(data interface{}, pretty bool) {
 	var out []byte
diff --git a/forge/cli/pkg/project/runtime.go b/forge/cli/pkg/project/runtime.go
index 37dd963e..9194de1d 100644
--- a/forge/cli/pkg/project/runtime.go
+++ b/forge/cli/pkg/project/runtime.go
@@ -69,8 +69,16 @@ func (g *GitRuntime) Load(project *Project) map[string]string {
 	return data
 }
 
+// NewGitRuntime creates a new GitRuntime.
 func NewGitRuntime(logger *slog.Logger) *GitRuntime {
 	return &GitRuntime{
 		logger: logger,
 	}
 }
+
+// GetDefaultRuntimes returns the default runtime data loaders.
+func GetDefaultRuntimes(logger *slog.Logger) []RuntimeData {
+	return []RuntimeData{
+		NewGitRuntime(logger),
+	}
+}