Skip to content

Commit 26701e8

Browse files
MikeMcQuaidMikeMcQuaid
authored
Merge pull request #21220 from Homebrew/dependabot/bundler/Library/Homebrew/bundler-3ef70dc9f7
build(deps): bump the bundler group across 1 directory with 6 updates
2 parents c5e2186 + 1aa4d18 commit 26701e8

File tree

94 files changed

+86
-38
lines changed

Some content is hidden

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

94 files changed

+86
-38
lines changed

‎Library/.rubocop.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ plugins:
88
plugin_class_name: RuboCop::RSpec::Plugin
99
- rubocop-sorbet:
1010
plugin_class_name: RuboCop::Sorbet::Plugin
11+
- test-prof:
12+
plugin_class_name: RuboCop::TestProf::Plugin
1113

1214
require:
1315
- ./Homebrew/rubocops.rb
14-
- test_prof/rubocop
1516

1617
inherit_mode:
1718
merge:

‎Library/Homebrew/Gemfile.lock‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ GEM
1717
bindata (~> 2)
1818
erubi (1.13.1)
1919
hana (1.3.7)
20-
json (2.16.0)
20+
json (2.18.0)
2121
json_schemer (2.4.0)
2222
bigdecimal
2323
hana (~> 1.3)
@@ -125,15 +125,15 @@ GEM
125125
simplecov-html (0.13.2)
126126
simplecov_json_formatter (0.1.4)
127127
simpleidn (0.2.3)
128-
sorbet (0.6.12806)
129-
sorbet-static (= 0.6.12806)
130-
sorbet-runtime (0.6.12806)
131-
sorbet-static (0.6.12806-aarch64-linux)
132-
sorbet-static (0.6.12806-universal-darwin)
133-
sorbet-static (0.6.12806-x86_64-linux)
134-
sorbet-static-and-runtime (0.6.12806)
135-
sorbet (= 0.6.12806)
136-
sorbet-runtime (= 0.6.12806)
128+
sorbet (0.6.12815)
129+
sorbet-static (= 0.6.12815)
130+
sorbet-runtime (0.6.12815)
131+
sorbet-static (0.6.12815-aarch64-linux)
132+
sorbet-static (0.6.12815-universal-darwin)
133+
sorbet-static (0.6.12815-x86_64-linux)
134+
sorbet-static-and-runtime (0.6.12815)
135+
sorbet (= 0.6.12815)
136+
sorbet-runtime (= 0.6.12815)
137137
spoom (1.7.10)
138138
erubi (>= 1.10.0)
139139
prism (>= 0.28.0)
@@ -154,7 +154,7 @@ GEM
154154
spoom (>= 1.7.9)
155155
thor (>= 1.2.0)
156156
yard-sorbet
157-
test-prof (1.4.4)
157+
test-prof (1.5.0)
158158
thor (1.4.0)
159159
unicode-display_width (3.2.0)
160160
unicode-emoji (~> 4.1)

Library/Homebrew/sorbet/rbi/gems/test-prof@1.4.4.rbi renamed to Library/Homebrew/sorbet/rbi/gems/test-prof@1.5.0.rbi

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Library/Homebrew/test/rubocop_spec.rb‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,18 @@
1919
end
2020

2121
it "loads all Formula cops without errors" do
22-
stdout, stderr, status = Open3.capture3(RUBY_PATH, "-W0", "-S", "rubocop", TEST_FIXTURE_DIR/"testball.rb")
22+
# TODO: Remove these args once TestProf fixes their RuboCop plugin.
23+
test_prof_rubocop_args = [
24+
# Require "sorbet-runtime" to bring T into scope for warnings.rb
25+
"-r", "sorbet-runtime",
26+
# Require "extend/module" to include T::Sig in Module for warnings.rb
27+
"-r", HOMEBREW_LIBRARY_PATH/"extend/module.rb",
28+
# Work around TestProf RuboCop plugin issues
29+
"-r", HOMEBREW_LIBRARY_PATH/"utils/test_prof_rubocop_stub.rb"
30+
]
31+
32+
stdout, stderr, status = Open3.capture3(RUBY_PATH, "-W0", "-S", "rubocop", TEST_FIXTURE_DIR/"testball.rb",
33+
*test_prof_rubocop_args)
2334
expect(stderr).to be_empty
2435
expect(stdout).to include("no offenses detected")
2536
expect(status).to be_a_success

‎Library/Homebrew/test/spec_helper.rb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
require "rubocop"
3232
end
3333

34+
# TODO: Remove this workaround once TestProf fixes their RuboCop plugin.
35+
# This is needed because the RuboCop RSpec plugin attempts to load TestProf's RuboCop plugin.
36+
require "utils/test_prof_rubocop_stub"
37+
3438
require "rspec/github"
3539
require "rspec/retry"
3640
require "rspec/sorbet"

‎Library/Homebrew/utils/rubocop.rb‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,7 @@
99
require "rubocop"
1010
end
1111

12-
# TestProf is not able to detect what version of RuboCop we're using, so we need to manually import its cops.
13-
# For more details, see https://github.com/test-prof/test-prof/blob/v1.4.4/lib/test_prof/rubocop.rb
14-
Warnings.ignore(/TestProf cops require RuboCop >= 0.51.0 to run/) do
15-
# All this file does is check the RuboCop version and require the files below.
16-
# If we don't require this now while the warning is ignored, we'll see the warning again later
17-
# when RuboCop requires the file.
18-
require "test_prof/rubocop"
19-
20-
# This is copied from test-prof/rubocop.rb, and is necessary because that file returns early if the RuboCop version
21-
# check isn't met.
22-
# Note: when the next version of TestProf is released, this will need to change to support RuboCop's plugin system.
23-
# See: https://github.com/test-prof/test-prof/pull/321
24-
require "test_prof/cops/inject"
25-
require "test_prof/cops/rspec/aggregate_examples"
26-
end
12+
# TODO: Remove this workaround once TestProf fixes their RuboCop plugin.
13+
require_relative "test_prof_rubocop_stub"
2714

2815
exit RuboCop::CLI.new.run

‎Library/Homebrew/utils/test_prof_rubocop_stub.rb‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# typed: strict
2+
# frozen_string_literal: true
3+
4+
require_relative "../warnings"
5+
6+
# TestProf's RuboCop plugin has two issues that we need to work around:
7+
#
8+
# 1. It references RuboCop::TestProf::Plugin::VERSION, which does not exist.
9+
# To solve this, we define the constant ourselves, which requires creating a dummy LintRoller::Plugin class.
10+
# This should be fixed in the next version of TestProf.
11+
# See: https://github.com/test-prof/test-prof/commit/a151a513373563ed8fa7f8e56193138d3ee9b5e3
12+
#
13+
# 2. It checks the RuboCop version using a method that is incompatible with our RuboCop setup.
14+
# To bypass this check, we need to manually require the necessary files. More details below.
15+
16+
module LintRoller
17+
# Dummy class to satisfy TestProf's reference to LintRoller::Plugin.
18+
class Plugin; end # rubocop:disable Lint/EmptyClass
19+
end
20+
21+
module RuboCop
22+
module TestProf
23+
class Plugin < LintRoller::Plugin
24+
VERSION = "1.5.0"
25+
end
26+
end
27+
end
28+
29+
# TestProf is not able to detect what version of RuboCop we're using, so we need to manually import its cops.
30+
# For more details, see https://github.com/test-prof/test-prof/blob/v1.5.0/lib/test_prof/rubocop.rb
31+
# TODO: This will change in the next version of TestProf.
32+
# See: https://github.com/test-prof/test-prof/commit/a151a513373563ed8fa7f8e56193138d3ee9b5e3
33+
Warnings.ignore(/TestProf cops require RuboCop >= 0.51.0 to run/) do
34+
# All this file does is check the RuboCop version and require the files below.
35+
# If we don't require this now while the warning is ignored, we'll see the warning again later
36+
# when RuboCop requires the file.
37+
require "test_prof/rubocop"
38+
39+
# This is copied from test-prof/rubocop.rb, and is necessary because that file returns early if the RuboCop version
40+
# check isn't met.
41+
require "test_prof/cops/plugin"
42+
require "test_prof/cops/rspec/aggregate_examples"
43+
end

‎Library/Homebrew/vendor/bundle/bundler/setup.rb‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ def self.extension_api_version
5050
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/elftools-1.3.1/lib")
5151
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/erubi-1.13.1/lib")
5252
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/hana-1.3.7/lib")
53-
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/json-2.16.0")
54-
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/json-2.16.0/lib")
53+
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/json-2.18.0")
54+
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/json-2.18.0/lib")
5555
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/regexp_parser-2.11.3/lib")
5656
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simpleidn-0.2.3/lib")
5757
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/json_schemer-2.4.0/lib")
@@ -89,7 +89,7 @@ def self.extension_api_version
8989
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rspec-3.13.2/lib")
9090
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rspec-github-3.0.0/lib")
9191
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rspec-retry-0.6.2/lib")
92-
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.6.12806/lib")
92+
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-runtime-0.6.12815/lib")
9393
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rspec-sorbet-1.9.2/lib")
9494
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rspec_junit_formatter-0.6.0/lib")
9595
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/rubocop-ast-1.48.0/lib")
@@ -109,17 +109,17 @@ def self.extension_api_version
109109
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov_json_formatter-0.1.4/lib")
110110
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov-0.22.0/lib")
111111
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/simplecov-cobertura-3.1.0/lib")
112-
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-0.6.12806-universal-darwin/lib")
113-
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-0.6.12806/lib")
114-
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-and-runtime-0.6.12806/lib")
112+
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-0.6.12815-universal-darwin/lib")
113+
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-0.6.12815/lib")
114+
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/sorbet-static-and-runtime-0.6.12815/lib")
115115
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/thor-1.4.0/lib")
116116
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/spoom-1.7.10/lib")
117117
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/stackprof-0.2.27")
118118
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/stackprof-0.2.27/lib")
119119
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/yard-0.9.37/lib")
120120
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/yard-sorbet-0.9.0/lib")
121121
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/tapioca-0.17.9/lib")
122-
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/test-prof-1.4.4/lib")
122+
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/test-prof-1.5.0/lib")
123123
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/arm64-darwin-20/#{Gem.extension_api_version}/vernier-1.9.0")
124124
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/vernier-1.9.0/lib")
125125
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/warning-1.5.0/lib")

Library/Homebrew/vendor/bundle/ruby/3.4.0/gems/sorbet-runtime-0.6.12806/lib/sorbet-runtime.rb renamed to Library/Homebrew/vendor/bundle/ruby/3.4.0/gems/sorbet-runtime-0.6.12815/lib/sorbet-runtime.rb

File renamed without changes.

Library/Homebrew/vendor/bundle/ruby/3.4.0/gems/sorbet-runtime-0.6.12806/lib/types/_types.rb renamed to Library/Homebrew/vendor/bundle/ruby/3.4.0/gems/sorbet-runtime-0.6.12815/lib/types/_types.rb

File renamed without changes.

0 commit comments

Comments
 (0)