rubygems-update 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28ee6cf18b2dd8595c173ed33216a3138e827f4a0cf2edabdd1241602d91f322
-  data.tar.gz: c0846629675967ffc8194b81f931b35c1bcba82e45c89c99ae3fa77e865ce9d4
+  metadata.gz: f46bbce4276140cd482c5f57e651c9e1b5093d0d0d1fa80305a62dd015f13824
+  data.tar.gz: ed7311da71b209962ca244fa6b1767ddaf556bb2572b3327825b67e7d68d6dde
 SHA512:
-  metadata.gz: c64d7c5069f669fd15fb3db88ddcc41fb46b427b523b86c628de4156aa256e5af13605b6437698ee012cdd6d336a01f226d79c22ce0f2f78611ef435d2eb7d34
-  data.tar.gz: ef84ccf16a33b1c0efc0e68607c06c86996485d69e4c5c61f50b00881932d29b7d028fe6e7fb5201a2ac8bf23c1e2709a6132d1a9e97da61d53526a8ac13dc8b
+  metadata.gz: 3be7c427689e3863e1c3e2164758ea267129cdae4ceef0d288d1928bbc686bcb0bb40bf2658da5a6ee7d7699710b7e6d010ccdb731a320ccb8b3ef54b13ca868
+  data.tar.gz: ea3b92eb905288d60b330d2a61efe848ef7ebf630ae3dfdafd9f371540854cd0d5f81b2e88eb596f534c6e09d35b154ffa99e0f7e3d57fe7caabe7137445bc1f

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 4.0.4 / 2026-01-15
+
+### Enhancements:
+
+* Remove date require from rebuild command. Pull request
+  [#9232](https://github.com/ruby/rubygems/pull/9232) by jeremyevans
+* Installs bundler 4.0.4 as a default gem.
+
+### Bug fixes:
+
+* Add a missing "require 'etc'" statement:. Pull request
+  [#9242](https://github.com/ruby/rubygems/pull/9242) by Edouard-chin
+
 ## 4.0.3 / 2025-12-23
 
 ### Enhancements:

data/bundler/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 4.0.4 (2026-01-15)
+
+### Enhancements:
+
+  - Validate more options for add sub-command [#5905](https://github.com/ruby/rubygems/pull/5905)
+  - Support Ruby 4.1 [#9219](https://github.com/ruby/rubygems/pull/9219)
+
+### Bug fixes:
+
+  - Fix dependency source bug in bundler [#9213](https://github.com/ruby/rubygems/pull/9213)
+  - Retain current bundler version on `bundle clean` [#9221](https://github.com/ruby/rubygems/pull/9221)
+
 ## 4.0.3 (2025-12-23)
 
 ### Enhancements:

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-23".freeze
-    @git_commit_sha = "28c66ecc1e".freeze
+    @built_at = "2026-01-15".freeze
+    @git_commit_sha = "49e812f884".freeze
     # end ivars
 
     # A hash representation of the build metadata.

data/bundler/lib/bundler/cli/add.rb

@@ -36,6 +36,16 @@ module Bundler
     end
 
     def validate_options!
+      raise InvalidOption, "You cannot specify `--git` and `--github` at the same time." if options["git"] && options["github"]
+
+      unless options["git"] || options["github"]
+        raise InvalidOption, "You cannot specify `--branch` unless `--git` or `--github` is specified." if options["branch"]
+
+        raise InvalidOption, "You cannot specify `--ref` unless `--git` or `--github` is specified." if options["ref"]
+      end
+
+      raise InvalidOption, "You cannot specify `--branch` and `--ref` at the same time." if options["branch"] && options["ref"]
+
       raise InvalidOption, "You cannot specify `--strict` and `--optimistic` at the same time." if options[:strict] && options[:optimistic]
 
       # raise error when no gems are specified

data/bundler/lib/bundler/current_ruby.rb

@@ -11,7 +11,7 @@ module Bundler
   end
 
   class CurrentRuby
-    ALL_RUBY_VERSIONS = [*18..27, *30..34, 40].freeze
+    ALL_RUBY_VERSIONS = [*18..27, *30..34, *40..41].freeze
     KNOWN_MINOR_VERSIONS = ALL_RUBY_VERSIONS.map {|v| v.digits.reverse.join(".") }.freeze
     KNOWN_MAJOR_VERSIONS = ALL_RUBY_VERSIONS.map {|v| v.digits.last.to_s }.uniq.freeze
     PLATFORM_MAP = {

data/bundler/lib/bundler/definition.rb

@@ -1066,7 +1066,22 @@ module Bundler
 
           deps << dep if !replacement_source || lockfile_source.include?(replacement_source) || new_deps.include?(dep)
         else
-          replacement_source = sources.get(lockfile_source)
+          parent_dep = @dependencies.find do |d|
+            next unless d.source && d.source != lockfile_source
+            next if d.source.is_a?(Source::Gemspec)
+
+            parent_locked_specs = @originally_locked_specs[d.name]
+
+            parent_locked_specs.any? do |parent_spec|
+              parent_spec.runtime_dependencies.any? {|rd| rd.name == s.name }
+            end
+          end
+
+          if parent_dep
+            replacement_source = parent_dep.source
+          else
+            replacement_source = sources.get(lockfile_source)
+          end
         end
 
         # Replace the locked dependency's source with the equivalent source from the Gemfile

data/bundler/lib/bundler/rubygems_integration.rb

@@ -432,7 +432,7 @@ module Bundler
     end
 
     def find_bundler(version)
-      find_name("bundler").find {|s| s.version.to_s == version }
+      find_name("bundler").find {|s| s.version.to_s == version.to_s }
     end
 
     def find_name(name)

data/bundler/lib/bundler/runtime.rb

@@ -174,7 +174,14 @@ module Bundler
       spec_cache_paths     = []
       spec_gemspec_paths   = []
       spec_extension_paths = []
-      Bundler.rubygems.add_default_gems_to(specs).values.each do |spec|
+      specs_to_keep = Bundler.rubygems.add_default_gems_to(specs).values
+
+      current_bundler = Bundler.rubygems.find_bundler(Bundler.gem_version)
+      if current_bundler
+        specs_to_keep << current_bundler
+      end
+
+      specs_to_keep.each do |spec|
         spec_gem_paths << spec.full_gem_path
         # need to check here in case gems are nested like for the rails git repo
         md = %r{(.+bundler/gems/.+-[a-f0-9]{7,12})}.match(spec.full_gem_path)

data/bundler/lib/bundler/version.rb

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

data/lib/rubygems/commands/rebuild_command.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "date"
 require "digest"
 require "fileutils"
 require "tmpdir"

data/lib/rubygems/installer.rb

@@ -943,7 +943,12 @@ class Gem::Installer
   end
 
   def build_jobs
-    @build_jobs ||= Etc.nprocessors + 1
+    @build_jobs ||= begin
+                      require "etc"
+                      Etc.nprocessors + 1
+                    rescue LoadError
+                      1
+                    end
   end
 
   def rb_config

data/lib/rubygems.rb

@@ -9,7 +9,7 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "4.0.3"
+  VERSION = "4.0.4"
 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.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Jim Weirich