Upgrade CNB to latest spec changes

dfreilich · dfreilich · commit e75b9f0896c4 · 2019-08-20T09:11:15.000-04:00
- Requires ruby, with the version it reads from the gemfile
- Requires and provides bundler, with the version it reads from the gemfile
- Requires and provides rubygems
- **This CNB is not yet fully implemented, and is not operational**
[#167707118]
diff --git a/README.md b/README.md
@@ -4,3 +4,5 @@ To package this buildpack for consumption:
 $ ./scripts/package.sh
 ```
 This builds the buildpack's Go source using GOOS=linux by default. You can supply another value as the first argument to package.sh.
+
+## This CNB is not yet fully implemented.
diff --git a/cmd/build/main.go b/cmd/build/main.go
@@ -1,10 +1,9 @@
 package main
 
 import (
+	"fmt"
 	"github.com/cloudfoundry/bundler-cnb/bundler"
 	"github.com/cloudfoundry/bundler-cnb/gems"
-	"fmt"
-	"github.com/buildpack/libbuildpack/buildplan"
 	"github.com/cloudfoundry/libcfbuildpack/build"
 )
 
@@ -26,8 +25,5 @@ func runBuild(context build.Build) (int, error) {
 		}
 	}
 
-	return context.Success(buildplan.BuildPlan{})
-
-
-	return 0, fmt.Errorf("not implemented")
+	return context.Success()
 }
diff --git a/cmd/detect/main.go b/cmd/detect/main.go
@@ -50,17 +50,26 @@ func runDetect(context detect.Detect) (int, error) {
 	}
 
 
-	return context.Pass(buildplan.BuildPlan{
-		ruby.Dependency: buildplan.Dependency{
-			Version:  rubyVersion,
-			Metadata: buildplan.Metadata{"build": true, "launch": true},
+	return context.Pass(buildplan.Plan{
+		Requires: []buildplan.Required{
+			{
+				Name:     ruby.Dependency,
+				Version:  rubyVersion,
+				Metadata: buildplan.Metadata{"build": true, "launch": true},
+			},
+			{
+				Name:     bundler.Dependency,
+				Version:  bundlerVersion,
+				Metadata: buildplan.Metadata{"build": true, "launch": true},
+			},
+			{
+				Name:     gems.Dependency,
+				Metadata: buildplan.Metadata{"launch": true},
+			},
 		},
-		bundler.Dependency: buildplan.Dependency{
-			Version:  bundlerVersion,
-			Metadata: buildplan.Metadata{"build": true, "launch": true},
-		},
-		gems.Dependency: buildplan.Dependency{
-			Metadata: buildplan.Metadata{"launch": true},
+		Provides: []buildplan.Provided{
+			{bundler.Dependency},
+			{gems.Dependency},
 		},
 	})
 }
diff --git a/cmd/detect/main_test.go b/cmd/detect/main_test.go
@@ -72,17 +72,26 @@ BUNDLED WITH
 				code, err := runDetect(factory.Detect)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(code).To(Equal(detect.PassStatusCode))
-				Expect(factory.Output).To(Equal(buildplan.BuildPlan{
-					ruby.Dependency: buildplan.Dependency{
-						Version:  "'~> 3.2','< 3.2.5'",
-						Metadata: buildplan.Metadata{"build": true, "launch": true},
-					},
-					bundler.Dependency: buildplan.Dependency{
-						Version:  "1.16.4",
-						Metadata: buildplan.Metadata{"build": true, "launch": true},
+				Expect(factory.Plans.Plan).To(Equal(buildplan.Plan{
+					Requires: []buildplan.Required{
+						{
+							Name:     ruby.Dependency,
+							Version:  "'~> 3.2','< 3.2.5'",
+							Metadata: buildplan.Metadata{"build": true, "launch": true},
+						},
+						{
+							Name:     bundler.Dependency,
+							Version:  "1.16.4",
+							Metadata: buildplan.Metadata{"build": true, "launch": true},
+						},
+						{
+							Name:     gems.Dependency,
+							Metadata: buildplan.Metadata{"launch": true},
+						},
 					},
-					gems.Dependency: buildplan.Dependency{
-						Metadata: buildplan.Metadata{"launch": true},
+					Provides: []buildplan.Provided{
+						{bundler.Dependency},
+						{gems.Dependency},
 					},
 				}))
 			})
@@ -118,17 +127,26 @@ BUNDLED WITH
 			code, err := runDetect(factory.Detect)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(code).To(Equal(detect.PassStatusCode))
-			Expect(factory.Output).To(Equal(buildplan.BuildPlan{
-				ruby.Dependency: buildplan.Dependency{
-					Version:  "'~> 3.2'",
-					Metadata: buildplan.Metadata{"build": true, "launch": true},
-				},
-				bundler.Dependency: buildplan.Dependency{
-					Version:  "2.0.1",
-					Metadata: buildplan.Metadata{"build": true, "launch": true},
+			Expect(factory.Plans.Plan).To(Equal(buildplan.Plan{
+				Requires: []buildplan.Required{
+					{
+						Name:     ruby.Dependency,
+						Version:  "'~> 3.2'",
+						Metadata: buildplan.Metadata{"build": true, "launch": true},
+					},
+					{
+						Name:     bundler.Dependency,
+						Version:  "2.0.1",
+						Metadata: buildplan.Metadata{"build": true, "launch": true},
+					},
+					{
+						Name:     gems.Dependency,
+						Metadata: buildplan.Metadata{"launch": true},
+					},
 				},
-				gems.Dependency: buildplan.Dependency{
-					Metadata: buildplan.Metadata{"launch": true},
+				Provides: []buildplan.Provided{
+					{bundler.Dependency},
+					{gems.Dependency},
 				},
 			}))
 		})
diff --git a/gems/gems.go b/gems/gems.go
@@ -37,9 +37,9 @@ type Contributor struct {
 }
 
 func NewContributor(context build.Build, pkgManager PackageManager) (Contributor, bool, error) {
-	plan, shouldUseBundler := context.BuildPlan[Dependency]
-	if !shouldUseBundler {
-		return Contributor{}, false, nil
+	plan, shouldUseBundler, err := context.Plans.GetShallowMerged(Dependency)
+	if err != nil || !shouldUseBundler {
+		return Contributor{}, false, err
 	}
 
 	gemFile := filepath.Join(context.Application.Root, "Gemfile")
@@ -64,13 +64,8 @@ func NewContributor(context build.Build, pkgManager PackageManager) (Contributor
 		Metadata:   Metadata{hex.EncodeToString(hash[:])},
 	}
 
-	if _, ok := plan.Metadata["build"]; ok {
-		contributor.buildContribution = true
-	}
-
-	if _, ok := plan.Metadata["launch"]; ok {
-		contributor.launchContribution = true
-	}
+	contributor.buildContribution, _ = plan.Metadata["build"].(bool)
+	contributor.launchContribution, _ = plan.Metadata["launch"].(bool)
 
 	return contributor, true, nil
 }
diff --git a/gems/gems_test.go b/gems/gems_test.go
@@ -1,10 +1,10 @@
 package gems_test
 
 import (
+	"github.com/cloudfoundry/libcfbuildpack/buildpackplan"
 	"path/filepath"
 	"testing"
 
-	"github.com/buildpack/libbuildpack/buildplan"
 	"github.com/cloudfoundry/bundler-cnb/gems"
 	"github.com/cloudfoundry/libcfbuildpack/test"
 	"github.com/golang/mock/gomock"
@@ -41,7 +41,9 @@ func testGems(t *testing.T, when spec.G, it spec.S) {
 
 		when("there is no Gemfile.lock", func() {
 			it("fails", func() {
-				factory.AddBuildPlan(gems.Dependency, buildplan.Dependency{})
+				factory.AddPlan(buildpackplan.Plan{
+					Name: gems.Dependency,
+				})
 
 				_, _, err := gems.NewContributor(factory.Build, mockPkgManager)
 				Expect(err).To(HaveOccurred())
@@ -58,7 +60,9 @@ func testGems(t *testing.T, when spec.G, it spec.S) {
 			})
 
 			it("returns true if a build plan exists", func() {
-				factory.AddBuildPlan(gems.Dependency, buildplan.Dependency{})
+				factory.AddPlan(buildpackplan.Plan{
+					Name: gems.Dependency,
+				})
 
 				_, willContribute, err := gems.NewContributor(factory.Build, mockPkgManager)
 				Expect(err).NotTo(HaveOccurred())
@@ -72,7 +76,9 @@ func testGems(t *testing.T, when spec.G, it spec.S) {
 			})
 
 			it("uses Gemfile for identity", func() {
-				factory.AddBuildPlan(gems.Dependency, buildplan.Dependency{})
+				factory.AddPlan(buildpackplan.Plan{
+					Name: gems.Dependency,
+				})
 
 				contributor, _, _ := gems.NewContributor(factory.Build, mockPkgManager)
 				name, version := contributor.Metadata.Identity()
@@ -92,7 +98,7 @@ func testGems(t *testing.T, when spec.G, it spec.S) {
 			//	})
 			//
 			//	it("contributes gems to the cache layer when included in the build plan", func() {
-			//		factory.AddBuildPlan(gems.Dependency, buildplan.Dependency{
+			//		factory.AddPlan(gems.Dependency, buildplan.Dependency{
 			//			Metadata: buildplan.Metadata{"build": true},
 			//		})
 			//
@@ -110,7 +116,7 @@ func testGems(t *testing.T, when spec.G, it spec.S) {
 			//	})
 			//
 			//	it("contributes gems to the launch layer when included in the build plan", func() {
-			//		factory.AddBuildPlan(gems.Dependency, buildplan.Dependency{
+			//		factory.AddPlan(gems.Dependency, buildplan.Dependency{
 			//			Metadata: buildplan.Metadata{"launch": true},
 			//		})
 			//
@@ -133,7 +139,7 @@ func testGems(t *testing.T, when spec.G, it spec.S) {
 			//when("the app is not vendored", func() {
 			//
 			//	it("contributes gems to the cache layer when included in the build plan", func() {
-			//		factory.AddBuildPlan(gems.Dependency, buildplan.Dependency{
+			//		factory.AddPlan(gems.Dependency, buildplan.Dependency{
 			//			Metadata: buildplan.Metadata{"build": true},
 			//		})
 			//
@@ -181,7 +187,7 @@ func testGems(t *testing.T, when spec.G, it spec.S) {
 			//	})
 			//
 			//	it("contributes gems to the launch layer when included in the build plan", func() {
-			//		factory.AddBuildPlan(gems.Dependency, buildplan.Dependency{
+			//		factory.AddPlan(gems.Dependency, buildplan.Dependency{
 			//			Metadata: buildplan.Metadata{"launch": true},
 			//		})
 			//
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/buildpack/libbuildpack v1.21.0
-	github.com/cloudfoundry/libcfbuildpack v1.82.1-0.20190815154108-ebdea9feb73d
+	github.com/cloudfoundry/libcfbuildpack v1.83.0
 	github.com/golang/mock v1.3.1
 	github.com/onsi/gomega v1.5.0
 	github.com/sclevine/spec v1.2.0
diff --git a/go.sum b/go.sum
@@ -4,8 +4,8 @@ github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITg
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/buildpack/libbuildpack v1.21.0 h1:94d0/8Xv8Pp2dwFHSKNrFyXYHM01IHpuRE0N0ezWrr4=
 github.com/buildpack/libbuildpack v1.21.0/go.mod h1:dEDd9Dbp681Gcb39omBAZdsuHZ5YFMgurKGkgxEVzVo=
-github.com/cloudfoundry/libcfbuildpack v1.82.1-0.20190815154108-ebdea9feb73d h1:YdbNg8BGGG/xwEYISxDbG9k+yFkP0FV+rAr5eZbrrOM=
-github.com/cloudfoundry/libcfbuildpack v1.82.1-0.20190815154108-ebdea9feb73d/go.mod h1:c3ag+OHs0rnwh7C7kMXw3xsGRVLDvm9LfdoRR5tAnko=
+github.com/cloudfoundry/libcfbuildpack v1.83.0 h1:rlr5jQcyAIOF2s29HFp2ooS1d8fAfqWt/UwOWsUncqY=
+github.com/cloudfoundry/libcfbuildpack v1.83.0/go.mod h1:c3ag+OHs0rnwh7C7kMXw3xsGRVLDvm9LfdoRR5tAnko=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -15,7 +15,7 @@ github.com/buildpack/libbuildpack/buildpackplan
 github.com/buildpack/libbuildpack/platform
 github.com/buildpack/libbuildpack/services
 github.com/buildpack/libbuildpack/stack
-# github.com/cloudfoundry/libcfbuildpack v1.82.1-0.20190815154108-ebdea9feb73d
+# github.com/cloudfoundry/libcfbuildpack v1.83.0
 github.com/cloudfoundry/libcfbuildpack/build
 github.com/cloudfoundry/libcfbuildpack/detect
 github.com/cloudfoundry/libcfbuildpack/helper

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "fmt"`
`4`	`5`	`"github.com/cloudfoundry/bundler-cnb/bundler"`
`5`	`6`	`"github.com/cloudfoundry/bundler-cnb/gems"`
`6`		`- "fmt"`
`7`		`- "github.com/buildpack/libbuildpack/buildplan"`
`8`	`7`	`"github.com/cloudfoundry/libcfbuildpack/build"`
`9`	`8`	`)`
`10`	`9`
`@@ -26,8 +25,5 @@ func runBuild(context build.Build) (int, error) {`
`26`	`25`	`}`
`27`	`26`	`}`
`28`	`27`
`29`		`- return context.Success(buildplan.BuildPlan{})`
`30`		`-`
`31`		`-`
`32`		`- return 0, fmt.Errorf("not implemented")`
	`28`	`+ return context.Success()`
`33`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@ type Contributor struct {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func NewContributor(context build.Build, pkgManager PackageManager) (Contributor, bool, error) {`
`40`		`- plan, shouldUseBundler := context.BuildPlan[Dependency]`
`41`		`- if !shouldUseBundler {`
`42`		`- return Contributor{}, false, nil`
	`40`	`+ plan, shouldUseBundler, err := context.Plans.GetShallowMerged(Dependency)`
	`41`	`+ if err != nil \|\| !shouldUseBundler {`
	`42`	`+ return Contributor{}, false, err`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`gemFile := filepath.Join(context.Application.Root, "Gemfile")`
`@@ -64,13 +64,8 @@ func NewContributor(context build.Build, pkgManager PackageManager) (Contributor`
`64`	`64`	`Metadata: Metadata{hex.EncodeToString(hash[:])},`
`65`	`65`	`}`
`66`	`66`
`67`		`- if _, ok := plan.Metadata["build"]; ok {`
`68`		`- contributor.buildContribution = true`
`69`		`- }`
`70`		`-`
`71`		`- if _, ok := plan.Metadata["launch"]; ok {`
`72`		`- contributor.launchContribution = true`
`73`		`- }`
	`67`	`+ contributor.buildContribution, _ = plan.Metadata["build"].(bool)`
	`68`	`+ contributor.launchContribution, _ = plan.Metadata["launch"].(bool)`
`74`	`69`
`75`	`70`	`return contributor, true, nil`
`76`	`71`	`}`