bundler 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6db19c6c72f2c38f056adfac393dcfebd51e4ae14eee0fc6a1b8122ba5f9f92
-  data.tar.gz: a83020c6d99aef70bee13b2ea4ef794dc0a5804aba44baff57a9a90777070361
+  metadata.gz: 244b150c10d3a97538eb2fca0bfd11f4f1d52498e017a412cb22cafab11b95d9
+  data.tar.gz: 3c09d427c503b26379f13fdb225368e2d7987f9588b6f1c3e9691145fb8b90ba
 SHA512:
-  metadata.gz: 6ebc0d4dda2d618578455c0d322008014beb2c81671f271bed81d904ace7c6871fbf25b2aa584b5331244814987299fc6b0aebe69ed4d02c2411db41a819c47f
-  data.tar.gz: aacaaef051b9e0f1fd08b24892e3f1b995d7c88ed3e9b4b401c94f922e4632bef37b02f8fdaac4dcc2457dde8bb45bd558f5410a6e514f41a6a8ee42899ba7f1
+  metadata.gz: 9edd329b4f4e36c9bfce9ad4468f764d011afe7f774439d6700f49064201fbe06bf1c374a938a96ae24933df34344c142f6db071324306b4255a235da2f1ff20
+  data.tar.gz: e26f55ba1f69d938047333d1065f1cc75ebf4c865ba966ba5355084681263392928c3f902fbd26d94077ac51dabfd1aacad4a2329b7c934fbc689f363761f4db

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 2.6.5 (February 20, 2025)
+
+## Enhancements:
+
+  - Fix lockfile platforms inconveniently added on JRuby [#8494](https://github.com/rubygems/rubygems/pull/8494)
+
+## Bug fixes:
+
+  - Fix resolver issue due to ill-defined version ranges being created [#8503](https://github.com/rubygems/rubygems/pull/8503)
+  - Make sure empty gems are not reinstalled every time [#8502](https://github.com/rubygems/rubygems/pull/8502)
+
 # 2.6.4 (February 17, 2025)
 
 ## Enhancements:

data/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2025-02-17".freeze
-    @git_commit_sha = "87f7bf0ac12".freeze
+    @built_at = "2025-02-20".freeze
+    @git_commit_sha = "cffd973142d".freeze
     @release = true
     # end ivars
 

data/lib/bundler/definition.rb

@@ -490,7 +490,7 @@ module Bundler
     end
 
     def validate_platforms!
-      return if current_platform_locked?
+      return if current_platform_locked? || @platforms.include?(Gem::Platform::RUBY)
 
       raise ProductionError, "Your bundle only supports platforms #{@platforms.map(&:to_s)} " \
         "but your local platform is #{local_platform}. " \
@@ -731,7 +731,7 @@ module Bundler
     end
 
     def start_resolution
-      local_platform_needed_for_resolvability = @most_specific_non_local_locked_ruby_platform && !@platforms.include?(local_platform)
+      local_platform_needed_for_resolvability = @most_specific_non_local_locked_platform && !@platforms.include?(local_platform)
       @platforms << local_platform if local_platform_needed_for_resolvability
       add_platform(Gem::Platform::RUBY) if RUBY_ENGINE == "truffleruby"
 
@@ -739,9 +739,9 @@ module Bundler
 
       @resolved_bundler_version = result.find {|spec| spec.name == "bundler" }&.version
 
-      if @most_specific_non_local_locked_ruby_platform
-        if spec_set_incomplete_for_platform?(result, @most_specific_non_local_locked_ruby_platform)
-          @platforms.delete(@most_specific_non_local_locked_ruby_platform)
+      if @most_specific_non_local_locked_platform
+        if spec_set_incomplete_for_platform?(result, @most_specific_non_local_locked_platform)
+          @platforms.delete(@most_specific_non_local_locked_platform)
         elsif local_platform_needed_for_resolvability
           @platforms.delete(local_platform)
         end
@@ -758,23 +758,23 @@ module Bundler
 
     def current_platform_locked?
       @platforms.any? do |bundle_platform|
-        MatchPlatform.platforms_match?(bundle_platform, local_platform)
+        generic_local_platform == bundle_platform || local_platform === bundle_platform
       end
     end
 
     def add_current_platform
       return if @platforms.include?(local_platform)
 
-      @most_specific_non_local_locked_ruby_platform = find_most_specific_locked_ruby_platform
-      return if @most_specific_non_local_locked_ruby_platform
+      @most_specific_non_local_locked_platform = find_most_specific_locked_platform
+      return if @most_specific_non_local_locked_platform
 
       @new_platforms << local_platform
       @platforms << local_platform
       true
     end
 
-    def find_most_specific_locked_ruby_platform
-      return unless generic_local_platform_is_ruby? && current_platform_locked?
+    def find_most_specific_locked_platform
+      return unless current_platform_locked?
 
       @most_specific_locked_platform
     end

data/lib/bundler/resolver.rb

@@ -237,7 +237,7 @@ module Bundler
             sorted_versions[high]
           end
 
-        range = PubGrub::VersionRange.new(min: low, max: high, include_min: true)
+        range = PubGrub::VersionRange.new(min: low, max: high, include_min: !low.nil?)
 
         self_constraint = PubGrub::VersionConstraint.new(package, range: range)
 

data/lib/bundler/rubygems_ext.rb

@@ -259,7 +259,7 @@ module Gem
     end
 
     def installation_missing?
-      !default_gem? && (!Dir.exist?(full_gem_path) || Dir.empty?(full_gem_path))
+      !default_gem? && !File.directory?(full_gem_path)
     end
 
     unless VALIDATES_FOR_RESOLUTION

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.6.4".freeze
+  VERSION = "2.6.5".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
 platform: ruby
 authors:
 - André Arko
@@ -21,7 +21,7 @@ authors:
 - Yehuda Katz
 bindir: exe
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -411,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.3
 requirements: []
-rubygems_version: 3.6.4
+rubygems_version: 3.6.5
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []