@vercel/ruby 1.3.23 → 1.3.26

package/dist/index.js

@@ -8639,27 +8639,23 @@ async function matchPaths(configPatterns, workPath) {
 async function bundleInstall(bundlePath, bundleDir, gemfilePath) {
     build_utils_1.debug(`running "bundle install --deployment"...`);
     const bundleAppConfig = await build_utils_1.getWriteableDirectory();
-    try {
-        await execa_1.default(bundlePath, [
-            'install',
-            '--deployment',
-            '--gemfile',
-            gemfilePath,
-            '--path',
-            bundleDir,
-        ], {
-            stdio: 'pipe',
-            env: {
-                BUNDLE_SILENCE_ROOT_WARNING: '1',
-                BUNDLE_APP_CONFIG: bundleAppConfig,
-                BUNDLE_JOBS: '4',
-            },
-        });
-    }
-    catch (err) {
-        build_utils_1.debug(`failed to run "bundle install --deployment"...`);
-        throw err;
-    }
+    const gemfileContent = await fs_extra_1.readFile(gemfilePath, 'utf8');
+    if (gemfileContent.includes('ruby "~> 2.7.x"')) {
+        // Gemfile contains "2.7.x" which will cause an error message:
+        // "Your Ruby patchlevel is 0, but your Gemfile specified -1"
+        // See https://github.com/rubygems/bundler/blob/3f0638c6c8d340c2f2405ecb84eb3b39c433e36e/lib/bundler/errors.rb#L49
+        // We must correct to the actual version in the build container.
+        await fs_extra_1.writeFile(gemfilePath, gemfileContent.replace('ruby "~> 2.7.x"', 'ruby "~> 2.7.0"'));
+    }
+    await execa_1.default(bundlePath, ['install', '--deployment', '--gemfile', gemfilePath, '--path', bundleDir], {
+        stdio: 'pipe',
+        env: {
+            ...process.env,
+            BUNDLE_SILENCE_ROOT_WARNING: '1',
+            BUNDLE_APP_CONFIG: bundleAppConfig,
+            BUNDLE_JOBS: '4',
+        },
+    });
 }
 exports.version = 3;
 async function build({ workPath, files, entrypoint, config, meta = {}, }) {
@@ -8711,13 +8707,7 @@ async function build({ workPath, files, entrypoint, config, meta = {}, }) {
             else {
                 // try installing. this won't work if native extesions are required.
                 // if that's the case, gems should be vendored locally before deploying.
-                try {
-                    await bundleInstall(bundlerPath, bundleDir, gemfilePath);
-                }
-                catch (err) {
-                    build_utils_1.debug('unable to build gems from Gemfile. vendor the gems locally with "bundle install --deployment" and retry.');
-                    throw err;
-                }
+                await bundleInstall(bundlerPath, bundleDir, gemfilePath);
             }
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vercel/ruby",
   "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "1.3.23",
+  "version": "1.3.26",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",
@@ -22,12 +22,12 @@
   "devDependencies": {
     "@types/fs-extra": "8.0.0",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "5.2.0",
+    "@vercel/build-utils": "5.3.1",
     "@vercel/ncc": "0.24.0",
     "execa": "2.0.4",
     "fs-extra": "^7.0.1",
     "semver": "6.1.1",
     "typescript": "4.3.4"
   },
-  "gitHead": "32afd67d29d46f67027091ab9695d8ff330355b5"
+  "gitHead": "5273279cf1ead46a1cc864850e67c2a4c2f485f7"
 }