Skip to content

Commit

Permalink
Update rubocop and friends
Browse files Browse the repository at this point in the history
  • Loading branch information
robotdana committed Nov 25, 2023
1 parent a7b35a1 commit 86e600b
Show file tree
Hide file tree
Showing 46 changed files with 34 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ AllCops:
- bin/benchmark # i have things rubocop doesn't like that i want to keep
DisplayCopNames: true
DisplayStyleGuide: true
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0

# all of our layout customisations are because we prefer indentation to be
# always consistently 2 spaces, for blocks, scopes, multiline expressions, etc
Expand Down
51 changes: 26 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GEM
ast (2.4.2)
benchmark-ips (2.12.0)
coderay (1.1.3)
commonmarker (0.23.9)
commonmarker (0.23.10)
debug (1.8.0)
irb (>= 1.5.0)
reline (>= 0.3.1)
Expand All @@ -19,8 +19,9 @@ GEM
fast_ignore (0.17.4)
io-console (0.6.0)
io-console (0.6.0-java)
irb (1.7.1)
reline (>= 0.3.0)
irb (1.9.1)
rdoc
reline (>= 0.3.8)
jar-dependencies (0.4.1)
jaro_winkler (1.5.6)
jaro_winkler (1.5.6-java)
Expand All @@ -33,26 +34,26 @@ GEM
parser
method_source (1.0.0)
parallel (1.23.0)
parser (3.2.2.3)
parser (3.2.2.4)
ast (~> 2.4.1)
racc
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
psych (5.1.0)
psych (5.1.1.1)
stringio
psych (5.1.0-java)
psych (5.1.1.1-java)
jar-dependencies (>= 0.1.7)
racc (1.7.1)
racc (1.7.1-java)
racc (1.7.3)
racc (1.7.3-java)
rainbow (3.1.1)
rake (13.0.6)
rdoc (6.5.0)
rake (13.1.0)
rdoc (6.6.0)
psych (>= 4.0.0)
regexp_parser (2.8.1)
reline (0.3.5)
regexp_parser (2.8.2)
reline (0.4.0)
io-console (~> 0.5)
rexml (3.2.5)
rexml (3.2.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
Expand All @@ -62,34 +63,34 @@ GEM
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.5)
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rubocop (1.54.0)
rubocop (1.57.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
parser (>= 3.2.2.4)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.18.0)
rubocop-capybara (2.19.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.23.1)
rubocop-factory_bot (2.24.0)
rubocop (~> 1.33)
rubocop-performance (1.18.0)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.22.0)
rubocop (~> 1.33)
rubocop-rspec (2.25.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
ruby-prof (0.18.0)
Expand All @@ -109,11 +110,11 @@ GEM
fast_ignore (>= 0.11.0)
jaro_winkler
parallel (~> 1.0)
stringio (3.0.7)
stringio (3.0.9)
syntax_suggest (1.1.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.4.2)
unicode-display_width (2.5.0)
webrick (1.8.1)
yard (0.9.34)

Expand Down
2 changes: 1 addition & 1 deletion lib/path_list/matcher/exact_string.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def initialize(item, polarity)
# @param (see Matcher#match)
# @return (see Matcher#match)
def match(candidate)
return @polarity if @item == candidate.full_path
@polarity if @item == candidate.full_path
end

# @return (see Matcher#inspect)
Expand Down
2 changes: 1 addition & 1 deletion lib/path_list/matcher/exact_string/case_insensitive.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def initialize(item, polarity)
# @param (see Matcher#match)
# @return (see Matcher#match)
def match(candidate)
return @polarity if @item == candidate.full_path_downcase
@polarity if @item == candidate.full_path_downcase
end
end
end
Expand Down
3 changes: 2 additions & 1 deletion lib/path_list/pattern_parser/glob_gitignore.rb
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ def process_first_characters
return dir_only! && emitted! if @s.dot_slash_end?
return emitted! if @s.dot_slash_or_end?
return process_up_a_level && dir_only! if @s.dot_dot_slash_end?
return process_up_a_level if @s.dot_dot_slash_or_end?

process_up_a_level if @s.dot_dot_slash_or_end?
end

# @return [void]
Expand Down
2 changes: 1 addition & 1 deletion path_list.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
spec.homepage = 'https://github.com/robotdana/path_list'
spec.license = 'MIT'

spec.required_ruby_version = '>= 2.7.0'
spec.required_ruby_version = '>= 3.0.0'

if spec.respond_to?(:metadata)
spec.metadata['homepage_uri'] = spec.homepage
Expand Down
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.
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.
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.
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ def build(pattern)
stub_const('::File::ALT_SEPARATOR', '\\')

silence_warnings do
load File.expand_path('../../lib/path_list/pattern_parser/glob_gitignore/scanner.rb', __dir__)
load File.expand_path('../../../lib/path_list/pattern_parser/glob_gitignore/scanner.rb', __dir__)
end
end

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

silence_warnings do
load File.expand_path('../../lib/path_list/pattern_parser/glob_gitignore/scanner.rb', __dir__)
load File.expand_path('../../../lib/path_list/pattern_parser/glob_gitignore/scanner.rb', __dir__)
end
end

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 86e600b

Please sign in to comment.