Move formatting logic from Gem::Platform.local to Gem::Platform::Stri…

…ngParser
rubygems · Dec 9, 2023 · 3c9fbf4 · 3c9fbf4
1 parent 281de0f
commit 3c9fbf4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bundler/lib/bundler/installer/standalone.rb b/bundler/lib/bundler/installer/standalone.rb
@@ -140,7 +140,7 @@ def platform_parser
           def local_platform
             force_mswin_version = true
             Gem::Platform::StringParser
-              .run(RbConfig::CONFIG["arch"])
+              .run(RbConfig::CONFIG["arch"], force_mswin_version)
               .compact
               .join "-"
           end

diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb
@@ -14,9 +14,8 @@ class Gem::Platform
 
   def self.local
     @local ||= begin
-      arch = RbConfig::CONFIG["arch"]
-      arch = "#{arch}_60" if /mswin(?:32|64)$/.match?(arch)
-      new(arch)
+      force_mswin_version = true
+      new(StringParser.run(RbConfig::CONFIG["arch"], force_mswin_version))
     end
   end
 

diff --git a/lib/rubygems/platform/string_parser.rb b/lib/rubygems/platform/string_parser.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module Gem::Platform::StringParser
-  def self.run(arch)
+  def self.run(arch, force_mswin_version = false)
+    arch = "#{arch}_60" if /mswin(?:32|64)$/.match?(arch) && force_mswin_version
     arch = arch.split "-"
 
     if arch.length > 2 && arch.last !~ /\d+(\.\d+)?$/ # reassemble x86-linux-{libc}