Skip to content

Commit fe81c46

Browse files
authored
Merge pull request #20244 from Homebrew/dependabot/bundler/Library/Homebrew/dependabot-9b21bfb7c6
build(deps): bump the dependabot group across 1 directory with 25 updates
2 parents 40a1297 + 4513a43 commit fe81c46

File tree

179 files changed

+6704
-8177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+6704
-8177
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,6 @@ jobs:
451451

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

454-
- run: brew test-bot --only-setup
455-
456454
- name: Run brew bundle and brew services integration tests
457455
run: |
458456
cat <<EOS >> Brewfile

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
**/vendor/bundle/ruby/*/gems/rdoc-*/
117117
**/vendor/bundle/ruby/*/gems/redcarpet-*/
118118
**/vendor/bundle/ruby/*/gems/regexp_parser-*/
119+
**/vendor/bundle/ruby/*/gems/require-hooks-*/
119120
**/vendor/bundle/ruby/*/gems/rexml-*/
120121
**/vendor/bundle/ruby/*/gems/rspec-*/
121122
**/vendor/bundle/ruby/*/gems/rspec-core-*/

Library/.rubocop.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ Naming/MethodParameterName:
216216
merge:
217217
- AllowedNames
218218

219+
# Allows a nicer API for boolean methods with side effects.
220+
Naming/PredicateMethod:
221+
AllowBangMethods: true
222+
219223
# Both styles are used depending on context,
220224
# e.g. `sha256` and `something_countable_1`.
221225
Naming/VariableNumber:

Library/Homebrew/.rubocop.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@ Homebrew/MoveToExtendOS:
1010
- "{extend,test,requirements}/**/*"
1111
- "os.rb"
1212

13-
Naming/PredicateName:
13+
# We don't use Sorbet for RSpec tests so let's disable this there.
14+
Sorbet/BlockMethodDefinition:
15+
Exclude:
16+
- test/**/*
17+
18+
# Want to preserve our own API for these methods for now.
19+
Naming/PredicatePrefix:
1420
inherit_mode:
1521
merge:
1622
- AllowedMethods

Library/Homebrew/Gemfile.lock

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ GEM
44
addressable (2.8.7)
55
public_suffix (>= 2.0.2, < 7.0)
66
ast (2.4.3)
7-
base64 (0.2.0)
8-
benchmark (0.4.0)
9-
bigdecimal (3.1.9)
7+
base64 (0.3.0)
8+
benchmark (0.4.1)
9+
bigdecimal (3.2.2)
1010
bindata (2.5.1)
1111
coderay (1.1.3)
1212
concurrent-ruby (1.3.5)
13-
csv (3.3.4)
13+
csv (3.3.5)
1414
diff-lcs (1.6.2)
1515
docile (1.4.1)
1616
elftools (1.3.1)
1717
bindata (~> 2)
1818
erubi (1.13.1)
1919
hana (1.3.7)
20-
json (2.12.0)
20+
json (2.12.2)
2121
json_schemer (2.4.0)
2222
bigdecimal
2323
hana (~> 1.3)
@@ -32,7 +32,7 @@ GEM
3232
minitest (5.25.5)
3333
netrc (0.11.0)
3434
parallel (1.27.0)
35-
parallel_tests (5.2.0)
35+
parallel_tests (5.3.0)
3636
parallel
3737
parser (3.3.8.0)
3838
ast (~> 2.4.1)
@@ -48,48 +48,49 @@ GEM
4848
pycall (1.5.2)
4949
racc (1.8.1)
5050
rainbow (3.1.1)
51-
rbi (0.3.3)
51+
rbi (0.3.6)
5252
prism (~> 1.0)
5353
rbs (>= 3.4.4)
54-
sorbet-runtime (>= 0.5.9204)
55-
rbs (3.9.4)
54+
rbs (4.0.0.dev.4)
5655
logger
56+
prism (>= 1.3.0)
5757
redcarpet (3.6.1)
5858
regexp_parser (2.10.0)
59+
require-hooks (0.2.2)
5960
rexml (3.4.1)
60-
rspec (3.13.0)
61+
rspec (3.13.1)
6162
rspec-core (~> 3.13.0)
6263
rspec-expectations (~> 3.13.0)
6364
rspec-mocks (~> 3.13.0)
64-
rspec-core (3.13.3)
65+
rspec-core (3.13.5)
6566
rspec-support (~> 3.13.0)
66-
rspec-expectations (3.13.4)
67+
rspec-expectations (3.13.5)
6768
diff-lcs (>= 1.2.0, < 2.0)
6869
rspec-support (~> 3.13.0)
6970
rspec-github (3.0.0)
7071
rspec-core (~> 3.0)
71-
rspec-mocks (3.13.4)
72+
rspec-mocks (3.13.5)
7273
diff-lcs (>= 1.2.0, < 2.0)
7374
rspec-support (~> 3.13.0)
7475
rspec-retry (0.6.2)
7576
rspec-core (> 3.3)
7677
rspec-sorbet (1.9.2)
7778
sorbet-runtime
78-
rspec-support (3.13.3)
79+
rspec-support (3.13.4)
7980
rspec_junit_formatter (0.6.0)
8081
rspec-core (>= 2, < 4, != 2.12.0)
81-
rubocop (1.75.6)
82+
rubocop (1.77.0)
8283
json (~> 2.3)
8384
language_server-protocol (~> 3.17.0.2)
8485
lint_roller (~> 1.1.0)
8586
parallel (~> 1.10)
8687
parser (>= 3.3.0.2)
8788
rainbow (>= 2.2.2, < 4.0)
8889
regexp_parser (>= 2.9.3, < 3.0)
89-
rubocop-ast (>= 1.44.0, < 2.0)
90+
rubocop-ast (>= 1.45.1, < 2.0)
9091
ruby-progressbar (~> 1.7)
9192
unicode-display_width (>= 2.4.0, < 4.0)
92-
rubocop-ast (1.44.1)
93+
rubocop-ast (1.45.1)
9394
parser (>= 3.3.7.2)
9495
prism (~> 1.4)
9596
rubocop-md (2.0.1)
@@ -102,15 +103,17 @@ GEM
102103
rubocop-rspec (3.6.0)
103104
lint_roller (~> 1.1)
104105
rubocop (~> 1.72, >= 1.72.1)
105-
rubocop-sorbet (0.10.0)
106-
rubocop (>= 1)
107-
ruby-lsp (0.23.21)
106+
rubocop-sorbet (0.10.5)
107+
lint_roller
108+
rubocop (>= 1.75.2)
109+
ruby-lsp (0.24.2)
108110
language_server-protocol (~> 3.17.0)
109111
prism (>= 1.2, < 2.0)
110-
rbs (>= 3, < 4)
112+
rbs (>= 3, < 5)
111113
sorbet-runtime (>= 0.5.10782)
112114
ruby-macho (4.1.0)
113-
ruby-prof (1.7.1)
115+
ruby-prof (1.7.2)
116+
base64
114117
ruby-progressbar (1.13.0)
115118
simplecov (0.22.0)
116119
docile (~> 1.1)
@@ -122,38 +125,40 @@ GEM
122125
simplecov-html (0.13.1)
123126
simplecov_json_formatter (0.1.4)
124127
simpleidn (0.2.3)
125-
sorbet (0.5.12117)
126-
sorbet-static (= 0.5.12117)
127-
sorbet-runtime (0.5.12117)
128-
sorbet-static (0.5.12117-aarch64-linux)
129-
sorbet-static (0.5.12117-universal-darwin)
130-
sorbet-static (0.5.12117-x86_64-linux)
131-
sorbet-static-and-runtime (0.5.12117)
132-
sorbet (= 0.5.12117)
133-
sorbet-runtime (= 0.5.12117)
134-
spoom (1.6.3)
128+
sorbet (0.5.12222)
129+
sorbet-static (= 0.5.12222)
130+
sorbet-runtime (0.5.12222)
131+
sorbet-static (0.5.12222-aarch64-linux)
132+
sorbet-static (0.5.12222-universal-darwin)
133+
sorbet-static (0.5.12222-x86_64-linux)
134+
sorbet-static-and-runtime (0.5.12222)
135+
sorbet (= 0.5.12222)
136+
sorbet-runtime (= 0.5.12222)
137+
spoom (1.7.4)
135138
erubi (>= 1.10.0)
136139
prism (>= 0.28.0)
137140
rbi (>= 0.3.3)
141+
rbs (>= 4.0.0.dev.4)
138142
rexml (>= 3.2.6)
139143
sorbet-static-and-runtime (>= 0.5.10187)
140144
thor (>= 0.19.2)
141145
stackprof (0.2.27)
142-
tapioca (0.16.11)
146+
tapioca (0.17.5)
143147
benchmark
144148
bundler (>= 2.2.25)
145149
netrc (>= 0.11.0)
146150
parallel (>= 1.21.0)
147-
rbi (~> 0.2)
151+
rbi (>= 0.3.1)
152+
require-hooks (>= 0.2.2)
148153
sorbet-static-and-runtime (>= 0.5.11087)
149-
spoom (>= 1.2.0)
154+
spoom (>= 1.7.0)
150155
thor (>= 1.2.0)
151156
yard-sorbet
152157
thor (1.3.2)
153158
unicode-display_width (3.1.4)
154159
unicode-emoji (~> 4.0, >= 4.0.4)
155160
unicode-emoji (4.0.4)
156-
vernier (1.7.1)
161+
vernier (1.8.0)
157162
warning (1.5.0)
158163
yard (0.9.37)
159164
yard-sorbet (0.9.0)

Library/Homebrew/api.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def self.merge_variations(json, bottle_tag: T.unsafe(nil))
142142
end
143143

144144
sig { params(names: T::Array[String], type: String, regenerate: T::Boolean).returns(T::Boolean) }
145-
def self.write_names_file(names, type, regenerate:)
145+
def self.write_names_file!(names, type, regenerate:)
146146
names_path = HOMEBREW_CACHE_API/"#{type}_names.txt"
147147
if !names_path.exist? || regenerate
148148
names_path.write(names.join("\n"))

Library/Homebrew/api/cask.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def self.fetch(token)
2828

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

98-
Homebrew::API.write_names_file(all_casks.keys, "cask", regenerate:)
98+
Homebrew::API.write_names_file!(all_casks.keys, "cask", regenerate:)
9999
end
100100
end
101101
end

Library/Homebrew/api/formula.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def self.tap_git_head
129129
def self.write_names_and_aliases(regenerate: false)
130130
download_and_cache_data! unless cache.key?("formulae")
131131

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

134134
(HOMEBREW_CACHE_API/"formula_aliases.txt").open("w") do |file|
135135
all_aliases.each do |alias_name, real_name|

Library/Homebrew/bottle.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def initialize(formula, spec, tag = nil)
9191
def fetch(verify_download_integrity: true, timeout: nil, quiet: false)
9292
resource.fetch(verify_download_integrity:, timeout:, quiet:)
9393
rescue DownloadError
94-
raise unless fallback_on_error
94+
raise unless fallback_on_error?
9595

9696
fetch_tab
9797
retry
@@ -121,7 +121,7 @@ def fetch_tab(timeout: nil, quiet: false)
121121
begin
122122
resource.fetch(timeout:, quiet:)
123123
rescue DownloadError
124-
raise unless fallback_on_error
124+
raise unless fallback_on_error?
125125

126126
retry
127127
rescue Resource::BottleManifest::Error
@@ -193,7 +193,7 @@ def select_download_strategy(specs)
193193
specs
194194
end
195195

196-
def fallback_on_error
196+
def fallback_on_error?
197197
# Use the default bottle domain as a fallback mirror
198198
if @resource.url.start_with?(Homebrew::EnvConfig.bottle_domain) &&
199199
Homebrew::EnvConfig.bottle_domain != HOMEBREW_BOTTLE_DEFAULT_DOMAIN

Library/Homebrew/bundle.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def brew(*args, verbose: false)
4141

4242
sig { returns(T::Boolean) }
4343
def mas_installed?
44-
@mas_installed ||= which_formula("mas")
44+
@mas_installed ||= which_formula?("mas")
4545
end
4646

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

6060
sig { returns(T::Boolean) }
6161
def whalebrew_installed?
62-
@whalebrew_installed ||= which_formula("whalebrew")
62+
@whalebrew_installed ||= which_formula?("whalebrew")
6363
end
6464

6565
sig { returns(T::Boolean) }
@@ -70,7 +70,7 @@ def cask_installed?
7070
end
7171

7272
sig { params(name: String).returns(T::Boolean) }
73-
def which_formula(name)
73+
def which_formula?(name)
7474
formula = Formulary.factory(name)
7575
ENV["PATH"] = "#{formula.opt_bin}:#{ENV.fetch("PATH", nil)}" if formula.any_version_installed?
7676
which(name).present?

0 commit comments

Comments
 (0)