Skip to content

Commit 86e600b

Browse files
committed
Update rubocop and friends
1 parent a7b35a1 commit 86e600b

Some content is hidden

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

46 files changed

+34
-32
lines changed

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ AllCops:
1919
- bin/benchmark # i have things rubocop doesn't like that i want to keep
2020
DisplayCopNames: true
2121
DisplayStyleGuide: true
22-
TargetRubyVersion: 2.7
22+
TargetRubyVersion: 3.0
2323

2424
# all of our layout customisations are because we prefer indentation to be
2525
# always consistently 2 spaces, for blocks, scopes, multiline expressions, etc

Gemfile.lock

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ GEM
1010
ast (2.4.2)
1111
benchmark-ips (2.12.0)
1212
coderay (1.1.3)
13-
commonmarker (0.23.9)
13+
commonmarker (0.23.10)
1414
debug (1.8.0)
1515
irb (>= 1.5.0)
1616
reline (>= 0.3.1)
@@ -19,8 +19,9 @@ GEM
1919
fast_ignore (0.17.4)
2020
io-console (0.6.0)
2121
io-console (0.6.0-java)
22-
irb (1.7.1)
23-
reline (>= 0.3.0)
22+
irb (1.9.1)
23+
rdoc
24+
reline (>= 0.3.8)
2425
jar-dependencies (0.4.1)
2526
jaro_winkler (1.5.6)
2627
jaro_winkler (1.5.6-java)
@@ -33,26 +34,26 @@ GEM
3334
parser
3435
method_source (1.0.0)
3536
parallel (1.23.0)
36-
parser (3.2.2.3)
37+
parser (3.2.2.4)
3738
ast (~> 2.4.1)
3839
racc
3940
pry (0.14.2)
4041
coderay (~> 1.1)
4142
method_source (~> 1.0)
42-
psych (5.1.0)
43+
psych (5.1.1.1)
4344
stringio
44-
psych (5.1.0-java)
45+
psych (5.1.1.1-java)
4546
jar-dependencies (>= 0.1.7)
46-
racc (1.7.1)
47-
racc (1.7.1-java)
47+
racc (1.7.3)
48+
racc (1.7.3-java)
4849
rainbow (3.1.1)
49-
rake (13.0.6)
50-
rdoc (6.5.0)
50+
rake (13.1.0)
51+
rdoc (6.6.0)
5152
psych (>= 4.0.0)
52-
regexp_parser (2.8.1)
53-
reline (0.3.5)
53+
regexp_parser (2.8.2)
54+
reline (0.4.0)
5455
io-console (~> 0.5)
55-
rexml (3.2.5)
56+
rexml (3.2.6)
5657
rspec (3.12.0)
5758
rspec-core (~> 3.12.0)
5859
rspec-expectations (~> 3.12.0)
@@ -62,34 +63,34 @@ GEM
6263
rspec-expectations (3.12.3)
6364
diff-lcs (>= 1.2.0, < 2.0)
6465
rspec-support (~> 3.12.0)
65-
rspec-mocks (3.12.5)
66+
rspec-mocks (3.12.6)
6667
diff-lcs (>= 1.2.0, < 2.0)
6768
rspec-support (~> 3.12.0)
6869
rspec-support (3.12.1)
69-
rubocop (1.54.0)
70+
rubocop (1.57.2)
7071
json (~> 2.3)
7172
language_server-protocol (>= 3.17.0)
7273
parallel (~> 1.10)
73-
parser (>= 3.2.2.3)
74+
parser (>= 3.2.2.4)
7475
rainbow (>= 2.2.2, < 4.0)
7576
regexp_parser (>= 1.8, < 3.0)
7677
rexml (>= 3.2.5, < 4.0)
77-
rubocop-ast (>= 1.28.0, < 2.0)
78+
rubocop-ast (>= 1.28.1, < 2.0)
7879
ruby-progressbar (~> 1.7)
7980
unicode-display_width (>= 2.4.0, < 3.0)
80-
rubocop-ast (1.29.0)
81+
rubocop-ast (1.30.0)
8182
parser (>= 3.2.1.0)
82-
rubocop-capybara (2.18.0)
83+
rubocop-capybara (2.19.0)
8384
rubocop (~> 1.41)
84-
rubocop-factory_bot (2.23.1)
85+
rubocop-factory_bot (2.24.0)
8586
rubocop (~> 1.33)
86-
rubocop-performance (1.18.0)
87+
rubocop-performance (1.19.1)
8788
rubocop (>= 1.7.0, < 2.0)
8889
rubocop-ast (>= 0.4.0)
8990
rubocop-rake (0.6.0)
9091
rubocop (~> 1.0)
91-
rubocop-rspec (2.22.0)
92-
rubocop (~> 1.33)
92+
rubocop-rspec (2.25.0)
93+
rubocop (~> 1.40)
9394
rubocop-capybara (~> 2.17)
9495
rubocop-factory_bot (~> 2.22)
9596
ruby-prof (0.18.0)
@@ -109,11 +110,11 @@ GEM
109110
fast_ignore (>= 0.11.0)
110111
jaro_winkler
111112
parallel (~> 1.0)
112-
stringio (3.0.7)
113+
stringio (3.0.9)
113114
syntax_suggest (1.1.0)
114115
terminal-table (3.0.2)
115116
unicode-display_width (>= 1.1.1, < 3)
116-
unicode-display_width (2.4.2)
117+
unicode-display_width (2.5.0)
117118
webrick (1.8.1)
118119
yard (0.9.34)
119120

lib/path_list/matcher/exact_string.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def initialize(item, polarity)
4141
# @param (see Matcher#match)
4242
# @return (see Matcher#match)
4343
def match(candidate)
44-
return @polarity if @item == candidate.full_path
44+
@polarity if @item == candidate.full_path
4545
end
4646

4747
# @return (see Matcher#inspect)

lib/path_list/matcher/exact_string/case_insensitive.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def initialize(item, polarity)
2222
# @param (see Matcher#match)
2323
# @return (see Matcher#match)
2424
def match(candidate)
25-
return @polarity if @item == candidate.full_path_downcase
25+
@polarity if @item == candidate.full_path_downcase
2626
end
2727
end
2828
end

lib/path_list/pattern_parser/glob_gitignore.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ def process_first_characters
103103
return dir_only! && emitted! if @s.dot_slash_end?
104104
return emitted! if @s.dot_slash_or_end?
105105
return process_up_a_level && dir_only! if @s.dot_dot_slash_end?
106-
return process_up_a_level if @s.dot_dot_slash_or_end?
106+
107+
process_up_a_level if @s.dot_dot_slash_or_end?
107108
end
108109

109110
# @return [void]

path_list.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
1414
spec.homepage = 'https://github.com/robotdana/path_list'
1515
spec.license = 'MIT'
1616

17-
spec.required_ruby_version = '>= 2.7.0'
17+
spec.required_ruby_version = '>= 3.0.0'
1818

1919
if spec.respond_to?(:metadata)
2020
spec.metadata['homepage_uri'] = spec.homepage
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

spec/pattern_parser/glob_gitignore_spec.rb renamed to spec/path_list/pattern_parser/glob_gitignore_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ def build(pattern)
333333
stub_const('::File::ALT_SEPARATOR', '\\')
334334

335335
silence_warnings do
336-
load File.expand_path('../../lib/path_list/pattern_parser/glob_gitignore/scanner.rb', __dir__)
336+
load File.expand_path('../../../lib/path_list/pattern_parser/glob_gitignore/scanner.rb', __dir__)
337337
end
338338
end
339339

@@ -345,7 +345,7 @@ def build(pattern)
345345
stub_const('::File::ALT_SEPARATOR', windows? ? '\\' : nil)
346346

347347
silence_warnings do
348-
load File.expand_path('../../lib/path_list/pattern_parser/glob_gitignore/scanner.rb', __dir__)
348+
load File.expand_path('../../../lib/path_list/pattern_parser/glob_gitignore/scanner.rb', __dir__)
349349
end
350350
end
351351

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)