cookstyle 7.25.6 → 7.25.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a67abdf6a42bec1022fc57e53a61a9aa6f371641e6afe429eee6a9489ff2355
-  data.tar.gz: c3ff11c1e6ef1be4af29d034d662a6b662a731103082477b0d8d0e9e3a0455e2
+  metadata.gz: c878c6f71305a020ad727f7487803d5b2e669b98efa8c454507fcdbf1b5d7780
+  data.tar.gz: 5bf633217017d6fff058d1214f7f0f28fe87b99107cf5d768bce2e68a2d1398e
 SHA512:
-  metadata.gz: 79074fc5f3c7ef245dbcb64a4739a49298cda263bc216333215599bbc7e052f0979981e67572eec6d77b33c8e620370087b32ad20f90d2c5f5ddcbfaf99182cc
-  data.tar.gz: 116535d0ada1a04fd19bb9af708390402aeeb983a962af1a681d66e9f9fa81afc515450f1bcae187dcf8de83876a8fd5c9a091ea0d93313033821f34263f51a8
+  metadata.gz: f575ac4b8b913935583fa697f82bb9fc6387f135c1a78d0ef2782df47def871bb5bce54f2a3b2df9c187af18eee08791e6173f6cb7a284356cfecbd844e8644a
+  data.tar.gz: 49a470d1a612896c887cbd8b879ab5c31a1d5180e454245f3abcd431f0725d7d3d9553342f48fdddf68b36fca682d2f778f42c642baf6e2acb65685b18edb5fc

data/config/cookstyle.yml

@@ -1941,6 +1941,15 @@ Chef/Modernize/UseChefLanguageSystemdHelper:
     - '**/metadata.rb'
     - '**/Berksfile'
 
+Chef/Modernize/DeclareActionClass:
+  Description: In Chef Infra Client 12.9 and later `action_class` can be used instead of `declare_action_class`.
+  StyleGuide: 'chef_modernize_declareactionclass'
+  Enabled: true
+  VersionAdded: '7.26.0'
+  Include:
+    - '**/resources/*.rb'
+    - '**/libraries/*.rb'
+
 ###############################
 # Chef/RedundantCode: Cleanup unnecessary code in your cookbooks regardless of Chef Infra Client release
 ###############################

data/config/upstream.yml

@@ -262,7 +262,7 @@ Gemspec/RequiredRubyVersion:
   Description: 'Checks that `required_ruby_version` of gemspec is specified and equal to `TargetRubyVersion` of .rubocop.yml.'
   Enabled: true
   VersionAdded: '0.52'
-  VersionChanged: '0.89'
+  VersionChanged: '1.22'
   Include:
     - '**/*.gemspec'
 
@@ -2754,10 +2754,9 @@ Security/JSONLoad:
   Reference: 'https://ruby-doc.org/stdlib-2.7.0/libdoc/json/rdoc/JSON.html#method-i-load'
   Enabled: true
   VersionAdded: '0.43'
-  VersionChanged: '0.44'
+  VersionChanged: '1.22'
   # Autocorrect here will change to a method that may cause crashes depending
   # on the value of the argument.
-  AutoCorrect: false
   SafeAutoCorrect: false
 
 Security/MarshalLoad:

data/lib/cookstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "7.25.6" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.22.0'
+  VERSION = "7.25.8" # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '1.22.2'
 end

data/lib/rubocop/cop/chef/modernize/class_eval_action_class.rb

@@ -40,7 +40,6 @@ module RuboCop
           minimum_target_chef_version '12.9'
 
           MSG = 'In Chef Infra Client 12.9 and later it is no longer necessary to call the class_eval method on the action class block.'
-          RESTRICT_ON_SEND = [:include_recipe].freeze
 
           def_node_matcher :class_eval_action_class?, <<-PATTERN
             (block

data/lib/rubocop/cop/chef/modernize/declare_action_class.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2021, Chef Software, Inc.
+# Author:: Tim Smith (<tsmith@chef.io>)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module RuboCop
+  module Cop
+    module Chef
+      module Modernize
+        # In Chef Infra Client 12.9 and later `action_class` can be used instead of `declare_action_class`.
+        #
+        # @example
+        #
+        #   #### incorrect
+        #   declare_action_class do
+        #     foo
+        #   end
+        #
+        #   #### correct
+        #   action_class do
+        #     foo
+        #   end
+        #
+        class DeclareActionClass < Base
+          extend TargetChefVersion
+          extend AutoCorrector
+
+          minimum_target_chef_version '12.9'
+
+          MSG = 'In Chef Infra Client 12.9 and later `action_class` can be used instead of `declare_action_class`.'
+          RESTRICT_ON_SEND = [:declare_action_class].freeze
+
+          def on_send(node)
+            add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              corrector.replace(node, node.source.gsub('declare_action_class', 'action_class'))
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.25.6
+  version: 7.25.8
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.22.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.22.2
 description: 
 email:
 - thom@chef.io
@@ -188,6 +188,7 @@ files:
 - lib/rubocop/cop/chef/modernize/cron_d_file_or_template.rb
 - lib/rubocop/cop/chef/modernize/cron_manage_resource.rb
 - lib/rubocop/cop/chef/modernize/databag_helpers.rb
+- lib/rubocop/cop/chef/modernize/declare_action_class.rb
 - lib/rubocop/cop/chef/modernize/default_action_initializer.rb
 - lib/rubocop/cop/chef/modernize/defines_chefspec_matchers.rb
 - lib/rubocop/cop/chef/modernize/definitions.rb