diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-07-08 18:42:47 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-07-31 21:07:19 +0900 |
commit | 1260d22cae8697fc2f8e3999190a228cf23e7823 (patch) | |
tree | 1f694e2bcdf8bb3151100c1a5a14670e0461c1e8 /lib/rubygems/specification.rb | |
parent | d5b5a7ab31099a14b5933696991dfc55c37005cc (diff) |
[rubygems/rubygems] Extract some common code into a private method
https://github.com/rubygems/rubygems/commit/d1be8cdb3a
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3379
Diffstat (limited to 'lib/rubygems/specification.rb')
-rw-r--r-- | lib/rubygems/specification.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb index a2b982cd74..5e326e081f 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb @@ -1006,9 +1006,7 @@ class Gem::Specification < Gem::BasicSpecification # Return currently unresolved specs that contain the file matching +path+. def self.find_in_unresolved(path) - specs = unresolved_deps.values.map {|dep| dep.to_specs }.flatten - - specs.find_all {|spec| spec.contains_requirable_file? path } + unresolved_specs.find_all {|spec| spec.contains_requirable_file? path } end ## @@ -1016,9 +1014,7 @@ class Gem::Specification < Gem::BasicSpecification # specs that contain the file matching +path+. def self.find_in_unresolved_tree(path) - specs = unresolved_deps.values.map {|dep| dep.to_specs }.flatten - - specs.each do |spec| + unresolved_specs.each do |spec| spec.traverse do |from_spec, dep, to_spec, trail| if to_spec.has_conflicts? || to_spec.conficts_when_loaded_with?(trail) :next @@ -1031,6 +1027,11 @@ class Gem::Specification < Gem::BasicSpecification [] end + def self.unresolved_specs + unresolved_deps.values.map {|dep| dep.to_specs }.flatten + end + private_class_method :unresolved_specs + ## # Special loader for YAML files. When a Specification object is loaded # from a YAML file, it bypasses the normal Ruby object initialization |