cookstyle 6.3.4 → 6.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a9b1ee43fdd2c9baa768f2cdbd18592bea73293b26ce1ef76ddc4e3cb1827a3
-  data.tar.gz: 87d8aff860e98ef48aa935345091bd66586b712e52e3b2ed767ba5aededffe6b
+  metadata.gz: 8a8c9e4e7d09afb290f4d894de9960bd1a0ffc1ed116321a5887a49206453029
+  data.tar.gz: 53389b9ed11b1571f8ce3e8fd108150594d5cb2c6c7e5ef0fc14b3ba2633d8ad
 SHA512:
-  metadata.gz: d31f92b56384f5fe012ea3fb39a154b30cc2d02dda3226d4fd2f856de4511efba3e52736886345dfacace945c4c02f74e3f8468537b00d233f7f5180c1553bd0
-  data.tar.gz: 70c9b88f541824fcd23aafb7bfd4ea9a8ad2d4500d201b65910e0055f538f7a9cdca2c7d8998b06e4cb6a06f865d2d19b93d8edf4c659527335d06b26a84430b
+  metadata.gz: 9a5a62cc80a0ebc6af299114f25b1d47af14dc857dc206e5281ee167f49207b8399a962addc8b942c8e14bd7055ea97830861e2419ad05da179e961d25c4ccec
+  data.tar.gz: cc44d7eb2418c84131f1916de9a15b83fcd5511ccbc3e19e2eb2103f53e09fd3df2d0828dda31e4b0affe43087abc009d0ec35052e1e63a6aca884ec1c51b2ea

data/config/cookstyle.yml

@@ -2,8 +2,8 @@ AllCops:
   TargetRubyVersion: 2.4
   TargetChefVersion: ~
   Exclude:
-    - '**/files/**/*'
-    - '**/vendor/**/*'
+    - '/**/files/**/*'
+    - '/**/vendor/**/*'
     - Guardfile
   ChefAttributes:
     Patterns:
@@ -1158,7 +1158,7 @@ ChefModernize/AllowedActionsFromInitialize:
 
 ChefModernize/FoodcriticComments:
   Description: Remove legacy code comments that disable Foodcritic rules. These comments are no longer necessary if you've migrated from Foodcritic to Cookstyle for cookbook linting.
-  Enabled: false
+  Enabled: true
   VersionAdded: '5.16.0'
   Exclude:
     - '**/Berksfile'

data/config/disable_all.yml

@@ -59,6 +59,8 @@ Layout/EmptyLinesAroundAccessModifier:
   Enabled: false
 Layout/EmptyLinesAroundArguments:
   Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: false
 Layout/EmptyLinesAroundBeginBody:
   Enabled: false
 Layout/EmptyLinesAroundBlockBody:
@@ -697,6 +699,8 @@ Style/SingleLineBlockParams:
   Enabled: false
 Style/SingleLineMethods:
   Enabled: false
+Style/SlicingWithRange:
+  Enabled: false
 Style/SpecialGlobalVars:
   Enabled: false
 Style/StabbyLambdaParentheses:
@@ -770,4 +774,4 @@ Security/MarshalLoad:
 Security/Open:
   Enabled: false
 Security/YAMLLoad:
-  Enabled: false
+  Enabled: false

data/config/upstream.yml

@@ -35,6 +35,7 @@ AllCops:
     - '**/*.watchr'
     - '**/.irbrc'
     - '**/.pryrc'
+    - '**/.simplecov'
     - '**/buildfile'
     - '**/Appraisals'
     - '**/Berksfile'
@@ -53,6 +54,7 @@ AllCops:
     - '**/Podfile'
     - '**/Puppetfile'
     - '**/Rakefile'
+    - '**/rakefile'
     - '**/Snapfile'
     - '**/Steepfile'
     - '**/Thorfile'
@@ -375,6 +377,7 @@ Layout/ConditionPosition:
   StyleGuide: '#same-line-condition'
   Enabled: true
   VersionAdded: '0.53'
+  VersionChanged: '0.83'
 
 Layout/DefEndAlignment:
   Description: 'Align ends corresponding to defs correctly.'
@@ -460,6 +463,12 @@ Layout/EmptyLinesAroundArguments:
   Enabled: true
   VersionAdded: '0.52'
 
+Layout/EmptyLinesAroundAttributeAccessor:
+  Description: "Keep blank lines around attribute accessors."
+  StyleGuide: '#empty-lines-around-attribute-accessor'
+  Enabled: pending
+  VersionAdded: '0.83'
+
 Layout/EmptyLinesAroundBeginBody:
   Description: "Keeps track of empty lines around begin-end bodies."
   StyleGuide: '#empty-lines-around-bodies'
@@ -1295,8 +1304,8 @@ Layout/TrailingWhitespace:
   StyleGuide: '#no-trailing-whitespace'
   Enabled: true
   VersionAdded: '0.49'
-  VersionChanged: '0.55'
-  AllowInHeredoc: false
+  VersionChanged: '0.83'
+  AllowInHeredoc: true
 
 #################### Lint ##################################
 ### Warnings
@@ -1316,6 +1325,7 @@ Lint/AmbiguousOperator:
   StyleGuide: '#method-invocation-parens'
   Enabled: true
   VersionAdded: '0.17'
+  VersionChanged: '0.83'
 
 Lint/AmbiguousRegexpLiteral:
   Description: >-
@@ -1323,6 +1333,7 @@ Lint/AmbiguousRegexpLiteral:
                  a method invocation without parentheses.
   Enabled: true
   VersionAdded: '0.17'
+  VersionChanged: '0.83'
 
 Lint/AssignmentInCondition:
   Description: "Don't use assignment in conditions."
@@ -1339,8 +1350,9 @@ Lint/BigDecimalNew:
 Lint/BooleanSymbol:
   Description: 'Check for `:true` and `:false` symbols.'
   Enabled: true
+  Safe: false
   VersionAdded: '0.50'
-  VersionChanged: '0.81'
+  VersionChanged: '0.83'
 
 Lint/CircularArgumentReference:
   Description: "Default values in optional keyword arguments and optional ordinal arguments should not refer back to the name of the argument."
@@ -1411,13 +1423,16 @@ Lint/EmptyInterpolation:
 Lint/EmptyWhen:
   Description: 'Checks for `when` branches with empty bodies.'
   Enabled: true
+  AllowComments: true
   VersionAdded: '0.45'
+  VersionChanged: '0.83'
 
 Lint/EnsureReturn:
   Description: 'Do not use return in an ensure block.'
   StyleGuide: '#no-return-ensure'
   Enabled: true
   VersionAdded: '0.9'
+  VersionChanged: '0.83'
 
 Lint/ErbNewArguments:
   Description: 'Use `:trim_mode` and `:eoutvar` keyword arguments to `ERB.new`.'
@@ -1565,6 +1580,7 @@ Lint/ParenthesesAsGroupedExpression:
   StyleGuide: '#parens-no-spaces'
   Enabled: true
   VersionAdded: '0.12'
+  VersionChanged: '0.83'
 
 Lint/PercentStringArray:
   Description: >-
@@ -1808,7 +1824,7 @@ Lint/UselessAccessModifier:
   Description: 'Checks for useless access modifiers.'
   Enabled: true
   VersionAdded: '0.20'
-  VersionChanged: '0.47'
+  VersionChanged: '0.83'
   ContextCreatingMethods: []
   MethodCreatingMethods: []
 
@@ -2948,6 +2964,7 @@ Style/IfWithSemicolon:
   StyleGuide: '#no-semicolon-ifs'
   Enabled: true
   VersionAdded: '0.9'
+  VersionChanged: '0.83'
 
 Style/ImplicitRuntimeError:
   Description: >-
@@ -3425,7 +3442,9 @@ Style/OptionalArguments:
                  of the argument list.
   StyleGuide: '#optional-arguments'
   Enabled: true
+  Safe: false
   VersionAdded: '0.33'
+  VersionChanged: '0.83'
 
 Style/OrAssignment:
   Description: 'Recommend usage of double pipe equals (||=) where applicable.'
@@ -3730,6 +3749,12 @@ Style/SingleLineMethods:
   VersionChanged: '0.19'
   AllowIfMethodIsEmpty: true
 
+Style/SlicingWithRange:
+  Description: 'Checks array slicing is done with endless ranges when suitable.'
+  Enabled: pending
+  VersionAdded: '0.83'
+  Safe: false
+
 Style/SpecialGlobalVars:
   Description: 'Avoid Perl-style global variables.'
   StyleGuide: '#no-cryptic-perlisms'

data/lib/cookstyle/version.rb

@@ -1,4 +1,4 @@
 module Cookstyle
-  VERSION = "6.3.4".freeze # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '0.82.0'.freeze
+  VERSION = "6.4.4".freeze # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '0.83.0'.freeze
 end

data/lib/rubocop/cop/chef/correctness/node_normal.rb

@@ -18,7 +18,7 @@ module RuboCop
     module Chef
       module ChefCorrectness
         # Normal attributes are discouraged since their semantics differ importantly from the
-        # default and override levels.  Their values persist in the node object even after
+        # default and override levels. Their values persist in the node object even after
         # all code referencing them has been deleted, unlike default and override.
         #
         # Code should be updated to use default or override levels, but this will change

data/lib/rubocop/cop/chef/correctness/node_normal_unless.rb

@@ -18,7 +18,7 @@ module RuboCop
     module Chef
       module ChefCorrectness
         # Normal attributes are discouraged since their semantics differ importantly from the
-        # default and override levels.  Their values persist in the node object even after
+        # default and override levels. Their values persist in the node object even after
         # all code referencing them has been deleted, unlike default and override.
         #
         # Code should be updated to use default or override levels, but this will change

data/lib/rubocop/cop/chef/deprecation/depends_compat_resource.rb

@@ -18,7 +18,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefDeprecations
-        # Don't depend on the deprecated compat_resource cookbook made obsolete by Chef 12.19+
+        # Don't depend on the deprecated compat_resource cookbook made obsolete by Chef Infra Client 12.19+
         #
         # @example
         #

data/lib/rubocop/cop/chef/deprecation/depends_partial_search.rb

@@ -18,7 +18,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefDeprecations
-        # Don't depend on the partial_search cookbook made obsolete by Chef 13
+        # Don't depend on the partial_search cookbook made obsolete by Chef Infra Client 13
         #
         # @example
         #

data/lib/rubocop/cop/chef/deprecation/easy_install.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefDeprecations
-        # Don't use the deprecated easy_install resource removed in Chef 13
+        # Don't use the deprecated easy_install resource removed in Chef Infra Client 13
         #
         # @example
         #
@@ -29,7 +29,7 @@ module RuboCop
         #   end
         #
         class EasyInstallResource < Cop
-          MSG = "Don't use the deprecated easy_install resource removed in Chef 13".freeze
+          MSG = "Don't use the deprecated easy_install resource removed in Chef Infra Client 13".freeze
 
           def on_send(node)
             add_offense(node, location: :expression, message: MSG, severity: :warning) if node.method_name == :easy_install

data/lib/rubocop/cop/chef/deprecation/erl_call.rb

@@ -29,7 +29,7 @@ module RuboCop
         #   end
         #
         class ErlCallResource < Cop
-          MSG = "Don't use the deprecated erl_call resource removed in Chef 13".freeze
+          MSG = "Don't use the deprecated erl_call resource removed in Chef Infra Client 13".freeze
 
           def on_send(node)
             add_offense(node, location: :expression, message: MSG, severity: :warning) if node.method_name == :erl_call

data/lib/rubocop/cop/chef/deprecation/locale_lc_all_property.rb

@@ -18,7 +18,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefDeprecations
-        # The local resource's lc_all property has been deprecated and will be removed in Chef Infra Client 16
+        # The local resource's lc_all property has been deprecated and will be removed in Chef Infra Client 17
         #
         # @example
         #
@@ -31,7 +31,7 @@ module RuboCop
         class LocaleDeprecatedLcAllProperty < Cop
           include RuboCop::Chef::CookbookHelpers
 
-          MSG = "The local resource's lc_all property has been deprecated and will be removed in Chef Infra Client 16".freeze
+          MSG = "The local resource's lc_all property has been deprecated and will be removed in Chef Infra Client 17".freeze
 
           def on_block(node)
             match_property_in_resource?(:locale, 'lc_all', node) do |property|

data/lib/rubocop/cop/chef/deprecation/node_methods_not_attributes.rb

@@ -18,7 +18,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefDeprecations
-        # Incorrectly using node methods for Ohai data when you really want node attributes
+        # Use node attributes to access data provided by Ohai instead of using node methods to access that data.
         #
         # @example
         #

data/lib/rubocop/cop/chef/deprecation/node_set.rb

@@ -17,10 +17,9 @@ module RuboCop
   module Cop
     module Chef
       module ChefDeprecations
-        # The node.set method has been removed in Chef-13 and must be replaced by node.normal.
+        # The `node.set` method has been removed in Chef Infra Client 13 and usage must be replaced with `node.normal`.
         #
-        # Note that node.normal keeps the semantics identical, but the use of node.normal is
-        # also discouraged.
+        # This cop will autocorrect code to use node.normal, which is functionally identical to node.set, but we also discourage the use of that method as normal level attributes persist on the node even if the code setting the attribute is later removed.
         #
         # @example
         #

data/lib/rubocop/cop/chef/deprecation/node_set_unless.rb

@@ -17,10 +17,9 @@ module RuboCop
   module Cop
     module Chef
       module ChefDeprecations
-        # The node.set_unless method has been removed in Chef-13 and must be replaced by node.normal_unless.
+        # The node.set_unless method has been removed in Chef Infra Client 13 and usage must be replaced with node.normal_unless.
         #
-        # Note that node.normal_unless keeps the semantics identical, but the use of node.normal is
-        # also discouraged.
+        # This cop will autocorrect code to use node.normal_unless, which is functionally identical to node.set_unless, but we also discourage the use of that method as normal level attributes persist on the node even if the code setting the attribute is later removed.
         #
         # @example
         #

data/lib/rubocop/cop/chef/deprecation/powershell_cookbook_helpers.rb

@@ -18,7 +18,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefDeprecations
-        # Use node['powershell']['version'] or the new powershell_version helper available in Chef Infra Client 16+ instead of the deprecated PowerShell cookbook helpers
+        # Use `node['powershell']['version']` or the new `powershell_version` helper available in Chef Infra Client 15.8+ instead of the deprecated PowerShell cookbook helpers
         #
         # @example
         #
@@ -28,11 +28,11 @@ module RuboCop
         #   # good
         #   node['powershell']['version'].to_f == 4.0
         #
-        #   # good (Chef Infra Client 16+)
+        #   # better (Chef Infra Client 15.8+)
         #   powershell_version == 4.0
         #
         class PowershellCookbookHelpers < Cop
-          MSG = "Use node['powershell']['version'] or the new powershell_version helper available in Chef Infra Client 16+ instead of the deprecated PowerShell cookbook helpers.".freeze
+          MSG = "Use node['powershell']['version'] or the new powershell_version helper available in Chef Infra Client 15.8+ instead of the deprecated PowerShell cookbook helpers.".freeze
 
           def_node_matcher :ps_cb_helper?, <<-PATTERN
           (send

data/lib/rubocop/cop/chef/deprecation/user_supports_property.rb

@@ -54,8 +54,13 @@ module RuboCop
           def autocorrect(node)
             lambda do |corrector|
               new_text = []
+
               node.arguments.first.each_pair do |k, v|
-                new_text << "#{k.value} #{v.source}"
+                # account for a strange edge case where the person incorrectly makes "manage_home a method
+                # the code would be broken, but without this handling cookstyle would explode
+                key_value = (k.send_type? && k.method_name == :manage_home) ? 'manage_home' : k.value
+
+                new_text << "#{key_value} #{v.source}"
               end
 
               corrector.replace(node.loc.expression, new_text.join("\n  "))

data/lib/rubocop/cop/chef/style/overly_complex_supports_depends_metadata.rb

@@ -18,7 +18,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefStyle
-        # Don't loop over an array to set cookbook dependencies or supported platforms if you have fewer than three values to set.  Setting multiple `supports` or `depends` values is simpler and easier to understand for new users.
+        # Don't loop over an array to set cookbook dependencies or supported platforms if you have fewer than three values to set. Setting multiple `supports` or `depends` values is simpler and easier to understand for new users.
         #
         # @example
         #

data/lib/rubocop/cop/target_chef_version.rb

@@ -6,6 +6,10 @@ module RuboCop
   module Cop
     # Common functionality for checking target chef version.
     module TargetChefVersion
+      def required_minimum_chef_version
+        @minimum_target_chef_version
+      end
+
       def minimum_target_chef_version(version)
         @minimum_target_chef_version = version
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 6.3.4
+  version: 6.4.4
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 0.83.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.82.0
+        version: 0.83.0
 description: 
 email:
 - thom@chef.io