From 3b1fb562e8ec88b71901ad43c61cd210aa8d220f Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Mon, 19 Sep 2022 15:39:32 -0400 Subject: [PATCH] fix: Gem::Platform.match handles String argument properly Previously 9eead86 introduced non-commutativity of platforms, and later commit 1b9f7f50 changed the behavior of `Gem::Platform.match` to ensure the callee of `#=~` was the gem platform. However, when the platform argument is a String, then the callee and argument of `#=~` are flipped (see docs for `String#=~`), which works against the fix from 1b9f7f50. Closes #5938 --- lib/rubygems/platform.rb | 1 + test/rubygems/test_gem_platform.rb | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb index 06de5ded8da6..1dacc596c47b 100644 --- a/lib/rubygems/platform.rb +++ b/lib/rubygems/platform.rb @@ -22,6 +22,7 @@ def self.match(platform) end def self.match_platforms?(platform, platforms) + platform = Gem::Platform.new(platform) unless platform.is_a?(Gem::Platform) platforms.any? do |local_platform| platform.nil? || local_platform == platform || diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb index f683204a2fc2..3bd4a862c524 100644 --- a/test/rubygems/test_gem_platform.rb +++ b/test/rubygems/test_gem_platform.rb @@ -452,6 +452,13 @@ def test_inspect assert_equal 1, result.scan(/@version=/).size end + def test_gem_platform_match_with_string_argument + util_set_arch "x86_64-linux-musl" + + assert(Gem::Platform.match(Gem::Platform.new("x86_64-linux")), "should match Gem::Platform") + assert(Gem::Platform.match("x86_64-linux"), "should match String platform") + end + def assert_local_match(name) assert_match Gem::Platform.local, name end