Skip to content

Commit ab890f5

Browse files
committed
1 parent 21836e2 commit ab890f5

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

ruby/rubocop.yml

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Layout
33
################################################################################
44

5-
Layout/AlignParameters:
5+
Layout/ParameterAlignment:
66
Enabled: false
77

88
Layout/EmptyLinesAroundClassBody:
@@ -49,12 +49,12 @@ Metrics/PerceivedComplexity:
4949
Style/BlockDelimiters:
5050
EnforcedStyle: semantic
5151
Exclude:
52-
- spec/**/*
52+
- spec/**/*
5353

5454
# Executables are conventionally named bin/foo-bar
55-
Style/FileName:
55+
Naming/FileName:
5656
Exclude:
57-
- bin/**/*
57+
- bin/**/*
5858

5959
# Naming format tokens is often less readable, especially with time values.
6060
Style/FormatStringToken:
@@ -80,10 +80,7 @@ Style/TrailingCommaInArrayLiteral:
8080
Style/TrailingCommaInHashLiteral:
8181
EnforcedStyleForMultiline: comma
8282

83-
Style/TrailingWhitespace:
84-
Enabled: false
85-
86-
Style/YodaConditions:
83+
Layout/TrailingWhitespace:
8784
Enabled: false
8885

8986
# We avoid GuardClause because it can result in "suprise return"
@@ -98,26 +95,26 @@ Style/IfUnlessModifier:
9895
Style/SignalException:
9996
EnforcedStyle: only_raise
10097

101-
Style/DotPosition:
98+
Layout/DotPosition:
10299
EnforcedStyle: trailing
103100

104101
# Common globals we allow
105102
Style/GlobalVars:
106103
AllowedVariables:
107-
- "$statsd"
108-
- "$mongo"
109-
- "$rollout"
104+
- "$statsd"
105+
- "$mongo"
106+
- "$rollout"
110107

111108
# Using english names requires loading an extra module, which is annoying, so
112109
# we prefer the perl names for consistency.
113110
Style/SpecialGlobalVars:
114111
EnforcedStyle: use_perl_names
115112

116113
# We have common cases where has_ and have_ make sense
117-
Style/PredicateName:
114+
Naming/PredicateName:
118115
Enabled: true
119-
NamePrefixBlacklist:
120-
- is_
116+
ForbiddenPrefixes:
117+
- is_
121118

122119
# We use %w[ ], not %w( ) because the former looks like an array
123120
Style/PercentLiteralDelimiters:
@@ -138,7 +135,7 @@ Style/Next:
138135
Style/ModuleFunction:
139136
Enabled: false
140137

141-
Style/ExtraSpacing:
138+
Layout/ExtraSpacing:
142139
Enabled: false
143140

144141
# and/or in conditionals has no meaningful difference (only gotchas), so we
@@ -153,10 +150,10 @@ Style/AndOr:
153150
Style/MultilineBlockChain:
154151
Enabled: false
155152

156-
Style/MultilineOperationIndentation:
153+
Layout/MultilineOperationIndentation:
157154
EnforcedStyle: indented
158155

159-
Style/AlignHash:
156+
Layout/AlignHash:
160157
EnforcedLastArgumentHashStyle: ignore_implicit
161158

162159
# This has the behavior we want, but it has a bug in it which produces a lot of false positives
@@ -196,4 +193,4 @@ Rails:
196193

197194
Style/ClassAndModuleChildren:
198195
Exclude:
199-
- spec/**/*
196+
- spec/**/*

0 commit comments

Comments
 (0)