Skip to content

Commit f322cea

Browse files
authored
Merge pull request #21675 from Homebrew/dependabot/bundler/Library/Homebrew/bundler-211037e23a
build(deps): bump the bundler group across 2 directories with 8 updates
2 parents af18672 + 287f2e8 commit f322cea

161 files changed

Lines changed: 1835 additions & 193 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
**/vendor/bundle/ruby/*/gems/csv-*/
8484
**/vendor/bundle/ruby/*/gems/diff-lcs-*/
8585
**/vendor/bundle/ruby/*/gems/docile-*/
86+
**/vendor/bundle/ruby/*/gems/drb-*/
8687
**/vendor/bundle/ruby/*/gems/ecma-re-validator-*/
8788
**/vendor/bundle/ruby/*/gems/erubi-*/
8889
**/vendor/bundle/ruby/*/gems/hana-*/
@@ -94,6 +95,7 @@
9495
**/vendor/bundle/ruby/*/gems/kramdown-*/
9596
**/vendor/bundle/ruby/*/gems/language_server-protocol-*/
9697
**/vendor/bundle/ruby/*/gems/lint_roller-*/
98+
**/vendor/bundle/ruby/*/gems/mcp-*/
9799
**/vendor/bundle/ruby/*/gems/method_source-*/
98100
**/vendor/bundle/ruby/*/gems/mini_portile2-*/
99101
**/vendor/bundle/ruby/*/gems/minitest-*/

Library/.rubocop.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,18 @@ Style/FetchEnvVar:
381381
- "/**/Formula/**/*.rb"
382382
- "**/Formula/**/*.rb"
383383

384+
# Doesn't make sense for formulae with e.g. requirements.
385+
Style/OneClassPerFile:
386+
Exclude:
387+
- "**/*.rbi"
388+
- "Taps/*/*/*.rb"
389+
- "/**/Abstract/**/*.rb"
390+
- "**/Abstract/**/*.rb"
391+
- "/**/Formula/**/*.rb"
392+
- "**/Formula/**/*.rb"
393+
- "/**/developer/bin/*"
394+
- "**/developer/bin/*"
395+
384396
# Not used for casks and formulae.
385397
Style/FrozenStringLiteralComment:
386398
EnforcedStyle: always

Library/Homebrew/Gemfile.lock

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ GEM
1313
csv (3.3.5)
1414
diff-lcs (1.6.2)
1515
docile (1.4.1)
16+
drb (2.2.3)
1617
elftools (1.3.1)
1718
bindata (~> 2)
1819
erubi (1.13.1)
1920
hana (1.3.7)
2021
io-console (0.8.2)
21-
json (2.18.1)
22+
json (2.19.0)
23+
json-schema (6.1.0)
24+
addressable (~> 2.8)
25+
bigdecimal (>= 3.1, < 5)
2226
json_schemer (2.5.0)
2327
bigdecimal
2428
hana (~> 1.3)
@@ -29,8 +33,11 @@ GEM
2933
language_server-protocol (3.17.0.5)
3034
lint_roller (1.1.0)
3135
logger (1.7.0)
36+
mcp (0.8.0)
37+
json-schema (>= 4.1)
3238
method_source (1.1.0)
33-
minitest (6.0.1)
39+
minitest (6.0.2)
40+
drb (~> 2.0)
3441
prism (~> 1.5)
3542
netrc (0.11.0)
3643
ostruct (0.6.3)
@@ -87,10 +94,11 @@ GEM
8794
rspec-support (3.13.7)
8895
rspec_junit_formatter (0.6.0)
8996
rspec-core (>= 2, < 4, != 2.12.0)
90-
rubocop (1.84.2)
97+
rubocop (1.85.0)
9198
json (~> 2.3)
9299
language_server-protocol (~> 3.17.0.2)
93100
lint_roller (~> 1.1.0)
101+
mcp (~> 0.6)
94102
parallel (~> 1.10)
95103
parser (>= 3.3.0.2)
96104
rainbow (>= 2.2.2, < 4.0)
@@ -133,15 +141,15 @@ GEM
133141
simplecov-html (0.13.2)
134142
simplecov_json_formatter (0.1.4)
135143
simpleidn (0.2.3)
136-
sorbet (0.6.12956)
137-
sorbet-static (= 0.6.12956)
138-
sorbet-runtime (0.6.12956)
139-
sorbet-static (0.6.12956-aarch64-linux)
140-
sorbet-static (0.6.12956-universal-darwin)
141-
sorbet-static (0.6.12956-x86_64-linux)
142-
sorbet-static-and-runtime (0.6.12956)
143-
sorbet (= 0.6.12956)
144-
sorbet-runtime (= 0.6.12956)
144+
sorbet (0.6.12971)
145+
sorbet-static (= 0.6.12971)
146+
sorbet-runtime (0.6.12971)
147+
sorbet-static (0.6.12971-aarch64-linux)
148+
sorbet-static (0.6.12971-universal-darwin)
149+
sorbet-static (0.6.12971-x86_64-linux)
150+
sorbet-static-and-runtime (0.6.12971)
151+
sorbet (= 0.6.12971)
152+
sorbet-runtime (= 0.6.12971)
145153
spoom (1.7.11)
146154
erubi (>= 1.10.0)
147155
prism (>= 0.28.0)

Library/Homebrew/brew_irb_helpers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def c(config: nil)
2121
end
2222
end
2323

24-
class Symbol
24+
class Symbol # rubocop:todo Style/OneClassPerFile
2525
# @!visibility private
2626
sig { params(args: Integer).returns(Formula) }
2727
def f(*args)

Library/Homebrew/cache_store.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def dirty?
189189
# {CacheStore} provides methods to mutate and fetch data from a persistent
190190
# storage mechanism.
191191
#
192-
class CacheStore
192+
class CacheStore # rubocop:todo Style/OneClassPerFile
193193
extend T::Helpers
194194

195195
abstract!

Library/Homebrew/cask/artifact/abstract_flight_block.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def uninstall_phase(**_options)
3838

3939
sig { override.returns(String) }
4040
def summarize
41-
directives.keys.map(&:to_s).join(", ")
41+
directives.keys.join(", ")
4242
end
4343

4444
private

Library/Homebrew/cask/audit.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ def audit_no_match
409409

410410
sig { void }
411411
def audit_generic_artifacts
412-
cask.artifacts.select { |a| a.is_a?(Artifact::Artifact) }.each do |artifact|
412+
cask.artifacts.grep(Artifact::Artifact).each do |artifact|
413413
unless artifact.target.absolute?
414414
add_error "target must be absolute path for #{artifact.class.english_name} #{artifact.source}"
415415
end

Library/Homebrew/cask/exceptions.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def initialize(errors)
1717
def to_s
1818
<<~EOS
1919
Problems with multiple casks:
20-
#{@errors.map(&:to_s).join("\n")}
20+
#{@errors.join("\n")}
2121
EOS
2222
end
2323
end

Library/Homebrew/cask/installer.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ def check_arch_requirements
402402

403403
raise CaskError,
404404
"Cask #{@cask} depends on hardware architecture being one of " \
405-
"[#{@cask.depends_on.arch.map(&:to_s).join(", ")}], " \
405+
"[#{@cask.depends_on.arch.join(", ")}], " \
406406
"but you are running #{@current_arch}."
407407
end
408408

@@ -450,7 +450,7 @@ def satisfy_cask_and_formula_dependencies
450450
return
451451
end
452452

453-
ohai "Installing dependencies: #{missing_formulae_and_casks.map(&:to_s).join(", ")}"
453+
ohai "Installing dependencies: #{missing_formulae_and_casks.join(", ")}"
454454
cask_installers = T.let([], T::Array[Installer])
455455
formula_installers = T.let([], T::Array[FormulaInstaller])
456456

@@ -638,7 +638,7 @@ def uninstall_artifacts(clear: false, successor: nil)
638638
def zap
639639
load_installed_caskfile!
640640
uninstall_artifacts
641-
if (zap_stanzas = @cask.artifacts.select { |a| a.is_a?(Artifact::Zap) }).empty?
641+
if (zap_stanzas = @cask.artifacts.grep(Artifact::Zap)).empty?
642642
opoo "No zap stanza present for Cask '#{@cask}'"
643643
else
644644
ohai "Dispatching zap stanza"

Library/Homebrew/cmd/update-report.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ def install_from_api_message
370370

371371
require "extend/os/cmd/update-report"
372372

373-
class Reporter
373+
class Reporter # rubocop:todo Style/OneClassPerFile
374374
include Utils::Output::Mixin
375375

376376
Report = T.type_alias do
@@ -774,7 +774,7 @@ def diff
774774
end
775775
end
776776

777-
class ReporterHub
777+
class ReporterHub # rubocop:todo Style/OneClassPerFile
778778
include Utils::Output::Mixin
779779

780780
sig { returns(T::Array[Reporter]) }

0 commit comments

Comments
 (0)