* lib/rubygems: Update to RubyGems master 6a3d9f9. Changes include:

  Compatibly renamed Gem::DependencyResolver to Gem::Resolver.

  Added support for git gems in gem.deps.rb and Gemfile.

  Fixed resolver bugs.

* test/rubygems: ditto.

* lib/rubygems/LICENSE.txt:  Updated to license from RubyGems trunk.
  [ruby-trunk - Bug #9086]

* lib/rubygems/commands/which_command.rb:  RubyGems now indicates
  failure when any file is missing.  [ruby-trunk - Bug #9004]

* lib/rubygems/ext/builder:  Extensions are now installed into the
  extension install directory and the first directory in the require
  path from the gem.  This allows backwards compatibility with msgpack
  and other gems that calculate full require paths.
  [ruby-trunk - Bug #9106]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 6 deletions

diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb
index 3a997f32ee..42d457063f 100644
--- a/lib/rubygems/request_set.rb
+++ b/lib/rubygems/request_set.rb
@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rubygems/dependency'
-require 'rubygems/dependency_resolver'
 require 'rubygems/dependency_list'
 require 'rubygems/installer'
 require 'tsort'
@@ -32,6 +31,11 @@ class Gem::RequestSet
   attr_accessor :development
 
   ##
+  # The set of git gems imported via load_gemdeps.
+
+  attr_reader :git_set # :nodoc:
+
+  ##
   # Sets used for resolution
 
   attr_reader :sets # :nodoc:
@@ -61,6 +65,7 @@ class Gem::RequestSet
     @always_install   = []
     @dependency_names = {}
     @development      = false
+    @git_set          = nil
     @requests         = []
     @sets             = []
     @soft_missing     = false
@@ -184,7 +189,8 @@ class Gem::RequestSet
   # Load a dependency management file.
 
   def load_gemdeps path, without_groups = []
-    @vendor_set = Gem::DependencyResolver::VendorSet.new
+    @git_set    = Gem::Resolver::GitSet.new
+    @vendor_set = Gem::Resolver::VendorSet.new
 
     gf = Gem::RequestSet::GemDependencyAPI.new self, path
     gf.without_groups = without_groups if without_groups
@@ -195,13 +201,14 @@ class Gem::RequestSet
   # Resolve the requested dependencies and return an Array of Specification
   # objects to be activated.
 
-  def resolve set = Gem::DependencyResolver::IndexSet.new
+  def resolve set = Gem::Resolver::IndexSet.new
     @sets << set
+    @sets << @git_set
     @sets << @vendor_set
 
-    set = Gem::DependencyResolver.compose_sets(*@sets)
+    set = Gem::Resolver.compose_sets(*@sets)
 
-    resolver = Gem::DependencyResolver.new @dependencies, set
+    resolver = Gem::Resolver.new @dependencies, set
     resolver.development  = @development
     resolver.soft_missing = @soft_missing
 
@@ -213,7 +220,7 @@ class Gem::RequestSet
   # and return an Array of Specification objects to be activated.
 
   def resolve_current
-    resolve Gem::DependencyResolver::CurrentSet.new
+    resolve Gem::Resolver::CurrentSet.new
   end
 
   def sorted_requests