@vercel/ruby 1.2.8-canary.4 → 1.2.9

package/dist/index.js

@@ -8665,10 +8665,11 @@ exports.version = 3;
 async function build({ workPath, files, entrypoint, config, meta = {}, }) {
     await build_utils_1.download(files, workPath, meta);
     const entrypointFsDirname = path_1.join(workPath, path_1.dirname(entrypoint));
+    const gemfileName = 'Gemfile';
     const gemfilePath = await build_utils_1.walkParentDirs({
         base: workPath,
         start: entrypointFsDirname,
-        filename: 'Gemfile',
+        filename: gemfileName,
     });
     const gemfileContents = gemfilePath
         ? await fs_extra_1.readFile(gemfilePath, 'utf8')
@@ -8700,14 +8701,23 @@ async function build({ workPath, files, entrypoint, config, meta = {}, }) {
     if (!hasVendorDir) {
         if (gemfilePath) {
             build_utils_1.debug('did not find a vendor directory but found a Gemfile, bundling gems...');
-            // 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);
+            const fileAtRoot = path_1.relative(workPath, gemfilePath) === gemfileName;
+            // If the `Gemfile` is located in the Root Directory of the project and
+            // the new File System API is used (`avoidTopLevelInstall`), the Install Command
+            // will have already installed its dependencies, so we don't need to do it again.
+            if (meta.avoidTopLevelInstall && fileAtRoot) {
+                build_utils_1.debug('Skipping `bundle install` — already handled by Install Command');
             }
-            catch (err) {
-                build_utils_1.debug('unable to build gems from Gemfile. vendor the gems locally with "bundle install --deployment" and retry.');
-                throw err;
+            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;
+                }
             }
         }
     }
@@ -8783,11 +8793,21 @@ const execa_1 = __importDefault(__webpack_require__(4237));
 const build_utils_1 = __webpack_require__(3445);
 const allOptions = [
     { major: 2, minor: 7, range: '2.7.x', runtime: 'ruby2.7' },
-    { major: 2, minor: 5, range: '2.5.x', runtime: 'ruby2.5' },
+    {
+        major: 2,
+        minor: 5,
+        range: '2.5.x',
+        runtime: 'ruby2.5',
+        discontinueDate: new Date('2021-11-30'),
+    },
 ];
 function getLatestRubyVersion() {
     return allOptions[0];
 }
+function isDiscontinued({ discontinueDate }) {
+    const today = Date.now();
+    return discontinueDate !== undefined && discontinueDate.getTime() <= today;
+}
 function getRubyPath(meta, gemfileContents) {
     let selection = getLatestRubyVersion();
     if (meta.isDev) {
@@ -8808,8 +8828,19 @@ function getRubyPath(meta, gemfileContents) {
             if (!found) {
                 throw new build_utils_1.NowBuildError({
                     code: 'RUBY_INVALID_VERSION',
-                    message: 'Found `Gemfile` with invalid Ruby version: `' + line + '`.',
-                    link: 'https://vercel.com/docs/runtimes#official-runtimes/ruby/ruby-version',
+                    message: `Found \`Gemfile\` with invalid Ruby version: \`${line}.\``,
+                    link: 'http://vercel.link/ruby-version',
+                });
+            }
+            if (isDiscontinued(selection)) {
+                const latest = getLatestRubyVersion();
+                const intro = `Found \`Gemfile\` with discontinued Ruby version: \`${line}.\``;
+                const hint = `Please set \`ruby "~> ${latest.range}"\` in your \`Gemfile\` to use Ruby ${latest.range}.`;
+                const upstream = 'This change is the result of a decision made by an upstream infrastructure provider (AWS).';
+                throw new build_utils_1.NowBuildError({
+                    code: 'RUBY_DISCONTINUED_VERSION',
+                    link: 'http://vercel.link/ruby-version',
+                    message: `${intro} ${hint} ${upstream}`,
                 });
             }
         }
@@ -8831,6 +8862,19 @@ function getRubyPath(meta, gemfileContents) {
 // the absolute path to it
 async function installBundler(meta, gemfileContents) {
     const { gemHome, rubyPath, gemPath, vendorPath, runtime } = getRubyPath(meta, gemfileContents);
+    // If the new File System API is used (`avoidTopLevelInstall`), the Install Command
+    // will have already installed the dependencies, so we don't need to do it again.
+    if (meta.avoidTopLevelInstall) {
+        build_utils_1.debug(`Skipping bundler installation, already installed by Install Command`);
+        return {
+            gemHome,
+            rubyPath,
+            gemPath,
+            vendorPath,
+            runtime,
+            bundlerPath: path_1.join(gemHome, 'bin', 'bundler'),
+        };
+    }
     build_utils_1.debug('installing bundler...');
     await execa_1.default(gemPath, ['install', 'bundler', '--no-document'], {
         stdio: 'pipe',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vercel/ruby",
   "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "1.2.8-canary.4",
+  "version": "1.2.9",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",
@@ -28,5 +28,5 @@
     "semver": "6.1.1",
     "typescript": "4.3.4"
   },
-  "gitHead": "ed1dacd27698f3bb181f32b516af6953655b37e9"
+  "gitHead": "160f4d46d906c8b7614a9aa63a60d3c79c3f0093"
 }