diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-14 12:59:03 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-14 12:59:03 +0000 |
| commit | 4ae3df42f723d25b0fe4ba6b2689d607b01c6f48 () | |
| tree | 26c5f5cf033f79373e63b10f684df07898b7cd8f /lib/rubygems/resolver | |
| parent | d1e6304a891fc5e9cc63e50520bdc798fb95b829 (diff) | |
Merge RubyGems master@9be7858f7f17eae3058204f3c03e4b798ba18b9c
This version contains the some style changes by RuboCop. * https://.com/rubygems/rubygems/commit/9d810be0ede925fb2e3af535848582c3f8e0e72f * https://.com/rubygems/rubygems/commit/61ea98a727fb1b76b6fac52d74107ee4b02aaef2 * https://.com/rubygems/rubygems/commit/795893dce3c5f8540804fc08144cc6a90f086b13 * https://.com/rubygems/rubygems/commit/9be7858f7f17eae3058204f3c03e4b798ba18b9c git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/rubygems/resolver/activation_request.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/resolver/best_set.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/resolver/installer_set.rb | 6 | ||||
| -rw-r--r-- | lib/rubygems/resolver/lock_set.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/resolver/lock_specification.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/resolver/requirement_list.rb | 1 | ||||
| -rw-r--r-- | lib/rubygems/resolver/specification.rb | 1 | ||||
| -rw-r--r-- | lib/rubygems/resolver/stats.rb | 2 |
8 files changed, 14 insertions, 10 deletions
@@ -54,12 +54,12 @@ class Gem::Resolver::ActivationRequest if @spec.respond_to? :sources exception = nil - path = @spec.sources.find{ |source| begin source.download full_spec, path rescue exception end - } return path if path raise exception if exception @@ -63,9 +63,9 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet uri = URI uri unless URI === uri uri.query = nil - raise error unless api_set = @sets.find { |set| Gem::Resolver::APISet === set and set.dep_uri == uri - } index_set = Gem::Resolver::IndexSet.new api_set.source @@ -55,9 +55,9 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set found = find_all request - found.delete_if { |s| s.version.prerelease? and not s.local? - } unless dependency.prerelease? found = found.select do |s| Gem::Source::SpecificFile === s.source or @@ -115,7 +115,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set def find_all(req) res = [] - dep = req.dependency return res if @ignore_dependencies and @always_install.none? { |spec| dep.match? spec } @@ -16,7 +16,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set Gem::Source::Lock.new source end - @specs = [] end ## @@ -71,9 +71,9 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification # A specification constructed from the lockfile is returned def spec - @spec ||= Gem::Specification.find { |spec| spec.name == @name and spec.version == @version - } @spec ||= Gem::Specification.new do |s| s.name = @name @@ -79,4 +79,5 @@ class Gem::Resolver::RequirementList x = @exact[0,5] x + @list[0,5 - x.size] end end @@ -111,4 +111,5 @@ class Gem::Resolver::Specification def local? # :nodoc: false end end @@ -1,5 +1,6 @@ # frozen_string_literal: true class Gem::Resolver::Stats def initialize @max_depth = 0 @max_requirements = 0 @@ -42,4 +43,5 @@ class Gem::Resolver::Stats $stdout.printf PATTERN, "Backtracking #", @backtracking $stdout.printf PATTERN, "Iteration #", @iterations end end |