Bundle RubyGems 4.0.2 and Bundler 4.0.2

Author: hsbt

lib/bundler/shared_helpers.rb

@@ -105,8 +105,7 @@ def set_bundle_environment
     def filesystem_access(path, action = :write, &block)
       yield(path.dup)
     rescue Errno::EACCES => e
-      path_basename = File.basename(path.to_s)
-      raise unless e.message.include?(path_basename) || action == :create
+      raise unless e.message.include?(path.to_s) || action == :create
 
       raise PermissionError.new(path, action)
     rescue Errno::EAGAIN

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

lib/rubygems.rb

@@ -9,15 +9,14 @@
 require "rbconfig"
 
 module Gem
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 end
 
 require_relative "rubygems/defaults"
 require_relative "rubygems/deprecate"
 require_relative "rubygems/errors"
 require_relative "rubygems/target_rbconfig"
 require_relative "rubygems/win_platform"
-require_relative "rubygems/util/atomic_file_writer"
 
 ##
 # RubyGems is the Ruby standard for publishing and managing third party
@@ -834,12 +833,14 @@ def self.read_binary(path)
   end
 
   ##
-  # Atomically write a file in binary mode on all platforms.
+  # Safely write a file in binary mode on all platforms.
 
   def self.write_binary(path, data)
-    Gem::AtomicFileWriter.open(path) do |file|
-      file.write(data)
-    end
+    File.binwrite(path, data)
+  rescue Errno::ENOSPC
+    # If we ran out of space but the file exists, it's *guaranteed* to be corrupted.
+    File.delete(path) if File.exist?(path)
+    raise
   end
 
   ##

lib/rubygems/util/atomic_file_writer.rb

@@ -46,4 +46,4 @@ DEPENDENCIES
   tapioca
 
 BUNDLED WITH
-  4.0.1
+  4.0.2

spec/bundler/realworld/fixtures/tapioca/Gemfile.lock

@@ -36,4 +36,4 @@ DEPENDENCIES
   warbler!
 
 BUNDLED WITH
-  4.0.1
+  4.0.2

spec/bundler/realworld/fixtures/warbler/Gemfile.lock

@@ -2385,31 +2385,25 @@ def test_leaves_no_empty_cached_spec_when_no_more_disk_space
     installer = Gem::Installer.for_spec @spec
     installer.gem_home = @gemhome
 
-    assert_raise(Errno::ENOSPC) do
-      Gem::AtomicFileWriter.open(@spec.spec_file) do
+    File.singleton_class.class_eval do
+      alias_method :original_binwrite, :binwrite
+
+      def binwrite(path, data)
         raise Errno::ENOSPC
       end
     end
 
-    assert_path_not_exist @spec.spec_file
-  end
-
-  def test_write_default_spec
-    @spec = setup_base_spec
-    @spec.files = %w[a.rb b.rb c.rb]
-
-    installer = Gem::Installer.for_spec @spec
-    installer.gem_home = @gemhome
-
-    installer.write_default_spec
-
-    assert_path_exist installer.default_spec_file
-
-    loaded = Gem::Specification.load installer.default_spec_file
+    assert_raise Errno::ENOSPC do
+      installer.write_spec
+    end
 
-    assert_equal @spec.files, loaded.files
-    assert_equal @spec.name, loaded.name
-    assert_equal @spec.version, loaded.version
+    assert_path_not_exist @spec.spec_file
+  ensure
+    File.singleton_class.class_eval do
+      remove_method :binwrite
+      alias_method :binwrite, :original_binwrite
+      remove_method :original_binwrite
+    end
   end
 
   def test_dir