add a dependency list attr to Source::Rubygems

lib/bundler/definition.rb

@@ -160,11 +160,13 @@ def resolve
     def index
       @index ||= Index.build do |idx|
         @sources.each do |s|
-          idx.use s.specs(@dependencies)
+          idx.use s.specs
         end
       end
     end
 
+    # used when frozen is enabled so we can find the bundler
+    # spec, even if (say) a git gem is not checked out.
     def rubygems_index
       @rubygems_index ||= Index.build do |idx|
         @sources.find_all{|s| s.is_a?(Source::Rubygems) }.each do |s|

lib/bundler/dsl.rb

@@ -112,8 +112,8 @@ def git(uri, options = {}, source_options = {}, &blk)
     end
 
     def to_definition(lockfile, unlock)
-      @sources << @rubygems_source
-      @sources.uniq!
+      @rubygems_source.dependencies = @dependencies
+      @sources << @rubygems_source unless @sources.include?(@rubygems_source)
       Definition.new(lockfile, @dependencies, @sources, unlock)
     end
 

lib/bundler/source.rb

@@ -11,6 +11,7 @@ module Source
     # TODO: Refactor this class
     class Rubygems
       attr_reader :remotes, :caches
+      attr_accessor :dependencies
 
       def initialize(options = {})
         @options = options
@@ -65,8 +66,8 @@ def to_s
       end
       alias_method :name, :to_s
 
-      def specs(dependencies = nil)
-        @specs ||= fetch_specs(dependencies)
+      def specs
+        @specs ||= fetch_specs
       end
 
       def fetch(spec)
@@ -154,11 +155,11 @@ def normalize_uri(uri)
         uri
       end
 
-      def fetch_specs(dependencies = nil)
+      def fetch_specs
         Index.build do |idx|
           idx.use installed_specs
           idx.use cached_specs if @allow_cached || @allow_remote
-          idx.use remote_specs(dependencies) if @allow_remote
+          idx.use remote_specs if @allow_remote
         end
       end
 
@@ -214,18 +215,16 @@ def cached_specs
         idx
       end
 
-      def remote_specs(dependencies = nil)
+      def remote_specs
         @remote_specs ||= begin
           idx     = Index.new
           old     = Bundler.rubygems.sources
 
           remotes.each do |uri|
 
             @fetchers[uri] = Bundler::Fetcher.new(uri)
-            gem_names =
-              if dependencies
-                dependencies.map {|d| d.name }
-              end
+            gem_names = dependencies && dependencies.map{|d| d.name }
+
             @fetchers[uri].fetch_remote_specs(gem_names) do |n,v|
               v.each do |name, version, platform|
                 next if name == 'bundler'