diff options
-rw-r--r-- | lib/rubygems/resolver/api_set.rb | 4 | ||||
-rw-r--r-- | lib/rubygems/resolver/composed_set.rb | 6 | ||||
-rw-r--r-- | lib/rubygems/resolver/conflict.rb | 2 | ||||
-rw-r--r-- | lib/rubygems/resolver/index_set.rb | 2 | ||||
-rw-r--r-- | lib/rubygems/resolver/installer_set.rb | 6 | ||||
-rw-r--r-- | lib/rubygems/resolver/lock_set.rb | 2 |
6 files changed, 11 insertions, 11 deletions
@@ -33,7 +33,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set @dep_uri = dep_uri @uri = dep_uri + '../..' - @data = Hash.new { |h,k| h[k] = [] } @source = Gem::Source.new @uri @to_fetch = [] @@ -67,7 +67,7 @@ class Gem::Resolver::APISet < Gem::Resolver::Set def prefetch(reqs) return unless @remote - names = reqs.map { |r| r.dependency.name } needed = names - @data.keys - @to_fetch @to_fetch += needed @@ -40,11 +40,11 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set def remote=(remote) super - @sets.each { |set| set.remote = remote } end def errors - @errors + @sets.map { |set| set.errors }.flatten end ## @@ -60,7 +60,7 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set # Prefetches +reqs+ in all sets. def prefetch(reqs) - @sets.each { |s| s.prefetch(reqs) } end end @@ -55,7 +55,7 @@ class Gem::Resolver::Conflict activated = @activated.spec.full_name dependency = @failed_dep.dependency requirement = dependency.requirement - alternates = dependency.matching_specs.map { |spec| spec.full_name } unless alternates.empty? matching = <<-MATCHING.chomp @@ -17,7 +17,7 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set Gem::SpecFetcher.fetcher end - @all = Hash.new { |h,k| h[k] = [] } list, errors = @f.available_specs :complete @@ -118,12 +118,12 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set dep = req.dependency return res if @ignore_dependencies and - @always_install.none? { |spec| dep.match? spec } name = dep.name dep.matching_specs.each do |gemspec| - next if @always_install.any? { |spec| spec.name == gemspec.name } res << Gem::Resolver::InstalledSpecification.new(self, gemspec) end unless @ignore_installed @@ -168,7 +168,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set end def inspect # :nodoc: - always_install = @always_install.map { |s| s.full_name } '#<%s domain: %s specs: %p always install: %p>' % [ self.class, @domain, @specs.keys, always_install, @@ -75,7 +75,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set q.text 'specs:' q.breakable - q.pp @specs.map { |spec| spec.full_name } end end |