chefstyle 0.4.0 → 0.5.0

data/config/upstream.yml

@@ -29,32 +29,35 @@ AllCops:
     - '**/*Fastfile'
   Exclude:
     - 'vendor/**/*'
-  # Default formatter will be used if no -f/--format option is given.
+  # Default formatter will be used if no `-f/--format` option is given.
   DefaultFormatter: progress
   # Cop names are not displayed in offense messages by default. Change behavior
-  # by overriding DisplayCopNames, or by giving the -D/--display-cop-names
+  # by overriding DisplayCopNames, or by giving the `-D/--display-cop-names`
   # option.
   DisplayCopNames: false
   # Style guide URLs are not displayed in offense messages by default. Change
-  # behavior by overriding DisplayStyleGuide, or by giving the
-  # -S/--display-style-guide option.
+  # behavior by overriding `DisplayStyleGuide`, or by giving the
+  # `-S/--display-style-guide` option.
   DisplayStyleGuide: false
+  # When specifying style guide URLs, any paths and/or fragments will be
+  # evaluated relative to the base URL.
+  StyleGuideBaseURL: https://github.com/bbatsov/ruby-style-guide
   # Extra details are not displayed in offense messages by default. Change
   # behavior by overriding ExtraDetails, or by giving the
-  # -E/--extra-details option.
+  # `-E/--extra-details` option.
   ExtraDetails: false
   # Additional cops that do not reference a style guide rule may be enabled by
-  # default. Change behavior by overriding StyleGuideCopsOnly, or by giving
-  # the --only-guide-cops option.
+  # default. Change behavior by overriding `StyleGuideCopsOnly`, or by giving
+  # the `--only-guide-cops` option.
   StyleGuideCopsOnly: false
   # All cops except the ones in disabled.yml are enabled by default. Change
-  # this behavior by overriding DisabledByDefault. When DisabledByDefault is
-  # true, all cops in the default configuration are disabled, and and only cops
+  # this behavior by overriding `DisabledByDefault`. When `DisabledByDefault` is
+  # `true`, all cops in the default configuration are disabled, and only cops
   # in user configuration are enabled. This makes cops opt-in instead of
-  # opt-out. Note that when DisabledByDefault is true, cops in user
+  # opt-out. Note that when `DisabledByDefault` is `true`, cops in user
   # configuration will be enabled even if they don't set the Enabled parameter.
   DisabledByDefault: false
-  # Enables the result cache if true. Can be overridden by the --cache command
+  # Enables the result cache if `true`. Can be overridden by the `--cache` command
   # line option.
   UseCache: true
   # Threshold for how many files can be stored in the result cache before some
@@ -77,7 +80,7 @@ AllCops:
   # run on? (If there is more than one, set this to the lowest version.)
   # If a value is specified for TargetRubyVersion then it is used.
   # Else if .ruby-version exists and it contains an MRI version it is used.
-  # Otherwise we fallback to the oldest officially supported Ruby version (2.0).
+  # Otherwise we fallback to the oldest officially supported Ruby version (2.1).
   TargetRubyVersion: ~
 
 # Indent private/protected/public as deep as method definitions
@@ -110,6 +113,10 @@ Style/AlignHash:
   #   'a'  => 2
   #   'bb' => 3
   EnforcedHashRocketStyle: key
+  SupportedHashRocketStyles:
+    - key
+    - separator
+    - table
   # Alignment of entries using colon as separator. Valid values are:
   #
   # key - left alignment of keys
@@ -122,6 +129,10 @@ Style/AlignHash:
   #   a:  0
   #   bb: 1
   EnforcedColonStyle: key
+  SupportedColonStyles:
+    - key
+    - separator
+    - table
   # Select whether hashes that are the last argument in a method call should be
   # inspected? Valid values are:
   #
@@ -191,7 +202,7 @@ Style/AndOr:
     - conditionals
 
 
-# Checks if usage of %() or %Q() matches configuration.
+# Checks if usage of `%()` or `%Q()` matches configuration.
 Style/BarePercentLiterals:
   EnforcedStyle: bare_percent
   SupportedStyles:
@@ -285,14 +296,14 @@ Style/BracesAroundHashParameters:
 
 # Indentation of `when`.
 Style/CaseIndentation:
-  IndentWhenRelativeTo: case
+  EnforcedStyle: case
   SupportedStyles:
     - case
     - end
   IndentOneStep: false
-  # By default, the indentation width from Style/IndentationWidth is used
-  # But it can be overridden by setting this parameter
-  # This only matters if IndentOneStep is true
+  # By default, the indentation width from `Style/IndentationWidth` is used.
+  # But it can be overridden by setting this parameter.
+  # This only matters if `IndentOneStep` is `true`
   IndentationWidth: ~
 
 Style/ClassAndModuleChildren:
@@ -310,7 +321,7 @@ Style/ClassAndModuleChildren:
   #   class Foo::Bar
   #   end
   #
-  # The compact style is only forced, for classes / modules with one child.
+  # The compact style is only forced, for classes or modules with one child.
   EnforcedStyle: nested
   SupportedStyles:
     - nested
@@ -337,17 +348,17 @@ Style/CollectionMethods:
     detect: 'find'
     find_all: 'select'
 
-# Use ` or %x around command literals.
+# Use '`' or '%x' around command literals.
 Style/CommandLiteral:
   EnforcedStyle: backticks
   # backticks: Always use backticks.
-  # percent_x: Always use %x.
-  # mixed: Use backticks on single-line commands, and %x on multi-line commands.
+  # percent_x: Always use `%x`.
+  # mixed: Use backticks on single-line commands, and `%x` on multi-line commands.
   SupportedStyles:
     - backticks
     - percent_x
     - mixed
-  # If false, the cop will always recommend using %x if one or more backticks
+  # If `false`, the cop will always recommend using `%x` if one or more backticks
   # are found in the command string.
   AllowInnerBackticks: false
 
@@ -372,14 +383,15 @@ Style/ConditionalAssignment:
   # will only register an offense for assignment to a condition that has
   # at least one multiline branch.
   SingleLineConditionsOnly: true
+  IncludeTernaryExpressions: true
 
 # Checks that you have put a copyright in a comment before any code.
 #
 # You can override the default Notice in your .rubocop.yml file.
 #
 # In order to use autocorrect, you must supply a value for the
-# AutocorrectNotice key that matches the regexp Notice.  A blank
-# AutocorrectNotice will cause an error during autocorrect.
+# `AutocorrectNotice` key that matches the regexp Notice.  A blank
+# `AutocorrectNotice` will cause an error during autocorrect.
 #
 # Autocorrect will add a copyright notice in a comment at the top
 # of the file immediately after any shebang or encoding comments.
@@ -395,6 +407,9 @@ Style/Copyright:
   Notice: '^Copyright (\(c\) )?2[0-9]{3} .+'
   AutocorrectNotice: ''
 
+Style/DocumentationMethod:
+  RequireForNonPublicMethods: false
+
 # Multi-line method chaining should be done with leading dots.
 Style/DotPosition:
   EnforcedStyle: leading
@@ -403,9 +418,9 @@ Style/DotPosition:
     - trailing
 
 # Warn on empty else statements
-# empty - warn only on empty else
-# nil - warn on else with nil in it
-# both - warn on empty else and else with nil in it
+# empty - warn only on empty `else`
+# nil - warn on `else` with nil in it
+# both - warn on empty `else` and `else` with nil in it
 Style/EmptyElse:
   EnforcedStyle: both
   SupportedStyles:
@@ -415,7 +430,7 @@ Style/EmptyElse:
 
 # Use empty lines between defs.
 Style/EmptyLineBetweenDefs:
-  # If true, this parameter means that single line method definitions don't
+  # If `true`, this parameter means that single line method definitions don't
   # need an empty line between them.
   AllowAdjacentOneLineDefs: false
 
@@ -429,14 +444,24 @@ Style/EmptyLinesAroundClassBody:
   EnforcedStyle: no_empty_lines
   SupportedStyles:
     - empty_lines
+    - empty_lines_except_namespace
+    - empty_lines_special
     - no_empty_lines
 
 Style/EmptyLinesAroundModuleBody:
   EnforcedStyle: no_empty_lines
   SupportedStyles:
     - empty_lines
+    - empty_lines_except_namespace
+    - empty_lines_special
     - no_empty_lines
 
+Style/EmptyMethod:
+  EnforcedStyle: compact
+  SupportedStyles:
+    - compact
+    - expanded
+
 # Checks whether the source file has a utf-8 encoding comment or not
 # AutoCorrectEncodingComment must match the regex
 # /#.*coding\s?[:=]\s?(?:UTF|utf)-8/
@@ -453,19 +478,19 @@ Style/ExtraSpacing:
   # things with the previous or next line, not counting empty lines or comment
   # lines.
   AllowForAlignment: true
-  # When true, forces the alignment of = in assignments on consecutive lines.
+  # When true, forces the alignment of `=` in assignments on consecutive lines.
   ForceEqualSignAlignment: false
 
 Style/FileName:
-  # File names listed in AllCops:Include are excluded by default. Add extra
+  # File names listed in `AllCops:Include` are excluded by default. Add extra
   # excludes here.
   Exclude: []
-  # When true, requires that each source file should define a class or module
+  # When `true`, requires that each source file should define a class or module
   # with a name which matches the file name (converted to ... case).
   # It further expects it to be nested inside modules which match the names
   # of subdirectories in its path.
   ExpectMatchingDefinition: false
-  # If non-nil, expect all source file names to match the following regex.
+  # If non-`nil`, expect all source file names to match the following regex.
   # Only the file name itself is matched, not the entire file path.
   # Use anchors as necessary if you want to match the entire name rather than
   # just a part of it.
@@ -474,6 +499,47 @@ Style/FileName:
   # report offending filenames for executable scripts (i.e. source
   # files with a shebang in the first line).
   IgnoreExecutableScripts: true
+  AllowedAcronyms:
+    - CLI
+    - DSL
+    - ACL
+    - API
+    - ASCII
+    - CPU
+    - CSS
+    - DNS
+    - EOF
+    - GUID
+    - HTML
+    - HTTP
+    - HTTPS
+    - ID
+    - IP
+    - JSON
+    - LHS
+    - QPS
+    - RAM
+    - RHS
+    - RPC
+    - SLA
+    - SMTP
+    - SQL
+    - SSH
+    - TCP
+    - TLS
+    - TTL
+    - UDP
+    - UI
+    - UID
+    - UUID
+    - URI
+    - URL
+    - UTF8
+    - VM
+    - XML
+    - XMPP
+    - XSRF
+    - XSS
 
 Style/FirstParameterIndentation:
   EnforcedStyle: special_for_inner_method_call_in_parentheses
@@ -486,10 +552,10 @@ Style/FirstParameterIndentation:
     # a parameter in a method call, then the inner parameter should be indented
     # relative to the inner method.
     - special_for_inner_method_call
-    # Same as special_for_inner_method_call except that the special rule only
+    # Same as `special_for_inner_method_call` except that the special rule only
     # applies if the outer method call encloses its arguments in parentheses.
     - special_for_inner_method_call_in_parentheses
-  # By default, the indentation width from Style/IndentationWidth is used
+  # By default, the indentation width from `Style/IndentationWidth` is used
   # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
@@ -519,12 +585,15 @@ Style/FrozenStringLiteralComment:
     # string literal. If you run code against multiple versions of Ruby, it is
     # possible that this will create errors in Ruby 2.3.0+.
     - always
+    # `never` will enforce that the frozen string literal comment does not
+    # exist in a file.
+    - never
 
 # Built-in global variables are allowed by default.
 Style/GlobalVars:
   AllowedVariables: []
 
-# `MinBodyLength` defines the number of lines of the a body of an if / unless
+# `MinBodyLength` defines the number of lines of the a body of an `if` or `unless`
 # needs to have to trigger this cop
 Style/GuardClause:
   MinBodyLength: 1
@@ -532,9 +601,14 @@ Style/GuardClause:
 Style/HashSyntax:
   EnforcedStyle: ruby19
   SupportedStyles:
+    # checks for 1.9 syntax (e.g. {a: 1}) for all symbol keys
     - ruby19
-    - ruby19_no_mixed_keys
+    # checks for hash rocket syntax for all hashes
     - hash_rockets
+    # forbids mixed key syntaxes (e.g. {a: 1, :b => 2})
+    - no_mixed_keys
+    # enforces both ruby19 and no_mixed_keys styles
+    - ruby19_no_mixed_keys
   # Force hashes that have a symbol value to use hash rockets
   UseHashRocketsWithSymbolValues: false
   # Do not suggest { a?: 1 } over { :a? => 1 } in ruby19 style
@@ -577,13 +651,13 @@ Style/IndentArray:
     - special_inside_parentheses
     - consistent
     - align_brackets
-  # By default, the indentation width from Style/IndentationWidth is used
+  # By default, the indentation width from `Style/IndentationWidth` is used
   # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
 # Checks the indentation of assignment RHS, when on a different line from LHS
 Style/IndentAssignment:
-  # By default, the indentation width from Style/IndentationWidth is used
+  # By default, the indentation width from `Style/IndentationWidth` is used
   # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
@@ -605,7 +679,7 @@ Style/IndentHash:
     - special_inside_parentheses
     - consistent
     - align_braces
-  # By default, the indentation width from Style/IndentationWidth is used
+  # By default, the indentation width from `Style/IndentationWidth` is used
   # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
@@ -616,6 +690,12 @@ Style/Lambda:
     - lambda
     - literal
 
+Style/SpaceInLambdaLiteral:
+  EnforcedStyle: require_no_space
+  SupportedStyles:
+    - require_no_space
+    - require_space
+
 Style/LambdaCall:
   EnforcedStyle: call
   SupportedStyles:
@@ -627,7 +707,7 @@ Style/Next:
   # replaced by next - with `skip_modifier_ifs` the modifier if like this one
   # are ignored: [1, 2].each { |a| return 'yes' if a == 1 }
   EnforcedStyle: skip_modifier_ifs
-  # `MinBodyLength` defines the number of lines of the a body of an if / unless
+  # `MinBodyLength` defines the number of lines of the a body of an `if` or `unless`
   # needs to have to trigger this cop
   MinBodyLength: 3
   SupportedStyles:
@@ -648,6 +728,10 @@ Style/NumericPredicate:
   SupportedStyles:
     - predicate
     - comparison
+  # Exclude RSpec specs because assertions like `expect(1).to be > 0` cause
+  # false positives.
+  Exclude:
+    - 'spec/**/*'
 
 Style/MethodDefParentheses:
   EnforcedStyle: require_parentheses
@@ -656,6 +740,9 @@ Style/MethodDefParentheses:
     - require_no_parentheses
     - require_no_parentheses_except_multiline
 
+Style/MethodCallWithArgsParentheses:
+  IgnoredMethods: []
+
 Style/MethodName:
   EnforcedStyle: snake_case
   SupportedStyles:
@@ -741,7 +828,7 @@ Style/MultilineOperationIndentation:
   SupportedStyles:
     - aligned
     - indented
-  # By default, the indentation width from Style/IndentationWidth is used
+  # By default, the indentation width from `Style/IndentationWidth` is used
   # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
@@ -771,6 +858,7 @@ Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%':  ()
     '%i': ()
+    '%I': ()
     '%q': ()
     '%Q': ()
     '%r': '{}'
@@ -782,8 +870,8 @@ Style/PercentLiteralDelimiters:
 Style/PercentQLiterals:
   EnforcedStyle: lower_case_q
   SupportedStyles:
-    - lower_case_q # Use %q when possible, %Q when necessary
-    - upper_case_q # Always use %Q
+    - lower_case_q # Use `%q` when possible, `%Q` when necessary
+    - upper_case_q # Always use `%Q`
 
 Style/PredicateName:
   # Predicate name prefixes.
@@ -796,7 +884,7 @@ Style/PredicateName:
     - is_
     - has_
     - have_
-  # Predicate names which, despite having a blacklisted prefix, or no ?,
+  # Predicate names which, despite having a blacklisted prefix, or no `?`,
   # should still be accepted
   NameWhitelist:
     - is_a?
@@ -805,6 +893,12 @@ Style/PredicateName:
   Exclude:
     - 'spec/**/*'
 
+Style/PreferredHashMethods:
+  EnforcedStyle: short
+  SupportedStyles:
+    - short
+    - verbose
+
 Style/RaiseArgs:
   EnforcedStyle: exploded
   SupportedStyles:
@@ -812,25 +906,30 @@ Style/RaiseArgs:
     - exploded # raise Exception, msg
 
 Style/RedundantReturn:
-  # When true allows code like `return x, y`.
+  # When `true` allows code like `return x, y`.
   AllowMultipleReturnValues: false
 
-# Use / or %r around regular expressions.
+# Use `/` or `%r` around regular expressions.
 Style/RegexpLiteral:
   EnforcedStyle: slashes
   # slashes: Always use slashes.
-  # percent_r: Always use %r.
-  # mixed: Use slashes on single-line regexes, and %r on multi-line regexes.
+  # percent_r: Always use `%r`.
+  # mixed: Use slashes on single-line regexes, and `%r` on multi-line regexes.
   SupportedStyles:
     - slashes
     - percent_r
     - mixed
-  # If false, the cop will always recommend using %r if one or more slashes
+  # If `false`, the cop will always recommend using `%r` if one or more slashes
   # are found in the regexp string.
   AllowInnerSlashes: false
 
+Style/SafeNavigation:
+  # Safe navigation may cause a statement to start returning `nil` in addition
+  # to whatever it used to return.
+  ConvertCodeThatCanStartToReturnNil: false
+
 Style/Semicolon:
-  # Allow ; to separate several expressions on the same line.
+  # Allow `;` to separate several expressions on the same line.
   AllowAsExpressionSeparator: false
 
 Style/SignalException:
@@ -843,17 +942,17 @@ Style/SignalException:
 Style/SingleLineBlockParams:
   Methods:
     - reduce:
-        - a
-        - e
+        - acc
+        - elem
     - inject:
-        - a
-        - e
+        - acc
+        - elem
 
 Style/SingleLineMethods:
   AllowIfMethodIsEmpty: true
 
 Style/SpaceBeforeFirstArg:
-  # When true, allows most uses of extra spacing if the intent is to align
+  # When `true`, allows most uses of extra spacing if the intent is to align
   # things with the previous or next line, not counting empty lines or comment
   # lines.
   AllowForAlignment: true
@@ -875,7 +974,7 @@ Style/StringLiterals:
   SupportedStyles:
     - single_quotes
     - double_quotes
-  # If true, strings which span multiple lines using \ for continuation must
+  # If `true`, strings which span multiple lines using `\` for continuation must
   # use the same type of quotes on each line.
   ConsistentQuotesInMultiline: false
 
@@ -897,7 +996,7 @@ Style/StringMethods:
 
 Style/SpaceAroundBlockParameters:
   EnforcedStyleInsidePipes: no_space
-  SupportedStyles:
+  SupportedStylesInsidePipes:
     - space
     - no_space
 
@@ -908,7 +1007,7 @@ Style/SpaceAroundEqualsInParameterDefault:
     - no_space
 
 Style/SpaceAroundOperators:
-  # When true, allows most uses of extra spacing if the intent is to align
+  # When `true`, allows most uses of extra spacing if the intent is to align
   # with an operator on the previous or next line, not counting empty lines
   # or comment lines.
   AllowForAlignment: true
@@ -924,20 +1023,25 @@ Style/SpaceInsideBlockBraces:
   SupportedStyles:
     - space
     - no_space
-  # Valid values are: space, no_space
   EnforcedStyleForEmptyBraces: no_space
+  SupportedStylesForEmptyBraces:
+    - space
+    - no_space
   # Space between { and |. Overrides EnforcedStyle if there is a conflict.
   SpaceBeforeBlockParameters: true
 
 Style/SpaceInsideHashLiteralBraces:
   EnforcedStyle: space
-  EnforcedStyleForEmptyBraces: no_space
   SupportedStyles:
     - space
     - no_space
     # 'compact' normally requires a space inside hash braces, with the exception
     # that successive left braces or right braces are collapsed together
     - compact
+  EnforcedStyleForEmptyBraces: no_space
+  SupportedStylesForEmptyBraces:
+    - space
+    - no_space
 
 Style/SpaceInsideStringInterpolation:
   EnforcedStyle: no_space
@@ -963,6 +1067,7 @@ Style/TernaryParentheses:
   SupportedStyles:
     - require_parentheses
     - require_no_parentheses
+    - require_parentheses_when_complex
   AllowSafeAssignment: true
 
 Style/TrailingBlankLines:
@@ -977,7 +1082,7 @@ Style/TrailingCommaInArguments:
   # If `consistent_comma`, the cop requires a comma after the last argument,
   # for all parenthesized method calls with arguments.
   EnforcedStyleForMultiline: no_comma
-  SupportedStyles:
+  SupportedStylesForMultiline:
     - comma
     - consistent_comma
     - no_comma
@@ -988,7 +1093,7 @@ Style/TrailingCommaInLiteral:
   # If `consistent_comma`, the cop requires a comma after the last item of all
   # non-empty array and hash literals.
   EnforcedStyleForMultiline: no_comma
-  SupportedStyles:
+  SupportedStylesForMultiline:
     - comma
     - consistent_comma
     - no_comma
@@ -996,7 +1101,7 @@ Style/TrailingCommaInLiteral:
 # TrivialAccessors requires exact name matches and doesn't allow
 # predicated methods by default.
 Style/TrivialAccessors:
-  # When set to false the cop will suggest the use of accessor methods
+  # When set to `false` the cop will suggest the use of accessor methods
   # in situations like:
   #
   # def name
@@ -1041,10 +1146,17 @@ Style/VariableName:
     - snake_case
     - camelCase
 
+Style/VariableNumber:
+  EnforcedStyle: normalcase
+  SupportedStyles:
+    - snake_case
+    - normalcase
+    - non_integer
+
 Style/WhileUntilModifier:
   MaxLineLength: 80
 
-# WordArray enforces how array literals of word-like strings should be expressed.
+# `WordArray` enforces how array literals of word-like strings should be expressed.
 Style/WordArray:
   EnforcedStyle: percent
   SupportedStyles:
@@ -1052,21 +1164,22 @@ Style/WordArray:
     - percent
     # bracket style: ['word1', 'word2']
     - brackets
-  # The MinSize option causes the WordArray rule to be ignored for arrays
+  # The `MinSize` option causes the `WordArray` rule to be ignored for arrays
   # smaller than a certain size.  The rule is only applied to arrays
-  # whose element count is greater than or equal to MinSize.
+  # whose element count is greater than or equal to `MinSize`.
   MinSize: 0
-  # The regular expression WordRegex decides what is considered a word.
+  # The regular expression `WordRegex` decides what is considered a word.
   WordRegex: !ruby/regexp '/\A[\p{Word}\n\t]+\z/'
 
 ##################### Metrics ##################################
 
 Metrics/AbcSize:
-  # The ABC size is a calculated magnitude, so this number can be a Fixnum or
+  # The ABC size is a calculated magnitude, so this number can be an Integer or
   # a Float.
   Max: 15
 
 Metrics/BlockNesting:
+  CountBlocks: false
   Max: 3
 
 Metrics/ClassLength:
@@ -1090,11 +1203,23 @@ Metrics/LineLength:
   URISchemes:
     - http
     - https
+  # The IgnoreCopDirectives option causes the LineLength rule to ignore cop
+  # directives like '# rubocop: enable ...' when calculating a line's length.
+  IgnoreCopDirectives: false
+  # The IgnoredPatterns option is a list of !ruby/regexp and/or string
+  # elements. Strings will be converted to Regexp objects. A line that matches
+  # any regular expression listed in this option will be ignored by LineLength.
+  IgnoredPatterns: []
 
 Metrics/MethodLength:
   CountComments: false  # count full line comments?
   Max: 10
 
+Metrics/BlockLength:
+  CountComments: false  # count full line comments?
+  Max: 25
+  ExcludedMethods: []
+
 Metrics/ParameterLists:
   Max: 5
   CountKeywordArgs: true
@@ -1115,8 +1240,8 @@ Lint/BlockAlignment:
   # The value `start_of_line` means it should be aligned with the whole
   # expression's starting line.
   # The value `either` means both are allowed.
-  AlignWith: either
-  SupportedStyles:
+  EnforcedStyleAlignWith: either
+  SupportedStylesAlignWith:
     - either
     - start_of_block
     - start_of_line
@@ -1124,14 +1249,14 @@ Lint/BlockAlignment:
 # Align ends correctly.
 Lint/EndAlignment:
   # The value `keyword` means that `end` should be aligned with the matching
-  # keyword (if, while, etc.).
+  # keyword (`if`, `while`, etc.).
   # The value `variable` means that in assignments, `end` should be aligned
   # with the start of the variable on the left hand side of `=`. In all other
   # situations, `end` should still be aligned with the keyword.
   # The value `start_of_line` means that `end` should be aligned with the start
   # of the line which the matching keyword appears on.
-  AlignWith: keyword
-  SupportedStyles:
+  EnforcedStyleAlignWith: keyword
+  SupportedStylesAlignWith:
     - keyword
     - variable
     - start_of_line
@@ -1142,8 +1267,8 @@ Lint/DefEndAlignment:
   # The value `start_of_line` means that `end` should be aligned with method
   # calls like `private`, `public`, etc, if present in front of the `def`
   # keyword on the same line.
-  AlignWith: start_of_line
-  SupportedStyles:
+  EnforcedStyleAlignWith: start_of_line
+  SupportedStylesAlignWith:
     - start_of_line
     - def
   AutoCorrect: false
@@ -1192,6 +1317,14 @@ Rails/Date:
     - strict
     - flexible
 
+Rails/DynamicFindBy:
+  Whitelist:
+    - find_by_sql
+
+Rails/EnumUniqueness:
+  Include:
+    - app/models/**/*.rb
+
 Rails/Exit:
   Include:
     - app/**/*.rb
@@ -1212,6 +1345,10 @@ Rails/HasAndBelongsToMany:
   Include:
     - app/models/**/*.rb
 
+Rails/NotNullColumn:
+  Include:
+    - db/migrate/*.rb
+
 Rails/Output:
   Include:
     - app/**/*.rb
@@ -1229,6 +1366,17 @@ Rails/RequestReferer:
     - referer
     - referrer
 
+Rails/ReversibleMigration:
+  Include:
+    - db/migrate/*.rb
+
+Rails/SafeNavigation:
+  # This will convert usages of `try` to use safe navigation as well as `try!`.
+  # `try` and `try!` work slighly differently. `try!` and safe navigation will
+  # both raise a `NoMethodError` if the receiver of the method call does not
+  # implement the intended method. `try` will not raise an exception for this.
+  ConvertTry: false
+
 Rails/ScopeArgs:
   Include:
     - app/models/**/*.rb
@@ -1242,12 +1390,26 @@ Rails/TimeZone:
     - flexible
 
 Rails/UniqBeforePluck:
-  EnforcedMode: conservative
-  SupportedModes:
+  EnforcedStyle: conservative
+  SupportedStyles:
     - conservative
     - aggressive
   AutoCorrect: false
 
+Rails/SkipsModelValidations:
+  Blacklist:
+    - decrement!
+    - decrement_counter
+    - increment!
+    - increment_counter
+    - toggle!
+    - touch
+    - update_all
+    - update_attribute
+    - update_column
+    - update_columns
+    - update_counters
+
 Rails/Validation:
   Include:
     - app/models/**/*.rb