Skip to content

Commit 5561eb3

Browse files
committed
Update bundle
1 parent 938f462 commit 5561eb3

File tree

10 files changed

+171
-120
lines changed

10 files changed

+171
-120
lines changed

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,11 @@ updates:
88
directory: "/"
99
schedule:
1010
interval: "weekly"
11+
- package-ecosystem: bundler
12+
directory: "/test_projects/monorepo"
13+
schedule:
14+
interval: "weekly"
15+
- package-ecosystem: bundler
16+
directory: "/test_projects/parallel_tests"
17+
schedule:
18+
interval: "weekly"

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem "matrix"
1212

1313
group :development do
1414
gem "apparition", github: "twalpole/apparition"
15-
gem "activesupport", "~> 6.1"
15+
gem "activesupport"
1616
gem "aruba"
1717
gem "capybara"
1818
if RUBY_VERSION < "2.7"
@@ -25,7 +25,7 @@ group :development do
2525
gem "rake"
2626
gem "rspec"
2727
gem "pry"
28-
gem "rubocop", "~> 1.70.0" if RUBY_VERSION > "3.2"
28+
gem "rubocop" if RUBY_VERSION > "3.2"
2929
gem "test-unit"
3030
gem "logger"
3131
# Explicitly add webrick because it has been removed from stdlib in Ruby 3.0

Gemfile.lock

Lines changed: 102 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,32 @@ PATH
1717
GEM
1818
remote: https://rubygems.org/
1919
specs:
20-
activesupport (6.1.7.10)
21-
concurrent-ruby (~> 1.0, >= 1.0.2)
20+
activesupport (8.1.3)
21+
base64
22+
bigdecimal
23+
concurrent-ruby (~> 1.0, >= 1.3.1)
24+
connection_pool (>= 2.2.5)
25+
drb
2226
i18n (>= 1.6, < 2)
27+
json
28+
logger (>= 1.4.2)
2329
minitest (>= 5.1)
24-
tzinfo (~> 2.0)
25-
zeitwerk (~> 2.3)
26-
addressable (2.8.7)
27-
public_suffix (>= 2.0.2, < 7.0)
30+
securerandom (>= 0.3)
31+
tzinfo (~> 2.0, >= 2.0.5)
32+
uri (>= 0.13.1)
33+
addressable (2.8.9)
34+
public_suffix (>= 2.0.2, < 8.0)
2835
aruba (2.3.3)
2936
bundler (>= 1.17)
3037
contracts (>= 0.16.0, < 0.18.0)
3138
cucumber (>= 8.0, < 11.0)
3239
rspec-expectations (>= 3.4, < 5.0)
3340
thor (~> 1.0)
34-
ast (2.4.2)
35-
base64 (0.2.0)
41+
ast (2.4.3)
42+
base64 (0.3.0)
3643
benchmark-ips (2.14.0)
37-
bigdecimal (3.1.9)
38-
bigdecimal (3.1.9-java)
44+
bigdecimal (4.1.0)
45+
bigdecimal (4.1.0-java)
3946
builder (3.3.0)
4047
capybara (3.40.0)
4148
addressable
@@ -47,126 +54,145 @@ GEM
4754
regexp_parser (>= 1.5, < 3.0)
4855
xpath (~> 3.2)
4956
coderay (1.1.3)
50-
concurrent-ruby (1.3.4)
51-
contracts (0.17.2)
52-
cucumber (9.2.1)
57+
concurrent-ruby (1.3.6)
58+
connection_pool (3.0.2)
59+
contracts (0.17.3)
60+
cucumber (10.2.0)
61+
base64 (~> 0.2)
5362
builder (~> 3.2)
54-
cucumber-ci-environment (> 9, < 11)
55-
cucumber-core (> 13, < 14)
56-
cucumber-cucumber-expressions (~> 17.0)
57-
cucumber-gherkin (> 24, < 28)
58-
cucumber-html-formatter (> 20.3, < 22)
59-
cucumber-messages (> 19, < 25)
63+
cucumber-ci-environment (> 9, < 12)
64+
cucumber-core (> 15, < 17)
65+
cucumber-cucumber-expressions (> 17, < 20)
66+
cucumber-html-formatter (> 21, < 23)
6067
diff-lcs (~> 1.5)
68+
logger (~> 1.6)
6169
mini_mime (~> 1.1)
6270
multi_test (~> 1.1)
63-
sys-uname (~> 1.2)
64-
cucumber-ci-environment (10.0.1)
65-
cucumber-core (13.0.3)
66-
cucumber-gherkin (>= 27, < 28)
67-
cucumber-messages (>= 20, < 23)
68-
cucumber-tag-expressions (> 5, < 7)
69-
cucumber-cucumber-expressions (17.1.0)
71+
sys-uname (~> 1.3)
72+
cucumber-ci-environment (11.0.0)
73+
cucumber-core (16.2.0)
74+
cucumber-gherkin (> 36, < 40)
75+
cucumber-messages (> 31, < 33)
76+
cucumber-tag-expressions (> 6, < 9)
77+
cucumber-cucumber-expressions (19.0.0)
7078
bigdecimal
71-
cucumber-gherkin (27.0.0)
72-
cucumber-messages (>= 19.1.4, < 23)
73-
cucumber-html-formatter (21.7.0)
74-
cucumber-messages (> 19, < 27)
75-
cucumber-messages (22.0.0)
76-
cucumber-tag-expressions (6.1.1)
77-
diff-lcs (1.5.1)
79+
cucumber-gherkin (39.0.0)
80+
cucumber-messages (>= 31, < 33)
81+
cucumber-html-formatter (22.3.0)
82+
cucumber-messages (> 23, < 33)
83+
cucumber-messages (32.2.0)
84+
cucumber-tag-expressions (8.1.0)
85+
diff-lcs (1.6.2)
7886
docile (1.4.1)
79-
ffi (1.17.1)
80-
ffi (1.17.1-java)
81-
i18n (1.14.6)
87+
drb (2.2.3)
88+
ffi (1.17.4)
89+
ffi (1.17.4-java)
90+
i18n (1.14.8)
8291
concurrent-ruby (~> 1.0)
83-
json (2.9.1)
84-
json (2.9.1-java)
85-
language_server-protocol (3.17.0.3)
92+
io-console (0.8.2)
93+
io-console (0.8.2-java)
94+
json (2.19.3)
95+
json (2.19.3-java)
96+
language_server-protocol (3.17.0.5)
97+
lint_roller (1.1.0)
8698
logger (1.7.0)
87-
matrix (0.4.2)
99+
matrix (0.4.3)
100+
memoist3 (1.0.0)
88101
method_source (1.1.0)
89102
mini_mime (1.1.5)
90-
mini_portile2 (2.8.8)
91-
minitest (5.25.4)
103+
mini_portile2 (2.8.9)
104+
minitest (6.0.2)
105+
drb (~> 2.0)
106+
prism (~> 1.5)
92107
multi_test (1.1.0)
93-
nokogiri (1.18.1)
108+
nokogiri (1.19.2)
94109
mini_portile2 (~> 2.8.2)
95110
racc (~> 1.4)
96-
parallel (1.26.3)
97-
parser (3.3.6.0)
111+
nokogiri (1.19.2-java)
112+
racc (~> 1.4)
113+
parallel (1.27.0)
114+
parser (3.3.11.1)
98115
ast (~> 2.4.1)
99116
racc
100-
power_assert (2.0.5)
101-
pry (0.15.2)
117+
power_assert (3.0.1)
118+
prism (1.9.0)
119+
pry (0.16.0)
102120
coderay (~> 1.1)
103121
method_source (~> 1.0)
104-
pry (0.15.2-java)
122+
reline (>= 0.6.0)
123+
pry (0.16.0-java)
105124
coderay (~> 1.1)
106125
method_source (~> 1.0)
126+
reline (>= 0.6.0)
107127
spoon (~> 0.0)
108-
public_suffix (6.0.1)
128+
public_suffix (7.0.5)
109129
racc (1.8.1)
110130
racc (1.8.1-java)
111-
rack (3.1.8)
131+
rack (3.2.5)
112132
rack-test (2.2.0)
113133
rack (>= 1.3)
114-
rackup (2.2.1)
134+
rackup (2.3.1)
115135
rack (>= 3)
116136
rainbow (3.1.1)
117-
rake (13.2.1)
118-
regexp_parser (2.10.0)
119-
rspec (3.13.0)
137+
rake (13.3.1)
138+
regexp_parser (2.11.3)
139+
reline (0.6.3)
140+
io-console (~> 0.5)
141+
rspec (3.13.2)
120142
rspec-core (~> 3.13.0)
121143
rspec-expectations (~> 3.13.0)
122144
rspec-mocks (~> 3.13.0)
123-
rspec-core (3.13.2)
145+
rspec-core (3.13.6)
124146
rspec-support (~> 3.13.0)
125-
rspec-expectations (3.13.3)
147+
rspec-expectations (3.13.5)
126148
diff-lcs (>= 1.2.0, < 2.0)
127149
rspec-support (~> 3.13.0)
128-
rspec-mocks (3.13.2)
150+
rspec-mocks (3.13.8)
129151
diff-lcs (>= 1.2.0, < 2.0)
130152
rspec-support (~> 3.13.0)
131-
rspec-support (3.13.2)
132-
rubocop (1.70.0)
153+
rspec-support (3.13.7)
154+
rubocop (1.86.0)
133155
json (~> 2.3)
134-
language_server-protocol (>= 3.17.0)
156+
language_server-protocol (~> 3.17.0.2)
157+
lint_roller (~> 1.1.0)
135158
parallel (~> 1.10)
136159
parser (>= 3.3.0.2)
137160
rainbow (>= 2.2.2, < 4.0)
138161
regexp_parser (>= 2.9.3, < 3.0)
139-
rubocop-ast (>= 1.36.2, < 2.0)
162+
rubocop-ast (>= 1.49.0, < 2.0)
140163
ruby-progressbar (~> 1.7)
141164
unicode-display_width (>= 2.4.0, < 4.0)
142-
rubocop-ast (1.37.0)
143-
parser (>= 3.3.1.0)
165+
rubocop-ast (1.49.1)
166+
parser (>= 3.3.7.2)
167+
prism (~> 1.7)
144168
ruby-progressbar (1.13.0)
145-
simplecov-html (0.13.1)
169+
securerandom (0.4.1)
170+
simplecov-html (0.13.2)
146171
simplecov_json_formatter (0.1.4)
147172
spoon (0.0.6)
148173
ffi
149-
sys-uname (1.3.1)
174+
sys-uname (1.5.1)
150175
ffi (~> 1.1)
151-
test-unit (3.6.7)
176+
memoist3 (~> 1.0.0)
177+
test-unit (3.7.7)
152178
power_assert
153-
thor (1.3.2)
179+
thor (1.5.0)
154180
tzinfo (2.0.6)
155181
concurrent-ruby (~> 1.0)
156-
unicode-display_width (3.1.4)
157-
unicode-emoji (~> 4.0, >= 4.0.4)
158-
unicode-emoji (4.0.4)
159-
webrick (1.9.1)
160-
websocket-driver (0.7.7)
182+
unicode-display_width (3.2.0)
183+
unicode-emoji (~> 4.1)
184+
unicode-emoji (4.2.0)
185+
uri (1.1.1)
186+
webrick (1.9.2)
187+
websocket-driver (0.8.0)
161188
base64
162189
websocket-extensions (>= 0.1.0)
163-
websocket-driver (0.7.7-java)
190+
websocket-driver (0.8.0-java)
164191
base64
165192
websocket-extensions (>= 0.1.0)
166193
websocket-extensions (0.1.5)
167194
xpath (3.2.0)
168195
nokogiri (~> 1.8)
169-
zeitwerk (2.7.1)
170196

171197
PLATFORMS
172198
java
@@ -175,7 +201,7 @@ PLATFORMS
175201
universal-java-11
176202

177203
DEPENDENCIES
178-
activesupport (~> 6.1)
204+
activesupport
179205
apparition!
180206
aruba
181207
benchmark-ips
@@ -188,7 +214,7 @@ DEPENDENCIES
188214
rackup
189215
rake
190216
rspec
191-
rubocop (~> 1.70.0)
217+
rubocop
192218
simplecov!
193219
test-unit
194220
webrick

lib/simplecov.rb

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
#
2222
module SimpleCov
2323
class << self
24+
CRITERION_TO_RUBY_COVERAGE = {
25+
branch: :branches,
26+
line: :lines,
27+
oneshot_line: :oneshot_lines
28+
}.freeze
29+
2430
attr_accessor :running, :pid
2531

2632
# Basically, should we take care of at_exit behavior or something else?
@@ -362,11 +368,6 @@ def coverage_running?
362368
Coverage.respond_to?(:running?) && Coverage.running?
363369
end
364370

365-
CRITERION_TO_RUBY_COVERAGE = {
366-
branch: :branches,
367-
line: :lines,
368-
oneshot_line: :oneshot_lines
369-
}.freeze
370371
def lookup_corresponding_ruby_coverage_name(criterion)
371372
CRITERION_TO_RUBY_COVERAGE.fetch(criterion)
372373
end

lib/simplecov/exit_codes/maximum_coverage_drop_check.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
module SimpleCov
44
module ExitCodes
55
class MaximumCoverageDropCheck
6+
MAX_DROP_ACCURACY = 10
7+
68
def initialize(result, maximum_coverage_drop)
79
@result = result
810
@maximum_coverage_drop = maximum_coverage_drop
@@ -56,8 +58,6 @@ def compute_coverage_drop_data
5658
end
5759
end
5860

59-
# if anyone says "max_coverage_drop 0.000000000000000001" I appologize. Please don't.
60-
MAX_DROP_ACCURACY = 10
6161
def drop_percent(criterion)
6262
drop = last_coverage(criterion) -
6363
SimpleCov.round_coverage(

lib/simplecov/result.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module SimpleCov
1010
#
1111
class Result
1212
extend Forwardable
13+
1314
# Returns the original Coverage.result used for this instance of SimpleCov::Result
1415
attr_reader :original_result
1516
# Returns all files that are applicable to this result (sans filters!) as instances of SimpleCov::SourceFile. Aliased as :source_files

lib/simplecov/result_merger.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def read_resultset
133133
end
134134

135135
# Saves the given SimpleCov::Result in the resultset cache
136-
def store_result(result)
136+
def store_result(result) # rubocop:disable Naming/PredicateMethod
137137
synchronize_resultset do
138138
# Ensure we have the latest, in case it was already cached
139139
new_resultset = read_resultset

lib/simplecov/source_file.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ module SimpleCov
66
# source lines and featuring helpers to interpret that data.
77
#
88
class SourceFile
9+
SHEBANG_REGEX = /\A#!/.freeze
10+
RUBY_FILE_ENCODING_MAGIC_COMMENT_REGEX = /\A#\s*(?:-\*-)?\s*(?:en)?coding:\s*(\S+)\s*(?:-\*-)?\s*\z/.freeze
11+
912
# The full path to this source file (e.g. /User/colszowka/projects/simplecov/lib/simplecov/source_file.rb)
1013
attr_reader :filename
1114
# The array of coverage data received from the Coverage.result
@@ -190,7 +193,6 @@ def load_source
190193
end
191194
end
192195

193-
SHEBANG_REGEX = /\A#!/.freeze
194196
def shebang?(line)
195197
SHEBANG_REGEX.match?(line)
196198
end
@@ -202,7 +204,6 @@ def read_lines(file, lines, current_line)
202204
lines.concat([current_line], ensure_remove_undefs(file.readlines))
203205
end
204206

205-
RUBY_FILE_ENCODING_MAGIC_COMMENT_REGEX = /\A#\s*(?:-\*-)?\s*(?:en)?coding:\s*(\S+)\s*(?:-\*-)?\s*\z/.freeze
206207
def set_encoding_based_on_magic_comment(file, line)
207208
# Check for encoding magic comment
208209
# Encoding magic comment must be placed at first line except for shebang

0 commit comments

Comments
 (0)