kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[rubygems/rubygems] Refactor platform matching on Linux

Browse source 
I think this highlights better how musl is special.

https://github.com/rubygems/rubygems/commit/4075771697
This commit is contained in:
David Rodríguez 2022-09-28 10:57:54 +02:00 committed by git
parent 850cfb021e
commit 4d58ee3de0
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/bundler/rubygems_ext.rb
View file

@ -261,10 +261,21 @@ module Gem
# version
(
(@os != "linux" && (@version.nil? || other.version.nil?)) ||
(@os == "linux" && (other.version == "gnu#{@version}" || other.version == "musl#{@version}" || @version == "gnu#{other.version}")) ||
(@os == "linux" && (normalized_linux_version_ext == other.normalized_linux_version_ext || other.version == "musl#{@version}")) ||
@version == other.version
)
end
# This is a copy of RubyGems 3.3.23 or higher `normalized_linux_method`.
# Once only 3.3.23 is supported, we can use the method in RubyGems.
def normalized_linux_version_ext
return nil unless @version
without_gnu = @version.sub(/\Agnu/, "")
return nil if without_gnu.empty?
without_gnu
end
end
end

11
lib/rubygems/platform.rb
View file

@ -181,11 +181,20 @@ class Gem::Platform
# version
(
(@os != "linux" && (@version.nil? || other.version.nil?)) ||
(@os == "linux" && (other.version == "gnu#{@version}" || other.version == "musl#{@version}" || @version == "gnu#{other.version}")) ||
(@os == "linux" && (normalized_linux_version == other.normalized_linux_version || other.version == "musl#{@version}")) ||
@version == other.version
)
end
def normalized_linux_version
return nil unless @version
without_gnu = @version.sub(/\Agnu/, "")
return nil if without_gnu.empty?
without_gnu
end
##
# Does +other+ match this platform? If +other+ is a String it will be
# converted to a Gem::Platform first. See #=== for matching rules.