Merge pull request #2 from paketo-community/run

Move main.go into run sub-package
paketo-buildpacks · Jun 8, 2020 · 1a1799b · 1a1799b
2 parents 9d42d02 + f2e0ce2
commit 1a1799b
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 24 deletions.
diff --git a/build.go b/build.go
@@ -1,4 +1,4 @@
-package main
+package thin
 
 import (
 	"github.com/paketo-buildpacks/packit"

diff --git a/build_test.go b/build_test.go
@@ -1,4 +1,4 @@
-package main_test
+package thin_test
 
 import (
 	"bytes"
@@ -8,7 +8,7 @@ import (
 
 	"github.com/paketo-buildpacks/packit"
 	"github.com/paketo-buildpacks/packit/scribe"
-	main "github.com/paketo-community/thin"
+	"github.com/paketo-community/thin"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
@@ -40,7 +40,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		buffer = bytes.NewBuffer(nil)
 		logger := scribe.NewLogger(buffer)
 
-		build = main.Build(logger)
+		build = thin.Build(logger)
 	})
 
 	it.After(func() {
@@ -80,7 +80,5 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 
 		Expect(buffer.String()).To(ContainSubstring("Some Buildpack some-version"))
 		Expect(buffer.String()).To(ContainSubstring("Writing start command"))
-
 	})
-
 }
diff --git a/detect.go b/detect.go
@@ -1,4 +1,4 @@
-package main
+package thin
 
 import (
 	"fmt"

diff --git a/detect_test.go b/detect_test.go
@@ -1,4 +1,4 @@
-package main_test
+package thin_test
 
 import (
 	"errors"
@@ -9,7 +9,7 @@ import (
 	"io/ioutil"
 
 	"github.com/paketo-buildpacks/packit"
-	main "github.com/paketo-community/thin"
+	"github.com/paketo-community/thin"
 	"github.com/paketo-community/thin/fakes"
 	"github.com/sclevine/spec"
 
@@ -38,7 +38,7 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 
 		gemfileParser = &fakes.Parser{}
 
-		detect = main.Detect(gemfileParser)
+		detect = thin.Detect(gemfileParser)
 	})
 
 	it.After(func() {
@@ -59,19 +59,19 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
 				Requires: []packit.BuildPlanRequirement{
 					{
 						Name: "gems",
-						Metadata: main.BuildPlanMetadata{
+						Metadata: thin.BuildPlanMetadata{
 							Launch: true,
 						},
 					},
 					{
 						Name: "bundler",
-						Metadata: main.BuildPlanMetadata{
+						Metadata: thin.BuildPlanMetadata{
 							Launch: true,
 						},
 					},
 					{
 						Name: "mri",
-						Metadata: main.BuildPlanMetadata{
+						Metadata: thin.BuildPlanMetadata{
 							Launch: true,
 						},
 					},

diff --git a/gemfile_parser.go b/gemfile_parser.go
@@ -1,4 +1,4 @@
-package main
+package thin
 
 import (
 	"bufio"

diff --git a/gemfile_parser_test.go b/gemfile_parser_test.go
@@ -1,21 +1,22 @@
-package main_test
+package thin_test
 
 import (
 	"io/ioutil"
 	"os"
 	"testing"
+
+	"github.com/paketo-community/thin"
 	"github.com/sclevine/spec"
 
 	. "github.com/onsi/gomega"
-	main "github.com/paketo-community/thin"
 )
 
 func testGemfileParser(t *testing.T, context spec.G, it spec.S) {
 	var (
 		Expect = NewWithT(t).Expect
 
 		path   string
-		parser main.GemfileParser
+		parser thin.GemfileParser
 	)
 
 	it.Before(func() {
@@ -24,7 +25,7 @@ func testGemfileParser(t *testing.T, context spec.G, it spec.S) {
 		defer file.Close()
 
 		path = file.Name()
-		parser = main.NewGemfileParser()
+		parser = thin.NewGemfileParser()
 	})
 
 	it.After(func() {

diff --git a/init_test.go b/init_test.go
@@ -1,4 +1,4 @@
-package main_test
+package thin_test
 
 import (
 	"testing"

diff --git a/main.go → run/main.go b/main.go → run/main.go
@@ -5,14 +5,15 @@ import (
 
 	"github.com/paketo-buildpacks/packit"
 	"github.com/paketo-buildpacks/packit/scribe"
+	"github.com/paketo-community/thin"
 )
 
 func main() {
-	parser := NewGemfileParser()
+	parser := thin.NewGemfileParser()
 	logger := scribe.NewLogger(os.Stdout)
 
-	detect := Detect(parser)
-	build := Build(logger)
-
-	packit.Run(detect, build)
+	packit.Run(
+		thin.Detect(parser),
+		thin.Build(logger),
+	)
 }
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -8,6 +8,28 @@ readonly BUILDPACKDIR="$(cd "${PROGDIR}/.." && pwd)"
 function main() {
     mkdir -p "${BUILDPACKDIR}/bin"
 
+    if [[ -f "${BUILDPACKDIR}/run/main.go" ]]; then
+        pushd "${BUILDPACKDIR}/bin" > /dev/null || return
+            printf "%s" "Building run..."
+
+            GOOS=linux \
+              go build \
+                -ldflags="-s -w" \
+                -o "run" \
+                  "${BUILDPACKDIR}/run"
+
+            echo "Success!"
+
+            for name in detect build; do
+              printf "%s" "Linking ${name}..."
+
+              ln -sf "run" "${name}"
+
+              echo "Success!"
+            done
+        popd > /dev/null || return
+    fi
+
     if [[ -f "${BUILDPACKDIR}/main.go" ]]; then
         pushd "${BUILDPACKDIR}/bin" > /dev/null || return
             printf "%s" "Building run..."