Reorder

* Avoid issues when using --conservative as seen in
  https://github.com/ruby/setup-ruby/pull/48, clarifies what's getting
  installed and simplifies the following logic.
* We'll probably need changes when Bundler 3 comes out anyway.

.github/workflows/test.yml

@@ -14,9 +14,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-16.04, ubuntu-18.04, macos-latest, windows-latest ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
         # Use various version syntaxes here for testing
-        ruby: [ 2.2, 2.3, .ruby-version, .tool-versions, ruby-head, jruby-9.1, jruby, jruby-head, truffleruby, truffleruby-head ]
+        ruby: [ 2.2, 2.3, 2.4, 2.5, 2.6.6, 2.7, ruby-head, jruby-9.1, jruby, jruby-head, truffleruby, truffleruby-head ]
         exclude:
         - os: windows-latest
           ruby: truffleruby

README.md

@@ -1,8 +1,5 @@
 # setup-ruby
 
-Note: this action used to be at `eregon/use-ruby-action` and was moved to the `ruby` organization.
-Please [update](https://github.com/ruby/setup-ruby/releases/tag/v1.13.0) if you are using `eregon/use-ruby-action`.
-
 This action downloads a prebuilt ruby and adds it to the `PATH`.
 
 It is very efficient and takes about 5 seconds to download, extract and add the given Ruby to the `PATH`.
@@ -105,9 +102,11 @@ jobs:
 
 ### Bundler
 
-Currently, Bundler is guaranteed to be installed for all versions.
+By default, if there is a `Gemfile.lock` file with a `BUNDLED WITH` section,
-If the Ruby ships with Bundler (Ruby >= 2.6), that version is used.
+the latest version of Bundler with the same major version will be installed.
-Otherwise (Ruby < 2.6), Bundler 1 is installed when that Ruby was built.
+Otherwise, the latest Bundler version is installed (except for Ruby 2.2 where only Bundler 1 is supported).
+
+This behavior can be customized, see [action.yml](action.yml) for details about the `bundler` input.
 
 ### Caching `bundle install`
 
@@ -156,8 +155,13 @@ It is recommended to first get your build working on Ubuntu and macOS before try
 This action follows semantic versioning with a moving `v1` branch.
 This follows the [recommendations](https://github.com/actions/toolkit/blob/master/docs/action-versioning.md) of GitHub Actions.
 
+## History
+
+This action used to be at `eregon/use-ruby-action` and was moved to the `ruby` organization.
+Please [update](https://github.com/ruby/setup-ruby/releases/tag/v1.13.0) if you are using `eregon/use-ruby-action`.
+
 ## Credits
 
 The current maintainer of this action is @eregon.
-Most of the Windows logic is from https://github.com/MSP-Greg/actions-ruby by MSP-Greg.
+Most of the Windows logic is based on work by MSP-Greg.
 Many thanks to MSP-Greg and Lars Kanis for the help with Ruby Installer.

action.yml

@@ -9,6 +9,10 @@ inputs:
     description: 'Engine and version to use, see the syntax in the README. Reads from .ruby-version if unset.'
     required: false
     default: 'default'
+  bundler:
+    description: 'The version of Bundler to install. Either none, 1, 2, latest or Gemfile.lock. The default tries Gemfile.lock and otherwise uses latest.'
+    required: false
+    default: 'default'
 outputs:
   ruby-prefix:
     description: 'The prefix of the installed ruby'

dist/index.js

@@ -983,7 +983,7 @@ async function run() {
 
     setupPath(ruby, newPathEntries)
 
-    await installBundler(platform, rubyPrefix)
+    await installBundler(platform, rubyPrefix, engine, version)
 
     core.setOutput('ruby-prefix', rubyPrefix)
   } catch (error) {
@@ -1058,7 +1058,7 @@ function setupPath(ruby, newPathEntries) {
     let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
 
     if (cleanPath.length !== originalPath.length) {
-        console.log("Entries removed from PATH to avoid conflicts with Ruby:")
+        console.log('Entries removed from PATH to avoid conflicts with Ruby:')
         for (const entry of originalPath) {
             if (!cleanPath.includes(entry)) {
                 console.log(`  ${entry}`)
@@ -1069,12 +1069,64 @@ function setupPath(ruby, newPathEntries) {
     core.exportVariable('PATH', [...newPathEntries, ...cleanPath].join(path.delimiter))
 }
 
-async function installBundler(platform, rubyPrefix) {
+function readBundledWithFromGemfileLock() {
-  const bundle_exe = platform === 'windows-latest' ? 'bundle.cmd' : 'bundle'
+  if (fs.existsSync('Gemfile.lock')) {
-  // Install Bundler if not already part of the stdlib
+    const contents = fs.readFileSync('Gemfile.lock', 'utf8')
-  if (!fs.existsSync(path.join(rubyPrefix, 'bin', bundle_exe))) {
+    const lines = contents.split(/\r?\n/)
-    await exec.exec(path.join(rubyPrefix, 'bin', 'gem'), ['install', 'bundler', '-v', '~> 1', '--no-document'])
+    const bundledWithLine = lines.findIndex(line => /^BUNDLED WITH$/.test(line.trim()))
+    if (bundledWithLine !== -1) {
+      const nextLine = lines[bundledWithLine+1]
+      if (nextLine && /^\d+/.test(nextLine.trim())) {
+        const bundlerVersion = nextLine.trim()
+        const majorVersion = bundlerVersion.match(/^\d+/)[0]
+        console.log(`Using Bundler ${majorVersion} from Gemfile.lock BUNDLED WITH ${bundlerVersion}`)
+        return majorVersion
+      }
+    }
   }
+  return null
+}
+
+async function installBundler(platform, rubyPrefix, engine, rubyVersion) {
+  var bundlerVersion = core.getInput('bundler')
+  if (bundlerVersion === 'none') {
+    return
+  }
+
+  if (bundlerVersion === 'default' || bundlerVersion === 'Gemfile.lock') {
+    bundlerVersion = readBundledWithFromGemfileLock()
+    if (!bundlerVersion) {
+      bundlerVersion = 'latest'
+    }
+  }
+
+  if (bundlerVersion === 'latest') {
+    bundlerVersion = '2'
+  }
+
+  if (rubyVersion.startsWith('2.2')) {
+    console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby 2.2')
+    bundlerVersion = '1'
+  } else if (/^\d+/.test(bundlerVersion)) {
+    // OK
+  } else {
+    throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
+  }
+
+  if (engine === 'ruby' && isHeadVersion(rubyVersion) && bundlerVersion === '2') {
+    console.log(`Using the Bundler version shipped with ${engine}-${rubyVersion}`)
+  } else if (engine === 'truffleruby' && bundlerVersion === '1') {
+    console.log(`Using the Bundler version shipped with ${engine}`)
+  } else if (engine === 'rubinius') {
+    console.log(`Rubinius only supports the version of Bundler shipped with it`)
+  } else {
+    const gem = path.join(rubyPrefix, 'bin', 'gem')
+    await exec.exec(gem, ['install', 'bundler', '-v', `~> ${bundlerVersion}`, '--no-document'])
+  }
+}
+
+function isHeadVersion(rubyVersion) {
+  return rubyVersion === 'head' || rubyVersion === 'mingw' || rubyVersion === 'mswin'
 }
 
 function getVirtualEnvironmentName() {
@@ -3392,19 +3444,23 @@ const versions = {
   "2.4.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.6-1/rubyinstaller-2.4.6-1-x64.7z",
   "2.4.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.7-1/rubyinstaller-2.4.7-1-x64.7z",
   "2.4.9": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.9-1/rubyinstaller-2.4.9-1-x64.7z",
+  "2.4.10": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.10-1/rubyinstaller-2.4.10-1-x64.7z",
   "2.5.0": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.0-2/rubyinstaller-2.5.0-2-x64.7z",
   "2.5.1": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.1-2/rubyinstaller-2.5.1-2-x64.7z",
   "2.5.3": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.3-1/rubyinstaller-2.5.3-1-x64.7z",
   "2.5.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.5-1/rubyinstaller-2.5.5-1-x64.7z",
   "2.5.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.6-1/rubyinstaller-2.5.6-1-x64.7z",
   "2.5.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.7-1/rubyinstaller-2.5.7-1-x64.7z",
+  "2.5.8": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.8-1/rubyinstaller-2.5.8-1-x64.7z",
   "2.6.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.0-1/rubyinstaller-2.6.0-1-x64.7z",
   "2.6.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.1-1/rubyinstaller-2.6.1-1-x64.7z",
   "2.6.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.2-1/rubyinstaller-2.6.2-1-x64.7z",
   "2.6.3": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.3-1/rubyinstaller-2.6.3-1-x64.7z",
   "2.6.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.4-1/rubyinstaller-2.6.4-1-x64.7z",
   "2.6.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.5-1/rubyinstaller-2.6.5-1-x64.7z",
+  "2.6.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.6-1/rubyinstaller-2.6.6-1-x64.7z",
   "2.7.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.0-1/rubyinstaller-2.7.0-1-x64.7z",
+  "2.7.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.1-1/rubyinstaller-2.7.1-1-x64.7z",
   "head": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z",
   "mingw": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mingw.7z",
   "mswin": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z"

generate-windows-versions.rb

@@ -17,7 +17,7 @@ versions = entries.select { |entry|
   end
   [version, builds.first]
 }.sort_by { |version, entry|
-  version
+  Gem::Version.new(version)
 }.select { |version, entry|
   Gem::Version.new(version) >= Gem::Version.new(min_version)
 }.map { |version, entry|

index.js

@@ -25,7 +25,7 @@ export async function run() {
 
     setupPath(ruby, newPathEntries)
 
-    await installBundler(platform, rubyPrefix)
+    await installBundler(platform, rubyPrefix, engine, version)
 
     core.setOutput('ruby-prefix', rubyPrefix)
   } catch (error) {
@@ -100,7 +100,7 @@ function setupPath(ruby, newPathEntries) {
     let cleanPath = originalPath.filter(entry => !/\bruby\b/i.test(entry))
 
     if (cleanPath.length !== originalPath.length) {
-        console.log("Entries removed from PATH to avoid conflicts with Ruby:")
+        console.log('Entries removed from PATH to avoid conflicts with Ruby:')
         for (const entry of originalPath) {
             if (!cleanPath.includes(entry)) {
                 console.log(`  ${entry}`)
@@ -111,12 +111,64 @@ function setupPath(ruby, newPathEntries) {
     core.exportVariable('PATH', [...newPathEntries, ...cleanPath].join(path.delimiter))
 }
 
-async function installBundler(platform, rubyPrefix) {
+function readBundledWithFromGemfileLock() {
-  const bundle_exe = platform === 'windows-latest' ? 'bundle.cmd' : 'bundle'
+  if (fs.existsSync('Gemfile.lock')) {
-  // Install Bundler if not already part of the stdlib
+    const contents = fs.readFileSync('Gemfile.lock', 'utf8')
-  if (!fs.existsSync(path.join(rubyPrefix, 'bin', bundle_exe))) {
+    const lines = contents.split(/\r?\n/)
-    await exec.exec(path.join(rubyPrefix, 'bin', 'gem'), ['install', 'bundler', '-v', '~> 1', '--no-document'])
+    const bundledWithLine = lines.findIndex(line => /^BUNDLED WITH$/.test(line.trim()))
+    if (bundledWithLine !== -1) {
+      const nextLine = lines[bundledWithLine+1]
+      if (nextLine && /^\d+/.test(nextLine.trim())) {
+        const bundlerVersion = nextLine.trim()
+        const majorVersion = bundlerVersion.match(/^\d+/)[0]
+        console.log(`Using Bundler ${majorVersion} from Gemfile.lock BUNDLED WITH ${bundlerVersion}`)
+        return majorVersion
+      }
+    }
   }
+  return null
+}
+
+async function installBundler(platform, rubyPrefix, engine, rubyVersion) {
+  var bundlerVersion = core.getInput('bundler')
+  if (bundlerVersion === 'none') {
+    return
+  }
+
+  if (bundlerVersion === 'default' || bundlerVersion === 'Gemfile.lock') {
+    bundlerVersion = readBundledWithFromGemfileLock()
+    if (!bundlerVersion) {
+      bundlerVersion = 'latest'
+    }
+  }
+
+  if (bundlerVersion === 'latest') {
+    bundlerVersion = '2'
+  }
+
+  if (rubyVersion.startsWith('2.2')) {
+    console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby 2.2')
+    bundlerVersion = '1'
+  } else if (/^\d+/.test(bundlerVersion)) {
+    // OK
+  } else {
+    throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
+  }
+
+  if (engine === 'ruby' && isHeadVersion(rubyVersion) && bundlerVersion === '2') {
+    console.log(`Using the Bundler version shipped with ${engine}-${rubyVersion}`)
+  } else if (engine === 'truffleruby' && bundlerVersion === '1') {
+    console.log(`Using the Bundler version shipped with ${engine}`)
+  } else if (engine === 'rubinius') {
+    console.log(`Rubinius only supports the version of Bundler shipped with it`)
+  } else {
+    const gem = path.join(rubyPrefix, 'bin', 'gem')
+    await exec.exec(gem, ['install', 'bundler', '-v', `~> ${bundlerVersion}`, '--no-document'])
+  }
+}
+
+function isHeadVersion(rubyVersion) {
+  return rubyVersion === 'head' || rubyVersion === 'mingw' || rubyVersion === 'mswin'
 }
 
 function getVirtualEnvironmentName() {

windows-versions.js

@@ -11,19 +11,23 @@ export const versions = {
   "2.4.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.6-1/rubyinstaller-2.4.6-1-x64.7z",
   "2.4.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.7-1/rubyinstaller-2.4.7-1-x64.7z",
   "2.4.9": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.9-1/rubyinstaller-2.4.9-1-x64.7z",
+  "2.4.10": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.10-1/rubyinstaller-2.4.10-1-x64.7z",
   "2.5.0": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.0-2/rubyinstaller-2.5.0-2-x64.7z",
   "2.5.1": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.1-2/rubyinstaller-2.5.1-2-x64.7z",
   "2.5.3": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.3-1/rubyinstaller-2.5.3-1-x64.7z",
   "2.5.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.5-1/rubyinstaller-2.5.5-1-x64.7z",
   "2.5.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.6-1/rubyinstaller-2.5.6-1-x64.7z",
   "2.5.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.7-1/rubyinstaller-2.5.7-1-x64.7z",
+  "2.5.8": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.8-1/rubyinstaller-2.5.8-1-x64.7z",
   "2.6.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.0-1/rubyinstaller-2.6.0-1-x64.7z",
   "2.6.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.1-1/rubyinstaller-2.6.1-1-x64.7z",
   "2.6.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.2-1/rubyinstaller-2.6.2-1-x64.7z",
   "2.6.3": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.3-1/rubyinstaller-2.6.3-1-x64.7z",
   "2.6.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.4-1/rubyinstaller-2.6.4-1-x64.7z",
   "2.6.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.5-1/rubyinstaller-2.6.5-1-x64.7z",
+  "2.6.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.6-1/rubyinstaller-2.6.6-1-x64.7z",
   "2.7.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.0-1/rubyinstaller-2.7.0-1-x64.7z",
+  "2.7.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.1-1/rubyinstaller-2.7.1-1-x64.7z",
   "head": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z",
   "mingw": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mingw.7z",
   "mswin": "https://github.com/MSP-Greg/ruby-loco/releases/download/ruby-master/ruby-mswin.7z"