Support install arm native gems on Windows

Co-authored-by: Johnny Shields <johnny.shields@gmail.com>

Author: deivid-rodriguez

bundler/lib/bundler/gem_helpers.rb

@@ -11,7 +11,7 @@ module GemHelpers
     def generic(p)
       GENERIC_CACHE[p] ||= begin
         found = GENERICS.find do |match|
-          p.os == match.os && (!match.cpu || p.cpu == match.cpu)
+          p === match
         end
         found || Gem::Platform::RUBY
       end

bundler/lib/bundler/rubygems_ext.rb

@@ -67,7 +67,8 @@ class Platform
     MINGW = Gem::Platform.new("x86-mingw32")
     X64_MINGW = [Gem::Platform.new("x64-mingw32"),
                  Gem::Platform.new("x64-mingw-ucrt")].freeze
-    WINDOWS = [MSWIN, MSWIN64, MINGW, X64_MINGW].flatten.freeze
+    UNIVERSAL_MINGW = Gem::Platform.new("universal-mingw")
+    WINDOWS = [MSWIN, MSWIN64, UNIVERSAL_MINGW].flatten.freeze
     X64_LINUX = Gem::Platform.new("x86_64-linux")
     X64_LINUX_MUSL = Gem::Platform.new("x86_64-linux-musl")
 

bundler/spec/commands/install_spec.rb

@@ -290,6 +290,23 @@
           expect(the_bundle).to include_gems("platform_specific 1.0 x86-mswin32")
         end
       end
+
+      it "installs gems for aarch64-mingw-ucrt" do
+        build_repo2 do
+          build_gem "platform_specific" do |s|
+            s.platform = "aarch64-mingw-ucrt"
+          end
+        end
+
+        simulate_platform "aarch64-mingw-ucrt" do
+          install_gemfile <<-G
+            source "https://gem.repo2"
+            gem "platform_specific"
+          G
+        end
+
+        expect(out).to include("Installing platform_specific 1.0 (aarch64-mingw-ucrt)")
+      end
     end
 
     describe "doing bundle install foo" do

bundler/spec/other/ext_spec.rb

@@ -34,17 +34,21 @@
     expect(generic(pl("x86-mswin32"))).to eq(pl("x86-mswin32"))
   end
 
-  it "converts 32-bit mingw platform variants into x86-mingw32" do
-    expect(generic(pl("i386-mingw32"))).to eq(pl("x86-mingw32"))
-    expect(generic(pl("x86-mingw32"))).to eq(pl("x86-mingw32"))
+  it "converts 32-bit mingw platform variants into universal-mingw" do
+    expect(generic(pl("i386-mingw32"))).to eq(pl("universal-mingw"))
+    expect(generic(pl("x86-mingw32"))).to eq(pl("universal-mingw"))
   end
 
-  it "converts 64-bit mingw platform variants into x64-mingw32" do
-    expect(generic(pl("x64-mingw32"))).to eq(pl("x64-mingw32"))
+  it "converts 64-bit mingw platform variants into universal-mingw" do
+    expect(generic(pl("x64-mingw32"))).to eq(pl("universal-mingw"))
   end
 
-  it "converts 64-bit mingw UCRT platform variants into x64-mingw-ucrt" do
-    expect(generic(pl("x64-mingw-ucrt"))).to eq(pl("x64-mingw-ucrt"))
+  it "converts x64 mingw UCRT platform variants into universal-mingw" do
+    expect(generic(pl("x64-mingw-ucrt"))).to eq(pl("universal-mingw"))
+  end
+
+  it "converts aarch64 mingw UCRT platform variants into aarch64-mingw-ucrt" do
+    expect(generic(pl("aarch64-mingw-ucrt"))).to eq(pl("universal-mingw"))
   end
 end