enable bundler 1.17 fixture to build successfully

Author: Sophie Wigmore

bundle_install_process.go

@@ -183,18 +183,19 @@ func (ip BundleInstallProcess) Execute(workingDir, layerPath string, config map[
 	}
 
 	buffer := bytes.NewBuffer(nil)
+	errorBuffer := bytes.NewBuffer(nil)
 	args := []string{"config", "--global", "cache_path", "--parseable"}
 
 	ip.logger.Subprocess("Running 'bundle %s'", strings.Join(args, " "))
 
 	err = ip.executable.Execute(pexec.Execution{
 		Args:   args,
 		Stdout: buffer,
-		Stderr: buffer,
+		Stderr: errorBuffer,
 		Env:    env,
 	})
 	if err != nil {
-		return fmt.Errorf("failed to execute bundle config output:\n%s\nerror: %s", buffer.String(), err)
+		return fmt.Errorf("failed to execute bundle config output:\n%s\nerror: %s", errorBuffer.String(), err)
 	}
 
 	cachePath := filepath.Join("vendor", "cache")

integration/simple_app_test.go

@@ -224,13 +224,16 @@ func testSimpleApp(t *testing.T, context spec.G, it spec.S) {
 				source, err = occam.Source(filepath.Join("testdata", "bundler_version_1_17"))
 				Expect(err).NotTo(HaveOccurred())
 
+				// must build with MRI 3.0 or 3.1, as some Bundler 1.17 code is not compatible with Ruby 3.2
+				// for example: `/usr/local/bundle/gems/bundler-1.17.3/lib/bundler/shared_helpers.rb:118: warning: Pathname#untaint is deprecated and will be removed in Ruby 3.2.`
 				image, logs, err = pack.WithVerbose().Build.
 					WithBuildpacks(
 						settings.Buildpacks.MRI.Online,
 						settings.Buildpacks.Bundler.Online,
 						settings.Buildpacks.BundleInstall.Online,
 						settings.Buildpacks.BundleList.Online,
 					).
+					WithEnv(map[string]string{"BP_MRI_VERSION": "3.1"}).
 					WithPullPolicy("never").
 					Execute(name, source)
 				Expect(err).NotTo(HaveOccurred())
@@ -269,13 +272,17 @@ func testSimpleApp(t *testing.T, context spec.G, it spec.S) {
 
 				Expect(logs).To(ContainLines(
 					"Paketo Buildpack for Bundle List",
+				))
+				Expect(logs).To(ContainLines(
 					"  Gems included by the bundle:",
 					MatchRegexp(`    \* bundler`),
 					MatchRegexp(`    \* coderay`),
 					MatchRegexp(`    \* diff-lcs`),
 					MatchRegexp(`    \* method_source`),
 					MatchRegexp(`    \* mustermann`),
+					MatchRegexp(`    \* nio4r`),
 					MatchRegexp(`    \* pry`),
+					MatchRegexp(`    \* puma`),
 					MatchRegexp(`    \* rack`),
 					MatchRegexp(`    \* rack-protection`),
 					MatchRegexp(`    \* rspec`),
@@ -327,6 +334,8 @@ func testSimpleApp(t *testing.T, context spec.G, it spec.S) {
 					"Gems included by the bundle:",
 					MatchRegexp(`  \* bundler`),
 					MatchRegexp(`  \* mustermann`),
+					MatchRegexp(`  \* nio4r`),
+					MatchRegexp(`  \* puma`),
 					MatchRegexp(`  \* rack`),
 					MatchRegexp(`  \* rack-protection`),
 					MatchRegexp(`  \* ruby2_keywords`),

integration/testdata/bundler_version_1_17/Gemfile

@@ -1,8 +1,9 @@
 source 'https://rubygems.org'
 
-ruby '~> 3.1'
+ruby '~> 3.0'
 
 gem 'sinatra', '~>2.1.0'
+gem 'puma'
 
 group :development do
   gem 'pry'

integration/testdata/bundler_version_1_17/Gemfile.lock

@@ -6,9 +6,12 @@ GEM
     method_source (1.0.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.9)
     pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    puma (6.2.1)
+      nio4r (~> 2.0)
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
@@ -38,6 +41,7 @@ PLATFORMS
 
 DEPENDENCIES
   pry
+  puma
   rspec
   sinatra (~> 2.1.0)