@vercel/ruby 2.0.3 → 2.0.5

package/dist/index.js

@@ -6110,17 +6110,17 @@ var require_jsonfile = __commonJS({
     }
     function stringify(obj, options) {
       var spaces;
-      var EOL = "\n";
+      var EOL2 = "\n";
       if (typeof options === "object" && options !== null) {
         if (options.spaces) {
           spaces = options.spaces;
         }
         if (options.EOL) {
-          EOL = options.EOL;
+          EOL2 = options.EOL;
         }
       }
       var str = JSON.stringify(obj, options ? options.replacer : null, spaces);
-      return str.replace(/\n/g, EOL) + EOL;
+      return str.replace(/\n/g, EOL2) + EOL2;
     }
     function writeFile2(file, obj, options, callback) {
       if (callback == null) {
@@ -7659,6 +7659,7 @@ __export(src_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(src_exports);
+var import_os = require("os");
 var import_path2 = require("path");
 var import_execa2 = __toESM(require_execa());
 var import_fs_extra = __toESM(require_lib());
@@ -7671,6 +7672,7 @@ 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,
@@ -7686,12 +7688,6 @@ function getOptions() {
       discontinueDate: /* @__PURE__ */ new Date("2021-11-30")
     }
   ];
-  if (process.env.VERCEL_ALLOW_RUBY32 === "1") {
-    return [
-      { major: 3, minor: 2, range: "3.2.x", runtime: "ruby3.2" },
-      ...options
-    ];
-  }
   return options;
 }
 function getLatestRubyVersion() {
@@ -7795,7 +7791,7 @@ async function matchPaths(configPatterns, workPath) {
   );
   return patternPaths.reduce((a, b) => a.concat(b), []);
 }
-async function bundleInstall(bundlePath, bundleDir, gemfilePath, runtime) {
+async function bundleInstall(bundlePath, bundleDir, gemfilePath, rubyPath, runtime) {
   (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");
@@ -7812,13 +7808,14 @@ async function bundleInstall(bundlePath, bundleDir, gemfilePath, runtime) {
   }
   const bundlerEnv = (0, import_build_utils2.cloneEnv)(process.env, {
     // Ensure the correct version of `ruby` is in front of the $PATH
-    PATH: `${(0, import_path2.dirname)(bundlePath)}:${process.env.PATH}`,
+    PATH: `${(0, import_path2.dirname)(rubyPath)}:${(0, import_path2.dirname)(bundlePath)}:${process.env.PATH}`,
     BUNDLE_SILENCE_ROOT_WARNING: "1",
     BUNDLE_APP_CONFIG: bundleAppConfig,
     BUNDLE_JOBS: "4"
   });
   if (runtime === "ruby3.2") {
     const result2 = await (0, import_execa2.default)("bundler", ["add", "webrick"], {
+      cwd: (0, import_path2.dirname)(gemfilePath),
       stdio: "pipe",
       env: bundlerEnv,
       reject: false
@@ -7845,26 +7842,27 @@ async function bundleInstall(bundlePath, bundleDir, gemfilePath, runtime) {
   }
 }
 var version = 3;
-async function build({
+var build = async ({
   workPath,
   files,
   entrypoint,
   config,
   meta = {}
-}) {
+}) => {
   await (0, import_build_utils2.download)(files, workPath, meta);
   const entrypointFsDirname = (0, import_path2.join)(workPath, (0, import_path2.dirname)(entrypoint));
   const gemfileName = "Gemfile";
-  const gemfilePath = await (0, import_build_utils2.walkParentDirs)({
+  let gemfilePath = await (0, import_build_utils2.walkParentDirs)({
     base: workPath,
     start: entrypointFsDirname,
     filename: gemfileName
   });
+  if (!gemfilePath) {
+    gemfilePath = (0, import_path2.join)(entrypointFsDirname, gemfileName);
+    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 } = await installBundler(
-    meta,
-    gemfileContents
-  );
+  const { gemHome, bundlerPath, vendorPath, runtime, rubyPath } = 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);
@@ -7895,7 +7893,13 @@ async function build({
       if (meta.avoidTopLevelInstall && fileAtRoot) {
         (0, import_build_utils2.debug)("Skipping `bundle install` \u2014 already handled by Install Command");
       } else {
-        await bundleInstall(bundlerPath, bundleDir, gemfilePath, runtime);
+        await bundleInstall(
+          bundlerPath,
+          bundleDir,
+          gemfilePath,
+          rubyPath,
+          runtime
+        );
       }
     }
   } else {
@@ -7914,11 +7918,10 @@ async function build({
     userHandlerFilePath
   );
   const handlerRbFilename = "vc__handler__ruby";
-  await (0, import_fs_extra.writeFile)(
-    (0, import_path2.join)(workPath, `${handlerRbFilename}.rb`),
-    nowHandlerRbContents
-  );
   const outputFiles = await (0, import_build_utils2.glob)("**", workPath);
+  outputFiles[`${handlerRbFilename}.rb`] = new import_build_utils2.FileBlob({
+    data: nowHandlerRbContents
+  });
   if (config && (config.includeFiles || config.excludeFiles)) {
     const includedPaths = await matchPaths(config.includeFiles, workPath);
     const excludedPaths = await matchPaths(
@@ -7938,14 +7941,14 @@ async function build({
       delete outputFiles[excludedPaths[i]];
     }
   }
-  const lambda = await (0, import_build_utils2.createLambda)({
+  const output = new import_build_utils2.Lambda({
     files: outputFiles,
     handler: `${handlerRbFilename}.vc__handler`,
     runtime,
     environment: {}
   });
-  return { output: lambda };
-}
+  return { output };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   build,

package/package.json

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

package/vc_init.rb

@@ -81,6 +81,12 @@ def vc__handler(event:, context:)
   payload = JSON.parse(event['body'])
   path = payload['path']
   headers = payload['headers']
+
+  if ENV['VERCEL_DEBUG']
+    puts 'Request Headers: '
+    puts headers
+  end
+
   httpMethod = payload['method']
   encoding = payload['encoding']
   body = payload['body']