Skip to content

build(deps): bump the dependabot group across 1 directory with 25 updates #20244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,6 @@ jobs:

- run: brew test-bot --only-cleanup-before

- run: brew test-bot --only-setup

- name: Run brew bundle and brew services integration tests
run: |
cat <<EOS >> Brewfile
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
**/vendor/bundle/ruby/*/gems/rdoc-*/
**/vendor/bundle/ruby/*/gems/redcarpet-*/
**/vendor/bundle/ruby/*/gems/regexp_parser-*/
**/vendor/bundle/ruby/*/gems/require-hooks-*/
**/vendor/bundle/ruby/*/gems/rexml-*/
**/vendor/bundle/ruby/*/gems/rspec-*/
**/vendor/bundle/ruby/*/gems/rspec-core-*/
Expand Down
4 changes: 4 additions & 0 deletions Library/.rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@ Naming/MethodParameterName:
merge:
- AllowedNames

# Allows a nicer API for boolean methods with side effects.
Naming/PredicateMethod:
AllowBangMethods: true

# Both styles are used depending on context,
# e.g. `sha256` and `something_countable_1`.
Naming/VariableNumber:
Expand Down
8 changes: 7 additions & 1 deletion Library/Homebrew/.rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ Homebrew/MoveToExtendOS:
- "{extend,test,requirements}/**/*"
- "os.rb"

Naming/PredicateName:
# We don't use Sorbet for RSpec tests so let's disable this there.
Sorbet/BlockMethodDefinition:
Exclude:
- test/**/*

# Want to preserve our own API for these methods for now.
Naming/PredicatePrefix:
inherit_mode:
merge:
- AllowedMethods
Expand Down
77 changes: 41 additions & 36 deletions Library/Homebrew/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ GEM
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ast (2.4.3)
base64 (0.2.0)
benchmark (0.4.0)
bigdecimal (3.1.9)
base64 (0.3.0)
benchmark (0.4.1)
bigdecimal (3.2.2)
bindata (2.5.1)
coderay (1.1.3)
concurrent-ruby (1.3.5)
csv (3.3.4)
csv (3.3.5)
diff-lcs (1.6.2)
docile (1.4.1)
elftools (1.3.1)
bindata (~> 2)
erubi (1.13.1)
hana (1.3.7)
json (2.12.0)
json (2.12.2)
json_schemer (2.4.0)
bigdecimal
hana (~> 1.3)
Expand All @@ -32,7 +32,7 @@ GEM
minitest (5.25.5)
netrc (0.11.0)
parallel (1.27.0)
parallel_tests (5.2.0)
parallel_tests (5.3.0)
parallel
parser (3.3.8.0)
ast (~> 2.4.1)
Expand All @@ -48,48 +48,49 @@ GEM
pycall (1.5.2)
racc (1.8.1)
rainbow (3.1.1)
rbi (0.3.3)
rbi (0.3.6)
prism (~> 1.0)
rbs (>= 3.4.4)
sorbet-runtime (>= 0.5.9204)
rbs (3.9.4)
rbs (4.0.0.dev.4)
logger
prism (>= 1.3.0)
redcarpet (3.6.1)
regexp_parser (2.10.0)
require-hooks (0.2.2)
rexml (3.4.1)
rspec (3.13.0)
rspec (3.13.1)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.3)
rspec-core (3.13.5)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.4)
rspec-expectations (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-github (3.0.0)
rspec-core (~> 3.0)
rspec-mocks (3.13.4)
rspec-mocks (3.13.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-sorbet (1.9.2)
sorbet-runtime
rspec-support (3.13.3)
rspec-support (3.13.4)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.75.6)
rubocop (1.77.0)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.44.0, < 2.0)
rubocop-ast (>= 1.45.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.44.1)
rubocop-ast (1.45.1)
parser (>= 3.3.7.2)
prism (~> 1.4)
rubocop-md (2.0.1)
Expand All @@ -102,15 +103,17 @@ GEM
rubocop-rspec (3.6.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-sorbet (0.10.0)
rubocop (>= 1)
ruby-lsp (0.23.21)
rubocop-sorbet (0.10.5)
lint_roller
rubocop (>= 1.75.2)
ruby-lsp (0.24.2)
language_server-protocol (~> 3.17.0)
prism (>= 1.2, < 2.0)
rbs (>= 3, < 4)
rbs (>= 3, < 5)
sorbet-runtime (>= 0.5.10782)
ruby-macho (4.1.0)
ruby-prof (1.7.1)
ruby-prof (1.7.2)
base64
ruby-progressbar (1.13.0)
simplecov (0.22.0)
docile (~> 1.1)
Expand All @@ -122,38 +125,40 @@ GEM
simplecov-html (0.13.1)
simplecov_json_formatter (0.1.4)
simpleidn (0.2.3)
sorbet (0.5.12117)
sorbet-static (= 0.5.12117)
sorbet-runtime (0.5.12117)
sorbet-static (0.5.12117-aarch64-linux)
sorbet-static (0.5.12117-universal-darwin)
sorbet-static (0.5.12117-x86_64-linux)
sorbet-static-and-runtime (0.5.12117)
sorbet (= 0.5.12117)
sorbet-runtime (= 0.5.12117)
spoom (1.6.3)
sorbet (0.5.12222)
sorbet-static (= 0.5.12222)
sorbet-runtime (0.5.12222)
sorbet-static (0.5.12222-aarch64-linux)
sorbet-static (0.5.12222-universal-darwin)
sorbet-static (0.5.12222-x86_64-linux)
sorbet-static-and-runtime (0.5.12222)
sorbet (= 0.5.12222)
sorbet-runtime (= 0.5.12222)
spoom (1.7.4)
erubi (>= 1.10.0)
prism (>= 0.28.0)
rbi (>= 0.3.3)
rbs (>= 4.0.0.dev.4)
rexml (>= 3.2.6)
sorbet-static-and-runtime (>= 0.5.10187)
thor (>= 0.19.2)
stackprof (0.2.27)
tapioca (0.16.11)
tapioca (0.17.5)
benchmark
bundler (>= 2.2.25)
netrc (>= 0.11.0)
parallel (>= 1.21.0)
rbi (~> 0.2)
rbi (>= 0.3.1)
require-hooks (>= 0.2.2)
sorbet-static-and-runtime (>= 0.5.11087)
spoom (>= 1.2.0)
spoom (>= 1.7.0)
thor (>= 1.2.0)
yard-sorbet
thor (1.3.2)
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
vernier (1.7.1)
vernier (1.8.0)
warning (1.5.0)
yard (0.9.37)
yard-sorbet (0.9.0)
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def self.merge_variations(json, bottle_tag: T.unsafe(nil))
end

sig { params(names: T::Array[String], type: String, regenerate: T::Boolean).returns(T::Boolean) }
def self.write_names_file(names, type, regenerate:)
def self.write_names_file!(names, type, regenerate:)
names_path = HOMEBREW_CACHE_API/"#{type}_names.txt"
if !names_path.exist? || regenerate
names_path.write(names.join("\n"))
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/api/cask.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def self.fetch(token)

sig { params(cask: ::Cask::Cask).returns(::Cask::Cask) }
def self.source_download(cask)
path = cask.ruby_source_path.to_s || "Casks/#{cask.token}.rb"
path = cask.ruby_source_path.to_s
sha256 = cask.ruby_source_checksum[:sha256]
checksum = Checksum.new(sha256) if sha256
git_head = cask.tap_git_head || "HEAD"
Expand Down Expand Up @@ -95,7 +95,7 @@ def self.all_renames
def self.write_names(regenerate: false)
download_and_cache_data! unless cache.key?("casks")

Homebrew::API.write_names_file(all_casks.keys, "cask", regenerate:)
Homebrew::API.write_names_file!(all_casks.keys, "cask", regenerate:)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/api/formula.rb
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def self.tap_git_head
def self.write_names_and_aliases(regenerate: false)
download_and_cache_data! unless cache.key?("formulae")

return unless Homebrew::API.write_names_file(all_formulae.keys, "formula", regenerate:)
return unless Homebrew::API.write_names_file!(all_formulae.keys, "formula", regenerate:)

(HOMEBREW_CACHE_API/"formula_aliases.txt").open("w") do |file|
all_aliases.each do |alias_name, real_name|
Expand Down
6 changes: 3 additions & 3 deletions Library/Homebrew/bottle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def initialize(formula, spec, tag = nil)
def fetch(verify_download_integrity: true, timeout: nil, quiet: false)
resource.fetch(verify_download_integrity:, timeout:, quiet:)
rescue DownloadError
raise unless fallback_on_error
raise unless fallback_on_error?

fetch_tab
retry
Expand Down Expand Up @@ -121,7 +121,7 @@ def fetch_tab(timeout: nil, quiet: false)
begin
resource.fetch(timeout:, quiet:)
rescue DownloadError
raise unless fallback_on_error
raise unless fallback_on_error?

retry
rescue Resource::BottleManifest::Error
Expand Down Expand Up @@ -193,7 +193,7 @@ def select_download_strategy(specs)
specs
end

def fallback_on_error
def fallback_on_error?
# Use the default bottle domain as a fallback mirror
if @resource.url.start_with?(Homebrew::EnvConfig.bottle_domain) &&
Homebrew::EnvConfig.bottle_domain != HOMEBREW_BOTTLE_DEFAULT_DOMAIN
Expand Down
6 changes: 3 additions & 3 deletions Library/Homebrew/bundle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def brew(*args, verbose: false)

sig { returns(T::Boolean) }
def mas_installed?
@mas_installed ||= which_formula("mas")
@mas_installed ||= which_formula?("mas")
end

sig { returns(T::Boolean) }
Expand All @@ -59,7 +59,7 @@ def which_vscode

sig { returns(T::Boolean) }
def whalebrew_installed?
@whalebrew_installed ||= which_formula("whalebrew")
@whalebrew_installed ||= which_formula?("whalebrew")
end

sig { returns(T::Boolean) }
Expand All @@ -70,7 +70,7 @@ def cask_installed?
end

sig { params(name: String).returns(T::Boolean) }
def which_formula(name)
def which_formula?(name)
formula = Formulary.factory(name)
ENV["PATH"] = "#{formula.opt_bin}:#{ENV.fetch("PATH", nil)}" if formula.any_version_installed?
which(name).present?
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/bundle/cask_installer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def self.reset!
Homebrew::Bundle::CaskDumper.cask_is_outdated_using_greedy?(name)
end

def self.preinstall(name, no_upgrade: false, verbose: false, **options)
def self.preinstall!(name, no_upgrade: false, verbose: false, **options)
if installed_casks.include?(name) && !upgrading?(no_upgrade, name, options)
puts "Skipping install of #{name} cask. It is already installed." if verbose
return false
Expand All @@ -27,7 +27,7 @@ def self.preinstall(name, no_upgrade: false, verbose: false, **options)
true
end

def self.install(name, preinstall: true, no_upgrade: false, verbose: false, force: false, **options)
def self.install!(name, preinstall: true, no_upgrade: false, verbose: false, force: false, **options)
return true unless preinstall

full_name = options.fetch(:full_name, name)
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/bundle/commands/cleanup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ def self.run(global: false, file: nil, force: false, zap: false, dsl: nil,
if casks.any?
args = zap ? ["--zap"] : []
Kernel.system HOMEBREW_BREW_FILE, "uninstall", "--cask", *args, "--force", *casks
puts "Uninstalled #{casks.size} cask#{(casks.size == 1) ? "" : "s"}"
puts "Uninstalled #{casks.size} cask#{"s" if casks.size != 1}"
end

if formulae.any?
Kernel.system HOMEBREW_BREW_FILE, "uninstall", "--formula", "--force", *formulae
puts "Uninstalled #{formulae.size} formula#{(formulae.size == 1) ? "" : "e"}"
puts "Uninstalled #{formulae.size} formula#{"e" if formulae.size != 1}"
end

Kernel.system HOMEBREW_BREW_FILE, "untap", *taps if taps.any?
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/bundle/commands/install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module Install
def self.run(global: false, file: nil, no_lock: false, no_upgrade: false, verbose: false, force: false,
quiet: false)
@dsl = Brewfile.read(global:, file:)
Homebrew::Bundle::Installer.install(
Homebrew::Bundle::Installer.install!(
@dsl.entries,
global:, file:, no_lock:, no_upgrade:, verbose:, force:, quiet:,
) || exit(1)
Expand Down
Loading