Merge RubyGems/Bundler master

  https://github.com/rubygems/rubygems/commit/6214d00b2315ed37c76b1fbc1c72f61f92ba5a65

2 files changed, 19 insertions, 35 deletions

diff --git a/lib/bundler/resolver/base.rb b/lib/bundler/resolver/base.rb
index 84e087b0ae..a8f42dc994 100644
--- a/lib/bundler/resolver/base.rb
+++ b/lib/bundler/resolver/base.rb
@@ -40,7 +40,7 @@ module Bundler
         base_requirements = {}
         @base.each do |ls|
           dep = Dependency.new(ls.name, ls.version)
-          base_requirements[ls.name] = DepProxy.get_proxy(dep, ls.platform)
+          base_requirements[ls.name] = dep
         end
         @additional_base_requirements.each {|d| base_requirements[d.name] = d }
         base_requirements
diff --git a/lib/bundler/resolver/spec_group.rb b/lib/bundler/resolver/spec_group.rb
index 2c00af3b84..ac32c3c119 100644
--- a/lib/bundler/resolver/spec_group.rb
+++ b/lib/bundler/resolver/spec_group.rb
@@ -6,14 +6,8 @@ module Bundler
       attr_accessor :name, :version, :source
       attr_accessor :activated_platforms, :force_ruby_platform
 
-      def self.create_for(specs, all_platforms)
-        platforms = all_platforms.select {|p| specs[p].any? }
-
-        new(specs, platforms)
-      end
-
       def initialize(specs, relevant_platforms)
-        @exemplary_spec = specs[relevant_platforms.first].first
+        @exemplary_spec = specs.first
         @name = @exemplary_spec.name
         @version = @exemplary_spec.version
         @source = @exemplary_spec.source
@@ -23,17 +17,12 @@ module Bundler
       end
 
       def to_specs
-        activated_platforms.map do |p|
-          specs = @specs[p]
-          next unless specs.any?
-
-          specs.map do |s|
-            lazy_spec = LazySpecification.new(name, version, s.platform, source)
-            lazy_spec.force_ruby_platform = force_ruby_platform
-            lazy_spec.dependencies.replace s.dependencies
-            lazy_spec
-          end
-        end.flatten.compact.uniq
+        @specs.map do |s|
+          lazy_spec = LazySpecification.new(name, version, s.platform, source)
+          lazy_spec.force_ruby_platform = force_ruby_platform
+          lazy_spec.dependencies.replace s.dependencies
+          lazy_spec
+        end
       end
 
       def to_s
@@ -42,7 +31,9 @@ module Bundler
       end
 
       def dependencies_for_activated_platforms
-        @dependencies_for_activated_platforms ||= dependencies_for(activated_platforms)
+        @dependencies_for_activated_platforms ||= @specs.map do |spec|
+          __dependencies(spec) + metadata_dependencies(spec)
+        end.flatten.uniq
       end
 
       def ==(other)
@@ -73,35 +64,28 @@ module Bundler
 
       private
 
-      def dependencies_for(platforms)
-        platforms.map do |platform|
-          __dependencies(platform) + metadata_dependencies(platform)
-        end.flatten
-      end
-
-      def __dependencies(platform)
+      def __dependencies(spec)
         dependencies = []
-        @specs[platform].first.dependencies.each do |dep|
+        spec.dependencies.each do |dep|
           next if dep.type == :development
-          dependencies << DepProxy.get_proxy(Dependency.new(dep.name, dep.requirement), platform)
+          dependencies << Dependency.new(dep.name, dep.requirement)
         end
         dependencies
       end
 
-      def metadata_dependencies(platform)
-        spec = @specs[platform].first
+      def metadata_dependencies(spec)
         return [] if spec.is_a?(LazySpecification)
 
         [
-          metadata_dependency("Ruby", spec.required_ruby_version, platform),
-          metadata_dependency("RubyGems", spec.required_rubygems_version, platform),
+          metadata_dependency("Ruby", spec.required_ruby_version),
+          metadata_dependency("RubyGems", spec.required_rubygems_version),
         ].compact
       end
 
-      def metadata_dependency(name, requirement, platform)
+      def metadata_dependency(name, requirement)
         return if requirement.nil? || requirement.none?
 
-        DepProxy.get_proxy(Dependency.new("#{name}\0", requirement), platform)
+        Dependency.new("#{name}\0", requirement)
       end
     end
   end