Improve Trellis project detection

swalkinshaw · swalkinshaw · commit afdaf903557b · 2019-01-16T23:54:14.000-05:00
diff --git a/trellis/trellis.go b/trellis/trellis.go
@@ -43,7 +43,7 @@ func (t *Trellis) Detect() []string {
 
 		if len(parent) == 1 {
 			if parent == "." || os.IsPathSeparator(parent[0]) {
-				log.Fatalln("Could not detect a Trellis project")
+				return []string{}
 			}
 		}
 
@@ -104,7 +104,7 @@ func (t *Trellis) Valid() bool {
 
 func (t *Trellis) EnforceValid(ui cli.Ui) {
 	if !t.Valid() {
-		ui.Error("No Trellis project detected. This command must be run in the root of a Trellis project.")
+		ui.Error("No Trellis project detected in the current directory or any of its parent directories.")
 		os.Exit(1)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func (t *Trellis) Detect() []string {`
`43`	`43`
`44`	`44`	`if len(parent) == 1 {`
`45`	`45`	`if parent == "." \|\| os.IsPathSeparator(parent[0]) {`
`46`		`- log.Fatalln("Could not detect a Trellis project")`
	`46`	`+ return []string{}`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`@@ -104,7 +104,7 @@ func (t *Trellis) Valid() bool {`
`104`	`104`
`105`	`105`	`func (t *Trellis) EnforceValid(ui cli.Ui) {`
`106`	`106`	`if !t.Valid() {`
`107`		`- ui.Error("No Trellis project detected. This command must be run in the root of a Trellis project.")`
	`107`	`+ ui.Error("No Trellis project detected in the current directory or any of its parent directories.")`
`108`	`108`	`os.Exit(1)`
`109`	`109`	`}`
`110`	`110`	`}`