From 378fbff12509a9e626314edd53f4a977c1d84f48 Mon Sep 17 00:00:00 2001
From: Ryan Moran <rmoran@pivotal.io>
Date: Mon, 8 Jun 2020 10:53:22 -0400
Subject: [PATCH] Aligns file structure to top-level package with run command

---
 yarn/build.go => build.go                     |  2 +-
 yarn/build_test.go => build_test.go           |  8 ++++----
 buildpack.toml                                |  2 +-
 yarn/cache_handler.go => cache_handler.go     |  2 +-
 ...e_handler_test.go => cache_handler_test.go |  8 ++++----
 cmd/detect/main.go                            | 12 ------------
 yarn/detect.go => detect.go                   |  2 +-
 yarn/detect_test.go => detect_test.go         | 16 ++++++++--------
 {yarn/fakes => fakes}/cache_matcher.go        |  0
 {yarn/fakes => fakes}/dependency_service.go   |  0
 {yarn/fakes => fakes}/executable.go           |  0
 {yarn/fakes => fakes}/install_process.go      |  0
 {yarn/fakes => fakes}/summer.go               |  0
 {yarn/fakes => fakes}/transport.go            |  0
 {yarn/fakes => fakes}/version_parser.go       |  0
 yarn/init_test.go => init_test.go             |  2 +-
 yarn/install_process.go => install_process.go |  2 +-
 ...process_test.go => install_process_test.go | 14 +++++++-------
 ...e_json_parser.go => package_json_parser.go |  2 +-
 ...ser_test.go => package_json_parser_test.go |  8 ++++----
 {cmd/build => run}/main.go                    | 19 ++++++++++++++-----
 21 files changed, 48 insertions(+), 51 deletions(-)
 rename yarn/build.go => build.go (99%)
 rename yarn/build_test.go => build_test.go (98%)
 rename yarn/cache_handler.go => cache_handler.go (92%)
 rename yarn/cache_handler_test.go => cache_handler_test.go (89%)
 delete mode 100644 cmd/detect/main.go
 rename yarn/detect.go => detect.go (98%)
 rename yarn/detect_test.go => detect_test.go (91%)
 rename {yarn/fakes => fakes}/cache_matcher.go (100%)
 rename {yarn/fakes => fakes}/dependency_service.go (100%)
 rename {yarn/fakes => fakes}/executable.go (100%)
 rename {yarn/fakes => fakes}/install_process.go (100%)
 rename {yarn/fakes => fakes}/summer.go (100%)
 rename {yarn/fakes => fakes}/transport.go (100%)
 rename {yarn/fakes => fakes}/version_parser.go (100%)
 rename yarn/init_test.go => init_test.go (93%)
 rename yarn/install_process.go => install_process.go (99%)
 rename yarn/install_process_test.go => install_process_test.go (96%)
 rename yarn/package_json_parser.go => package_json_parser.go (96%)
 rename yarn/package_json_parser_test.go => package_json_parser_test.go (89%)
 rename {cmd/build => run}/main.go (57%)

diff --git a/yarn/build.go b/build.go
similarity index 99%
rename from yarn/build.go
rename to build.go
index cb45115d..5c18af58 100644
--- a/yarn/build.go
+++ b/build.go
@@ -1,4 +1,4 @@
-package yarn
+package yarninstall
 
 import (
 	"os"
diff --git a/yarn/build_test.go b/build_test.go
similarity index 98%
rename from yarn/build_test.go
rename to build_test.go
index 0358b544..2dd06b7e 100644
--- a/yarn/build_test.go
+++ b/build_test.go
@@ -1,4 +1,4 @@
-package yarn_test
+package yarninstall_test
 
 import (
 	"bytes"
@@ -13,8 +13,8 @@ import (
 	"github.com/paketo-buildpacks/packit/chronos"
 	"github.com/paketo-buildpacks/packit/postal"
 	"github.com/paketo-buildpacks/packit/scribe"
-	"github.com/paketo-buildpacks/yarn-install/yarn"
-	"github.com/paketo-buildpacks/yarn-install/yarn/fakes"
+	yarninstall "github.com/paketo-buildpacks/yarn-install"
+	"github.com/paketo-buildpacks/yarn-install/fakes"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -78,7 +78,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 
 		buffer = bytes.NewBuffer(nil)
 
-		build = yarn.Build(dependencyService, cacheMatcher, installProcess, clock, scribe.NewLogger(buffer))
+		build = yarninstall.Build(dependencyService, cacheMatcher, installProcess, clock, scribe.NewLogger(buffer))
 	})
 
 	it.After(func() {
diff --git a/buildpack.toml b/buildpack.toml
index 3158819a..f762d034 100644
--- a/buildpack.toml
+++ b/buildpack.toml
@@ -6,7 +6,7 @@ api = "0.2"
   homepage = "https://github.com/paketo-buildpacks/yarn-install"
 
 [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]
     yarn = "1.*"
diff --git a/yarn/cache_handler.go b/cache_handler.go
similarity index 92%
rename from yarn/cache_handler.go
rename to cache_handler.go
index de0096c2..1f8ee35b 100644
--- a/yarn/cache_handler.go
+++ b/cache_handler.go
@@ -1,4 +1,4 @@
-package yarn
+package yarninstall
 
 type CacheHandler struct{}
 
diff --git a/yarn/cache_handler_test.go b/cache_handler_test.go
similarity index 89%
rename from yarn/cache_handler_test.go
rename to cache_handler_test.go
index 3ebcbd73..9c8231b1 100644
--- a/yarn/cache_handler_test.go
+++ b/cache_handler_test.go
@@ -1,9 +1,9 @@
-package yarn_test
+package yarninstall_test
 
 import (
 	"testing"
 
-	"github.com/paketo-buildpacks/yarn-install/yarn"
+	yarninstall "github.com/paketo-buildpacks/yarn-install"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -13,11 +13,11 @@ func testCacheHandler(t *testing.T, context spec.G, it spec.S) {
 	var (
 		Expect = NewWithT(t).Expect
 
-		cacheHandler yarn.CacheHandler
+		cacheHandler yarninstall.CacheHandler
 	)
 
 	it.Before(func() {
-		cacheHandler = yarn.NewCacheHandler()
+		cacheHandler = yarninstall.NewCacheHandler()
 	})
 
 	context("Match", func() {
diff --git a/cmd/detect/main.go b/cmd/detect/main.go
deleted file mode 100644
index 41880061..00000000
--- a/cmd/detect/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package main
-
-import (
-	"github.com/paketo-buildpacks/packit"
-	"github.com/paketo-buildpacks/yarn-install/yarn"
-)
-
-func main() {
-	packageJSONParser := yarn.NewPackageJSONParser()
-
-	packit.Detect(yarn.Detect(packageJSONParser))
-}
diff --git a/yarn/detect.go b/detect.go
similarity index 98%
rename from yarn/detect.go
rename to detect.go
index 58143a84..a8b131b3 100644
--- a/yarn/detect.go
+++ b/detect.go
@@ -1,4 +1,4 @@
-package yarn
+package yarninstall
 
 import (
 	"errors"
diff --git a/yarn/detect_test.go b/detect_test.go
similarity index 91%
rename from yarn/detect_test.go
rename to detect_test.go
index ebb24777..aa67e500 100644
--- a/yarn/detect_test.go
+++ b/detect_test.go
@@ -1,4 +1,4 @@
-package yarn_test
+package yarninstall_test
 
 import (
 	"errors"
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/paketo-buildpacks/packit"
-	"github.com/paketo-buildpacks/yarn-install/yarn"
-	"github.com/paketo-buildpacks/yarn-install/yarn/fakes"
+	yarninstall "github.com/paketo-buildpacks/yarn-install"
+	"github.com/paketo-buildpacks/yarn-install/fakes"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -35,7 +35,7 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 		versionParser = &fakes.VersionParser{}
 		versionParser.ParseVersionCall.Returns.Version = "some-version"
 
-		detect = yarn.Detect(versionParser)
+		detect = yarninstall.Detect(versionParser)
 	})
 
 	it("returns a plan that provides node_modules", func() {
@@ -50,14 +50,14 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 			Requires: []packit.BuildPlanRequirement{
 				{
 					Name: "node_modules",
-					Metadata: yarn.BuildPlanMetadata{
+					Metadata: yarninstall.BuildPlanMetadata{
 						Launch: true,
 					},
 				},
 				{
 					Name:    "node",
 					Version: "some-version",
-					Metadata: yarn.BuildPlanMetadata{
+					Metadata: yarninstall.BuildPlanMetadata{
 						VersionSource: "package.json",
 						Build:         true,
 						Launch:        true,
@@ -86,13 +86,13 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 				Requires: []packit.BuildPlanRequirement{
 					{
 						Name: "node_modules",
-						Metadata: yarn.BuildPlanMetadata{
+						Metadata: yarninstall.BuildPlanMetadata{
 							Launch: true,
 						},
 					},
 					{
 						Name: "node",
-						Metadata: yarn.BuildPlanMetadata{
+						Metadata: yarninstall.BuildPlanMetadata{
 							Build:  true,
 							Launch: true,
 						},
diff --git a/yarn/fakes/cache_matcher.go b/fakes/cache_matcher.go
similarity index 100%
rename from yarn/fakes/cache_matcher.go
rename to fakes/cache_matcher.go
diff --git a/yarn/fakes/dependency_service.go b/fakes/dependency_service.go
similarity index 100%
rename from yarn/fakes/dependency_service.go
rename to fakes/dependency_service.go
diff --git a/yarn/fakes/executable.go b/fakes/executable.go
similarity index 100%
rename from yarn/fakes/executable.go
rename to fakes/executable.go
diff --git a/yarn/fakes/install_process.go b/fakes/install_process.go
similarity index 100%
rename from yarn/fakes/install_process.go
rename to fakes/install_process.go
diff --git a/yarn/fakes/summer.go b/fakes/summer.go
similarity index 100%
rename from yarn/fakes/summer.go
rename to fakes/summer.go
diff --git a/yarn/fakes/transport.go b/fakes/transport.go
similarity index 100%
rename from yarn/fakes/transport.go
rename to fakes/transport.go
diff --git a/yarn/fakes/version_parser.go b/fakes/version_parser.go
similarity index 100%
rename from yarn/fakes/version_parser.go
rename to fakes/version_parser.go
diff --git a/yarn/init_test.go b/init_test.go
similarity index 93%
rename from yarn/init_test.go
rename to init_test.go
index 3d513e39..e813cabc 100644
--- a/yarn/init_test.go
+++ b/init_test.go
@@ -1,4 +1,4 @@
-package yarn_test
+package yarninstall_test
 
 import (
 	"testing"
diff --git a/yarn/install_process.go b/install_process.go
similarity index 99%
rename from yarn/install_process.go
rename to install_process.go
index 4d052e08..394f8d61 100644
--- a/yarn/install_process.go
+++ b/install_process.go
@@ -1,4 +1,4 @@
-package yarn
+package yarninstall
 
 import (
 	"bytes"
diff --git a/yarn/install_process_test.go b/install_process_test.go
similarity index 96%
rename from yarn/install_process_test.go
rename to install_process_test.go
index f4393365..26889a1b 100644
--- a/yarn/install_process_test.go
+++ b/install_process_test.go
@@ -1,4 +1,4 @@
-package yarn_test
+package yarninstall_test
 
 import (
 	"bytes"
@@ -12,8 +12,8 @@ import (
 
 	"github.com/paketo-buildpacks/packit/pexec"
 	"github.com/paketo-buildpacks/packit/scribe"
-	"github.com/paketo-buildpacks/yarn-install/yarn"
-	"github.com/paketo-buildpacks/yarn-install/yarn/fakes"
+	yarninstall "github.com/paketo-buildpacks/yarn-install"
+	"github.com/paketo-buildpacks/yarn-install/fakes"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -26,7 +26,7 @@ func testInstallProcess(t *testing.T, context spec.G, it spec.S) {
 		var (
 			workingDir     string
 			executable     *fakes.Executable
-			installProcess yarn.YarnInstallProcess
+			installProcess yarninstall.YarnInstallProcess
 			summer         *fakes.Summer
 		)
 
@@ -38,7 +38,7 @@ func testInstallProcess(t *testing.T, context spec.G, it spec.S) {
 			executable = &fakes.Executable{}
 			summer = &fakes.Summer{}
 
-			installProcess = yarn.NewYarnInstallProcess(executable, summer, scribe.NewLogger(bytes.NewBuffer(nil)))
+			installProcess = yarninstall.NewYarnInstallProcess(executable, summer, scribe.NewLogger(bytes.NewBuffer(nil)))
 		})
 
 		context("we should run yarn install when", func() {
@@ -127,7 +127,7 @@ func testInstallProcess(t *testing.T, context spec.G, it spec.S) {
 			executable       *fakes.Executable
 			summer           *fakes.Summer
 
-			installProcess yarn.YarnInstallProcess
+			installProcess yarninstall.YarnInstallProcess
 		)
 
 		it.Before(func() {
@@ -159,7 +159,7 @@ func testInstallProcess(t *testing.T, context spec.G, it spec.S) {
 			path = os.Getenv("PATH")
 			os.Setenv("PATH", "/some/bin")
 
-			installProcess = yarn.NewYarnInstallProcess(executable, summer, scribe.NewLogger(buffer))
+			installProcess = yarninstall.NewYarnInstallProcess(executable, summer, scribe.NewLogger(buffer))
 		})
 
 		it.After(func() {
diff --git a/yarn/package_json_parser.go b/package_json_parser.go
similarity index 96%
rename from yarn/package_json_parser.go
rename to package_json_parser.go
index 0765e6d2..0463ad84 100644
--- a/yarn/package_json_parser.go
+++ b/package_json_parser.go
@@ -1,4 +1,4 @@
-package yarn
+package yarninstall
 
 import (
 	"encoding/json"
diff --git a/yarn/package_json_parser_test.go b/package_json_parser_test.go
similarity index 89%
rename from yarn/package_json_parser_test.go
rename to package_json_parser_test.go
index 3b4ad137..15acb284 100644
--- a/yarn/package_json_parser_test.go
+++ b/package_json_parser_test.go
@@ -1,11 +1,11 @@
-package yarn_test
+package yarninstall_test
 
 import (
 	"io/ioutil"
 	"os"
 	"testing"
 
-	"github.com/paketo-buildpacks/yarn-install/yarn"
+	yarninstall "github.com/paketo-buildpacks/yarn-install"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -17,7 +17,7 @@ func testPackageJSONParser(t *testing.T, context spec.G, it spec.S) {
 	context("ParseVersion", func() {
 		var (
 			path   string
-			parser yarn.PackageJSONParser
+			parser yarninstall.PackageJSONParser
 		)
 
 		it.Before(func() {
@@ -34,7 +34,7 @@ func testPackageJSONParser(t *testing.T, context spec.G, it spec.S) {
 
 			path = file.Name()
 
-			parser = yarn.NewPackageJSONParser()
+			parser = yarninstall.NewPackageJSONParser()
 		})
 
 		it.After(func() {
diff --git a/cmd/build/main.go b/run/main.go
similarity index 57%
rename from cmd/build/main.go
rename to run/main.go
index 5195a3d8..4bdc5985 100644
--- a/cmd/build/main.go
+++ b/run/main.go
@@ -10,18 +10,27 @@ import (
 	"github.com/paketo-buildpacks/packit/pexec"
 	"github.com/paketo-buildpacks/packit/postal"
 	"github.com/paketo-buildpacks/packit/scribe"
-	"github.com/paketo-buildpacks/yarn-install/yarn"
+	yarninstall "github.com/paketo-buildpacks/yarn-install"
 )
 
 func main() {
+	packageJSONParser := yarninstall.NewPackageJSONParser()
 	logger := scribe.NewLogger(os.Stdout)
-
 	transport := cargo.NewTransport()
 	executable := pexec.NewExecutable("yarn")
 	summer := fs.NewChecksumCalculator()
-	installProcess := yarn.NewYarnInstallProcess(executable, summer, logger)
+	installProcess := yarninstall.NewYarnInstallProcess(executable, summer, logger)
 	dependencyService := postal.NewService(transport)
-	cacheHandler := yarn.NewCacheHandler()
+	cacheHandler := yarninstall.NewCacheHandler()
 
-	packit.Build(yarn.Build(dependencyService, cacheHandler, installProcess, chronos.DefaultClock, logger))
+	packit.Run(
+		yarninstall.Detect(packageJSONParser),
+		yarninstall.Build(
+			dependencyService,
+			cacheHandler,
+			installProcess,
+			chronos.DefaultClock,
+			logger,
+		),
+	)
 }