diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-11-11 10:44:07 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-11-22 10:51:35 +0900 |
| commit | e262272b6a50c1a92cdcfee684e82f9242ef8171 (patch) | |
| tree | d7baf0c94ed9670d7ef097ce0390ca543ee97b33 /spec/bundler/support | |
| parent | 24f911f474e11560af5fbd0f637f4c0ded23f604 (diff) | |
Merge RubyGems 3.2.29 and Bundler 2.2.29
Diffstat (limited to 'spec/bundler/support')
| -rw-r--r-- | spec/bundler/support/hax.rb | 5 | ||||
| -rw-r--r-- | spec/bundler/support/path.rb | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/spec/bundler/support/hax.rb b/spec/bundler/support/hax.rb index aaf8c74894..0ad5239128 100644 --- a/spec/bundler/support/hax.rb +++ b/spec/bundler/support/hax.rb @@ -9,7 +9,10 @@ module Gem Gem.ruby = ENV["RUBY"] end - @default_dir = ENV["BUNDLER_GEM_DEFAULT_DIR"] if ENV["BUNDLER_GEM_DEFAULT_DIR"] + if ENV["BUNDLER_GEM_DEFAULT_DIR"] + @default_dir = ENV["BUNDLER_GEM_DEFAULT_DIR"] + @default_specifications_dir = nil + end if ENV["BUNDLER_SPEC_PLATFORM"] class Platform diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb index 9de716ff35..a7272bc019 100644 --- a/spec/bundler/support/path.rb +++ b/spec/bundler/support/path.rb @@ -275,7 +275,14 @@ module Spec end def rubocop_gemfile_basename - source_root.join("tool/bundler/#{RUBY_VERSION.start_with?("2.3") ? "rubocop23_gems.rb" : "rubocop_gems.rb"}") + filename = if RUBY_VERSION.start_with?("2.3") + "rubocop23_gems" + elsif RUBY_VERSION.start_with?("2.4") + "rubocop24_gems" + else + "rubocop_gems" + end + source_root.join("tool/bundler/#{filename}.rb") end extend self |