From 62408315596aedf81662f3f4f62c47690244961a Mon Sep 17 00:00:00 2001 From: Nathan Rajlich Date: Mon, 29 Apr 2024 15:57:43 -0700 Subject: [PATCH] . --- .changeset/friendly-badgers-protect.md | 2 +- packages/ruby/src/index.ts | 2 -- .../13-version-3-2-on-al2023-error/Gemfile | 7 +++++++ .../13-version-3-2-on-al2023-error/Gemfile.lock | 16 ++++++++++++++++ .../13-version-3-2-on-al2023-error/index.rb | 9 +++++++++ .../13-version-3-2-on-al2023-error/vercel.json | 4 ++++ packages/ruby/test/test.js | 4 ++++ 7 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/Gemfile create mode 100644 packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/Gemfile.lock create mode 100644 packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/index.rb create mode 100644 packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/vercel.json diff --git a/.changeset/friendly-badgers-protect.md b/.changeset/friendly-badgers-protect.md index b9bdeecf02c..3d4674a7ec2 100644 --- a/.changeset/friendly-badgers-protect.md +++ b/.changeset/friendly-badgers-protect.md @@ -1,5 +1,5 @@ --- -'@vercel/ruby': patch +'@vercel/ruby': minor --- Add support for Ruby 3.3 diff --git a/packages/ruby/src/index.ts b/packages/ruby/src/index.ts index 7b8ae2ea985..8db26ebb863 100644 --- a/packages/ruby/src/index.ts +++ b/packages/ruby/src/index.ts @@ -95,7 +95,6 @@ async function bundleInstall( // "webrick" needs to be installed for Ruby 3+ to fix runtime error: // webrick is not part of the default gems since Ruby 3.0.0. Install webrick from RubyGems. if (major >= 3) { - console.log('installing webrick'); const result = await execa('bundler', ['add', 'webrick'], { cwd: dirname(gemfilePath), stdio: 'pipe', @@ -155,7 +154,6 @@ export const build: BuildV3 = async ({ : ''; const { gemHome, bundlerPath, vendorPath, runtime, rubyPath, major } = await installBundler(meta, gemfileContents); - console.log({ gemHome, bundlerPath, vendorPath, runtime, rubyPath, major }); process.env.GEM_HOME = gemHome; debug(`Checking existing vendor directory at "${vendorPath}"`); const vendorDir = join(workPath, vendorPath); diff --git a/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/Gemfile b/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/Gemfile new file mode 100644 index 00000000000..8d3731d9700 --- /dev/null +++ b/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/Gemfile @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +ruby "~> 3.2.x" + +gem "cowsay", "~> 0.3.0" diff --git a/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/Gemfile.lock b/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/Gemfile.lock new file mode 100644 index 00000000000..f3faa0ae557 --- /dev/null +++ b/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/Gemfile.lock @@ -0,0 +1,16 @@ +GEM + remote: https://rubygems.org/ + specs: + cowsay (0.3.0) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + cowsay (~> 0.3.0) + +RUBY VERSION + ruby 2.5.5p157 + +BUNDLED WITH + 2.2.22 diff --git a/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/index.rb b/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/index.rb new file mode 100644 index 00000000000..a2899e8f1e6 --- /dev/null +++ b/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/index.rb @@ -0,0 +1,9 @@ +require 'cowsay' + +Handler = Proc.new do |req, res| + name = req.query['name'] || 'World' + + res.status = 200 + res['Content-Type'] = 'text/text; charset=utf-8' + res.body = Cowsay.say("Hello #{name}", 'cow') +end diff --git a/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/vercel.json b/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/vercel.json new file mode 100644 index 00000000000..e6700a8244f --- /dev/null +++ b/packages/ruby/test/fixtures/13-version-3-2-on-al2023-error/vercel.json @@ -0,0 +1,4 @@ +{ + "version": 2, + "builds": [{ "src": "index.rb", "use": "@vercel/ruby" }] +} diff --git a/packages/ruby/test/test.js b/packages/ruby/test/test.js index 9782ef8e27d..b56a73fc563 100644 --- a/packages/ruby/test/test.js +++ b/packages/ruby/test/test.js @@ -18,6 +18,10 @@ const testsThatFailToBuild = new Map([ '12-version-3-3-on-al2-error', 'Found `Gemfile` with invalid Ruby version: `ruby "~> 3.3.x".` Please set `ruby "~> 3.2.x"` in your `Gemfile` to use Ruby 3.2.x.', ], + [ + '13-version-3-2-on-al2023-error', + 'Found `Gemfile` with invalid Ruby version: `ruby "~> 3.2.x".` Please set `ruby "~> 3.3.x"` in your `Gemfile` to use Ruby 3.3.x.', + ], ]); const testsThatShouldBeSkipped = ['06-rails'];