Skip to content

Commit

Permalink
rubocop updates (#2770)
Browse files Browse the repository at this point in the history
* rubocop updates

update rubocop files to match hound

* update rubocop yml configs

new gem versions with updated / obsolete config options
  • Loading branch information
camallen committed May 18, 2018
1 parent d6aa12a commit e6e1283
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
11 changes: 5 additions & 6 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Layout/DotPosition:
SupportedStyles:
- leading
- trailing
Style/FileName:
Naming/FileName:
Description: Use snake_case for source file names.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files
Enabled: true
Expand All @@ -29,7 +29,6 @@ Style/IfUnlessModifier:
Description: Favor modifier if/unless usage when you have a single-line body.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
Enabled: false
MaxLineLength: 80
Style/OptionHash:
Description: Don't use option hashes when you can use keyword arguments.
Enabled: false
Expand All @@ -49,7 +48,7 @@ Style/PercentLiteralDelimiters:
"%w": "()"
"%W": "()"
"%x": "()"
Style/PredicateName:
Naming/PredicateName:
Description: Check the names of predicate methods.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark
Enabled: true
Expand Down Expand Up @@ -141,7 +140,7 @@ Lint/AssignmentInCondition:
Style/InlineComment:
Description: Avoid inline comments.
Enabled: false
Style/AccessorMethodName:
Naming/AccessorMethodName:
Description: Check the naming of accessor methods for get_/set_.
Enabled: false
Style/Alias:
Expand Down Expand Up @@ -199,7 +198,7 @@ Lint/HandleExceptions:
Description: Don't suppress exception.
StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
Enabled: false
Lint/LiteralInCondition:
Lint/LiteralAsCondition:
Description: Checks of literals used in conditions.
Enabled: false
Lint/LiteralInInterpolation:
Expand All @@ -212,7 +211,7 @@ Style/FrozenStringLiteralComment:
Style/StringLiterals:
EnforcedStyle: single_quotes
Enabled: false
Style/BlockLength:
Metrics/BlockLength:
Exclude:
- 'Rakefile'
- '**/*.rake'
Expand Down
14 changes: 7 additions & 7 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Lint/AmbiguousRegexpLiteral:

# Offense count: 5
# Cop supports --auto-correct.
Lint/BlockAlignment:
Layout/BlockAlignment:
Exclude:
- 'app/schemas/project_update_schema.rb'
- 'spec/controllers/registrations_controller_spec.rb'
Expand All @@ -30,13 +30,13 @@ Lint/BlockAlignment:
# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
Lint/DefEndAlignment:
Layout/DefEndAlignment:
Enabled: false

# Offense count: 11
# Cop supports --auto-correct.
# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
Lint/EndAlignment:
Layout/EndAlignment:
Enabled: false

# Offense count: 2
Expand Down Expand Up @@ -180,7 +180,7 @@ Style/CommentAnnotation:
- 'config/environments/test.rb'

# Offense count: 1
Style/ConstantName:
Naming/ConstantName:
Exclude:
- 'spec/lib/media_storage/aws_adapter_spec.rb'

Expand Down Expand Up @@ -377,7 +377,7 @@ Style/MethodCallWithoutArgsParentheses:

# Offense count: 2
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/MethodName:
Naming/MethodName:
Enabled: false

# Offense count: 2
Expand Down Expand Up @@ -433,7 +433,7 @@ Style/NumericLiterals:

# Offense count: 5
# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
Style/PredicateName:
Naming/PredicateName:
Exclude:
- 'app/models/api_user.rb'
- 'app/models/concerns/translated_content.rb'
Expand Down Expand Up @@ -561,7 +561,7 @@ Layout/SpaceInsideBlockBraces:

# Offense count: 218
# Cop supports --auto-correct.
Layout/SpaceInsideBrackets:
Layout/SpaceInsideArrayLiteralBrackets:
Enabled: false

# Offense count: 427
Expand Down

0 comments on commit e6e1283

Please sign in to comment.