Aligns file structure to top-level package with run command (#34)

paketo-buildpacks · Jun 10, 2020 · 87297c0 · 87297c0
1 parent afab469
commit 87297c0
Show file tree

Hide file tree

Showing 26 changed files with 28 additions and 33 deletions.
diff --git a/bundler/build.go → build.go b/bundler/build.go → build.go
diff --git a/bundler/build_test.go → build_test.go b/bundler/build_test.go → build_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/paketo-buildpacks/packit"
 	"github.com/paketo-buildpacks/packit/chronos"
 	"github.com/paketo-buildpacks/packit/postal"
-	"github.com/paketo-community/bundler/bundler"
-	"github.com/paketo-community/bundler/bundler/fakes"
+	"github.com/paketo-community/bundler"
+	"github.com/paketo-community/bundler/fakes"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"

diff --git a/buildpack.toml b/buildpack.toml
@@ -5,7 +5,7 @@ api = "0.2"
   name = "Bundler Buildpack"
 
 [metadata]
-  include_files = ["bin/build", "bin/detect", "buildpack.toml"]
+  include_files = ["bin/build", "bin/detect", "bin/run", "buildpack.toml"]
   pre_package = "./scripts/build.sh"
   [metadata.default-versions]
     bundler = "2.x.x"

diff --git a/bundler/buildpack_yml_parser.go → buildpack_yml_parser.go b/bundler/buildpack_yml_parser.go → buildpack_yml_parser.go
diff --git a/bundler/buildpack_yml_parser_test.go → buildpack_yml_parser_test.go b/bundler/buildpack_yml_parser_test.go → buildpack_yml_parser_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/paketo-community/bundler/bundler"
+	"github.com/paketo-community/bundler"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"

diff --git a/cmd/detect/main.go b/cmd/detect/main.go
diff --git a/bundler/constants.go → constants.go b/bundler/constants.go → constants.go
diff --git a/bundler/detect.go → detect.go b/bundler/detect.go → detect.go
diff --git a/bundler/detect_test.go → detect_test.go b/bundler/detect_test.go → detect_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/paketo-buildpacks/packit"
-	"github.com/paketo-community/bundler/bundler"
-	"github.com/paketo-community/bundler/bundler/fakes"
+	"github.com/paketo-community/bundler"
+	"github.com/paketo-community/bundler/fakes"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"

diff --git a/bundler/fakes/build_plan_refinery.go → fakes/build_plan_refinery.go b/bundler/fakes/build_plan_refinery.go → fakes/build_plan_refinery.go
diff --git a/bundler/fakes/dependency_manager.go → fakes/dependency_manager.go b/bundler/fakes/dependency_manager.go → fakes/dependency_manager.go
diff --git a/bundler/fakes/entry_resolver.go → fakes/entry_resolver.go b/bundler/fakes/entry_resolver.go → fakes/entry_resolver.go
diff --git a/bundler/fakes/shimmer.go → fakes/shimmer.go b/bundler/fakes/shimmer.go → fakes/shimmer.go
diff --git a/bundler/fakes/version_parser.go → fakes/version_parser.go b/bundler/fakes/version_parser.go → fakes/version_parser.go
diff --git a/bundler/gemfile_lock_parser.go → gemfile_lock_parser.go b/bundler/gemfile_lock_parser.go → gemfile_lock_parser.go
diff --git a/bundler/gemfile_lock_parser_test.go → gemfile_lock_parser_test.go b/bundler/gemfile_lock_parser_test.go → gemfile_lock_parser_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/paketo-community/bundler/bundler"
+	"github.com/paketo-community/bundler"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"

diff --git a/bundler/init_test.go → init_test.go b/bundler/init_test.go → init_test.go
diff --git a/bundler/log_emitter.go → log_emitter.go b/bundler/log_emitter.go → log_emitter.go
diff --git a/bundler/log_emitter_test.go → log_emitter_test.go b/bundler/log_emitter_test.go → log_emitter_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/paketo-buildpacks/packit"
 	"github.com/paketo-buildpacks/packit/postal"
-	"github.com/paketo-community/bundler/bundler"
+	"github.com/paketo-community/bundler"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"

diff --git a/bundler/plan_entry_resolver.go → plan_entry_resolver.go b/bundler/plan_entry_resolver.go → plan_entry_resolver.go
diff --git a/bundler/plan_entry_resolver_test.go → plan_entry_resolver_test.go b/bundler/plan_entry_resolver_test.go → plan_entry_resolver_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/paketo-buildpacks/packit"
-	"github.com/paketo-community/bundler/bundler"
+	"github.com/paketo-community/bundler"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"

diff --git a/bundler/plan_refinery.go → plan_refinery.go b/bundler/plan_refinery.go → plan_refinery.go
diff --git a/bundler/plan_refinery_test.go → plan_refinery_test.go b/bundler/plan_refinery_test.go → plan_refinery_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/paketo-buildpacks/packit/postal"
-	"github.com/paketo-community/bundler/bundler"
+	"github.com/paketo-community/bundler"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"

diff --git a/cmd/build/main.go → run/main.go b/cmd/build/main.go → run/main.go
@@ -7,22 +7,30 @@ import (
 	"github.com/paketo-buildpacks/packit/cargo"
 	"github.com/paketo-buildpacks/packit/chronos"
 	"github.com/paketo-buildpacks/packit/postal"
-	"github.com/paketo-community/bundler/bundler"
+	"github.com/paketo-community/bundler"
 )
 
 func main() {
+	buildpackYMLParser := bundler.NewBuildpackYMLParser()
+	gemfileLockParser := bundler.NewGemfileLockParser()
 	logEmitter := bundler.NewLogEmitter(os.Stdout)
 	entryResolver := bundler.NewPlanEntryResolver(logEmitter)
 	dependencyManager := postal.NewService(cargo.NewTransport())
 	planRefinery := bundler.NewPlanRefinery()
 	versionShimmer := bundler.NewVersionShimmer()
 
-	packit.Build(bundler.Build(
-		entryResolver,
-		dependencyManager,
-		planRefinery,
-		logEmitter,
-		chronos.DefaultClock,
-		versionShimmer,
-	))
+	packit.Run(
+		bundler.Detect(
+			buildpackYMLParser,
+			gemfileLockParser,
+		),
+		bundler.Build(
+			entryResolver,
+			dependencyManager,
+			planRefinery,
+			logEmitter,
+			chronos.DefaultClock,
+			versionShimmer,
+		),
+	)
 }
diff --git a/bundler/version_shimmer.go → version_shimmer.go b/bundler/version_shimmer.go → version_shimmer.go
diff --git a/bundler/version_shimmer_test.go → version_shimmer_test.go b/bundler/version_shimmer_test.go → version_shimmer_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/paketo-community/bundler/bundler"
+	"github.com/paketo-community/bundler"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"