diff options
| author | Hiroshi SHIBATA <[email protected]> | 2020-09-23 21:59:35 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2020-09-23 22:01:44 +0900 |
| commit | b717f73402dc6f2d6ba6a1d72d9c8543a4f2cd27 () | |
| tree | 9d4a4c198aa124592552c66e2a3e6d130b6486eb /lib/rubygems/resolver | |
| parent | a46841612c846f00f31ff63d886620d66cdea5b3 (diff) | |
Revert "Manually merged from https://.com/rubygems/rubygems/pull/2636"
31a6eaabc165d8a222e176f2c809d90622d88ec2 is obsoleted with https://.com/rubygems/rubygems/pull/3820
25 files changed, 0 insertions, 50 deletions
@@ -4,7 +4,6 @@ # dependency that was used to introduce this activation. class Gem::Resolver::ActivationRequest - ## # The parent request for this activation request. @@ -152,5 +151,4 @@ class Gem::Resolver::ActivationRequest def name_tuple @name_tuple ||= Gem::NameTuple.new(name, version, platform) end - end @@ -4,7 +4,6 @@ # Returns instances of APISpecification. class Gem::Resolver::APISet < Gem::Resolver::Set - ## # The URI for the dependency API this APISet uses. @@ -121,5 +120,4 @@ class Gem::Resolver::APISet < Gem::Resolver::Set @data[name] end - end @@ -6,7 +6,6 @@ # is the name, version, and dependencies. class Gem::Resolver::APISpecification < Gem::Resolver::Specification - ## # Creates an APISpecification for the given +set+ from the rubygems.org # +api_data+. @@ -86,5 +85,4 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification def source # :nodoc: @set.source end - end @@ -5,7 +5,6 @@ # It combines IndexSet and APISet class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet - ## # Creates a BestSet for the given +sources+ or Gem::sources if none are # specified. +sources+ must be a Gem::SourceList. @@ -74,5 +73,4 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet index_set end end - end @@ -9,7 +9,6 @@ # This method will eliminate nesting of composed sets. class Gem::Resolver::ComposedSet < Gem::Resolver::Set - attr_reader :sets # :nodoc: ## @@ -62,5 +61,4 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set def prefetch(reqs) @sets.each {|s| s.prefetch(reqs) } end - end @@ -4,7 +4,6 @@ # with a spec that would be activated. class Gem::Resolver::Conflict - ## # The specification that was activated prior to the conflict @@ -151,5 +150,4 @@ class Gem::Resolver::Conflict def requester @failed_dep.requester end - end @@ -5,9 +5,7 @@ # for installed gems. class Gem::Resolver::CurrentSet < Gem::Resolver::Set - def find_all(req) req.dependency.matching_specs end - end @@ -4,7 +4,6 @@ # contained the Dependency. class Gem::Resolver::DependencyRequest - ## # The wrapped Gem::Dependency @@ -116,5 +115,4 @@ class Gem::Resolver::DependencyRequest def to_s # :nodoc: @dependency.to_s end - end @@ -10,7 +10,6 @@ # set.add_git_gem 'rake', 'git://example/rake.git', tag: 'rake-10.1.0' class Gem::Resolver::GitSet < Gem::Resolver::Set - ## # The root directory for git gems in this set. This is usually Gem.dir, the # installation directory for regular gems. @@ -118,5 +117,4 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set end end end - end @@ -5,7 +5,6 @@ # option. class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification - def ==(other) # :nodoc: self.class === other and @set == other.set and @@ -54,5 +53,4 @@ class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification q.pp @source end end - end @@ -4,7 +4,6 @@ # source index. class Gem::Resolver::IndexSet < Gem::Resolver::Set - def initialize(source = nil) # :nodoc: super() @@ -76,5 +75,4 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set end end end - end @@ -5,7 +5,6 @@ # and +version+ are needed. class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification - ## # An IndexSpecification is created from the index format described in `gem # help generate_index`. @@ -65,5 +64,4 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification @source.fetch_spec tuple end end - end @@ -4,7 +4,6 @@ # locally. class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification - def ==(other) # :nodoc: self.class === other and @set == other.set and @@ -54,5 +53,4 @@ class Gem::Resolver::InstalledSpecification < Gem::Resolver::SpecSpecification def source @source ||= Gem::Source::Installed.new end - end @@ -4,7 +4,6 @@ # files class Gem::Resolver::InstallerSet < Gem::Resolver::Set - ## # List of Gem::Specification objects that must always be installed. @@ -223,5 +222,4 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set @domain = :local unless remote end end - end @@ -3,7 +3,6 @@ # A LocalSpecification comes from a .gem file on the local filesystem. class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification - ## # Returns +true+ if this gem is installable for the current platform. @@ -37,5 +36,4 @@ class Gem::Resolver::LocalSpecification < Gem::Resolver::SpecSpecification q.text "source: #{@source.path}" end end - end @@ -3,7 +3,6 @@ # A set of gems from a gem dependencies lockfile. class Gem::Resolver::LockSet < Gem::Resolver::Set - attr_reader :specs # :nodoc: ## @@ -78,5 +77,4 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set q.pp @specs.map {|spec| spec.full_name } end end - end @@ -6,7 +6,6 @@ # lockfile. class Gem::Resolver::LockSpecification < Gem::Resolver::Specification - attr_reader :sources def initialize(set, name, version, sources, platform) @@ -83,5 +82,4 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification s.dependencies.concat @dependencies end end - end @@ -7,7 +7,6 @@ # first. class Gem::Resolver::RequirementList - include Enumerable ## @@ -79,5 +78,4 @@ class Gem::Resolver::RequirementList x = @exact[0,5] x + @list[0,5 - x.size] end - end @@ -4,7 +4,6 @@ # dependencies) used in resolution. This set is abstract. class Gem::Resolver::Set - ## # Set to true to disable network access for this set @@ -53,5 +52,4 @@ class Gem::Resolver::Set def remote? # :nodoc: @remote end - end @@ -4,7 +4,6 @@ # Kind off like BestSet but filters the sources for gems class Gem::Resolver::SourceSet < Gem::Resolver::Set - ## # Creates a SourceSet for the given +sources+ or Gem::sources if none are # specified. +sources+ must be a Gem::SourceList. @@ -43,5 +42,4 @@ class Gem::Resolver::SourceSet < Gem::Resolver::Set link = @links[name] @sets[link] ||= Gem::Source.new(link).dependency_resolver_set if link end - end @@ -4,7 +4,6 @@ # Resolver specifications that are backed by a Gem::Specification. class Gem::Resolver::SpecSpecification < Gem::Resolver::Specification - ## # A SpecSpecification is created for a +set+ for a Gem::Specification in # +spec+. The +source+ is either where the +spec+ came from, or should be @@ -52,5 +51,4 @@ class Gem::Resolver::SpecSpecification < Gem::Resolver::Specification def version spec.version end - end @@ -5,7 +5,6 @@ # dependency resolution in the resolver is included. class Gem::Resolver::Specification - ## # The dependencies of the gem for this specification @@ -111,5 +110,4 @@ class Gem::Resolver::Specification def local? # :nodoc: false end - end @@ -1,6 +1,5 @@ # frozen_string_literal: true class Gem::Resolver::Stats - def initialize @max_depth = 0 @max_requirements = 0 @@ -43,5 +42,4 @@ class Gem::Resolver::Stats $stdout.printf PATTERN, "Backtracking #", @backtracking $stdout.printf PATTERN, "Iteration #", @iterations end - end @@ -15,7 +15,6 @@ # rake.gemspec (watching the given name). class Gem::Resolver::VendorSet < Gem::Resolver::Set - ## # The specifications for this set. @@ -83,5 +82,4 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set end end end - end @@ -5,7 +5,6 @@ # option. class Gem::Resolver::VendorSpecification < Gem::Resolver::SpecSpecification - def ==(other) # :nodoc: self.class === other and @set == other.set and @@ -20,5 +19,4 @@ class Gem::Resolver::VendorSpecification < Gem::Resolver::SpecSpecification def install(options = {}) yield nil end - end |