Install Bundler at runtime if not already part of the stdlib

* This gives more flexibility to choose the Bundler version.

README.md

@@ -17,7 +17,7 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
 
 | Interpreter | Versions |
 | ----------- | -------- |
-| Ruby | 2.2, 2.3.0 - 2.3.8, 2.4.0 - 2.4.9, 2.5.0 - 2.5.7, 2.6.0 - 2.6.5, 2.7.0, head, mingw, mswin |
+| Ruby | 2.2, 2.3.0 - 2.3.8, 2.4.0 - 2.4.10, 2.5.0 - 2.5.8, 2.6.0 - 2.6.6, 2.7.1, head, mingw, mswin |
 | JRuby | 9.1.17.0, 9.2.9.0 - 9.2.11.1, head |
 | TruffleRuby | 19.3.0 - 20.0.0, head |
 | Rubinius | 4.14 |

dist/index.js

@@ -960,6 +960,7 @@ const os = __webpack_require__(87)
 const fs = __webpack_require__(747)
 const path = __webpack_require__(622)
 const core = __webpack_require__(470)
+const exec = __webpack_require__(986)
 
 async function run() {
   try {
@@ -976,9 +977,14 @@ async function run() {
     const engineVersions = installer.getAvailableVersions(platform, engine)
     const ruby = validateRubyEngineAndVersion(platform, engineVersions, engine, version)
 
+    createGemRC()
+
     const [rubyPrefix, newPathEntries] = await installer.install(platform, ruby)
 
     setupPath(ruby, newPathEntries)
+
+    await installBundler(platform, rubyPrefix)
+
     core.setOutput('ruby-prefix', rubyPrefix)
   } catch (error) {
     core.setFailed(error.message)
@@ -1040,6 +1046,13 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, version)
   return engine + '-' + version
 }
 
+function createGemRC() {
+  const gemrc = path.join(os.homedir(), '.gemrc')
+  if (!fs.existsSync(gemrc)) {
+    fs.writeFileSync(gemrc, `gem: --no-document${os.EOL}`)
+  }
+}
+
 function setupPath(ruby, newPathEntries) {
     const originalPath = process.env['PATH'].split(path.delimiter)
     let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
@@ -1056,6 +1069,14 @@ function setupPath(ruby, newPathEntries) {
     core.exportVariable('PATH', [...newPathEntries, ...cleanPath].join(path.delimiter))
 }
 
+async function installBundler(platform, rubyPrefix) {
+  const bundle_exe = platform === 'windows-latest' ? 'bundle.cmd' : 'bundle'
+  // Install Bundler if not already part of the stdlib
+  if (!fs.existsSync(path.join(rubyPrefix, 'bin', bundle_exe))) {
+    await exec.exec(path.join(rubyPrefix, 'bin', 'gem'), ['install', 'bundler', '-v', '~> 1', '--no-document'])
+  }
+}
+
 function getVirtualEnvironmentName() {
   const platform = os.platform()
   if (platform === 'linux') {
@@ -1389,10 +1410,10 @@ function getVersions(platform) {
     "ruby": [
       "2.2.10",
       "2.3.0", "2.3.1", "2.3.2", "2.3.3", "2.3.4", "2.3.5", "2.3.6", "2.3.7", "2.3.8",
-      "2.4.0", "2.4.1", "2.4.2", "2.4.3", "2.4.4", "2.4.5", "2.4.6", "2.4.7", "2.4.9",
-      "2.5.0", "2.5.1", "2.5.2", "2.5.3", "2.5.4", "2.5.5", "2.5.6", "2.5.7",
-      "2.6.0", "2.6.1", "2.6.2", "2.6.3", "2.6.4", "2.6.5",
-      "2.7.0",
+      "2.4.0", "2.4.1", "2.4.2", "2.4.3", "2.4.4", "2.4.5", "2.4.6", "2.4.7", "2.4.9", "2.4.10",
+      "2.5.0", "2.5.1", "2.5.2", "2.5.3", "2.5.4", "2.5.5", "2.5.6", "2.5.7", "2.5.8",
+      "2.6.0", "2.6.1", "2.6.2", "2.6.3", "2.6.4", "2.6.5", "2.6.6",
+      "2.7.0", "2.7.1",
       "head"
     ],
     "jruby": [
@@ -3406,7 +3427,7 @@ const io = __webpack_require__(1)
 const tc = __webpack_require__(533)
 const rubyBuilderVersions = __webpack_require__(156)
 
-const builderReleaseTag = 'builds-no-warn'
+const builderReleaseTag = 'enable-shared'
 const releasesURL = 'https://github.com/ruby/ruby-builder/releases'
 
 function getAvailableVersions(platform, engine) {
@@ -3415,7 +3436,7 @@ function getAvailableVersions(platform, engine) {
 
 async function install(platform, ruby) {
   const rubyPrefix = await downloadAndExtract(platform, ruby)
-  let newPathEntries;
+  let newPathEntries
   if (ruby.startsWith('rubinius')) {
     newPathEntries = [path.join(rubyPrefix, 'bin'), path.join(rubyPrefix, 'gems', 'bin')]
   } else {
@@ -4801,6 +4822,7 @@ __webpack_require__.r(__webpack_exports__);
 // https://github.com/MSP-Greg/actions-ruby/blob/master/lib/main.js
 
 const fs = __webpack_require__(747)
+const path = __webpack_require__(622)
 const cp = __webpack_require__(129)
 const core = __webpack_require__(470)
 const exec = __webpack_require__(986)
@@ -4848,11 +4870,6 @@ async function install(platform, ruby) {
     await setupMSWin() : await setupMingw(version)
   const newPathEntries = [`${rubyPrefix}\\bin`, ...toolchainPaths]
 
-  // Install Bundler if needed
-  if (!fs.existsSync(`${rubyPrefix}\\bin\\bundle.cmd`)) {
-    await exec.exec(`${rubyPrefix}\\bin\\gem install bundler -v "~> 1" --no-document`)
-  }
-
   return [rubyPrefix, newPathEntries]
 }
 
@@ -4869,6 +4886,8 @@ async function symLinkToEmbeddedMSYS2() {
 }
 
 async function setupMingw(version) {
+  core.exportVariable('MAKE', 'make.exe')
+
   if (version.startsWith('2.2') || version.startsWith('2.3')) {
     core.exportVariable('SSL_CERT_FILE', certFile)
     await installMSYS(version)
@@ -4899,6 +4918,8 @@ async function installMSYS(version) {
 }
 
 async function setupMSWin() {
+  core.exportVariable('MAKE', 'nmake.exe')
+
   // All standard MSVC OpenSSL builds use C:\Program Files\Common Files\SSL
   const certsDir = 'C:\\Program Files\\Common Files\\SSL\\certs'
   if (!fs.existsSync(certsDir)) {
@@ -4940,7 +4961,7 @@ function addVCVARSEnv() {
   for (let [k, v] of newEnv) {
     if (process.env[k] !== v) {
       if (k === 'Path') {
-        newPathEntries = v.replace(process.env['Path'], '').split(';')
+        newPathEntries = v.replace(process.env['Path'], '').split(path.delimiter)
       } else {
         core.exportVariable(k, v)
       }

index.js

@@ -2,6 +2,7 @@ const os = require('os')
 const fs = require('fs')
 const path = require('path')
 const core = require('@actions/core')
+const exec = require('@actions/exec')
 
 export async function run() {
   try {
@@ -18,9 +19,14 @@ export async function run() {
     const engineVersions = installer.getAvailableVersions(platform, engine)
     const ruby = validateRubyEngineAndVersion(platform, engineVersions, engine, version)
 
+    createGemRC()
+
     const [rubyPrefix, newPathEntries] = await installer.install(platform, ruby)
 
     setupPath(ruby, newPathEntries)
+
+    await installBundler(platform, rubyPrefix)
+
     core.setOutput('ruby-prefix', rubyPrefix)
   } catch (error) {
     core.setFailed(error.message)
@@ -82,6 +88,13 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, version)
   return engine + '-' + version
 }
 
+function createGemRC() {
+  const gemrc = path.join(os.homedir(), '.gemrc')
+  if (!fs.existsSync(gemrc)) {
+    fs.writeFileSync(gemrc, `gem: --no-document${os.EOL}`)
+  }
+}
+
 function setupPath(ruby, newPathEntries) {
     const originalPath = process.env['PATH'].split(path.delimiter)
     let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
@@ -98,6 +111,14 @@ function setupPath(ruby, newPathEntries) {
     core.exportVariable('PATH', [...newPathEntries, ...cleanPath].join(path.delimiter))
 }
 
+async function installBundler(platform, rubyPrefix) {
+  const bundle_exe = platform === 'windows-latest' ? 'bundle.cmd' : 'bundle'
+  // Install Bundler if not already part of the stdlib
+  if (!fs.existsSync(path.join(rubyPrefix, 'bin', bundle_exe))) {
+    await exec.exec(path.join(rubyPrefix, 'bin', 'gem'), ['install', 'bundler', '-v', '~> 1', '--no-document'])
+  }
+}
+
 function getVirtualEnvironmentName() {
   const platform = os.platform()
   if (platform === 'linux') {

ruby-builder-versions.js

@@ -3,10 +3,10 @@ export function getVersions(platform) {
     "ruby": [
       "2.2.10",
       "2.3.0", "2.3.1", "2.3.2", "2.3.3", "2.3.4", "2.3.5", "2.3.6", "2.3.7", "2.3.8",
-      "2.4.0", "2.4.1", "2.4.2", "2.4.3", "2.4.4", "2.4.5", "2.4.6", "2.4.7", "2.4.9",
-      "2.5.0", "2.5.1", "2.5.2", "2.5.3", "2.5.4", "2.5.5", "2.5.6", "2.5.7",
-      "2.6.0", "2.6.1", "2.6.2", "2.6.3", "2.6.4", "2.6.5",
-      "2.7.0",
+      "2.4.0", "2.4.1", "2.4.2", "2.4.3", "2.4.4", "2.4.5", "2.4.6", "2.4.7", "2.4.9", "2.4.10",
+      "2.5.0", "2.5.1", "2.5.2", "2.5.3", "2.5.4", "2.5.5", "2.5.6", "2.5.7", "2.5.8",
+      "2.6.0", "2.6.1", "2.6.2", "2.6.3", "2.6.4", "2.6.5", "2.6.6",
+      "2.7.0", "2.7.1",
       "head"
     ],
     "jruby": [

ruby-builder.js

@@ -5,7 +5,7 @@ const io = require('@actions/io')
 const tc = require('@actions/tool-cache')
 const rubyBuilderVersions = require('./ruby-builder-versions')
 
-const builderReleaseTag = 'builds-no-warn'
+const builderReleaseTag = 'enable-shared'
 const releasesURL = 'https://github.com/ruby/ruby-builder/releases'
 
 export function getAvailableVersions(platform, engine) {
@@ -14,7 +14,7 @@ export function getAvailableVersions(platform, engine) {
 
 export async function install(platform, ruby) {
   const rubyPrefix = await downloadAndExtract(platform, ruby)
-  let newPathEntries;
+  let newPathEntries
   if (ruby.startsWith('rubinius')) {
     newPathEntries = [path.join(rubyPrefix, 'bin'), path.join(rubyPrefix, 'gems', 'bin')]
   } else {

windows.js

@@ -2,6 +2,7 @@
 // https://github.com/MSP-Greg/actions-ruby/blob/master/lib/main.js
 
 const fs = require('fs')
+const path = require('path')
 const cp = require('child_process')
 const core = require('@actions/core')
 const exec = require('@actions/exec')
@@ -49,11 +50,6 @@ export async function install(platform, ruby) {
     await setupMSWin() : await setupMingw(version)
   const newPathEntries = [`${rubyPrefix}\\bin`, ...toolchainPaths]
 
-  // Install Bundler if needed
-  if (!fs.existsSync(`${rubyPrefix}\\bin\\bundle.cmd`)) {
-    await exec.exec(`${rubyPrefix}\\bin\\gem install bundler -v "~> 1" --no-document`)
-  }
-
   return [rubyPrefix, newPathEntries]
 }
 
@@ -70,6 +66,8 @@ async function symLinkToEmbeddedMSYS2() {
 }
 
 async function setupMingw(version) {
+  core.exportVariable('MAKE', 'make.exe')
+
   if (version.startsWith('2.2') || version.startsWith('2.3')) {
     core.exportVariable('SSL_CERT_FILE', certFile)
     await installMSYS(version)
@@ -100,6 +98,8 @@ async function installMSYS(version) {
 }
 
 async function setupMSWin() {
+  core.exportVariable('MAKE', 'nmake.exe')
+
   // All standard MSVC OpenSSL builds use C:\Program Files\Common Files\SSL
   const certsDir = 'C:\\Program Files\\Common Files\\SSL\\certs'
   if (!fs.existsSync(certsDir)) {
@@ -141,7 +141,7 @@ export function addVCVARSEnv() {
   for (let [k, v] of newEnv) {
     if (process.env[k] !== v) {
       if (k === 'Path') {
-        newPathEntries = v.replace(process.env['Path'], '').split(';')
+        newPathEntries = v.replace(process.env['Path'], '').split(path.delimiter)
       } else {
         core.exportVariable(k, v)
       }