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

ryanmoran · web-flow · commit b46478465fde · 2020-06-10T09:14:15.000-04:00
diff --git a/build.go b/build.go
@@ -1,4 +1,4 @@
-package bundle
+package bundleinstall
 
 import (
 	"time"
diff --git a/build_test.go b/build_test.go
@@ -1,4 +1,4 @@
-package bundle_test
+package bundleinstall_test
 
 import (
 	"bytes"
@@ -11,8 +11,8 @@ import (
 
 	"github.com/paketo-buildpacks/packit"
 	"github.com/paketo-buildpacks/packit/chronos"
-	"github.com/paketo-community/bundle-install/bundle"
-	"github.com/paketo-community/bundle-install/bundle/fakes"
+	bundleinstall "github.com/paketo-community/bundle-install"
+	"github.com/paketo-community/bundle-install/fakes"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -49,14 +49,14 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		installProcess = &fakes.InstallProcess{}
 
 		buffer = bytes.NewBuffer(nil)
-		logEmitter := bundle.NewLogEmitter(buffer)
+		logEmitter := bundleinstall.NewLogEmitter(buffer)
 
 		timeStamp = time.Now()
 		clock = chronos.NewClock(func() time.Time {
 			return timeStamp
 		})
 
-		build = bundle.Build(installProcess, logEmitter, clock)
+		build = bundleinstall.Build(installProcess, logEmitter, clock)
 	})
 
 	it.After(func() {
@@ -154,7 +154,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		context("when the layer directory cannot be removed", func() {
 			var layerDir string
 			it.Before(func() {
-				layerDir = filepath.Join(layersDir, bundle.LayerNameGems)
+				layerDir = filepath.Join(layersDir, bundleinstall.LayerNameGems)
 				Expect(os.MkdirAll(filepath.Join(layerDir, "baller"), os.ModePerm)).To(Succeed())
 				Expect(os.Chmod(layerDir, 0000)).To(Succeed())
 			})
diff --git a/buildpack.toml b/buildpack.toml
@@ -5,7 +5,7 @@ api = "0.2"
   name = "Bundle Install 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"
 
 [[stacks]]
diff --git a/bundle_install_process.go b/bundle_install_process.go
@@ -1,4 +1,4 @@
-package bundle
+package bundleinstall
 
 import (
 	"bytes"
diff --git a/bundle_install_process_test.go b/bundle_install_process_test.go
@@ -1,4 +1,4 @@
-package bundle_test
+package bundleinstall_test
 
 import (
 	"errors"
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/paketo-buildpacks/packit/pexec"
-	"github.com/paketo-community/bundle-install/bundle"
-	"github.com/paketo-community/bundle-install/bundle/fakes"
+	bundleinstall "github.com/paketo-community/bundle-install"
+	"github.com/paketo-community/bundle-install/fakes"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -25,7 +25,7 @@ func testBundleInstallProcess(t *testing.T, context spec.G, it spec.S) {
 			executions []pexec.Execution
 			executable *fakes.Executable
 
-			installProcess bundle.BundleInstallProcess
+			installProcess bundleinstall.BundleInstallProcess
 		)
 
 		it.Before(func() {
@@ -44,7 +44,7 @@ func testBundleInstallProcess(t *testing.T, context spec.G, it spec.S) {
 			path = os.Getenv("PATH")
 			os.Setenv("PATH", "/some/bin")
 
-			installProcess = bundle.NewBundleInstallProcess(executable)
+			installProcess = bundleinstall.NewBundleInstallProcess(executable)
 		})
 
 		it.After(func() {
diff --git a/cmd/build/main.go b/cmd/build/main.go
diff --git a/cmd/detect/main.go b/cmd/detect/main.go
diff --git a/constants.go b/constants.go
@@ -1,4 +1,4 @@
-package bundle
+package bundleinstall
 
 const (
 	GemsDependency    = "gems"
diff --git a/detect.go b/detect.go
@@ -1,4 +1,4 @@
-package bundle
+package bundleinstall
 
 import (
 	"fmt"
diff --git a/detect_test.go b/detect_test.go
@@ -1,16 +1,15 @@
-package bundle_test
+package bundleinstall_test
 
 import (
 	"errors"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
 
-	"io/ioutil"
-
 	"github.com/paketo-buildpacks/packit"
-	"github.com/paketo-community/bundle-install/bundle"
-	"github.com/paketo-community/bundle-install/bundle/fakes"
+	bundleinstall "github.com/paketo-community/bundle-install"
+	"github.com/paketo-community/bundle-install/fakes"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -35,7 +34,7 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 
 		gemfileParser = &fakes.VersionParser{}
 
-		detect = bundle.Detect(gemfileParser)
+		detect = bundleinstall.Detect(gemfileParser)
 	})
 
 	it.After(func() {
@@ -54,13 +53,13 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 			Requires: []packit.BuildPlanRequirement{
 				{
 					Name: "bundler",
-					Metadata: bundle.BuildPlanMetadata{
+					Metadata: bundleinstall.BuildPlanMetadata{
 						Build: true,
 					},
 				},
 				{
 					Name: "mri",
-					Metadata: bundle.BuildPlanMetadata{
+					Metadata: bundleinstall.BuildPlanMetadata{
 						Build: true,
 					},
 				},
@@ -85,14 +84,14 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 				Requires: []packit.BuildPlanRequirement{
 					{
 						Name: "bundler",
-						Metadata: bundle.BuildPlanMetadata{
+						Metadata: bundleinstall.BuildPlanMetadata{
 							Build: true,
 						},
 					},
 					{
 						Name:    "mri",
 						Version: "2.6.x",
-						Metadata: bundle.BuildPlanMetadata{
+						Metadata: bundleinstall.BuildPlanMetadata{
 							Build: true,
 						},
 					},
diff --git a/fakes/executable.go b/fakes/executable.go
diff --git a/fakes/install_process.go b/fakes/install_process.go
diff --git a/fakes/version_parser.go b/fakes/version_parser.go
diff --git a/gemfile_parser.go b/gemfile_parser.go
@@ -1,4 +1,4 @@
-package bundle
+package bundleinstall
 
 import (
 	"bufio"
diff --git a/gemfile_parser_test.go b/gemfile_parser_test.go
@@ -1,4 +1,4 @@
-package bundle_test
+package bundleinstall_test
 
 import (
 	"fmt"
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/paketo-community/bundle-install/bundle"
+	bundleinstall "github.com/paketo-community/bundle-install"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -22,7 +22,7 @@ func testGemfileParser(t *testing.T, context spec.G, it spec.S) {
 		Expect = NewWithT(t).Expect
 
 		path   string
-		parser bundle.GemfileParser
+		parser bundleinstall.GemfileParser
 	)
 
 	it.Before(func() {
@@ -32,7 +32,7 @@ func testGemfileParser(t *testing.T, context spec.G, it spec.S) {
 
 		path = file.Name()
 
-		parser = bundle.NewGemfileParser()
+		parser = bundleinstall.NewGemfileParser()
 	})
 
 	it.After(func() {
diff --git a/init_test.go b/init_test.go
@@ -1,4 +1,4 @@
-package bundle_test
+package bundleinstall_test
 
 import (
 	"testing"
diff --git a/log_emitter.go b/log_emitter.go
@@ -1,4 +1,4 @@
-package bundle
+package bundleinstall
 
 import (
 	"io"
diff --git a/log_emitter_test.go b/log_emitter_test.go
@@ -1,11 +1,11 @@
-package bundle_test
+package bundleinstall_test
 
 import (
 	"bytes"
 	"testing"
 
 	"github.com/paketo-buildpacks/packit"
-	"github.com/paketo-community/bundle-install/bundle"
+	bundleinstall "github.com/paketo-community/bundle-install"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -16,12 +16,12 @@ func testLogEmitter(t *testing.T, context spec.G, it spec.S) {
 		Expect = NewWithT(t).Expect
 
 		buffer  *bytes.Buffer
-		emitter bundle.LogEmitter
+		emitter bundleinstall.LogEmitter
 	)
 
 	it.Before(func() {
 		buffer = bytes.NewBuffer(nil)
-		emitter = bundle.NewLogEmitter(buffer)
+		emitter = bundleinstall.NewLogEmitter(buffer)
 	})
 
 	context("Environment", func() {
diff --git a/run/main.go b/run/main.go
@@ -0,0 +1,24 @@
+package main
+
+import (
+	"os"
+
+	"github.com/paketo-buildpacks/packit"
+	"github.com/paketo-buildpacks/packit/chronos"
+	"github.com/paketo-buildpacks/packit/pexec"
+	bundleinstall "github.com/paketo-community/bundle-install"
+)
+
+func main() {
+	gemfileParser := bundleinstall.NewGemfileParser()
+	executable := pexec.NewExecutable("bundle")
+	logEmitter := bundleinstall.NewLogEmitter(os.Stdout)
+	installProcess := bundleinstall.NewBundleInstallProcess(executable)
+
+	packit.Run(
+		bundleinstall.Detect(gemfileParser),
+		bundleinstall.Build(
+			installProcess,
+			logEmitter, chronos.DefaultClock),
+	)
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package bundle`
	`1`	`+package bundleinstall`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"time"`