Merge pull request #6717 from rubygems/prepare-rg-3-3-27-bundler-2-3-27

Prepare to release RubyGems 3.3.27 and Bundler 2.3.27

Author: hsbt

.github/workflows/bundler.yml

@@ -23,8 +23,8 @@ jobs:
           - { name: Ubuntu, value: ubuntu-20.04 }
 
         ruby:
-          - { name: ruby-2.3, value: 2.3.8 }
-          - { name: ruby-2.4, value: 2.4.10 }
+          # - { name: ruby-2.3, value: 2.3.8 }
+          # - { name: ruby-2.4, value: 2.4.10 }
           - { name: ruby-2.5, value: 2.5.9 }
           - { name: ruby-2.6, value: 2.6.10 }
           - { name: ruby-2.7, value: 2.7.6 }
@@ -36,8 +36,8 @@ jobs:
           - { name: 3, value: 3.0.0 }
 
         exclude:
-          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.3, value: 2.3.8 } }
-          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.4, value: 2.4.10 } }
+          # - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.3, value: 2.3.8 } }
+          # - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.4, value: 2.4.10 } }
           - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.5, value: 2.5.9 } }
           - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.6, value: 2.6.10 } }
 

.github/workflows/older-rubygems-bundler.yml

@@ -24,14 +24,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.3, value: 2.3.8 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.4, value: 2.4.10 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
+          # - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.3, value: 2.3.8 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
+          # - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.4, value: 2.4.10 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
           - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.5, value: 2.5.9 }, rgv: { name: rgv-2.7, value: v2.7.11 } }
           - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.10 }, rgv: { name: rgv-3.0, value: v3.0.9 } }
-          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.6 }, rgv: { name: rgv-3.1, value: v3.1.6 } }
+          # - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.6 }, rgv: { name: rgv-3.1, value: v3.1.6 } }
           - { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.4 }, rgv: { name: rgv-3.2, value: v3.2.33 } }
           - { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.2 }, rgv: { name: rgv-3.3, value: v3.3.5 } }
-          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.6 }, rgv: { name: rgv-3.1, value: v3.1.6 } }
+          # - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.6 }, rgv: { name: rgv-3.1, value: v3.1.6 } }
           - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.4 }, rgv: { name: rgv-3.2, value: v3.2.33 } }
           - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.2 }, rgv: { name: rgv-3.3, value: v3.3.5 } }
     env:

.github/workflows/ruby-core.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [Rubygems, Bundler]
+        target: [Rubygems] #, Bundler]
     steps:
       - name: Set up latest ruby as baseruby to be able to compile ruby
         uses: ruby/setup-ruby@v1

bundler/lib/bundler/index.rb

@@ -71,6 +71,7 @@ def local_search(query)
       when Gem::Specification, RemoteSpecification, LazySpecification, EndpointSpecification then search_by_spec(query)
       when String then specs_by_name(query)
       when Gem::Dependency then search_by_dependency(query)
+      when Array then search_by_name_and_version(*query)
       else
         raise "You can't search for a #{query.inspect}."
       end
@@ -173,6 +174,10 @@ def search_by_dependency(dependency)
       end
     end
 
+    def search_by_name_and_version(name, version)
+      specs_by_name(name).select {|spec| spec.version == version }
+    end
+
     EMPTY_SEARCH = [].freeze
 
     def search_by_spec(spec)

bundler/lib/bundler/lazy_specification.rb

@@ -13,7 +13,6 @@ def initialize(name, version, platform, source = nil)
       @dependencies  = []
       @platform      = platform || Gem::Platform::RUBY
       @source        = source
-      @specification = nil
     end
 
     def full_name
@@ -76,37 +75,46 @@ def to_lock
     def materialize_for_installation
       source.local!
 
-      candidates = if source.is_a?(Source::Path) || !ruby_platform_materializes_to_ruby_platform?
-        target_platform = ruby_platform_materializes_to_ruby_platform? ? platform : local_platform
+      matching_specs = source.specs.search(use_exact_resolved_specifications? ? self : [name, version])
+      return self if matching_specs.empty?
 
-        GemHelpers.select_best_platform_match(source.specs.search(Dependency.new(name, version)), target_platform)
+      candidates = if use_exact_resolved_specifications?
+        matching_specs
       else
-        source.specs.search(self)
-      end
+        target_platform = ruby_platform_materializes_to_ruby_platform? ? platform : local_platform
 
-      return self if candidates.empty?
+        installable_candidates = GemHelpers.select_best_platform_match(matching_specs, target_platform)
 
-      __materialize__(candidates)
-    end
+        specification = __materialize__(installable_candidates, :fallback_to_non_installable => false)
+        return specification unless specification.nil?
 
-    def __materialize__(candidates)
-      @specification = begin
-        search = candidates.reverse.find do |spec|
-          spec.is_a?(StubSpecification) ||
-            (spec.matches_current_ruby? &&
-              spec.matches_current_rubygems?)
-        end
-        if search.nil? && Bundler.frozen_bundle?
-          search = candidates.last
-        else
-          search.dependencies = dependencies if search && search.full_name == full_name && (search.is_a?(RemoteSpecification) || search.is_a?(EndpointSpecification))
+        if target_platform != platform
+          installable_candidates = GemHelpers.select_best_platform_match(matching_specs, platform)
         end
-        search
+
+        installable_candidates
       end
+
+      __materialize__(candidates)
     end
 
-    def respond_to?(*args)
-      super || @specification ? @specification.respond_to?(*args) : nil
+    # If in frozen mode, we fallback to a non-installable candidate because by
+    # doing this we avoid re-resolving and potentially end up changing the
+    # lock file, which is not allowed. In that case, we will give a proper error
+    # about the mismatch higher up the stack, right before trying to install the
+    # bad gem.
+    def __materialize__(candidates, fallback_to_non_installable: Bundler.frozen_bundle?)
+      search = candidates.reverse.find do |spec|
+        spec.is_a?(StubSpecification) ||
+          (spec.matches_current_ruby? &&
+           spec.matches_current_rubygems?)
+      end
+      if search.nil? && fallback_to_non_installable
+        search = candidates.last
+      else
+        search.dependencies = dependencies if search && search.full_name == full_name && (search.is_a?(RemoteSpecification) || search.is_a?(EndpointSpecification))
+      end
+      search
     end
 
     def to_s
@@ -128,16 +136,8 @@ def git_version
 
     private
 
-    def to_ary
-      nil
-    end
-
-    def method_missing(method, *args, &blk)
-      raise "LazySpecification has not been materialized yet (calling :#{method} #{args.inspect})" unless @specification
-
-      return super unless respond_to?(method)
-
-      @specification.send(method, *args, &blk)
+    def use_exact_resolved_specifications?
+      @use_exact_resolved_specifications ||= !source.is_a?(Source::Path) && ruby_platform_materializes_to_ruby_platform?
     end
 
     #

bundler/spec/commands/add_spec.rb

@@ -147,23 +147,23 @@
     it "adds dependency with specified github source" do
       bundle "add rake --github=ruby/rake"
 
-      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.0", :github => "ruby\/rake"})
+      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.\d+", :github => "ruby\/rake"})
     end
   end
 
   describe "with --github and --branch" do
     it "adds dependency with specified github source and branch" do
       bundle "add rake --github=ruby/rake --branch=master"
 
-      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.0", :github => "ruby\/rake", :branch => "master"})
+      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.\d+", :github => "ruby\/rake", :branch => "master"})
     end
   end
 
   describe "with --github and --ref" do
     it "adds dependency with specified github source and ref" do
       bundle "add rake --github=ruby/rake --ref=5c60da8"
 
-      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.0", :github => "ruby\/rake", :ref => "5c60da8"})
+      expect(bundled_app_gemfile.read).to match(%r{gem "rake", "~> 13\.\d+", :github => "ruby\/rake", :ref => "5c60da8"})
     end
   end
 

bundler/spec/commands/binstubs_spec.rb

@@ -225,7 +225,7 @@
         before { lockfile.gsub(system_bundler_version, "1.1.1") }
 
         it "calls through to the latest bundler version" do
-          sys_exec "bin/bundle update --bundler", :env => { "DEBUG" => "1" }
+          sys_exec "bin/bundle update --bundler=#{Bundler::VERSION}", :env => { "DEBUG" => "1" }
           using_bundler_line = /Using bundler ([\w\.]+)\n/.match(out)
           expect(using_bundler_line).to_not be_nil
           latest_version = using_bundler_line[1]

bundler/spec/install/gemfile/specific_platform_spec.rb

@@ -104,6 +104,55 @@
       L
     end
 
+    context "when running on a legacy lockfile locked only to RUBY" do
+      around do |example|
+        build_repo4 do
+          build_gem "nokogiri", "1.3.10"
+          build_gem "nokogiri", "1.3.10" do |s|
+            s.platform = "arm64-darwin"
+            s.required_ruby_version = "< #{Gem.ruby_version}"
+          end
+
+          build_gem "bundler", "2.1.4"
+        end
+
+        gemfile <<~G
+        source "#{file_uri_for(gem_repo4)}"
+
+        gem "nokogiri"
+        G
+
+        lockfile <<-L
+        GEM
+          remote: #{file_uri_for(gem_repo4)}/
+          specs:
+            nokogiri (1.3.10)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          nokogiri
+
+        RUBY VERSION
+          2.5.3p105
+
+        BUNDLED WITH
+           2.1.4
+        L
+
+        simulate_platform "arm64-darwin-22", &example
+      end
+
+      it "still installs the generic RUBY variant if necessary" do
+        bundle "update --bundler", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s }
+      end
+
+      it "still installs the generic RUBY variant if necessary, even in frozen mode" do
+        bundle "update --bundler", :artifice => "compact_index", :env => { "BUNDLER_SPEC_GEM_REPO" => gem_repo4.to_s, "BUNDLE_FROZEN" => "true" }
+      end
+    end
+
     it "doesn't discard previously installed platform specific gem and fall back to ruby on subsequent bundles" do
       build_repo2 do
         build_gem("libv8", "8.4.255.0")

bundler/spec/support/artifice/compact_index.rb

@@ -39,7 +39,7 @@ def not_modified?(checksum)
     end
 
     def requested_range_for(response_body)
-      ranges = Rack::Utils.byte_ranges(env, response_body.bytesize)
+      ranges = Rack::Utils.get_byte_ranges(env, response_body.bytesize)
 
       if ranges
         status 206

bundler/tool/bundler/dev_gems.rb

@@ -11,7 +11,7 @@
 gem "parallel", "1.19.2" # 1.20+ is required > Ruby 2.3
 gem "rspec-core", "~> 3.8"
 gem "rspec-expectations", "~> 3.8"
-gem "rspec-mocks", "~> 3.11.1"
+gem "rspec-mocks", "~> 3.8"
 gem "uri", "~> 0.10.1"
 
 group :doc do