bundler 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5040339545260efa41ad3b7bd4201dfdc9275e322b970ed3c768a45ec01e06
-  data.tar.gz: 6d8271cc5fd5a98f98637ef49a597ff4edc8ce78e2fcb2f504b21c29b6f4b0a1
+  metadata.gz: 7bfa8675573c163266376b8d0db160906de8e1f96c701803d8ce1805fcd2483b
+  data.tar.gz: 97fa241962c9c6bd4359807f8c14419bb2d01dfafce9e6255f6814bb92808261
 SHA512:
-  metadata.gz: 1cfdf00dc9e185a6af93c187a55b2c4d2c61f0f21edcfd0b5e213f1b00026e010815c7b1ea4ea2efd96c199b514061b3b183257a4e7aa6b25bd1bce2b6e7404e
-  data.tar.gz: b32951d8312bb7d65fabd06c269ca6ec6e2114f9f2836aeb74aa72a73a2b219c56a173f0383f7e917072fe9ab78c7a0fa9c31a58aca24d9faf078490145e9dfa
+  metadata.gz: f43793bc6ef1428699716d32ee2b7fb48ba0bb32b4a1dd6a28468c6677be7814b975598545f109d38eb13e6160117c2193fb9feba5df35911ab2a6bcae935c9e
+  data.tar.gz: 025362f4733db21ed544eb34467e9b944e011a45896c3dfbd1a3ecc571bcb81db68fec9dce2725c52ee9ac2c285c97541b78ad7ca079c403c5a4684da3df43fa

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.6.1 (December 17, 2024)
+
+## Bug fixes:
+
+  - Fix missing `Gem::Uri.redact` on some Ruby 3.1 versions [#8337](https://github.com/rubygems/rubygems/pull/8337)
+  - Fix `bundle lock --add-checksums` when gems are already installed [#8326](https://github.com/rubygems/rubygems/pull/8326)
+
 # 2.6.0 (December 16, 2024)
 
 ## Security:

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 = "2024-12-16".freeze
-    @git_commit_sha = "d6be0319aaf".freeze
+    @built_at = "2024-12-17".freeze
+    @git_commit_sha = "00a344e02c8".freeze
     @release = true
     # end ivars
 

data/lib/bundler/definition.rb

@@ -186,13 +186,13 @@ module Bundler
     def setup_domain!(options = {})
       prefer_local! if options[:"prefer-local"]
 
-      if options[:local] || no_install_needed?
-        Bundler.settings.set_command_option(:jobs, 1) if no_install_needed? # to avoid the overhead of Bundler::Worker
-        with_cache!
-        false
-      else
+      if options[:add_checksums] || (!options[:local] && install_needed?)
         remotely!
         true
+      else
+        Bundler.settings.set_command_option(:jobs, 1) unless install_needed? # to avoid the overhead of Bundler::Worker
+        with_cache!
+        false
       end
     end
 
@@ -513,26 +513,11 @@ module Bundler
     end
 
     def nothing_changed?
-      return false unless lockfile_exists?
-
-      !@source_changes &&
-        !@dependency_changes &&
-        !@current_platform_missing &&
-        @new_platforms.empty? &&
-        !@path_changes &&
-        !@local_changes &&
-        !@missing_lockfile_dep &&
-        !@unlocking_bundler &&
-        !@locked_spec_with_missing_deps &&
-        !@locked_spec_with_invalid_deps
-    end
-
-    def no_install_needed?
-      no_resolve_needed? && !missing_specs?
+      !something_changed?
     end
 
     def no_resolve_needed?
-      !unlocking? && nothing_changed?
+      !resolve_needed?
     end
 
     def unlocking?
@@ -544,13 +529,36 @@ module Bundler
     def add_checksums
       @locked_checksums = true
 
-      setup_domain!
+      setup_domain!(add_checksums: true)
 
       specs # force materialization to real specifications, so that checksums are fetched
     end
 
     private
 
+    def install_needed?
+      resolve_needed? || missing_specs?
+    end
+
+    def something_changed?
+      return true unless lockfile_exists?
+
+      @source_changes ||
+        @dependency_changes ||
+        @current_platform_missing ||
+        @new_platforms.any? ||
+        @path_changes ||
+        @local_changes ||
+        @missing_lockfile_dep ||
+        @unlocking_bundler ||
+        @locked_spec_with_missing_deps ||
+        @locked_spec_with_invalid_deps
+    end
+
+    def resolve_needed?
+      unlocking? || something_changed?
+    end
+
     def should_add_extra_platforms?
       !lockfile_exists? && generic_local_platform_is_ruby? && !Bundler.settings[:force_ruby_platform]
     end

data/lib/bundler/rubygems_ext.rb

@@ -455,4 +455,15 @@ module Gem
 
     Package::TarReader::Entry.prepend(FixFullNameEncoding)
   end
+
+  require "rubygems/uri"
+
+  # Can be removed once RubyGems 3.3.15 support is dropped
+  unless Gem::Uri.respond_to?(:redact)
+    class Uri
+      def self.redact(uri)
+        new(uri).redacted
+      end
+    end
+  end
 end

data/lib/bundler/vendor/securerandom/lib/securerandom.rb

@@ -41,7 +41,7 @@ require 'random/formatter'
 module Bundler::SecureRandom
 
   # The version
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 
   class << self
     # Returns a random binary string containing +size+ bytes.
@@ -51,6 +51,12 @@ module Bundler::SecureRandom
       return gen_random(n)
     end
 
+    # Compatibility methods for Ruby 3.2, we can remove this after dropping to support Ruby 3.2
+    def alphanumeric(n = nil, chars: ALPHANUMERIC)
+      n = 16 if n.nil?
+      choose(chars, n)
+    end if RUBY_VERSION < '3.3'
+
     private
 
     # :stopdoc:

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "2.6.0".freeze
+  VERSION = "2.6.1".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.0
+  version: 2.6.1
 platform: ruby
 original_platform: ''
 authors:
@@ -22,7 +22,7 @@ authors:
 - Yehuda Katz
 bindir: exe
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies: []
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
@@ -412,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.3.3
 requirements: []
-rubygems_version: 3.6.0
+rubygems_version: 3.6.1
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []