Merge pull request #7795 from rubygems/deivid-rodriguez/truffleruby

Fix truffleruby removing gems from lockfile

Author: deivid-rodriguez

.github/workflows/ubuntu-lint.yml

@@ -16,16 +16,22 @@ permissions: # added using https://github.com/step-security/secure-workflows
 
 jobs:
   ubuntu_lint:
-    name: Lint
+    name: Lint on ${{ matrix.ruby.name }}
     runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - { name: ruby, value: 3.3.4 }
+          - { name: truffleruby, value: truffleruby-24.0.1 }
     env:
       RUBYOPT: -Ilib
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Setup ruby
         uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
         with:
-          ruby-version: 3.3.4
+          ruby-version: ${{ matrix.ruby.value }}
           bundler: none
       - name: Install Dependencies
         run: bin/rake setup

bundler/lib/bundler/definition.rb

@@ -630,6 +630,7 @@ def materialize(dependencies)
     def start_resolution
       local_platform_needed_for_resolvability = @most_specific_non_local_locked_ruby_platform && !@platforms.include?(local_platform)
       @platforms << local_platform if local_platform_needed_for_resolvability
+      add_platform(Gem::Platform::RUBY) if RUBY_ENGINE == "truffleruby"
 
       result = SpecSet.new(resolver.start)
 

bundler/lib/bundler/force_platform.rb

@@ -2,8 +2,6 @@
 
 module Bundler
   module ForcePlatform
-    private
-
     # The `:force_ruby_platform` value used by dependencies for resolution, and
     # by locked specifications for materialization is `false` by default, except
     # for TruffleRuby. TruffleRuby generally needs to force the RUBY platform

bundler/lib/bundler/rubygems_ext.rb

@@ -237,16 +237,12 @@ class Dependency
 
     include ::Bundler::ForcePlatform
 
+    attr_reader :force_ruby_platform
+
     attr_accessor :source, :groups
 
     alias_method :eql?, :==
 
-    def force_ruby_platform
-      return @force_ruby_platform if defined?(@force_ruby_platform) && !@force_ruby_platform.nil?
-
-      @force_ruby_platform = default_force_ruby_platform
-    end
-
     unless method_defined?(:encode_with, false)
       def encode_with(coder)
         [:@name, :@requirement, :@type, :@prerelease, :@version_requirements].each do |ivar|

bundler/lib/bundler/spec_set.rb

@@ -280,7 +280,7 @@ def specs_for_dependency(dep, platform)
       if platform
         GemHelpers.select_best_platform_match(specs_for_name, platform, force_ruby: dep.force_ruby_platform)
       else
-        GemHelpers.select_best_local_platform_match(specs_for_name, force_ruby: dep.force_ruby_platform)
+        GemHelpers.select_best_local_platform_match(specs_for_name, force_ruby: dep.force_ruby_platform || dep.default_force_ruby_platform)
       end
     end
 

bundler/spec/commands/lock_spec.rb

@@ -1797,10 +1797,11 @@
       G
     end
 
-    it "locks ruby specs" do
+    it "locks both ruby and platform specific specs" do
       checksums = checksums_section_when_enabled do |c|
         c.no_checksum "foo", "1.0"
-        c.no_checksum "nokogiri", "1.14.2"
+        c.checksum gem_repo4, "nokogiri", "1.14.2"
+        c.checksum gem_repo4, "nokogiri", "1.14.2", "x86_64-linux"
       end
 
       simulate_platform "x86_64-linux" do
@@ -1818,6 +1819,7 @@
           remote: https://gem.repo4/
           specs:
             nokogiri (1.14.2)
+            nokogiri (1.14.2-x86_64-linux)
 
         PLATFORMS
           ruby
@@ -1830,6 +1832,73 @@
            #{Bundler::VERSION}
       L
     end
+
+    context "and a lockfile with platform specific gems only already exists" do
+      before do
+        checksums = checksums_section_when_enabled do |c|
+          c.no_checksum "foo", "1.0"
+          c.checksum gem_repo4, "nokogiri", "1.14.2", "x86_64-linux"
+        end
+
+        lockfile <<~L
+          PATH
+            remote: .
+            specs:
+              foo (1.0)
+                nokogiri
+
+          GEM
+            remote: https://gem.repo4/
+            specs:
+              nokogiri (1.14.2-x86_64-linux)
+
+          PLATFORMS
+            x86_64-linux
+
+          DEPENDENCIES
+            foo!
+          #{checksums}
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+      end
+
+      it "keeps platform specific gems" do
+        checksums = checksums_section_when_enabled do |c|
+          c.no_checksum "foo", "1.0"
+          c.checksum gem_repo4, "nokogiri", "1.14.2"
+          c.checksum gem_repo4, "nokogiri", "1.14.2", "x86_64-linux"
+        end
+
+        simulate_platform "x86_64-linux" do
+          bundle "install"
+        end
+
+        expect(lockfile).to eq <<~L
+          PATH
+            remote: .
+            specs:
+              foo (1.0)
+                nokogiri
+
+          GEM
+            remote: https://gem.repo4/
+            specs:
+              nokogiri (1.14.2)
+              nokogiri (1.14.2-x86_64-linux)
+
+          PLATFORMS
+            ruby
+            x86_64-linux
+
+          DEPENDENCIES
+            foo!
+          #{checksums}
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+      end
+    end
   end
 
   context "when adding a new gem that requires unlocking other transitive deps" do

bundler/spec/install/gems/resolving_spec.rb

@@ -673,4 +673,55 @@
       expect(err).to end_with(nice_error)
     end
   end
+
+  context "when non platform specific gems bring more dependencies", :truffleruby_only do
+    before do
+      build_repo4 do
+        build_gem "foo", "1.0" do |s|
+          s.add_dependency "bar"
+        end
+
+        build_gem "foo", "2.0" do |s|
+          s.platform = "x86_64-linux"
+        end
+
+        build_gem "bar"
+      end
+
+      gemfile <<-G
+        source "https://gem.repo4"
+        gem "foo"
+      G
+    end
+
+    it "locks both ruby and current platform, and resolve to ruby variants that install on truffleruby" do
+      checksums = checksums_section_when_enabled do |c|
+        c.checksum gem_repo4, "foo", "1.0"
+        c.checksum gem_repo4, "bar", "1.0"
+      end
+
+      simulate_platform "x86_64-linux" do
+        bundle "install"
+
+        expect(lockfile).to eq <<~L
+          GEM
+            remote: https://gem.repo4/
+            specs:
+              bar (1.0)
+              foo (1.0)
+                bar
+
+          PLATFORMS
+            ruby
+            x86_64-linux
+
+          DEPENDENCIES
+            foo
+          #{checksums}
+          BUNDLED WITH
+             #{Bundler::VERSION}
+        L
+      end
+    end
+  end
 end

tool/bundler/dev_gems.rb.lock

@@ -57,9 +57,11 @@ GEM
     webrick (1.8.1)
 
 PLATFORMS
+  aarch64-darwin
   arm64-darwin-22
   arm64-darwin-23
   java
+  ruby
   universal-java-11
   universal-java-18
   universal-java-19

tool/bundler/release_gems.rb.lock

@@ -38,11 +38,13 @@ GEM
     uri (0.13.0)
 
 PLATFORMS
+  aarch64-darwin
   aarch64-linux
   arm64-darwin-20
   arm64-darwin-21
   arm64-darwin-22
   arm64-darwin-23
+  ruby
   universal-java-11
   universal-java-18
   x86_64-darwin-20

tool/bundler/rubocop_gems.rb.lock

@@ -53,11 +53,13 @@ GEM
     unicode-display_width (2.5.0)
 
 PLATFORMS
+  aarch64-darwin
   aarch64-linux
   arm64-darwin-20
   arm64-darwin-21
   arm64-darwin-22
   arm64-darwin-23
+  ruby
   universal-java-11
   universal-java-18
   universal-java-19