diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-07-20 11:02:15 +0900 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2023-07-25 06:23:25 +0000 |
| commit | 2424b921b2e773343fa7dd670c40e26873adc22f (patch) | |
| tree | b35452689d89008a5a09b84b684fb189fe3e1dd2 | |
| parent | cc2617ae3f82b6ae12965d9974680f3d15462745 (diff) | |
[rubygems/rubygems] make bundled gemst list as constant under Gem namespace
https://github.com/rubygems/rubygems/commit/438eac5447
| -rw-r--r-- | lib/bundler/rubygems_ext.rb | 6 | ||||
| -rw-r--r-- | lib/bundler/rubygems_integration.rb | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index b96edd5e2d..c21884ee13 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -29,6 +29,12 @@ unless Gem.ruby_version.to_s == RUBY_VERSION || RUBY_PATCHLEVEL == -1 end module Gem + + BUNDLED_GEMS = %w[ + abbrev observer getoptlong resolv-replace rinda + nkf syslog drb mutex_m csv base64 + ] + class Specification include ::Bundler::MatchMetadata include ::Bundler::MatchPlatform diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index 3110d3358e..4c207cabc3 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -230,14 +230,10 @@ module Bundler return if [kernel, ::Kernel].any?{|klass| klass.respond_to?(:no_warning_require)} - bundled_gems = %w[ - abbrev observer getoptlong resolv-replace rinda - nkf syslog drb mutex_m csv base64 - ] [kernel, ::Kernel].each do |kernel_class| kernel_class.send(:alias_method, :no_warning_require, :require) kernel_class.send(:define_method, :require) do |file| - if bundled_gems.include?(file) + if ::Gem::BUNDLED_GEMS.include?(file) unless specs.to_a.map(&:name).include?(file) target_file = begin Bundler.default_gemfile.basename |