Skip to content

Commit ea05828

Browse files
authored
Merge pull request #17329 from Homebrew/rmtree
extend/pathname: import rmtree again.
2 parents 91b58f0 + a92e6fc commit ea05828

File tree

4 files changed

+15
-23
lines changed

4 files changed

+15
-23
lines changed

Library/.rubocop.yml

-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ Sorbet/TrueSigil:
284284
- "/**/{Formula,Casks}/**/*.rb"
285285
- "**/{Formula,Casks}/**/*.rb"
286286
- "Homebrew/test/**/*.rb"
287-
- "Homebrew/extend/pathname/rmtree.rb"
288287

289288
# Require &&/|| instead of and/or
290289
Style/AndOr:

Library/Homebrew/.rubocop.yml

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ Style/Documentation:
3333
- extend/ENV/super.rb
3434
- extend/kernel.rb
3535
- extend/pathname.rb
36-
- extend/pathname/rmtree.rb
3736
- formula.rb
3837
- formula_assertions.rb
3938
- formula_free_port.rb

Library/Homebrew/extend/pathname.rb

+15-2
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,21 @@ def zipinfo
498498
.encode(Encoding::UTF_8, invalid: :replace)
499499
.split("\n")
500500
end
501+
502+
# Like regular `rmtree`, except it never ignores errors.
503+
#
504+
# This was the default behaviour in Ruby 3.1 and earlier.
505+
#
506+
# @api public
507+
def rmtree(noop: nil, verbose: nil, secure: nil)
508+
# Ideally we'd odeprecate this but probably can't given gems so let's
509+
# create a RuboCop autocorrect instead soon.
510+
# This is why monkeypatching is non-ideal (but right solution to get
511+
# Ruby 3.3 over the line).
512+
# odeprecated "rmtree", "FileUtils#rm_r"
513+
FileUtils.rm_r(@path, noop:, verbose:, secure:)
514+
nil
515+
end
501516
end
502517

503518
require "extend/os/pathname"
@@ -584,5 +599,3 @@ def uninstall_info
584599
puts "uninfo #{self}" if ObserverPathnameExtension.verbose?
585600
end
586601
end
587-
588-
require "extend/pathname/rmtree"

Library/Homebrew/extend/pathname/rmtree.rb

-19
This file was deleted.

0 commit comments

Comments
 (0)