* lib/rubygems: Update to RubyGems master 4bdc4f2. Important changes

  in this commit:

  RubyGems now chooses the test server port reliably.  Patch by akr.

  Partial implementation of bundler's Gemfile format.

  Refactorings to improve the new resolver.

  Fixes bugs in the resolver.

* test/rubygems:  Tests for the above.


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

1 files changed, 20 insertions, 0 deletions

diff --git a/lib/rubygems/dependency_resolver/dependency_request.rb b/lib/rubygems/dependency_resolver/dependency_request.rb
index 05e447c3be..36b77ab558 100644
--- a/lib/rubygems/dependency_resolver/dependency_request.rb
+++ b/lib/rubygems/dependency_resolver/dependency_request.rb
@@ -32,6 +32,22 @@ class Gem::DependencyResolver::DependencyRequest
     @dependency.name
   end
 
+  # Indicate that the request is for a gem explicitly requested by the user
+  def explicit?
+    @requester.nil?
+  end
+
+  # Indicate that the requset is for a gem requested as a dependency of another gem
+  def implicit?
+    !explicit?
+  end
+
+  # Return a String indicating who caused this request to be added (only
+  # valid for implicit requests)
+  def request_context
+    @requester ? @requester.request : "(unknown)"
+  end
+
   def pretty_print q # :nodoc:
     q.group 2, '[Dependency request ', ']' do
       q.breakable
@@ -43,6 +59,10 @@ class Gem::DependencyResolver::DependencyRequest
     end
   end
 
+  def requirement
+    @dependency.requirement
+  end
+
   def to_s # :nodoc:
     @dependency.to_s
   end