summaryrefslogtreecommitdiff
path: root/lib/rubygems/resolver
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-01 21:50:14 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-01 21:50:14 +0000
commiteffdbf5936cc090a618e13c8f9a1b5412ebab2fa ()
treec8410a18cbbe7ad013470fc06fef0c75ce0fd230 /lib/rubygems/resolver
parent9c4ef4b191a1e6b9abdbb21c7c709d1d0f2397e6 (diff)
* lib/rubygems: Update to RubyGems HEAD(c202db2).
this version contains many enhancements see http://git.io/vtNwF * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/rubygems/resolver/activation_request.rb3
-rw-r--r--lib/rubygems/resolver/conflict.rb1
-rw-r--r--lib/rubygems/resolver/dependency_request.rb5
-rw-r--r--lib/rubygems/resolver/git_specification.rb3
-rw-r--r--lib/rubygems/resolver/molinillo.rb1
-rw-r--r--lib/rubygems/resolver/molinillo/lib/molinillo.rb5
-rw-r--r--lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb266
-rw-r--r--lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb69
-rw-r--r--lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb3
-rw-r--r--lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb99
-rw-r--r--lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb63
-rw-r--r--lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb430
-rw-r--r--lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb43
-rw-r--r--lib/rubygems/resolver/molinillo/lib/molinillo/state.rb51
-rw-r--r--lib/rubygems/resolver/specification.rb2
15 files changed, 1038 insertions, 6 deletions
@@ -67,6 +67,8 @@ class Gem::Resolver::ActivationRequest
@spec.full_name
end
##
# The Gem::Specification for this activation request.
@@ -169,4 +171,3 @@ class Gem::Resolver::ActivationRequest
end
end
-
@@ -157,4 +157,3 @@ end
# TODO: Remove in RubyGems 3
Gem::Resolver::DependencyConflict = Gem::Resolver::Conflict # :nodoc:
-
@@ -67,6 +67,10 @@ class Gem::Resolver::DependencyRequest
@dependency.name
end
##
# Indicate that the request is for a gem explicitly requested by the user
@@ -113,4 +117,3 @@ class Gem::Resolver::DependencyRequest
end
end
-
@@ -23,8 +23,7 @@ class Gem::Resolver::GitSpecification < Gem::Resolver::SpecSpecification
def install options = {}
require 'rubygems/installer'
- installer = Gem::Installer.new '', options
- installer.spec = spec
yield installer if block_given?
@@ -0,0 +1 @@
@@ -0,0 +1,5 @@
@@ -0,0 +1,266 @@
@@ -0,0 +1,69 @@
@@ -0,0 +1,3 @@
@@ -0,0 +1,99 @@
@@ -0,0 +1,63 @@
@@ -0,0 +1,430 @@
@@ -0,0 +1,43 @@
@@ -0,0 +1,51 @@
@@ -89,7 +89,7 @@ class Gem::Resolver::Specification
gem = source.download spec, destination
- installer = Gem::Installer.new gem, options
yield installer if block_given?