Refactor and Rename pyfinder [#151740582]

dgodd · dgodd · commit e62565dd370e · 2017-10-06T12:12:33.000-04:00
diff --git a/src/python/finalize/cli/main.go b/src/python/finalize/cli/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"python/finalize"
 	_ "python/hooks"
-	"python/manage_py_finder"
+	"python/pyfinder"
 	"time"
 
 	"github.com/cloudfoundry/libbuildpack"
@@ -48,7 +48,7 @@ func main() {
 		Log:            logger,
 		Logfile:        logfile,
 		Command:        &libbuildpack.Command{},
-		ManagePyFinder: manage_py_finder.ManagePyFinder{},
+		ManagePyFinder: pyfinder.ManagePyFinder{},
 	}
 
 	if err := finalize.Run(&f); err != nil {
diff --git a/src/python/manage_py_finder/manage_py_finder.go b/src/python/manage_py_finder/manage_py_finder.go
diff --git a/src/python/pyfinder/manage_py_finder.go b/src/python/pyfinder/manage_py_finder.go
@@ -0,0 +1,20 @@
+package pyfinder
+
+import (
+	"fmt"
+	"path/filepath"
+)
+
+type ManagePyFinder struct{}
+
+func (m ManagePyFinder) FindManagePy(dir string) (string, error) {
+	for _, glob := range []string{"manage.py", "*/manage.py", "*/*/manage.py"} {
+		if matches, err := filepath.Glob(filepath.Join(dir, glob)); err != nil {
+			return "", fmt.Errorf("Finding %s: %v", glob, err)
+		} else if len(matches) > 0 {
+			return matches[0], nil
+		}
+	}
+
+	return "", fmt.Errorf("manage.py not found!")
+}
diff --git a/src/python/pyfinder/manage_py_finder_suite_test.go b/src/python/pyfinder/manage_py_finder_suite_test.go
@@ -1,4 +1,4 @@
-package manage_py_finder_test
+package pyfinder_test
 
 import (
 	. "github.com/onsi/ginkgo"
diff --git a/src/python/pyfinder/manage_py_finder_test.go b/src/python/pyfinder/manage_py_finder_test.go
@@ -1,10 +1,10 @@
-package manage_py_finder_test
+package pyfinder_test
 
 import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	. "python/manage_py_finder"
+	. "python/pyfinder"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -18,7 +18,7 @@ var _ = Describe("ManagePyFinder", func() {
 	)
 
 	BeforeEach(func() {
-		tempDir, err = ioutil.TempDir("", "manage_py_finder")
+		tempDir, err = ioutil.TempDir("", "pyfinder")
 		Expect(err).NotTo(HaveOccurred())
 		finder = ManagePyFinder{}
 	})

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package manage_py_finder_test`
	`1`	`+package pyfinder_test`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`. "github.com/onsi/ginkgo"`