Search for boxes in vendor directory

packr/cmd/root.go

@@ -6,12 +6,14 @@ import (
 	"os"
 
 	"github.com/gobuffalo/packr/builder"
+	"github.com/gobuffalo/packr/v2/jam/parser"
 	"github.com/spf13/cobra"
 )
 
 var input string
 var compress bool
 var verbose bool
+var includeVendored bool
 
 var rootCmd = &cobra.Command{
 	Use:   "packr",
@@ -36,6 +38,9 @@ var rootCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		b := builder.New(context.Background(), input)
 		b.Compress = compress
+		if !includeVendored {
+			parser.DefaultIgnoredFolders = append(parser.DefaultIgnoredFolders, "vendor")
+		}
 		return b.Run()
 	},
 }
@@ -44,6 +49,7 @@ func init() {
 	pwd, _ := os.Getwd()
 	rootCmd.Flags().StringVarP(&input, "input", "i", pwd, "path to scan for packr Boxes")
 	rootCmd.Flags().BoolVarP(&compress, "compress", "z", false, "compress box contents")
+	rootCmd.Flags().BoolVar(&includeVendored, "vendor", false, "look for boxes in vendor directory")
 	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "print verbose logging information")
 }
 

v2/jam/parser/finder.go

@@ -30,6 +30,9 @@ func (fd *finder) findAllGoFiles(dir string) ([]string, error) {
 		plog.Debug(fd, "findAllGoFiles", "dir", dir)
 
 		callback := func(path string, do *godirwalk.Dirent) error {
+			if filepath.Base(path) == "vendor" {
+				return filepath.SkipDir
+			}
 			ext := filepath.Ext(path)
 			if ext != ".go" {
 				return nil
@@ -57,18 +60,22 @@ func (fd *finder) findAllGoFiles(dir string) ([]string, error) {
 }
 
 func (fd *finder) findAllGoFilesImports(dir string) ([]string, error) {
+	return fd.findAllGoFilesImportsIn(".", dir)
+}
+
+func (fd *finder) findAllGoFilesImportsIn(path, dir string) ([]string, error) {
 	var err error
 	var names []string
-	oncer.Do(fd.key("findAllGoFilesImports", dir), func() {
+	oncer.Do(fd.key("findAllGoFilesImports", filepath.Join(dir, path)), func() {
 		ctx := build.Default
 
 		if len(ctx.SrcDirs()) == 0 {
 			err = fmt.Errorf("no src directories found")
 			return
 		}
 
-		pkg, err := ctx.ImportDir(dir, 0)
-		if strings.HasPrefix(pkg.ImportPath, "github.com/gobuffalo/packr") {
+		pkg, err := ctx.Import(path, dir, 0)
+		if strings.Contains(pkg.ImportPath, "github.com/gobuffalo/packr") {
 			return
 		}
 
@@ -90,17 +97,12 @@ func (fd *finder) findAllGoFilesImports(dir string) ([]string, error) {
 
 		plog.Debug(fd, "findAllGoFilesImports", "dir", dir)
 
-		names, _ = fd.findAllGoFiles(dir)
+		names, _ = fd.findAllGoFiles(pkg.Dir)
 		for _, n := range pkg.GoFiles {
 			names = append(names, filepath.Join(pkg.Dir, n))
 		}
 		for _, imp := range pkg.Imports {
-			if len(ctx.SrcDirs()) == 0 {
-				continue
-			}
-			d := ctx.SrcDirs()[len(ctx.SrcDirs())-1]
-			ip := filepath.Join(d, imp)
-			n, err := fd.findAllGoFilesImports(ip)
+			n, err := fd.findAllGoFilesImportsIn(imp, dir)
 			if err != nil && len(n) != 0 {
 				names = n
 				return

v2/jam/parser/parser_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func init() {
-	parser.DefaultIgnoredFolders = []string{"vendor", ".git", "node_modules", ".idea"}
+	parser.DefaultIgnoredFolders = []string{".git", "node_modules", ".idea"}
 }
 
 func Test_Parser_Run(t *testing.T) {

v2/jam/parser/prospect.go

@@ -9,7 +9,9 @@ import (
 	"github.com/gobuffalo/packr/v2/plog"
 )
 
-var DefaultIgnoredFolders = []string{".", "_", "vendor", "node_modules", "_fixtures", "testdata"}
+// DefaultIgnoredFolders is a list of directories where box lookup is not
+// performed.
+var DefaultIgnoredFolders = []string{".", "_", "node_modules", "_fixtures", "testdata"}
 
 func IsProspect(path string, ignore ...string) (status bool) {
 	// plog.Debug("parser", "IsProspect", "path", path, "ignore", ignore)

v2/jam/parser/prospect_test.go

@@ -18,7 +18,7 @@ func Test_IsProspect(t *testing.T) {
 		{"a/b.go", true},
 		{"a/b_test.go", false},
 		{"a/b-packr.go", false},
-		{"a/vendor/b.go", false},
+		{"a/vendor/b.go", true},
 		{"a/_c/c.go", false},
 		{"a/_c/e/fe/f/c.go", false},
 		{"a/d/_d.go", false},