summaryrefslogtreecommitdiff
path: root/lib/rubygems/resolver
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rubygems/resolver')
-rw-r--r--lib/rubygems/resolver/activation_request.rb2
-rw-r--r--lib/rubygems/resolver/api_set.rb2
-rw-r--r--lib/rubygems/resolver/api_specification.rb2
-rw-r--r--lib/rubygems/resolver/best_set.rb2
-rw-r--r--lib/rubygems/resolver/composed_set.rb2
-rw-r--r--lib/rubygems/resolver/conflict.rb2
-rw-r--r--lib/rubygems/resolver/current_set.rb2
-rw-r--r--lib/rubygems/resolver/dependency_request.rb2
-rw-r--r--lib/rubygems/resolver/git_set.rb2
-rw-r--r--lib/rubygems/resolver/git_specification.rb2
-rw-r--r--lib/rubygems/resolver/index_set.rb2
-rw-r--r--lib/rubygems/resolver/index_specification.rb2
-rw-r--r--lib/rubygems/resolver/installed_specification.rb2
-rw-r--r--lib/rubygems/resolver/installer_set.rb2
-rw-r--r--lib/rubygems/resolver/local_specification.rb2
-rw-r--r--lib/rubygems/resolver/lock_set.rb2
-rw-r--r--lib/rubygems/resolver/lock_specification.rb2
-rw-r--r--lib/rubygems/resolver/requirement_list.rb2
-rw-r--r--lib/rubygems/resolver/set.rb2
-rw-r--r--lib/rubygems/resolver/source_set.rb2
-rw-r--r--lib/rubygems/resolver/spec_specification.rb2
-rw-r--r--lib/rubygems/resolver/specification.rb2
-rw-r--r--lib/rubygems/resolver/stats.rb2
-rw-r--r--lib/rubygems/resolver/vendor_set.rb2
-rw-r--r--lib/rubygems/resolver/vendor_specification.rb2
25 files changed, 0 insertions, 50 deletions
diff --git a/lib/rubygems/resolver/activation_request.rb b/lib/rubygems/resolver/activation_request.rb
index 2a8d6032f8..293df1efe9 100644
--- a/lib/rubygems/resolver/activation_request.rb
+++ b/lib/rubygems/resolver/activation_request.rb
@@ -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
diff --git a/lib/rubygems/resolver/api_set.rb b/lib/rubygems/resolver/api_set.rb
index ca92bac09c..19c59a315b 100644
--- a/lib/rubygems/resolver/api_set.rb
+++ b/lib/rubygems/resolver/api_set.rb
@@ -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
diff --git a/lib/rubygems/resolver/api_specification.rb b/lib/rubygems/resolver/api_specification.rb
index 4052846e99..a47d910331 100644
--- a/lib/rubygems/resolver/api_specification.rb
+++ b/lib/rubygems/resolver/api_specification.rb
@@ -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
diff --git a/lib/rubygems/resolver/best_set.rb b/lib/rubygems/resolver/best_set.rb
index 8a8c15d9a4..7a708ee391 100644
--- a/lib/rubygems/resolver/best_set.rb
+++ b/lib/rubygems/resolver/best_set.rb
@@ -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
diff --git a/lib/rubygems/resolver/composed_set.rb b/lib/rubygems/resolver/composed_set.rb
index 094cb69b04..226da1e1e0 100644
--- a/lib/rubygems/resolver/composed_set.rb
+++ b/lib/rubygems/resolver/composed_set.rb
@@ -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
diff --git a/lib/rubygems/resolver/conflict.rb b/lib/rubygems/resolver/conflict.rb
index 4245b59bee..2ce63feef2 100644
--- a/lib/rubygems/resolver/conflict.rb
+++ b/lib/rubygems/resolver/conflict.rb
@@ -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
diff --git a/lib/rubygems/resolver/current_set.rb b/lib/rubygems/resolver/current_set.rb
index d60e46389d..c3aa3a2c37 100644
--- a/lib/rubygems/resolver/current_set.rb
+++ b/lib/rubygems/resolver/current_set.rb
@@ -5,9 +5,7 @@
# for installed gems.
class Gem::Resolver::CurrentSet < Gem::Resolver::Set
-
def find_all(req)
req.dependency.matching_specs
end
-
end
diff --git a/lib/rubygems/resolver/dependency_request.rb b/lib/rubygems/resolver/dependency_request.rb
index 1984aa9ddc..77539c340f 100644
--- a/lib/rubygems/resolver/dependency_request.rb
+++ b/lib/rubygems/resolver/dependency_request.rb
@@ -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
diff --git a/lib/rubygems/resolver/git_set.rb b/lib/rubygems/resolver/git_set.rb
index 6340b92fae..eac51f15ad 100644
--- a/lib/rubygems/resolver/git_set.rb
+++ b/lib/rubygems/resolver/git_set.rb
@@ -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
diff --git a/lib/rubygems/resolver/git_specification.rb b/lib/rubygems/resolver/git_specification.rb
index f43cfba853..555dcffc22 100644
--- a/lib/rubygems/resolver/git_specification.rb
+++ b/lib/rubygems/resolver/git_specification.rb
@@ -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
diff --git a/lib/rubygems/resolver/index_set.rb b/lib/rubygems/resolver/index_set.rb
index f1ecc7f95f..9390e34255 100644
--- a/lib/rubygems/resolver/index_set.rb
+++ b/lib/rubygems/resolver/index_set.rb
@@ -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
diff --git a/lib/rubygems/resolver/index_specification.rb b/lib/rubygems/resolver/index_specification.rb
index ed9423791c..d80f121189 100644
--- a/lib/rubygems/resolver/index_specification.rb
+++ b/lib/rubygems/resolver/index_specification.rb
@@ -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
diff --git a/lib/rubygems/resolver/installed_specification.rb b/lib/rubygems/resolver/installed_specification.rb
index 9d996fc1da..167ba1439e 100644
--- a/lib/rubygems/resolver/installed_specification.rb
+++ b/lib/rubygems/resolver/installed_specification.rb
@@ -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
diff --git a/lib/rubygems/resolver/installer_set.rb b/lib/rubygems/resolver/installer_set.rb
index dad6313eba..eaa7e207b2 100644
--- a/lib/rubygems/resolver/installer_set.rb
+++ b/lib/rubygems/resolver/installer_set.rb
@@ -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
diff --git a/lib/rubygems/resolver/local_specification.rb b/lib/rubygems/resolver/local_specification.rb
index 7418cfcc86..9c69c4ab74 100644
--- a/lib/rubygems/resolver/local_specification.rb
+++ b/lib/rubygems/resolver/local_specification.rb
@@ -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
diff --git a/lib/rubygems/resolver/lock_set.rb b/lib/rubygems/resolver/lock_set.rb
index 12807f3957..1ab03e753b 100644
--- a/lib/rubygems/resolver/lock_set.rb
+++ b/lib/rubygems/resolver/lock_set.rb
@@ -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
diff --git a/lib/rubygems/resolver/lock_specification.rb b/lib/rubygems/resolver/lock_specification.rb
index 5954507dba..cdb8e4e425 100644
--- a/lib/rubygems/resolver/lock_specification.rb
+++ b/lib/rubygems/resolver/lock_specification.rb
@@ -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
diff --git a/lib/rubygems/resolver/requirement_list.rb b/lib/rubygems/resolver/requirement_list.rb
index cf0014b0bb..5b51493c9a 100644
--- a/lib/rubygems/resolver/requirement_list.rb
+++ b/lib/rubygems/resolver/requirement_list.rb
@@ -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
diff --git a/lib/rubygems/resolver/set.rb b/lib/rubygems/resolver/set.rb
index 242f9cd3dc..8046e18ea1 100644
--- a/lib/rubygems/resolver/set.rb
+++ b/lib/rubygems/resolver/set.rb
@@ -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
diff --git a/lib/rubygems/resolver/source_set.rb b/lib/rubygems/resolver/source_set.rb
index 8e799514fd..bf8c23184e 100644
--- a/lib/rubygems/resolver/source_set.rb
+++ b/lib/rubygems/resolver/source_set.rb
@@ -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
diff --git a/lib/rubygems/resolver/spec_specification.rb b/lib/rubygems/resolver/spec_specification.rb
index d0e744f3a7..bde5d9cddc 100644
--- a/lib/rubygems/resolver/spec_specification.rb
+++ b/lib/rubygems/resolver/spec_specification.rb
@@ -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
diff --git a/lib/rubygems/resolver/specification.rb b/lib/rubygems/resolver/specification.rb
index e859d6659a..7fe2afd3bd 100644
--- a/lib/rubygems/resolver/specification.rb
+++ b/lib/rubygems/resolver/specification.rb
@@ -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
diff --git a/lib/rubygems/resolver/stats.rb b/lib/rubygems/resolver/stats.rb
index 5f41940b1e..64b458f504 100644
--- a/lib/rubygems/resolver/stats.rb
+++ b/lib/rubygems/resolver/stats.rb
@@ -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
diff --git a/lib/rubygems/resolver/vendor_set.rb b/lib/rubygems/resolver/vendor_set.rb
index 7e2e917d5c..48c640d8c9 100644
--- a/lib/rubygems/resolver/vendor_set.rb
+++ b/lib/rubygems/resolver/vendor_set.rb
@@ -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
diff --git a/lib/rubygems/resolver/vendor_specification.rb b/lib/rubygems/resolver/vendor_specification.rb
index 56f2e6eb2c..8dfe5940f2 100644
--- a/lib/rubygems/resolver/vendor_specification.rb
+++ b/lib/rubygems/resolver/vendor_specification.rb
@@ -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