v0.0.9: misc improvements

Author: benburkert

api/api.go

@@ -178,6 +178,7 @@ func (s *Session) FetchCredentials(ctx context.Context, orgSlug, realmSlug strin
 	var creds struct {
 		Items []Credential `json:"items,omitempty"`
 	}
+
 	if err := s.get(ctx, fetchCredentialsPath(orgSlug, realmSlug), &creds); err != nil {
 		return nil, err
 	}

detection/detection.go

@@ -1,6 +1,8 @@
 package detection
 
 import (
+	"io/fs"
+
 	"github.com/anchordotdev/cli/anchorcli"
 )
 
@@ -33,26 +35,32 @@ func (s Confidence) String() string {
 
 var (
 	DefaultDetectors = []Detector{
-		RubyDetector,
-		GoDetector,
-		JavascriptDetector,
-		PythonDetector,
+		Ruby,
+		Go,
+		Javascript,
+		Python,
 	}
 
 	DetectorsByFlag = map[string]Detector{
-		"django":     DjangoDetector,
-		"flask":      FlaskDetector,
-		"go":         GoDetector,
-		"javascript": JavascriptDetector,
-		"python":     PythonDetector,
-		"rails":      RailsDetector,
-		"ruby":       RubyDetector,
-		"sinatra":    SinatraDetector,
+		"django":     Django,
+		"flask":      Flask,
+		"go":         Go,
+		"javascript": Javascript,
+		"nextjs":     NextJS,
+		"python":     Python,
+		"rails":      Rails,
+		"ruby":       Ruby,
+		"sinatra":    Sinatra,
 	}
 
 	PositiveDetectionMessage = "%s project detected with confidence level %s!\n"
 )
 
+type FS interface {
+	fs.ReadFileFS
+	fs.StatFS
+}
+
 // Match holds the detection result, confidence, and follow-up detectors
 type Match struct {
 	Detector   Detector
@@ -68,14 +76,14 @@ type Match struct {
 // Detector interface represents a project detector
 type Detector interface {
 	GetTitle() string
-	Detect(directory string) (Match, error)
+	Detect(FS) (Match, error)
 	FollowUp() []Detector
 }
 
-func Perform(detectors []Detector, dir string) (Results, error) {
+func Perform(detectors []Detector, dirFS FS) (Results, error) {
 	res := make(Results)
 	for _, detector := range detectors {
-		match, err := detector.Detect(dir)
+		match, err := detector.Detect(dirFS)
 		if err != nil {
 			return nil, err
 		}
@@ -86,7 +94,7 @@ func Perform(detectors []Detector, dir string) (Results, error) {
 
 		res[match.Confidence] = append(res[match.Confidence], match)
 
-		if followupResults, err := Perform(match.FollowUpDetectors, dir); err == nil {
+		if followupResults, err := Perform(match.FollowUpDetectors, dirFS); err == nil {
 			res.merge(followupResults)
 		} else {
 			return nil, err

detection/detection_test.go

@@ -41,21 +41,21 @@ func TestDefaultDetectors(t *testing.T) {
 	}
 
 	fakeFS := fstest.MapFS{
-		"app/Gemfile":          &fstest.MapFile{Data: []byte(""), Mode: 0644},
-		"app/Gemfile.lock":     &fstest.MapFile{Data: []byte(""), Mode: 0644},
-		"app/package.json":     &fstest.MapFile{Data: []byte(""), Mode: 0644},
-		"app/requirements.txt": &fstest.MapFile{Data: []byte(""), Mode: 0644},
-		"app/main.go":          &fstest.MapFile{Data: []byte(""), Mode: 0644},
-		"app/index.js":         &fstest.MapFile{Data: []byte(""), Mode: 0644},
-		"app/app.py":           &fstest.MapFile{Data: []byte(""), Mode: 0644},
+		"Gemfile":          &fstest.MapFile{Data: []byte(""), Mode: 0644},
+		"Gemfile.lock":     &fstest.MapFile{Data: []byte(""), Mode: 0644},
+		"package.json":     &fstest.MapFile{Data: []byte(""), Mode: 0644},
+		"requirements.txt": &fstest.MapFile{Data: []byte(""), Mode: 0644},
+		"main.go":          &fstest.MapFile{Data: []byte(""), Mode: 0644},
+		"index.js":         &fstest.MapFile{Data: []byte(""), Mode: 0644},
+		"app.py":           &fstest.MapFile{Data: []byte(""), Mode: 0644},
 	}
 
 	for _, detector := range DefaultDetectors {
 		t.Run(detector.GetTitle(), func(t *testing.T) {
 			// Assume all detectors are FileDetectors right now
 			det := detector.(*FileDetector)
-			det.FileSystem = fakeFS
-			match, err := det.Detect("app")
+
+			match, err := det.Detect(fakeFS)
 			if err != nil {
 				t.Fatal(err)
 			}

detection/filesystem.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"io/fs"
 	"os"
-	"path/filepath"
 	"slices"
 
 	"github.com/anchordotdev/cli/anchorcli"
@@ -16,7 +15,6 @@ type FileDetector struct {
 	Paths             []string
 	RequiredFiles     []string
 	FollowUpDetectors []Detector
-	FileSystem        fs.StatFS
 	AnchorCategory    *anchorcli.Category
 }
 
@@ -26,16 +24,11 @@ func (fd FileDetector) GetTitle() string {
 }
 
 // Detect checks if the directory contains any of the specified files
-func (fd FileDetector) Detect(directory string) (Match, error) {
-	if fd.FileSystem == nil {
-		fd.FileSystem = &osFS{}
-	}
-
+func (fd FileDetector) Detect(dirFS FS) (Match, error) {
 	var matchedPaths []string
 
 	for _, path := range fd.Paths {
-		fullPath := filepath.Join(directory, path)
-		if _, err := fd.FileSystem.Stat(fullPath); err == nil {
+		if _, err := dirFS.Stat(path); err == nil {
 			matchedPaths = append(matchedPaths, path)
 		} else if !os.IsNotExist(err) {
 			return Match{}, errors.Join(err, errors.New("project file detection failure"))