@vercel/ruby 2.0.5 → 2.1.0

package/dist/index.js

@@ -174,8 +174,8 @@ var require_isexe = __commonJS({
 // ../../node_modules/.pnpm/which@1.3.1/node_modules/which/which.js
 var require_which = __commonJS({
   "../../node_modules/.pnpm/which@1.3.1/node_modules/which/which.js"(exports, module2) {
-    module2.exports = which;
-    which.sync = whichSync;
+    module2.exports = which2;
+    which2.sync = whichSync;
     var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
     var path = require("path");
     var COLON = isWindows ? ";" : ":";
@@ -206,7 +206,7 @@ var require_which = __commonJS({
         extExe: pathExtExe
       };
     }
-    function which(cmd, opt, cb) {
+    function which2(cmd, opt, cb) {
       if (typeof opt === "function") {
         cb = opt;
         opt = {};
@@ -307,7 +307,7 @@ var require_resolveCommand = __commonJS({
   "../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/util/resolveCommand.js"(exports, module2) {
     "use strict";
     var path = require("path");
-    var which = require_which();
+    var which2 = require_which();
     var pathKey = require_path_key()();
     function resolveCommandAttempt(parsed, withoutPathExt) {
       const cwd = process.cwd();
@@ -320,7 +320,7 @@ var require_resolveCommand = __commonJS({
       }
       let resolved;
       try {
-        resolved = which.sync(parsed.command, {
+        resolved = which2.sync(parsed.command, {
           path: (parsed.options.env || process.env)[pathKey],
           pathExt: withoutPathExt ? path.delimiter : void 0
         });
@@ -5165,11 +5165,11 @@ var require_symlink = __commonJS({
           return callback(err);
         if (destinationExists)
           return callback(null);
-        symlinkPaths(srcpath, dstpath, (err2, relative2) => {
+        symlinkPaths(srcpath, dstpath, (err2, relative) => {
           if (err2)
             return callback(err2);
-          srcpath = relative2.toDst;
-          symlinkType(relative2.toCwd, type, (err3, type2) => {
+          srcpath = relative.toDst;
+          symlinkType(relative.toCwd, type, (err3, type2) => {
             if (err3)
               return callback(err3);
             const dir = path.dirname(dstpath);
@@ -5192,9 +5192,9 @@ var require_symlink = __commonJS({
       const destinationExists = fs.existsSync(dstpath);
       if (destinationExists)
         return void 0;
-      const relative2 = symlinkPathsSync(srcpath, dstpath);
-      srcpath = relative2.toDst;
-      type = symlinkTypeSync(relative2.toCwd, type);
+      const relative = symlinkPathsSync(srcpath, dstpath);
+      srcpath = relative.toDst;
+      type = symlinkTypeSync(relative.toCwd, type);
       const dir = path.dirname(dstpath);
       const exists = fs.existsSync(dir);
       if (exists)
@@ -6502,6 +6502,94 @@ var require_lib = __commonJS({
   }
 });
 
+// ../../node_modules/.pnpm/which@3.0.0/node_modules/which/lib/index.js
+var require_lib2 = __commonJS({
+  "../../node_modules/.pnpm/which@3.0.0/node_modules/which/lib/index.js"(exports, module2) {
+    var isexe = require_isexe();
+    var { join: join3, delimiter, sep, posix } = require("path");
+    var isWindows = process.platform === "win32";
+    var rSlash = new RegExp(`[${posix.sep}${sep === posix.sep ? "" : sep}]`.replace(/(\\)/g, "\\$1"));
+    var rRel = new RegExp(`^\\.${rSlash.source}`);
+    var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
+    var getPathInfo = (cmd, {
+      path: optPath = process.env.PATH,
+      pathExt: optPathExt = process.env.PATHEXT,
+      delimiter: optDelimiter = delimiter
+    }) => {
+      const pathEnv = cmd.match(rSlash) ? [""] : [
+        // windows always checks the cwd first
+        ...isWindows ? [process.cwd()] : [],
+        ...(optPath || /* istanbul ignore next: very unusual */
+        "").split(optDelimiter)
+      ];
+      if (isWindows) {
+        const pathExtExe = optPathExt || [".EXE", ".CMD", ".BAT", ".COM"].join(optDelimiter);
+        const pathExt = pathExtExe.split(optDelimiter);
+        if (cmd.includes(".") && pathExt[0] !== "") {
+          pathExt.unshift("");
+        }
+        return { pathEnv, pathExt, pathExtExe };
+      }
+      return { pathEnv, pathExt: [""] };
+    };
+    var getPathPart = (raw, cmd) => {
+      const pathPart = /^".*"$/.test(raw) ? raw.slice(1, -1) : raw;
+      const prefix = !pathPart && rRel.test(cmd) ? cmd.slice(0, 2) : "";
+      return prefix + join3(pathPart, cmd);
+    };
+    var which2 = async (cmd, opt = {}) => {
+      const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
+      const found = [];
+      for (const envPart of pathEnv) {
+        const p = getPathPart(envPart, cmd);
+        for (const ext of pathExt) {
+          const withExt = p + ext;
+          const is = await isexe(withExt, { pathExt: pathExtExe, ignoreErrors: true });
+          if (is) {
+            if (!opt.all) {
+              return withExt;
+            }
+            found.push(withExt);
+          }
+        }
+      }
+      if (opt.all && found.length) {
+        return found;
+      }
+      if (opt.nothrow) {
+        return null;
+      }
+      throw getNotFoundError(cmd);
+    };
+    var whichSync = (cmd, opt = {}) => {
+      const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
+      const found = [];
+      for (const pathEnvPart of pathEnv) {
+        const p = getPathPart(pathEnvPart, cmd);
+        for (const ext of pathExt) {
+          const withExt = p + ext;
+          const is = isexe.sync(withExt, { pathExt: pathExtExe, ignoreErrors: true });
+          if (is) {
+            if (!opt.all) {
+              return withExt;
+            }
+            found.push(withExt);
+          }
+        }
+      }
+      if (opt.all && found.length) {
+        return found;
+      }
+      if (opt.nothrow) {
+        return null;
+      }
+      throw getNotFoundError(cmd);
+    };
+    module2.exports = which2;
+    which2.sync = whichSync;
+  }
+});
+
 // ../../node_modules/.pnpm/semver@6.3.1/node_modules/semver/semver.js
 var require_semver2 = __commonJS({
   "../../node_modules/.pnpm/semver@6.3.1/node_modules/semver/semver.js"(exports, module2) {
@@ -7666,32 +7754,39 @@ var import_fs_extra = __toESM(require_lib());
 var import_build_utils2 = require("@vercel/build-utils");
 
 // src/install-ruby.ts
+var import_execa = __toESM(require_execa());
+var import_which = __toESM(require_lib2());
 var import_path = require("path");
 var import_semver = __toESM(require_semver2());
-var import_execa = __toESM(require_execa());
 var import_build_utils = require("@vercel/build-utils");
-function getOptions() {
-  const options = [
-    { major: 3, minor: 2, range: "3.2.x", runtime: "ruby3.2" },
-    {
-      major: 2,
-      minor: 7,
-      range: "2.7.x",
-      runtime: "ruby2.7",
-      discontinueDate: /* @__PURE__ */ new Date("2023-12-07")
-    },
-    {
-      major: 2,
-      minor: 5,
-      range: "2.5.x",
-      runtime: "ruby2.5",
-      discontinueDate: /* @__PURE__ */ new Date("2021-11-30")
-    }
-  ];
-  return options;
-}
+var allOptions = [
+  { major: 3, minor: 3, range: "3.3.x", runtime: "ruby3.3" },
+  { major: 3, minor: 2, range: "3.2.x", runtime: "ruby3.2" },
+  {
+    major: 2,
+    minor: 7,
+    range: "2.7.x",
+    runtime: "ruby2.7",
+    discontinueDate: /* @__PURE__ */ new Date("2023-12-07")
+  },
+  {
+    major: 2,
+    minor: 5,
+    range: "2.5.x",
+    runtime: "ruby2.5",
+    discontinueDate: /* @__PURE__ */ new Date("2021-11-30")
+  }
+];
 function getLatestRubyVersion() {
-  return getOptions()[0];
+  const selection = allOptions.find(isInstalled);
+  if (!selection) {
+    throw new import_build_utils.NowBuildError({
+      code: "RUBY_INVALID_VERSION",
+      link: "http://vercel.link/ruby-version",
+      message: `Unable to find any supported Ruby versions.`
+    });
+  }
+  return selection;
 }
 function isDiscontinued({ discontinueDate }) {
   const today = Date.now();
@@ -7707,7 +7802,7 @@ function getRubyPath(meta, gemfileContents) {
     const line = gemfileContents.split("\n").find((line2) => line2.startsWith("ruby"));
     if (line) {
       const strVersion = line.slice(4).trim().slice(1, -1).replace("~>", "");
-      const found = getOptions().some((o) => {
+      const found = allOptions.some((o) => {
         selection = o;
         return (0, import_semver.intersects)(o.range, strVersion);
       });
@@ -7718,12 +7813,13 @@ function getRubyPath(meta, gemfileContents) {
           link: "http://vercel.link/ruby-version"
         });
       }
-      if (isDiscontinued(selection)) {
+      const discontinued = isDiscontinued(selection);
+      if (discontinued || !isInstalled(selection)) {
         const latest = getLatestRubyVersion();
-        const intro = `Found \`Gemfile\` with discontinued Ruby version: \`${line}.\``;
+        const intro = `Found \`Gemfile\` with ${discontinued ? "discontinued" : "invalid"} Ruby version: \`${line}.\``;
         const hint = `Please set \`ruby "~> ${latest.range}"\` in your \`Gemfile\` to use Ruby ${latest.range}.`;
         throw new import_build_utils.NowBuildError({
-          code: "RUBY_DISCONTINUED_VERSION",
+          code: discontinued ? "RUBY_DISCONTINUED_VERSION" : "RUBY_INVALID_VERSION",
           link: "http://vercel.link/ruby-version",
           message: `${intro} ${hint}`
         });
@@ -7733,6 +7829,7 @@ function getRubyPath(meta, gemfileContents) {
   const { major, minor, runtime } = selection;
   const gemHome = "/ruby" + major + minor;
   const result = {
+    major,
     gemHome,
     runtime,
     rubyPath: (0, import_path.join)(gemHome, "bin", "ruby"),
@@ -7743,23 +7840,7 @@ function getRubyPath(meta, gemfileContents) {
   return result;
 }
 async function installBundler(meta, gemfileContents) {
-  const { gemHome, rubyPath, gemPath, vendorPath, runtime } = getRubyPath(
-    meta,
-    gemfileContents
-  );
-  if (meta.avoidTopLevelInstall) {
-    (0, import_build_utils.debug)(
-      `Skipping bundler installation, already installed by Install Command`
-    );
-    return {
-      gemHome,
-      rubyPath,
-      gemPath,
-      vendorPath,
-      runtime,
-      bundlerPath: (0, import_path.join)(gemHome, "bin", "bundler")
-    };
-  }
+  const { gemHome, rubyPath, gemPath, vendorPath, runtime, major } = getRubyPath(meta, gemfileContents);
   (0, import_build_utils.debug)("installing bundler...");
   await (0, import_execa.default)(gemPath, ["install", "bundler", "--no-document"], {
     stdio: "pipe",
@@ -7768,6 +7849,7 @@ async function installBundler(meta, gemfileContents) {
     }
   });
   return {
+    major,
     gemHome,
     rubyPath,
     gemPath,
@@ -7776,6 +7858,10 @@ async function installBundler(meta, gemfileContents) {
     bundlerPath: (0, import_path.join)(gemHome, "bin", "bundler")
   };
 }
+function isInstalled({ major, minor }) {
+  const gemHome = "/ruby" + major + minor;
+  return Boolean(import_which.default.sync((0, import_path.join)(gemHome, "bin/ruby"), { nothrow: true })) && Boolean(import_which.default.sync((0, import_path.join)(gemHome, "bin/gem"), { nothrow: true }));
+}
 
 // src/index.ts
 async function matchPaths(configPatterns, workPath) {
@@ -7791,7 +7877,7 @@ async function matchPaths(configPatterns, workPath) {
   );
   return patternPaths.reduce((a, b) => a.concat(b), []);
 }
-async function bundleInstall(bundlePath, bundleDir, gemfilePath, rubyPath, runtime) {
+async function bundleInstall(bundlePath, bundleDir, gemfilePath, rubyPath, major) {
   (0, import_build_utils2.debug)(`running "bundle install --deployment"...`);
   const bundleAppConfig = await (0, import_build_utils2.getWriteableDirectory)();
   const gemfileContent = await (0, import_fs_extra.readFile)(gemfilePath, "utf8");
@@ -7805,6 +7891,11 @@ async function bundleInstall(bundlePath, bundleDir, gemfilePath, rubyPath, runti
       gemfilePath,
       gemfileContent.replace('ruby "~> 3.2.x"', 'ruby "~> 3.2.0"')
     );
+  } else if (gemfileContent.includes('ruby "~> 3.3.x"')) {
+    await (0, import_fs_extra.writeFile)(
+      gemfilePath,
+      gemfileContent.replace('ruby "~> 3.3.x"', 'ruby "~> 3.3.0"')
+    );
   }
   const bundlerEnv = (0, import_build_utils2.cloneEnv)(process.env, {
     // Ensure the correct version of `ruby` is in front of the $PATH
@@ -7813,7 +7904,7 @@ async function bundleInstall(bundlePath, bundleDir, gemfilePath, rubyPath, runti
     BUNDLE_APP_CONFIG: bundleAppConfig,
     BUNDLE_JOBS: "4"
   });
-  if (runtime === "ruby3.2") {
+  if (major >= 3) {
     const result2 = await (0, import_execa2.default)("bundler", ["add", "webrick"], {
       cwd: (0, import_path2.dirname)(gemfilePath),
       stdio: "pipe",
@@ -7862,7 +7953,7 @@ var build = async ({
     await (0, import_fs_extra.writeFile)(gemfilePath, `source "https://rubygems.org"${import_os.EOL}`);
   }
   const gemfileContents = gemfilePath ? await (0, import_fs_extra.readFile)(gemfilePath, "utf8") : "";
-  const { gemHome, bundlerPath, vendorPath, runtime, rubyPath } = await installBundler(meta, gemfileContents);
+  const { gemHome, bundlerPath, vendorPath, runtime, rubyPath, major } = await installBundler(meta, gemfileContents);
   process.env.GEM_HOME = gemHome;
   (0, import_build_utils2.debug)(`Checking existing vendor directory at "${vendorPath}"`);
   const vendorDir = (0, import_path2.join)(workPath, vendorPath);
@@ -7889,18 +7980,7 @@ var build = async ({
       (0, import_build_utils2.debug)(
         "did not find a vendor directory but found a Gemfile, bundling gems..."
       );
-      const fileAtRoot = (0, import_path2.relative)(workPath, gemfilePath) === gemfileName;
-      if (meta.avoidTopLevelInstall && fileAtRoot) {
-        (0, import_build_utils2.debug)("Skipping `bundle install` \u2014 already handled by Install Command");
-      } else {
-        await bundleInstall(
-          bundlerPath,
-          bundleDir,
-          gemfilePath,
-          rubyPath,
-          runtime
-        );
-      }
+      await bundleInstall(bundlerPath, bundleDir, gemfilePath, rubyPath, major);
     }
   } else {
     (0, import_build_utils2.debug)('found vendor directory, skipping "bundle install"...');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vercel/ruby",
   "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",
@@ -17,11 +17,13 @@
   "devDependencies": {
     "@types/fs-extra": "8.0.0",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "7.5.1",
+    "@types/which": "3.0.0",
+    "@vercel/build-utils": "8.0.0",
     "execa": "2.0.4",
     "fs-extra": "^7.0.1",
     "jest-junit": "16.0.0",
-    "semver": "6.3.1"
+    "semver": "6.3.1",
+    "which": "3.0.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",

package/vc_init.rb

@@ -60,7 +60,7 @@ def webrick_handler(httpMethod, path, body, headers)
   server.shutdown
   Thread.kill(th)
 
-  # Net::HTTP doesnt read the set the encoding so we must set manually.
+  # Net::HTTP doesn't read the set the encoding so we must set manually.
   # Bug: https://bugs.ruby-lang.org/issues/15517
   # More: https://yehudakatz.com/2010/05/17/encodings-unabridged/
   res_headers = res.each_capitalized.to_h