cookstyle 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c56119ca74e509ed6974159f8d803695e5a1386
-  data.tar.gz: 01c8f3aef8e2ae28dbe378e8c9113e058afb3bca
+  metadata.gz: 75b32711348d3f0b5891a824438bd01b37ce7fd6
+  data.tar.gz: f5d36c386380ec83f1451fcd8febc76465daef7a
 SHA512:
-  metadata.gz: 331fcfe4d7e8be43448f841451b05e4745c6d3e91e8fc05e0f11fe5989ad889e30f52b10eb4ea58d0fcb13adb6ff6e6c99ae607adaefd0b76802c7ee7a7b0c5c
-  data.tar.gz: e9a0775ab1793a1608f276e4dae1abcafa1cb6870eb40e2689d7128dddf96f0ab168399593c8b01a0b080a9d58ad977d7dd62f0cb14da56d3254179d48a651e0
+  metadata.gz: b24c45f4629433a677a32d2b0da198d9c4553118979868e63f99ec3a6834de6b71c69bda1b3bc08dbfa5e8887ecd083bd3388dcbf37d93db005d0cc62621caf9
+  data.tar.gz: 462d275f1fae9a901196afdbe0fc7fd10870843dc9bd5f7be4b40437ecee2355ebeb17aa401ca6b5e118ac7590a9c820ad4bc2e48cda47e1608db42774537208

data/.travis.yml

@@ -6,6 +6,12 @@ sudo: false
 branches:
   only:
     - master
+
+# Early warning system to catch if Rubygems breaks something
+before_install:
+  - gem update --system
+
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Cookstyle Changelog
 
+## 1.3.0 (2017-02-13)
+
+- Upgraded the Rubocop engine from 0.46 -> 0.47.1, but disabled all new cops. This aligns cookstyle with the Rubocop in Chefstyle and also resolves multiple bugs in Rubocop 0.46\. If you previously disabled the Lint/Eval cop in your own Rubocop config you'll need to update that with the new cop name of Security/Eval.
+
 ## 1.2.0 (2017-01-19)
 
 - Change Style/NumericPredicate to use comparisons. We found that cookstyle autocorrecting code from foo == 0 to foo.zero? was breaking a lot of cookbooks. Additionally .zero? is significantly slower than just using foo == 0.

data/README.md

@@ -1,14 +1,20 @@
-# Cookstyle - Version Pinned rubocop and sane defaults for Chef Cookbooks
+# Cookstyle - Sane rubocop defaults for Chef Cookbooks
 
 [![Gem Version](https://badge.fury.io/rb/cookstyle.svg)](https://badge.fury.io/rb/cookstyle) [![Build Status](https://travis-ci.org/chef/cookstyle.svg?branch=master)](https://travis-ci.org/chef/cookstyle)
 
-Pull Requests will not be accepted that assume unfunded mandates for other people to finish the work cleaning up various Chef owned cookbooks. Do not open PRs offering opinions or suggestions without offering to do the work.
+Cookstyle is a set of opinions about ruby code that are specific to
+cookbooks. Running both cookstyle and rubocop on the same codebase will
+result, by design, in changes being applied and then removed. Needless
+to say you should *not* use both tools on the same cookbook.
 
-The project itself is a derivative of [finstyle](https://github.com/fnichol/finstyle), but starts with all rules disabled. The active ruleset is in the [config/cookstyle.yml](https://github.com/chef/cookstyle/blob/master/config/cookstyle.yml) file.
+Cookstyle is included in the ChefDK, and can be used from the command
+line by running `cookstyle`.
+
+The active ruleset is in the [config/cookstyle.yml](https://github.com/chef/cookstyle/blob/master/config/cookstyle.yml) file. Changes to the rule set must be accompanied by arguments and code demonstrating why the change should be made, and in most cases we would expect the author of the change to help with updating the core community cookbooks.
 
 ## How It Works
 
-This library has a direct dependency on one specific version of RuboCop (at a time), and [patches it][patch] to load the [upstream configuration][upstream] and [custom set][config] of rule updates. When a new RuboCop release comes out, this library can rev its pinned version dependency and [re-vendor][rakefile] the upstream configuration to determine if any breaking style or lint rules were added/dropped/reversed/etc.
+The project itself is a derivative of [finstyle](https://github.com/fnichol/finstyle), but starts with all rules disabled. Cookstyle has a direct dependency on one specific version of RuboCop (at a time), and [patches it][patch] to load the [upstream configuration][upstream] and [custom set][config] of rule updates. When a new RuboCop release comes out, this library can rev its pinned version dependency and [re-vendor][rakefile] the upstream configuration to determine if any breaking style or lint rules were added/dropped/reversed/etc.
 
 ## NOTE CAREFULLY ABOUT UPDATING COOKSTYLE
 
@@ -28,6 +34,9 @@ When editing the `cookstyle_base.yml` becomes too much of a PITA, it may be time
 
 ## Installation
 
+Cookstyle is included in the [ChefDK](https://downloads.chef.io/chefdk). If you choose not to use ChefDK,
+you can still install Cookstyle manually using the instructions below.
+
 Add this line to your application's Gemfile:
 
 ```ruby

data/config/cookstyle.yml

@@ -15,6 +15,10 @@ Style/Alias:
   Enabled: false
 Style/SpaceBeforeFirstArg:
   Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# disable all the length cops as they're not appropriate for cookbooks
 LineLength:
   Enabled: false
 MethodLength:
@@ -29,8 +33,6 @@ Metrics/CyclomaticComplexity:
   Enabled: false
 PerceivedComplexity:
   Enabled: false
-Style/ClassAndModuleChildren:
-  Enabled: false
 
 # https://github.com/chef/cookstyle/pull/5
 Style/TrailingCommaInLiteral:

data/config/cookstyle_base.yml

@@ -376,7 +376,7 @@ Lint/EndInMethod:
   Enabled: true
 Lint/EnsureReturn:
   Enabled: true
-Lint/Eval:
+Security/Eval:
   Enabled: true
 Lint/FloatOutOfRange:
   Enabled: true

data/config/disable_all.yml

@@ -1,4 +1,8 @@
 ---
+Bundler/DuplicatedGem:
+  Enabled: false
+Bundler/OrderedGems:
+  Enabled: false
 Lint/AmbiguousOperator:
   Enabled: false
 Lint/AmbiguousRegexpLiteral:
@@ -41,8 +45,6 @@ Lint/EndInMethod:
   Enabled: false
 Lint/EnsureReturn:
   Enabled: false
-Lint/Eval:
-  Enabled: false
 Lint/FloatOutOfRange:
   Enabled: false
 Lint/FormatParameterMismatch:
@@ -63,6 +65,8 @@ Lint/LiteralInInterpolation:
   Enabled: false
 Lint/Loop:
   Enabled: false
+Lint/MultipleCompare:
+  Enabled: false
 Lint/NestedMethodDefinition:
   Enabled: false
 Lint/NextWithoutAccumulator:
@@ -81,6 +85,8 @@ Lint/RequireParentheses:
   Enabled: false
 Lint/RescueException:
   Enabled: false
+Lint/SafeNavigationChain:
+  Enabled: false
 Lint/ShadowedException:
   Enabled: false
 Lint/ShadowingOuterLocalVariable:
@@ -163,13 +169,15 @@ Performance/RedundantMerge:
   Enabled: false
 Performance/RedundantSortBy:
   Enabled: false
+Performance/RegexpMatch:
+  Enabled: false
 Performance/ReverseEach:
   Enabled: false
 Performance/Sample:
   Enabled: false
 Performance/Size:
   Enabled: false
-Performance/SortWithBlock:
+Performance/CompareWithBlock:
   Enabled: false
 Performance/StartWith:
   Enabled: false
@@ -285,6 +293,8 @@ Style/EmptyLinesAroundModuleBody:
   Enabled: false
 Style/EmptyLiteral:
   Enabled: false
+Style/EmptyMethod:
+  Enabled: false
 Style/Encoding:
   Enabled: false
 Style/EndBlock:
@@ -357,7 +367,9 @@ Style/LeadingCommentSpace:
   Enabled: false
 Style/LineEndConcatenation:
   Enabled: false
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
+  Enabled: false
+Style/MethodCallWithArgsParentheses:
   Enabled: false
 Style/MethodCalledOnDoEndBlock:
   Enabled: false
@@ -593,8 +605,12 @@ Rails/Delegate:
   Enabled: false
 Rails/DelegateAllowBlank:
   Enabled: false
+Rails/EnumUniqueness:
+  Enabled: false
 Rails/Exit:
   Enabled: false
+Rails/FilePath:
+  Enabled: false
 Rails/FindBy:
   Enabled: false
 Rails/FindEach:
@@ -615,17 +631,27 @@ Rails/ReadWriteAttribute:
   Enabled: false
 Rails/RequestReferer:
   Enabled: false
+Rails/ReversibleMigration:
+  Enabled: false
 Rails/SafeNavigation:
   Enabled: false
 Rails/SaveBang:
   Enabled: false
 Rails/ScopeArgs:
   Enabled: false
+Rails/SkipsModelValidations:
+  Enabled: false
 Rails/TimeZone:
   Enabled: false
 Rails/UniqBeforePluck:
   Enabled: false
 Rails/Validation:
   Enabled: false
+Security/Eval:
+  Enabled: false
 Security/JSONLoad:
   Enabled: false
+Security/MarshalLoad:
+  Enabled: false
+Security/YAMLLoad:
+  Enabled: false

data/config/disabled.yml

@@ -69,6 +69,11 @@ Style/InlineComment:
   Description: 'Avoid trailing inline comments.'
   Enabled: false
 
+Style/MethodCallWithArgsParentheses:
+  Description: 'Use parentheses for method calls with arguments.'
+  StyleGuide: '#method-invocation-parens'
+  Enabled: false
+
 Style/MethodCalledOnDoEndBlock:
   Description: 'Avoid chaining a method call on a do...end block.'
   StyleGuide: '#single-line-blocks'
@@ -113,3 +118,7 @@ Style/SymbolArray:
   Description: 'Use %i or %I for arrays of symbols.'
   StyleGuide: '#percent-i'
   Enabled: false
+
+Style/SingleLineBlockParams:
+  Description: 'Enforces the names of some block params.'
+  Enabled: false

data/config/enabled.yml

@@ -404,7 +404,7 @@ Style/LineEndConcatenation:
                  line end.
   Enabled: true
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Description: 'Do not use parentheses for method calls with no arguments.'
   StyleGuide: '#method-invocation-parens'
   Enabled: true
@@ -710,10 +710,6 @@ Style/SignalException:
   StyleGuide: '#prefer-raise-over-fail'
   Enabled: true
 
-Style/SingleLineBlockParams:
-  Description: 'Enforces the names of some block params.'
-  Enabled: true
-
 Style/SingleLineMethods:
   Description: 'Avoid single-line methods.'
   StyleGuide: '#no-single-line-methods'
@@ -1120,10 +1116,6 @@ Lint/EnsureReturn:
   StyleGuide: '#no-return-ensure'
   Enabled: true
 
-Lint/Eval:
-  Description: 'The use of eval represents a serious security risk.'
-  Enabled: true
-
 Lint/FloatOutOfRange:
   Description: >-
                  Catches floating-point literals too large or small for Ruby to
@@ -1176,6 +1168,10 @@ Lint/Loop:
   StyleGuide: '#loop-with-break'
   Enabled: true
 
+Lint/MultipleCompare:
+  Description: "Use `&&` operator to compare multiple value."
+  Enabled: true
+
 Lint/NestedMethodDefinition:
   Description: 'Do not use nested method definitions.'
   StyleGuide: '#no-nested-methods'
@@ -1225,6 +1221,10 @@ Lint/RescueException:
   StyleGuide: '#no-blind-rescues'
   Enabled: true
 
+Lint/SafeNavigationChain:
+  Description: 'Do not chain ordinary method call after safe navigation operator.'
+  Enabled: true
+
 Lint/ShadowedException:
   Description: >-
                   Avoid rescuing a higher level exception
@@ -1279,6 +1279,7 @@ Lint/UselessAccessModifier:
   Description: 'Checks for useless access modifiers.'
   Enabled: true
   ContextCreatingMethods: []
+  MethodCreatingMethods: []
 
 Lint/UselessAssignment:
   Description: 'Checks for useless assignment to a local variable.'
@@ -1408,6 +1409,10 @@ Performance/RedundantSortBy:
   Description: 'Use `sort` instead of `sort_by { |x| x }`.'
   Enabled: true
 
+Performance/RegexpMatch:
+  Description: 'Use `match?` instead of `Regexp#match`, `String#match`, `Symbol#match`, `Regexp#===` or `=~` when `MatchData` is not used.'
+  Enabled: true
+
 Performance/ReverseEach:
   Description: 'Use `reverse_each` instead of `reverse.each`.'
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerablereverseeach-vs-enumerablereverse_each-code'
@@ -1488,6 +1493,10 @@ Rails/Exit:
                   exits during unit testing or running in production.
   Enabled: true
 
+Rails/FilePath:
+  Description: 'Use `Rails.root.join` for file path joining.'
+  Enabled: true
+
 Rails/FindBy:
   Description: 'Prefer find_by over where.first.'
   StyleGuide: 'https://github.com/bbatsov/rails-style-guide#find_by'
@@ -1537,6 +1546,12 @@ Rails/RequestReferer:
   Description: 'Use consistent syntax for request.referer.'
   Enabled: true
 
+Rails/ReversibleMigration:
+  Description: 'Checks whether the change method of the migration file is reversible.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#reversible-migration'
+  Reference: 'http://api.rubyonrails.org/classes/ActiveRecord/Migration/CommandRecorder.html'
+  Enabled: true
+
 Rails/SafeNavigation:
   Description: "Use Ruby's safe navigation operator (`&.`) instead of `try!`"
   Enabled: true
@@ -1555,10 +1570,21 @@ Rails/UniqBeforePluck:
   Description: 'Prefer the use of uniq or distinct before pluck.'
   Enabled: true
 
+Rails/SkipsModelValidations:
+  Description: >-
+                 Use methods that skips model validations with caution.
+                 See reference for more information.
+  Reference: 'http://guides.rubyonrails.org/active_record_validations.html#skipping-validations'
+  Enabled: true
+
 Rails/Validation:
   Description: 'Use validates :attribute, hash of validations.'
   Enabled: true
 
+Security/Eval:
+  Description: 'The use of eval represents a serious security risk.'
+  Enabled: true
+
 Security/JSONLoad:
   Description: >-
                  Prefer usage of `JSON.parse` over `JSON.load` due to potential
@@ -1569,6 +1595,20 @@ Security/JSONLoad:
   # on the value of the argument.
   AutoCorrect: false
 
+Security/MarshalLoad:
+  Description: >-
+                 Avoid using of `Marshal.load` or `Marshal.restore` due to potential
+                 security issues. See reference for more information.
+  Reference: 'http://ruby-doc.org/core-2.3.3/Marshal.html#module-Marshal-label-Security+considerations'
+  Enabled: true
+
+Security/YAMLLoad:
+  Description: >-
+                 Prefer usage of `YAML.safe_load` over `YAML.load` due to potential
+                 security issues. See reference for more information.
+  Reference: 'https://ruby-doc.org/stdlib-2.3.3/libdoc/yaml/rdoc/YAML.html#module-YAML-label-Security'
+  Enabled: true
+
 ##################### Bundler #############################
 
 Bundler/DuplicatedGem:

data/config/upstream.yml

@@ -29,35 +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
@@ -113,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
@@ -125,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:
   #
@@ -194,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:
@@ -288,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:
@@ -313,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
@@ -340,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
 
@@ -375,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.
@@ -409,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:
@@ -421,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
 
@@ -469,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.
@@ -490,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
@@ -502,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: ~
 
@@ -535,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
@@ -598,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: ~
 
@@ -626,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: ~
 
@@ -654,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:
@@ -687,6 +740,9 @@ Style/MethodDefParentheses:
     - require_no_parentheses
     - require_no_parentheses_except_multiline
 
+Style/MethodCallWithArgsParentheses:
+  IgnoredMethods: []
+
 Style/MethodName:
   EnforcedStyle: snake_case
   SupportedStyles:
@@ -772,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: ~
 
@@ -814,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.
@@ -828,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?
@@ -850,20 +906,20 @@ 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
 
@@ -873,7 +929,7 @@ Style/SafeNavigation:
   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:
@@ -896,7 +952,7 @@ 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
@@ -918,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
 
@@ -940,7 +996,7 @@ Style/StringMethods:
 
 Style/SpaceAroundBlockParameters:
   EnforcedStyleInsidePipes: no_space
-  SupportedStyles:
+  SupportedStylesInsidePipes:
     - space
     - no_space
 
@@ -951,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
@@ -967,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
@@ -1021,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
@@ -1032,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
@@ -1040,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
@@ -1095,7 +1156,7 @@ Style/VariableNumber:
 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:
@@ -1103,11 +1164,11 @@ 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 ##################################
@@ -1118,6 +1179,7 @@ Metrics/AbcSize:
   Max: 15
 
 Metrics/BlockNesting:
+  CountBlocks: false
   Max: 3
 
 Metrics/ClassLength:
@@ -1156,10 +1218,7 @@ Metrics/MethodLength:
 Metrics/BlockLength:
   CountComments: false  # count full line comments?
   Max: 25
-  Exclude:
-    - 'Rakefile'
-    - '**/*.rake'
-    - 'spec/**/*.rb'
+  ExcludedMethods: []
 
 Metrics/ParameterLists:
   Max: 5
@@ -1181,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
@@ -1190,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
@@ -1208,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
@@ -1307,6 +1366,10 @@ 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
@@ -1327,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

data/cookstyle.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Rubocop configuration for Chef cookbooks}
   spec.homepage      = "https://github.com/chef/cookstyle"
   spec.license       = "Apache-2.0"
-  spec.required_ruby_version = ">= 2.0.0"
+  spec.required_ruby_version = ">= 2.1"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.executables    = %w[cookstyle]
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 11.0"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec"
   spec.add_dependency("rubocop", Cookstyle::RUBOCOP_VERSION)
 end

data/lib/cookstyle/version.rb

@@ -1,4 +1,4 @@
 module Cookstyle
-  VERSION = "1.2.0".freeze
-  RUBOCOP_VERSION = "0.46.0".freeze
+  VERSION = "1.3.0".freeze
+  RUBOCOP_VERSION = "0.47.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Thom May
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.47.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.47.1
 description: 
 email:
 - thom@chef.io
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="