Skip to content

Commit 2dcd59f

Browse files
eregoneregon
committed
Account for Bundler 4
* Fixes #827
1 parent 8aeb6ff commit 2dcd59f

File tree

3 files changed

+58
-44
lines changed

3 files changed

+58
-44
lines changed

‎bundler.js‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,15 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
6767
}
6868
}
6969

70-
const floatVersion = common.floatVersion(rubyVersion)
71-
7270
if (bundlerVersion === 'default') {
73-
if (common.isBundler2dot2Default(engine, rubyVersion)) {
71+
if (common.isBundler2dot2PlusDefault(engine, rubyVersion)) {
7472
if (common.windows && engine === 'ruby' && (common.isStableVersion(engine, rubyVersion) || rubyVersion === 'head')) {
7573
// https://github.com/ruby/setup-ruby/issues/371
7674
console.log(`Installing latest Bundler for ${engine}-${rubyVersion} on Windows because bin/bundle does not work in bash otherwise`)
7775
bundlerVersion = 'latest'
7876
} else {
79-
console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`)
80-
return '2'
77+
console.log(`Using Bundler shipped with ${engine}-${rubyVersion}`)
78+
return 'default'
8179
}
8280
} else if (common.hasBundlerDefaultGem(engine, rubyVersion)) {
8381
// Those Rubies have a old Bundler default gem < 2.2 which does not work well for `gem 'foo', github: 'foo/foo'`:
@@ -91,7 +89,7 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
9189
}
9290

9391
if (bundlerVersion === 'latest') {
94-
bundlerVersion = '2'
92+
bundlerVersion = '4'
9593
}
9694

9795
if (isValidBundlerVersion(bundlerVersion)) {
@@ -100,24 +98,25 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
10098
throw new Error(`Cannot parse bundler input: ${bundlerVersion}`)
10199
}
102100

103-
// Use Bundler 1 when we know Bundler 2 does not work
104-
if (bundlerVersion.startsWith('2')) {
105-
if (engine === 'ruby' && floatVersion <= 2.2) {
106-
console.log('Bundler 2 requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2')
101+
const targetRubyVersion = common.targetRubyVersion(engine, rubyVersion)
102+
103+
// Use Bundler 1 when we know Bundler 2+ does not work
104+
if (common.floatVersion(bundlerVersion) >= 2) {
105+
if (engine === 'ruby' && targetRubyVersion <= 2.2) {
106+
console.log(`Bundler 2+ requires Ruby 2.3+, using Bundler 1 on Ruby <= 2.2`)
107107
bundlerVersion = '1'
108108
} else if (engine === 'ruby' && /^2\.3\.[01]/.test(rubyVersion)) {
109109
console.log('Ruby 2.3.0 and 2.3.1 have shipped with an old rubygems that only works with Bundler 1')
110110
bundlerVersion = '1'
111111
} else if (engine === 'jruby' && rubyVersion.startsWith('9.1')) { // JRuby 9.1 targets Ruby 2.3, treat it the same
112-
console.log('JRuby 9.1 has a bug with Bundler 2 (https://github.com/ruby/setup-ruby/issues/108), using Bundler 1 instead on JRuby 9.1')
112+
console.log('JRuby 9.1 has a bug with Bundler 2+ (https://github.com/ruby/setup-ruby/issues/108), using Bundler 1 instead on JRuby 9.1')
113113
bundlerVersion = '1'
114114
}
115115
}
116116

117-
const targetRubyVersion = common.targetRubyVersion(engine, rubyVersion)
118117
// Use Bundler 2.3 when we use Ruby 2.3.2 - 2.5
119118
// Use Bundler 2.4 when we use Ruby 2.6-2.7
120-
if (bundlerVersion == '2') {
119+
if (bundlerVersion === '2') {
121120
if (targetRubyVersion <= 2.5) { // < 2.3.2 already handled above
122121
console.log('Ruby 2.3.2 - 2.5 only works with Bundler 2.3')
123122
bundlerVersion = '2.3'
@@ -127,6 +126,12 @@ export async function installBundler(bundlerVersionInput, rubygemsInputSet, lock
127126
}
128127
}
129128

129+
// Use Bundler 2.x when we use Ruby 3.0-3.1
130+
if (common.floatVersion(bundlerVersion) >= 4 && targetRubyVersion < 3.2) {
131+
console.log('Bundler 4 requires Ruby 3.2+, using Bundler 2 instead on Ruby < 3.2)')
132+
bundlerVersion = '2'
133+
}
134+
130135
const gem = path.join(rubyPrefix, 'bin', 'gem')
131136

132137
const versionParts = [...bundlerVersion.matchAll(/\d+/g)].length
@@ -144,8 +149,8 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
144149
}
145150

146151
let envOptions = {}
147-
if (bundlerVersion.startsWith('1') && common.isBundler2Default(engine, rubyVersion)) {
148-
// If Bundler 1 is specified on Rubies which ship with Bundler 2,
152+
if (bundlerVersion.startsWith('1') && common.isBundler2PlusDefault(engine, rubyVersion)) {
153+
// If Bundler 1 is specified on Rubies which ship with Bundler 2+,
149154
// we need to specify which Bundler version to use explicitly until the lockfile exists.
150155
console.log(`Setting BUNDLER_VERSION=${bundlerVersion} for "bundle config|lock" commands below to ensure Bundler 1 is used`)
151156
envOptions = { env: { ...process.env, BUNDLER_VERSION: bundlerVersion } }
@@ -156,10 +161,10 @@ export async function bundleInstall(gemfile, lockFile, platform, engine, rubyVer
156161
// An absolute path, so it is reliably under $PWD/vendor/bundle, and not relative to the gemfile's directory
157162
const bundleCachePath = path.join(process.cwd(), cachePath)
158163

159-
await exec.exec('bundle', ['config', '--local', 'path', bundleCachePath], envOptions)
164+
await exec.exec('bundle', ['config', 'set', '--local', 'path', bundleCachePath], envOptions)
160165

161166
if (fs.existsSync(lockFile)) {
162-
await exec.exec('bundle', ['config', '--local', 'deployment', 'true'], envOptions)
167+
await exec.exec('bundle', ['config', 'set', '--local', 'deployment', 'true'], envOptions)
163168
} else {
164169
// Generate the lockfile so we can use it to compute the cache key.
165170
// This will also automatically pick up the latest gem versions compatible with the Gemfile.

‎common.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export function isStableVersion(engine, rubyVersion) {
8080
}
8181

8282
export function hasBundlerDefaultGem(engine, rubyVersion) {
83-
return isBundler1Default(engine, rubyVersion) || isBundler2Default(engine, rubyVersion)
83+
return isBundler1Default(engine, rubyVersion) || isBundler2PlusDefault(engine, rubyVersion)
8484
}
8585

8686
export function isBundler1Default(engine, rubyVersion) {
@@ -95,7 +95,7 @@ export function isBundler1Default(engine, rubyVersion) {
9595
}
9696
}
9797

98-
export function isBundler2Default(engine, rubyVersion) {
98+
export function isBundler2PlusDefault(engine, rubyVersion) {
9999
if (engine === 'ruby') {
100100
return floatVersion(rubyVersion) >= 2.7
101101
} else if (engine.startsWith('truffleruby')) {
@@ -107,7 +107,7 @@ export function isBundler2Default(engine, rubyVersion) {
107107
}
108108
}
109109

110-
export function isBundler2dot2Default(engine, rubyVersion) {
110+
export function isBundler2dot2PlusDefault(engine, rubyVersion) {
111111
if (engine === 'ruby') {
112112
return floatVersion(rubyVersion) >= 3.0
113113
} else if (engine.startsWith('truffleruby')) {
@@ -132,6 +132,8 @@ export function targetRubyVersion(engine, rubyVersion) {
132132
return 2.6
133133
} else if (version === 9.4) {
134134
return 3.1
135+
} else if (version === 10.0) {
136+
return 3.4
135137
}
136138
} else if (engine.startsWith('truffleruby')) {
137139
if (version < 21.0) {
@@ -151,7 +153,7 @@ export function targetRubyVersion(engine, rubyVersion) {
151153
}
152154

153155
export function floatVersion(rubyVersion) {
154-
const match = rubyVersion.match(/^\d+\.\d+/)
156+
const match = rubyVersion.match(/^\d+(\.\d+|$)/)
155157
if (match) {
156158
return parseFloat(match[0])
157159
} else if (isHeadVersion(rubyVersion)) {

‎dist/index.js‎

Lines changed: 30 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)