kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[rubygems/rubygems] Remove unnecessary code

Browse source 
All supported rubygems versions implement this.

2130782ef6
This commit is contained in:
David Rodríguez 2021-10-11 19:58:24 +02:00 • committed by git
parent ad4e7308d2
commit d6627ab85c
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/bundler/rubygems_integration.rb
View file

@ -86,16 +86,12 @@ module Bundler
def spec_missing_extensions?(spec, default = true) def spec_missing_extensions?(spec, default = true)
return spec.missing_extensions? if spec.respond_to?(:missing_extensions?) return spec.missing_extensions? if spec.respond_to?(:missing_extensions?)
return false if spec_default_gem?(spec) return false if spec.default_gem?
return false if spec.extensions.empty? return false if spec.extensions.empty?
default default
end end
def spec_default_gem?(spec)
spec.respond_to?(:default_gem?) && spec.default_gem?
end
def spec_matches_for_glob(spec, glob) def spec_matches_for_glob(spec, glob)
return spec.matches_for_glob(glob) if spec.respond_to?(:matches_for_glob) return spec.matches_for_glob(glob) if spec.respond_to?(:matches_for_glob)

2
lib/bundler/runtime.rb
View file

@ -291,7 +291,7 @@ module Bundler
return unless activated_spec = Bundler.rubygems.loaded_specs(spec.name) return unless activated_spec = Bundler.rubygems.loaded_specs(spec.name)
return if activated_spec.version == spec.version return if activated_spec.version == spec.version
suggestion = if Bundler.rubygems.spec_default_gem?(activated_spec) suggestion = if activated_spec.default_gem?
"Since #{spec.name} is a default gem, you can either remove your dependency on it" \ "Since #{spec.name} is a default gem, you can either remove your dependency on it" \
" or try updating to a newer version of bundler that supports #{spec.name} as a default gem." " or try updating to a newer version of bundler that supports #{spec.name} as a default gem."
else else

2
spec/bundler/commands/binstubs_spec.rb
View file

@ -116,7 +116,7 @@ RSpec.describe "bundle binstubs <gem>" do
s.executables = "print_loaded_gems" s.executables = "print_loaded_gems"
s.bindir = "exe" s.bindir = "exe"
s.write "exe/print_loaded_gems", <<-R s.write "exe/print_loaded_gems", <<-R
specs = Gem.loaded_specs.values.reject {|s| Bundler.rubygems.spec_default_gem?(s) } specs = Gem.loaded_specs.values.reject {|s| s.default_gem? }
puts specs.map(&:full_name).sort.inspect puts specs.map(&:full_name).sort.inspect
R R
end end