summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <[email protected]>2023-07-21 12:30:49 +0900
committergit <[email protected]>2023-07-25 06:23:29 +0000
commitcf1f2e9d06a2fb699d911492425c4090e02b3eb1 (patch)
tree61796cafccda79c3f83c03bad689d59a70b7ed07
parent979d1fa5fe57f441ceca10f513d6009ddd78b8f2 (diff)
[rubygems/rubygems] bin/rubocop -A
https://github.com/rubygems/rubygems/commit/e8a4184429
-rw-r--r--lib/bundler/rubygems_integration.rb4
-rw-r--r--spec/bundler/runtime/setup_spec.rb1
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 29940d75f5..4a69329852 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -244,14 +244,14 @@ module Bundler
end
def replace_require(specs)
- return if [::Kernel.singleton_class, ::Kernel].any?{|klass| klass.respond_to?(:no_warning_require)}
+ return if [::Kernel.singleton_class, ::Kernel].any? {|klass| klass.respond_to?(:no_warning_require) }
[::Kernel.singleton_class, ::Kernel].each do |kernel_class|
kernel_class.send(:alias_method, :no_warning_require, :require)
kernel_class.send(:define_method, :require) do |file|
name = file.tr("/", "-")
if (::Gem::BUNDLED_GEMS.keys - specs.to_a.map(&:name)).include?(name)
- unless $LOADED_FEATURES.any?{|f| f.end_with?("#{name}.rb", "#{name}.#{RbConfig::CONFIG['DLEXT']}")}
+ unless $LOADED_FEATURES.any? {|f| f.end_with?("#{name}.rb", "#{name}.#{RbConfig::CONFIG["DLEXT"]}") }
target_file = begin
Bundler.default_gemfile.basename
rescue GemfileNotFound
diff --git a/spec/bundler/runtime/setup_spec.rb b/spec/bundler/runtime/setup_spec.rb
index 644a93efab..8901477e07 100644
--- a/spec/bundler/runtime/setup_spec.rb
+++ b/spec/bundler/runtime/setup_spec.rb
@@ -1566,7 +1566,6 @@ end
gem "rack"
G
-
ruby <<-R
module Gem
remove_const :BUNDLED_GEMS if defined?(BUNDLED_GEMS)