rubygems-update 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3a33e757835b567451e625eb60fd87dc9d40b5710c96f6a548cf493bb930f03
-  data.tar.gz: 95b7748028d7563f74e22aac82e4eab9766ba4aca0b29596af58264ac42721e6
+  metadata.gz: c9f59269d6d1048c0621c1a5eebf9a11e4bfb2563437a2321ab7ea7cc88112ae
+  data.tar.gz: cc74dcbadef15de4f55949db6c8260b59a2c32217db792305cbc43f8f9475c2c
 SHA512:
-  metadata.gz: 86a9a29465975044bfc0ad313700a2037a3ef33182f905134df80ab09b43bb753ccd5512bc0cdcc4c8838648ed7e01cfa47d9348d3d482d43c6a045584119be4
-  data.tar.gz: aaa0136052ccb1ca34cbedc2d45707f34b82820d1b72859c9de97f959b861bddae87e77801a47a50c79f5b5fb3fe2ce56d8fc46c47506646e554629c3bb41cf4
+  metadata.gz: dfca31973be9cfacea2aa06e470b47a0c49c4a381c2e5a3fa0cf8ef68bebdb675c62e101cc31bc9c3786fbe3272263792ee77ef13a5869d85fb68e97311d4f91
+  data.tar.gz: 3da6e226d22a6328348ea79ea704e0c6acb99a1090579707aeacbe1984f823e0c8c02330c1aeb1281c61c4ffef17801325bd6c0061b79fe8502997093b6f9bf8

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 4.0.2 / 2025-12-17
+
+### Enhancements:
+
+* Pass down value of `BUNDLE_JOBS` to RubyGems before compiling &
+  introduce a new `gem install -j` flag. Pull request
+  [#9171](https://github.com/ruby/rubygems/pull/9171) by Edouard-chin
+* Installs bundler 4.0.2 as a default gem.
+
+## 4.0.1 / 2025-12-09
+
+### Enhancements:
+
+* Installs bundler 4.0.1 as a default gem.
+
+### Bug fixes:
+
+* Fixed unexpected default bundler installation. Pull request
+  [#9167](https://github.com/ruby/rubygems/pull/9167) by hsbt
+
+### Documentation:
+
+* Update contributing docs with `RGV`. Pull request
+  [#9155](https://github.com/ruby/rubygems/pull/9155) by eileencodes
+
 ## 4.0.0 / 2025-12-03
 
 ### Features:

data/bundler/CHANGELOG.md

@@ -1,5 +1,32 @@
 # 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:
+
+  - Increase connection pool to allow for up to 70% speed increase on `bundle install` [#9087](https://github.com/ruby/rubygems/pull/9087)
+
+### Enhancements:
+
+  - Fix the config suggestion in the warning for `$ bundle` [#9164](https://github.com/ruby/rubygems/pull/9164)
+  - Fix native extension loading in newgem template for RHEL-based systems [#9156](https://github.com/ruby/rubygems/pull/9156)
+
+### Bug fixes:
+
+  - Fix Bundler removing executables after creating them [#9169](https://github.com/ruby/rubygems/pull/9169)
+
 ## 4.0.0 (2025-12-03)
 
 ### Features:

data/bundler/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-03".freeze
-    @git_commit_sha = "64d0dfe695".freeze
+    @built_at = "2025-12-17".freeze
+    @git_commit_sha = "03359f8b08".freeze
     # end ivars
 
     # A hash representation of the build metadata.

data/bundler/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/bundler/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/bundler/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 }
@@ -120,28 +120,31 @@ module Bundler
       self.class.send(:class_options_help, shell)
     end
 
-    desc "install_or_cli_help", "Tries to run bundle install but prints a summary of bundler commands if there is no Gemfile", hide: true
+    desc "install_or_cli_help", "Deprecated alias of install", hide: true
     def install_or_cli_help
+      Bundler.ui.warn <<~MSG
+        `bundle install_or_cli_help` is a deprecated alias of `bundle install`.
+        It might be called due to the 'default_cli_command' being set to 'install_or_cli_help',
+        if so fix that by running `bundle config set default_cli_command install --global`.
+      MSG
       invoke_other_command("install")
-    rescue GemfileNotFound => error
-      Bundler.ui.error error.message, wrap: true
-      invoke_other_command("cli_help")
     end
 
     def self.default_command(meth = nil)
       return super if meth
 
       unless Bundler.settings[:default_cli_command]
-        Bundler.ui.info <<-MSG
+        Bundler.ui.info <<~MSG
           In a future version of Bundler, running `bundle` without argument will no longer run `bundle install`.
           Instead, the `cli_help` command will be displayed. Please use `bundle install` explicitly for scripts like CI/CD.
           You can use the future behavior now with `bundle config set default_cli_command cli_help --global`,
-          or you can continue to use the current behavior with `bundle config set default_cli_command install_or_cli_help --global`.
+          or you can continue to use the current behavior with `bundle config set default_cli_command install --global`.
           This message will be removed after a default_cli_command value is set.
+
         MSG
       end
 
-      Bundler.settings[:default_cli_command] || "install_or_cli_help"
+      Bundler.settings[:default_cli_command] || "install"
     end
 
     class_option "no-color", type: :boolean, desc: "Disable colorization in output"
@@ -287,6 +290,9 @@ module Bundler
       Bundler.settings.temporary(no_install: false) do
         Install.new(options).run
       end
+    rescue GemfileNotFound => error
+      invoke_other_command("cli_help")
+      raise error # re-raise to show the error and get a failing exit status
     end
 
     map aliases_for("install")

data/bundler/lib/bundler/endpoint_specification.rb

@@ -60,6 +60,28 @@ module Bundler
       end
     end
 
+    # needed for binstubs
+    def executables
+      if @remote_specification
+        @remote_specification.executables
+      elsif _local_specification
+        _local_specification.executables
+      else
+        super
+      end
+    end
+
+    # needed for bundle clean
+    def bindir
+      if @remote_specification
+        @remote_specification.bindir
+      elsif _local_specification
+        _local_specification.bindir
+      else
+        super
+      end
+    end
+
     # needed for post_install_messages during install
     def post_install_message
       if @remote_specification

data/bundler/lib/bundler/fetcher/gem_remote_fetcher.rb

@@ -5,6 +5,12 @@ require "rubygems/remote_fetcher"
 module Bundler
   class Fetcher
     class GemRemoteFetcher < Gem::RemoteFetcher
+      def initialize(*)
+        super
+
+        @pool_size = 5
+      end
+
       def request(*args)
         super do |req|
           req.delete("User-Agent") if headers["User-Agent"]

data/bundler/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/bundler/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/bundler/lib/bundler/templates/newgem/lib/newgem.rb.tt

@@ -2,7 +2,7 @@
 
 require_relative "<%= File.basename(config[:namespaced_path]) %>/version"
 <%- if config[:ext] -%>
-require_relative "<%= File.basename(config[:namespaced_path]) %>/<%= config[:underscored_name] %>"
+require "<%= File.basename(config[:namespaced_path]) %>/<%= config[:underscored_name] %>"
 <%- end -%>
 
 <%- config[:constant_array].each_with_index do |c, i| -%>

data/bundler/lib/bundler/version.rb

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

data/doc/rubygems/CONTRIBUTING.md

@@ -82,6 +82,10 @@ To run an individual test file location for example in `spec/install/gems/standa
 
     bin/rspec spec/install/gems/standalone_spec.rb
 
+To test Rubygems changes in bundler, set the path to your local Rubygems copy using the `RGV` environment variable:
+
+    RGV=.. bin/rspec spec/install/gems/standalone_spec.rb
+
 ### Checking code style
 
 You can check compliance with our code style with

data/lib/rubygems/commands/setup_command.rb

@@ -402,8 +402,10 @@ By default, this RubyGems will install gem as:
           install_dir: default_dir,
           wrappers: true
         )
-        installer.install
-        File.delete installer.spec_file
+        # We need to install only executable and default spec files.
+        # lib/bundler.rb and lib/bundler/* are available under the site_ruby directory.
+        installer.extract_bin
+        installer.generate_bin
         installer.write_default_spec
       ensure
         FileUtils.rm_f built_gem

data/lib/rubygems/dependency_installer.rb

@@ -83,6 +83,7 @@ class Gem::DependencyInstaller
     @user_install        = options[:user_install]
     @wrappers            = options[:wrappers]
     @build_args          = options[:build_args]
+    @build_jobs          = options[:build_jobs]
     @build_docs_in_background = options[:build_docs_in_background]
     @dir_mode = options[:dir_mode]
     @data_mode = options[:data_mode]
@@ -154,6 +155,7 @@ class Gem::DependencyInstaller
     options = {
       bin_dir: @bin_dir,
       build_args: @build_args,
+      build_jobs: @build_jobs,
       document: @document,
       env_shebang: @env_shebang,
       force: @force,

data/lib/rubygems/ext/builder.rb

@@ -22,7 +22,7 @@ class Gem::Ext::Builder
   end
 
   def self.make(dest_path, results, make_dir = Dir.pwd, sitedir = nil, targets = ["clean", "", "install"],
-    target_rbconfig: Gem.target_rbconfig)
+    target_rbconfig: Gem.target_rbconfig, n_jobs: nil)
     unless File.exist? File.join(make_dir, "Makefile")
       # No makefile exists, nothing to do.
       raise NoMakefileError, "No Makefile found in #{make_dir}"
@@ -34,8 +34,18 @@ class Gem::Ext::Builder
     make_program_name ||= RUBY_PLATFORM.include?("mswin") ? "nmake" : "make"
     make_program = shellsplit(make_program_name)
 
+    is_nmake = /\bnmake/i.match?(make_program_name)
     # The installation of the bundled gems is failed when DESTDIR is empty in mswin platform.
-    destdir = /\bnmake/i !~ make_program_name || ENV["DESTDIR"] && ENV["DESTDIR"] != "" ? format("DESTDIR=%s", ENV["DESTDIR"]) : ""
+    destdir = !is_nmake || ENV["DESTDIR"] && ENV["DESTDIR"] != "" ? format("DESTDIR=%s", ENV["DESTDIR"]) : ""
+
+    # nmake doesn't support parallel build
+    unless is_nmake
+      have_make_arguments = make_program.size > 1
+
+      if !have_make_arguments && !ENV["MAKEFLAGS"] && n_jobs
+        make_program << "-j#{n_jobs}"
+      end
+    end
 
     env = [destdir]
 
@@ -147,11 +157,12 @@ class Gem::Ext::Builder
   # have build arguments, saved, set +build_args+ which is an ARGV-style
   # array.
 
-  def initialize(spec, build_args = spec.build_args, target_rbconfig = Gem.target_rbconfig)
+  def initialize(spec, build_args = spec.build_args, target_rbconfig = Gem.target_rbconfig, build_jobs = nil)
     @spec       = spec
     @build_args = build_args
     @gem_dir    = spec.full_gem_path
     @target_rbconfig = target_rbconfig
+    @build_jobs = build_jobs
 
     @ran_rake = false
   end
@@ -208,7 +219,7 @@ EOF
       FileUtils.mkdir_p dest_path
 
       results = builder.build(extension, dest_path,
-                              results, @build_args, lib_dir, extension_dir, @target_rbconfig)
+                              results, @build_args, lib_dir, extension_dir, @target_rbconfig, n_jobs: @build_jobs)
 
       verbose { results.join("\n") }
 

data/lib/rubygems/ext/cargo_builder.rb

@@ -15,7 +15,7 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
   end
 
   def build(extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd,
-    target_rbconfig = Gem.target_rbconfig)
+    target_rbconfig = Gem.target_rbconfig, n_jobs: nil)
     require "tempfile"
     require "fileutils"
 

data/lib/rubygems/ext/cmake_builder.rb

@@ -37,7 +37,7 @@ class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
   end
 
   def build(extension, dest_path, results, args = [], lib_dir = nil, cmake_dir = Dir.pwd,
-    target_rbconfig = Gem.target_rbconfig)
+    target_rbconfig = Gem.target_rbconfig, n_jobs: nil)
     if target_rbconfig.path
       warn "--target-rbconfig is not yet supported for CMake extensions. Ignoring"
     end

data/lib/rubygems/ext/configure_builder.rb

@@ -8,7 +8,7 @@
 
 class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
   def self.build(extension, dest_path, results, args = [], lib_dir = nil, configure_dir = Dir.pwd,
-    target_rbconfig = Gem.target_rbconfig)
+    target_rbconfig = Gem.target_rbconfig, n_jobs: nil)
     if target_rbconfig.path
       warn "--target-rbconfig is not yet supported for configure-based extensions. Ignoring"
     end
@@ -19,7 +19,7 @@ class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
       run cmd, results, class_name, configure_dir
     end
 
-    make dest_path, results, configure_dir, target_rbconfig: target_rbconfig
+    make dest_path, results, configure_dir, target_rbconfig: target_rbconfig, n_jobs: n_jobs
 
     results
   end

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -8,7 +8,7 @@
 
 class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
   def self.build(extension, dest_path, results, args = [], lib_dir = nil, extension_dir = Dir.pwd,
-    target_rbconfig = Gem.target_rbconfig)
+    target_rbconfig = Gem.target_rbconfig, n_jobs: nil)
     require "fileutils"
     require "tempfile"
 
@@ -40,11 +40,8 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
       end
 
       ENV["DESTDIR"] = nil
-      unless RUBY_PLATFORM.include?("mswin") && RbConfig::CONFIG["configure_args"]&.include?("nmake")
-        ENV["MAKEFLAGS"] ||= "-j#{Etc.nprocessors + 1}"
-      end
 
-      make dest_path, results, extension_dir, tmp_dest_relative, target_rbconfig: target_rbconfig
+      make dest_path, results, extension_dir, tmp_dest_relative, target_rbconfig: target_rbconfig, n_jobs: n_jobs
 
       full_tmp_dest = File.join(extension_dir, tmp_dest_relative)
 

data/lib/rubygems/ext/rake_builder.rb

@@ -8,7 +8,7 @@
 
 class Gem::Ext::RakeBuilder < Gem::Ext::Builder
   def self.build(extension, dest_path, results, args = [], lib_dir = nil, extension_dir = Dir.pwd,
-    target_rbconfig = Gem.target_rbconfig)
+    target_rbconfig = Gem.target_rbconfig, n_jobs: nil)
     if target_rbconfig.path
       warn "--target-rbconfig is not yet supported for Rake extensions. Ignoring"
     end

data/lib/rubygems/install_update_options.rb

@@ -31,6 +31,15 @@ module Gem::InstallUpdateOptions
       options[:bin_dir] = File.expand_path(value)
     end
 
+    add_option(:"Install/Update", "-j", "--build-jobs VALUE", Integer,
+               "Specify the number of jobs to pass to `make` when installing",
+               "gems with native extensions.",
+               "Defaults to the number of processors.",
+               "This option is ignored on the mswin platform or",
+               "if the MAKEFLAGS environment variable is set.") do |value, options|
+      options[:build_jobs] = value
+    end
+
     add_option(:"Install/Update", "--document [TYPES]", Array,
                "Generate documentation for installed gems",
                "List the documentation types you wish to",

data/lib/rubygems/installer.rb

@@ -635,6 +635,7 @@ class Gem::Installer
     @build_root          = options[:build_root]
 
     @build_args = options[:build_args]
+    @build_jobs = options[:build_jobs]
 
     @gem_home = @install_dir || user_install_dir || Gem.dir
 
@@ -803,7 +804,7 @@ class Gem::Installer
   # configure scripts and rakefiles or mkrf_conf files.
 
   def build_extensions
-    builder = Gem::Ext::Builder.new spec, build_args, Gem.target_rbconfig
+    builder = Gem::Ext::Builder.new spec, build_args, Gem.target_rbconfig, build_jobs
 
     builder.build_extensions
   end
@@ -941,6 +942,10 @@ class Gem::Installer
                     end
   end
 
+  def build_jobs
+    @build_jobs ||= Etc.nprocessors + 1
+  end
+
   def rb_config
     Gem.target_rbconfig
   end

data/lib/rubygems/remote_fetcher.rb

@@ -82,6 +82,7 @@ class Gem::RemoteFetcher
     @proxy = proxy
     @pools = {}
     @pool_lock = Thread::Mutex.new
+    @pool_size = 1
     @cert_files = Gem::Request.get_cert_files
 
     @headers = headers
@@ -338,7 +339,7 @@ class Gem::RemoteFetcher
 
   def pools_for(proxy)
     @pool_lock.synchronize do
-      @pools[proxy] ||= Gem::Request::ConnectionPools.new proxy, @cert_files
+      @pools[proxy] ||= Gem::Request::ConnectionPools.new proxy, @cert_files, @pool_size
     end
   end
 end

data/lib/rubygems/request/connection_pools.rb

@@ -7,11 +7,12 @@ class Gem::Request::ConnectionPools # :nodoc:
     attr_accessor :client
   end
 
-  def initialize(proxy_uri, cert_files)
+  def initialize(proxy_uri, cert_files, pool_size = 1)
     @proxy_uri  = proxy_uri
     @cert_files = cert_files
     @pools      = {}
     @pool_mutex = Thread::Mutex.new
+    @pool_size  = pool_size
   end
 
   def pool_for(uri)
@@ -20,9 +21,9 @@ class Gem::Request::ConnectionPools # :nodoc:
     @pool_mutex.synchronize do
       @pools[key] ||=
         if https? uri
-          Gem::Request::HTTPSPool.new(http_args, @cert_files, @proxy_uri)
+          Gem::Request::HTTPSPool.new(http_args, @cert_files, @proxy_uri, @pool_size)
         else
-          Gem::Request::HTTPPool.new(http_args, @cert_files, @proxy_uri)
+          Gem::Request::HTTPPool.new(http_args, @cert_files, @proxy_uri, @pool_size)
         end
     end
   end

data/lib/rubygems/request/http_pool.rb

@@ -9,12 +9,14 @@
 class Gem::Request::HTTPPool # :nodoc:
   attr_reader :cert_files, :proxy_uri
 
-  def initialize(http_args, cert_files, proxy_uri)
+  def initialize(http_args, cert_files, proxy_uri, pool_size)
     @http_args  = http_args
     @cert_files = cert_files
     @proxy_uri  = proxy_uri
-    @queue      = Thread::SizedQueue.new 1
-    @queue << nil
+    @pool_size  = pool_size
+
+    @queue      = Thread::SizedQueue.new @pool_size
+    setup_queue
   end
 
   def checkout
@@ -31,7 +33,8 @@ class Gem::Request::HTTPPool # :nodoc:
         connection.finish
       end
     end
-    @queue.push(nil)
+
+    setup_queue
   end
 
   private
@@ -44,4 +47,8 @@ class Gem::Request::HTTPPool # :nodoc:
     connection.start
     connection
   end
+
+  def setup_queue
+    @pool_size.times { @queue.push(nil) }
+  end
 end

data/lib/rubygems.rb

@@ -9,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "4.0.0"
+  VERSION = "4.0.2"
 end
 
 require_relative "rubygems/defaults"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.2
 platform: ruby
 authors:
 - Jim Weirich