Skip to content

Commit 363475b

Browse files
committed
Update RuboCop 0.48.1 -> 0.49.1
Fixes a few new warnings in the process.
1 parent cb02c5b commit 363475b

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

.rubocop.yml

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
Layout/ClosingParenthesisIndentation:
2+
Enabled: false
3+
4+
Layout/DotPosition:
5+
EnforcedStyle: trailing
6+
7+
# Fails on AppVeyor builds
8+
Layout/EndOfLine:
9+
Enabled: false
10+
11+
Layout/FirstParameterIndentation:
12+
Enabled: false
13+
14+
Layout/IndentArray:
15+
Enabled: false
16+
17+
Layout/IndentHeredoc:
18+
Enabled: false
19+
20+
Layout/MultilineMethodCallIndentation:
21+
Enabled: false
22+
23+
Layout/MultilineOperationIndentation:
24+
Enabled: false
25+
26+
Layout/SpaceBeforeFirstArg:
27+
Exclude:
28+
- '*.gemspec'
29+
130
Lint/AmbiguousBlockAssociation:
231
Enabled: false
332

@@ -29,33 +58,20 @@ Metrics/ModuleLength:
2958
Style/ClassAndModuleChildren:
3059
Enabled: false
3160

32-
Style/ClosingParenthesisIndentation:
33-
Enabled: false
34-
3561
Style/Documentation:
3662
Exclude:
3763
- 'spec/overcommit/**/*'
3864

39-
Style/DotPosition:
40-
EnforcedStyle: trailing
41-
4265
Style/Encoding:
4366
EnforcedStyle: when_needed
4467

45-
# Fails on AppVeyor builds
46-
Style/EndOfLine:
47-
Enabled: false
48-
4968
Style/FileName:
5069
Exclude:
5170
- 'template-dir/hooks/*'
5271
- 'Gemfile'
5372
- 'Rakefile'
5473
- '*.gemspec'
5574

56-
Style/FirstParameterIndentation:
57-
Enabled: false
58-
5975
Style/FormatString:
6076
Enabled: false
6177

@@ -64,12 +80,6 @@ Style/FormatString:
6480
Style/GuardClause:
6581
Enabled: false
6682

67-
Style/IndentArray:
68-
Enabled: false
69-
70-
Style/IndentHeredoc:
71-
Enabled: false
72-
7383
Style/IfUnlessModifier:
7484
Enabled: false
7585

@@ -79,12 +89,6 @@ Style/IfUnlessModifier:
7989
Style/Lambda:
8090
Enabled: false
8191

82-
Style/MultilineMethodCallIndentation:
83-
Enabled: false
84-
85-
Style/MultilineOperationIndentation:
86-
Enabled: false
87-
8892
Style/Next:
8993
Enabled: false
9094

@@ -121,10 +125,6 @@ Style/SignalException:
121125
Style/SingleLineBlockParams:
122126
Enabled: false
123127

124-
Style/SpaceBeforeFirstArg:
125-
Exclude:
126-
- '*.gemspec'
127-
128128
Style/SpecialGlobalVars:
129129
Enabled: false
130130

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ gem 'rspec', '~> 3.0'
1010
gem 'coveralls', '~> 0.8'
1111

1212
# Pin RuboCop for Travis builds.
13-
gem 'rubocop', '0.48.1'
13+
gem 'rubocop', '0.49.1'

lib/overcommit/configuration.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def concurrency
4141
@concurrency ||=
4242
begin
4343
cores = Overcommit::Utils.processor_count
44-
content = @hash.fetch('concurrency', '%{processors}')
44+
content = @hash.fetch('concurrency', '%<processors>d')
4545
if content.is_a?(String)
4646
concurrency_expr = content % { processors: cores }
4747

0 commit comments

Comments
 (0)