Skip to content

Commit de551dd

Browse files
authored
Lock to RuboCop v1.18.x (#242)
Merge pull request 242
1 parent 0de03e3 commit de551dd

File tree

4 files changed

+43
-29
lines changed

4 files changed

+43
-29
lines changed

.rubocop.yml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,33 @@ inherit_gem:
66
rubocop-jekyll: .rubocop.yml
77

88
AllCops:
9-
TargetRubyVersion: 2.4
9+
TargetRubyVersion: 2.5
10+
SuggestExtensions: false
1011
Exclude:
1112
- vendor/**/*
13+
14+
Layout/LineEndStringConcatenationIndentation:
15+
Enabled: true
16+
17+
Lint/EmptyInPattern:
18+
Enabled: false
19+
20+
Naming/InclusiveLanguage:
21+
Enabled: false
22+
Naming/MemoizedInstanceVariableName:
23+
Exclude:
24+
- 'lib/jekyll-redirect-from/page_without_a_file.rb'
25+
26+
Performance/MapCompact:
27+
Enabled: true
28+
Performance/RedundantEqualityComparisonBlock:
29+
Enabled: true
30+
Performance/RedundantSplitRegexpArgument:
31+
Enabled: true
32+
33+
Style/InPatternThen:
34+
Enabled: false
35+
Style/MultilineInPatternThen:
36+
Enabled: false
37+
Style/QuotedSymbols:
38+
Enabled: true

.rubocop_todo.yml

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,27 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2018-12-06 11:51:19 +0100 using RuboCop version 0.61.1.
3+
# on 2021-09-17 12:49:45 UTC using RuboCop version 1.18.4.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
88

9-
# Offense count: 12
10-
# Configuration parameters: CountComments, Max, ExcludedMethods.
11-
# ExcludedMethods: refine
12-
Metrics/BlockLength:
13-
Exclude:
14-
- 'spec/integrations_spec.rb'
15-
- 'spec/jekyll_redirect_from/generator_spec.rb'
16-
- 'spec/jekyll_redirect_from/redirect_page_spec.rb'
17-
- 'spec/jekyll_redirect_from/redirectable_spec.rb'
18-
- 'spec/spec_helper.rb'
19-
209
# Offense count: 3
21-
# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
10+
# Cop supports --auto-correct.
11+
# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
2212
# URISchemes: http, https
2313
Layout/LineLength:
24-
Exclude:
25-
- 'spec/jekyll_redirect_from/generator_spec.rb'
26-
- 'spec/jekyll_redirect_from/redirect_page_spec.rb'
14+
Max: 105
2715

28-
# Offense count: 1
29-
# Configuration parameters: EnforcedStyleForLeadingUnderscores.
30-
# SupportedStylesForLeadingUnderscores: disallowed, required, optional
31-
Naming/MemoizedInstanceVariableName:
16+
# Offense count: 2
17+
# Configuration parameters: AllowedMethods.
18+
# AllowedMethods: enums
19+
Lint/ConstantDefinitionInBlock:
3220
Exclude:
33-
- 'lib/jekyll-redirect-from/page_without_a_file.rb'
21+
- 'spec/jekyll_redirect_from/generator_spec.rb'
3422

3523
# Offense count: 2
36-
# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
37-
# AllowedNames: io, id, to, by, on, in, at, ip, db
38-
Naming/MethodParameterName:
24+
# Configuration parameters: AllowComments, AllowEmptyLambdas.
25+
Lint/EmptyBlock:
3926
Exclude:
40-
- 'lib/jekyll-redirect-from/redirect_page.rb'
27+
- 'spec/jekyll_redirect_from/generator_spec.rb'

jekyll-redirect-from.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
1919
spec.test_files = spec.files.grep(%r!^(test|spec|features)/!)
2020
spec.require_paths = ["lib"]
2121

22-
spec.required_ruby_version = ">= 2.4.0"
22+
spec.required_ruby_version = ">= 2.5.0"
2323

2424
spec.add_runtime_dependency "jekyll", ">= 3.3", "< 5.0"
2525

2626
spec.add_development_dependency "bundler"
2727
spec.add_development_dependency "jekyll-sitemap", "~> 1.0"
2828
spec.add_development_dependency "rake", "~> 12.0"
2929
spec.add_development_dependency "rspec", "~> 3.5"
30-
spec.add_development_dependency "rubocop-jekyll", "~> 0.10"
30+
spec.add_development_dependency "rubocop-jekyll", "~> 0.12.0"
3131
end

script/fmt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
33

4-
echo "Rubocop $(bundle exec rubocop --version)"
4+
echo "RuboCop $(bundle exec rubocop --version)"
55
bundle exec rubocop -D -E $@
66
success=$?
77
if ((success != 0)); then

0 commit comments

Comments
 (0)