[rubygems/rubygems] Move expanding dependencies with metadata to specification classes

ruby/rubygems@7f921aa46e

Author: deivid-rodriguez

lib/bundler/match_metadata.rb

@@ -13,5 +13,18 @@ def matches_current_ruby?
     def matches_current_rubygems?
       @required_rubygems_version.satisfied_by?(Gem.rubygems_version)
     end
+
+    def expanded_dependencies
+      runtime_dependencies + [
+        metadata_dependency("Ruby", required_ruby_version),
+        metadata_dependency("RubyGems", required_rubygems_version),
+      ].compact
+    end
+
+    def metadata_dependency(name, requirement)
+      return if requirement.nil? || requirement.none?
+
+      Gem::Dependency.new("#{name}\0", requirement)
+    end
   end
 end

lib/bundler/resolver/spec_group.rb

@@ -39,9 +39,7 @@ def to_s
       end
 
       def dependencies
-        @dependencies ||= @specs.flat_map do |spec|
-          spec.runtime_dependencies + metadata_dependencies(spec)
-        end.uniq.sort
+        @dependencies ||= @specs.flat_map(&:expanded_dependencies).uniq.sort
       end
 
       def ==(other)
@@ -71,19 +69,6 @@ def equivalent?(other)
       def exemplary_spec
         @specs.first
       end
-
-      def metadata_dependencies(spec)
-        [
-          metadata_dependency("Ruby", spec.required_ruby_version),
-          metadata_dependency("RubyGems", spec.required_rubygems_version),
-        ].compact
-      end
-
-      def metadata_dependency(name, requirement)
-        return if requirement.nil? || requirement.none?
-
-        Gem::Dependency.new("#{name}\0", requirement)
-      end
     end
   end
 end