1 files changed, 31 insertions, 12 deletions
diff --git a/lib/bundler/match_platform.rb b/lib/bundler/match_platform.rb
index 050cd0efd3..479818e5ec 100644
--- a/lib/bundler/match_platform.rb
+++ b/lib/bundler/match_platform.rb
@@ -1,23 +1,42 @@
 # frozen_string_literal: true
-require "bundler/gem_helpers"
 
 module Bundler
   module MatchPlatform
-    include GemHelpers
+    def installable_on_platform?(target_platform) # :nodoc:
+      return true if [Gem::Platform::RUBY, nil, target_platform].include?(platform)
+      return true if Gem::Platform.new(platform) === target_platform
 
-    def match_platform(p)
-      MatchPlatform.platforms_match?(platform, p)
+      false
     end
 
-    def self.platforms_match?(gemspec_platform, local_platform)
-      return true if gemspec_platform.nil?
-      return true if Gem::Platform::RUBY == gemspec_platform
-      return true if local_platform == gemspec_platform
-      gemspec_platform = Gem::Platform.new(gemspec_platform)
-      return true if GemHelpers.generic(gemspec_platform) === local_platform
-      return true if gemspec_platform === local_platform
+    def self.select_best_platform_match(specs, platform, force_ruby: false, prefer_locked: false)
+      matching = select_all_platform_match(specs, platform, force_ruby: force_ruby, prefer_locked: prefer_locked)
 
-      false
+      Gem::Platform.sort_and_filter_best_platform_match(matching, platform)
+    end
+
+    def self.select_best_local_platform_match(specs, force_ruby: false)
+      local = Bundler.local_platform
+      matching = select_all_platform_match(specs, local, force_ruby: force_ruby).filter_map(&:materialized_for_installation)
+
+      Gem::Platform.sort_best_platform_match(matching, local)
+    end
+
+    def self.select_all_platform_match(specs, platform, force_ruby: false, prefer_locked: false)
+      matching = specs.select {|spec| spec.installable_on_platform?(force_ruby ? Gem::Platform::RUBY : platform) }
+
+      specs.each(&:force_ruby_platform!) if force_ruby
+
+      if prefer_locked
+        locked_originally = matching.select {|spec| spec.is_a?(::Bundler::LazySpecification) }
+        return locked_originally if locked_originally.any?
+      end
+
+      matching
+    end
+
+    def self.generic_local_platform_is_ruby?
+      Bundler.generic_local_platform == Gem::Platform::RUBY
     end
   end
 end