bundler 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33d66a9c2eb47416c1c3a4b32d7e66a4cf1239e8e899783c35f1cafe8eff20e
-  data.tar.gz: 82936b62cddb391a1b1f84492a6ef1be7ab4520fb6e51eaf1d016b9f33bb89ee
+  metadata.gz: bc795eb4fad5cfda77ee10bf7d3dd7ebbd9fbbbfe243f4741d6d927d0dbc1783
+  data.tar.gz: aff16ee9ee860d6907e7861eb457b1fc469ab3d61474a2052dbee902c0109f6b
 SHA512:
-  metadata.gz: d8795b477c774ce5552d81c222ce0fa363def747cb224394842b0adfd344846b10dc5d9c2cfe5f1aaaa41da787458f949a83fb1726587e8460b8a1ee8750c02f
-  data.tar.gz: 502655e746eb8ce71d2282c7487a7ccac711e733ddc64984a4980ddeb684668171ac72c3726884a16aea16309fd4d616d1d5b36576ad54b5e0fc737d23344185
+  metadata.gz: 9fedd026b308dc0529dba0e6e2363f3162eca30cd4bc45d302348531eae3f10485a5142cdd2bff81b746c3538bebca71b2baf2a6f8beac320589e162fbf21de0
+  data.tar.gz: 48acb62c12160b55a8caee93ffbe77cb59bdf2164a7e3280c44bd74f2246b575d9fc31ec85c753f886d6c64896761dfcd8ad562ca10bdb782e0e81c5e524d857

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 4.0.2 (2025-12-17)
+
+### Enhancements:
+
+  - Support single quotes in mise format ruby version [#9183](https://github.com/ruby/rubygems/pull/9183)
+  - Tweak the Bundler's "X gems now installed message": [#9194](https://github.com/ruby/rubygems/pull/9194)
+
+### Bug fixes:
+
+  - Allow to show cli_help with `bundler` executable [#9198](https://github.com/ruby/rubygems/pull/9198)
+  - Allow bundle pristine to work for git gems in the same repo [#9196](https://github.com/ruby/rubygems/pull/9196)
+
 ## 4.0.1 (2025-12-09)
 
 ### Performance:

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-12-09".freeze
-    @git_commit_sha = "f3e5ebf5af".freeze
+    @built_at = "2025-12-17".freeze
+    @git_commit_sha = "03359f8b08".freeze
     # end ivars
 
     # A hash representation of the build metadata.

data/lib/bundler/cli/install.rb

@@ -90,7 +90,7 @@ module Bundler
     end
 
     def gems_installed_for(definition)
-      count = definition.specs.count
+      count = definition.specs.count {|spec| spec.name != "bundler" }
       "#{count} #{count == 1 ? "gem" : "gems"} now installed"
     end
 

data/lib/bundler/cli/pristine.rb

@@ -11,6 +11,7 @@ module Bundler
       definition = Bundler.definition
       definition.validate_runtime!
       installer = Bundler::Installer.new(Bundler.root, definition)
+      git_sources = []
 
       ProcessLock.lock do
         installed_specs = definition.specs.reject do |spec|
@@ -41,6 +42,9 @@ module Bundler
             end
             FileUtils.rm_rf spec.extension_dir
             FileUtils.rm_rf spec.full_gem_path
+
+            next if git_sources.include?(source)
+            git_sources << source
           else
             Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is sourced from local path.")
             next

data/lib/bundler/cli.rb

@@ -104,7 +104,7 @@ module Bundler
       primary_commands = ["install", "update", "cache", "exec", "config", "help"]
 
       list = self.class.printable_commands(true)
-      by_name = list.group_by {|name, _message| name.match(/^bundle (\w+)/)[1] }
+      by_name = list.group_by {|name, _message| name.match(/^bundler? (\w+)/)[1] }
       utilities = by_name.keys.sort - primary_commands
       primary_commands.map! {|name| (by_name[name] || raise("no primary command #{name}")).first }
       utilities.map! {|name| by_name[name].first }

data/lib/bundler/ruby_dsl.rb

@@ -42,18 +42,21 @@ module Bundler
     # Loads the file relative to the dirname of the Gemfile itself.
     def normalize_ruby_file(filename)
       file_content = Bundler.read_file(gemfile.dirname.join(filename))
-      # match "ruby-3.2.2", ruby = "3.2.2" or "ruby   3.2.2" capturing version string up to the first space or comment
-      if /^                    # Start of line
-         ruby                  # Literal "ruby"
-         [\s-]*                # Optional whitespace or hyphens (for "ruby-3.2.2" format)
-         (?:=\s*)?             # Optional equals sign with whitespace (for ruby = "3.2.2" format)
-         "?                    # Optional opening quote
-         (                     # Start capturing group
-           [^\s#"]+            # One or more chars that aren't spaces, #, or quotes
-         )                     # End capturing group
-         "?                    # Optional closing quote
-         /x.match(file_content)
-        $1
+      # match "ruby-3.2.2", ruby = "3.2.2", ruby = '3.2.2' or "ruby   3.2.2" capturing version string up to the first space or comment
+      version_match = /^               # Start of line
+                      ruby             # Literal "ruby"
+                      [\s-]*           # Optional whitespace or hyphens (for "ruby-3.2.2" format)
+                      (?:=\s*)?        # Optional equals sign with whitespace (for ruby = "3.2.2" format)
+                      (?:
+                        "([^"]+)"      # Double quoted version
+                        |
+                        '([^']+)'      # Single quoted version
+                        |
+                        ([^\s#"']+)    # Unquoted version
+                      )
+                      /x.match(file_content)
+      if version_match
+        version_match[1] || version_match[2] || version_match[3]
       else
         file_content.strip
       end

data/lib/bundler/rubygems_gem_installer.rb

@@ -103,6 +103,10 @@ module Bundler
       end
     end
 
+    def build_jobs
+      Bundler.settings[:jobs] || super
+    end
+
     def build_extensions
       extension_cache_path = options[:bundler_extension_cache_path]
       extension_dir = spec.extension_dir

data/lib/bundler/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 
 module Bundler
-  VERSION = "4.0.1".freeze
+  VERSION = "4.0.2".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= gem_version.segments.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - André Arko