cookstyle 7.30.3 → 7.31.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94be7df501ab0a3a055ee36aab695764830d816e3db7005a7b18231d3a703505
-  data.tar.gz: 3cf466a2d3fec655c473df01a769bb9e577359ed04ea3569f6cc6fb0f5c59ea0
+  metadata.gz: ef76b0aec4f125de72a07fdb9aac1e079b6ff6b873dff89d3e9ee1665a153843
+  data.tar.gz: 8d8332cf3c6c991fb7b483fc4de82e73cd47f4834304e105b624da6649c9845b
 SHA512:
-  metadata.gz: 339ccca52365ef809d5976ceadcea5ead13bcef57b294725a26d0f6e5ddfb306f1e003c72d1fd99448640018f0da00d4188ea48adfda39593b2cc02cc541d95e
-  data.tar.gz: d02e13fed47f62938a3e3f3dd07c86c8873294bd9fbb96395534f33419b62084a2814581717c8540db139668a67657e009bb3060432a553b111e99c1d0830bc5
+  metadata.gz: e61f510b819dd0b81019a78e49ab6794b63890bc4e8940c39db6a2170fdbf28ca2b4d610eabd78ed0fe8d804eea66b746701f64927a82775c2fcab37cdd449dd
+  data.tar.gz: a0d25d86e1db04309786f376ea6ea3733d14be8e85651e7764879770ba3f28339bf99e7385c2ffc0144d03089886a6458e69c9bab8e9f29eff09731daf615a4a

data/config/cookstyle.yml

@@ -12,6 +12,7 @@ AllCops:
 ###############################
 
 Chef/Style:
+  Enabled: true
   StyleGuideBaseURL: https://docs.chef.io/workstation/cookstyle/
 
 Chef/Style/AttributeKeys:
@@ -156,6 +157,7 @@ Chef/Style/IncludeRecipeWithParentheses:
 ###############################
 
 Chef/Correctness:
+  Enabled: true
   StyleGuideBaseURL: https://docs.chef.io/workstation/cookstyle/
 
 Chef/Correctness/ServiceResource:
@@ -529,6 +531,7 @@ Chef/Correctness/InvalidNotificationResource:
 ###############################
 
 Chef/Sharing:
+  Enabled: true
   StyleGuideBaseURL: https://docs.chef.io/workstation/cookstyle/
 
 Chef/Sharing/InsecureCookbookURL:
@@ -597,6 +600,7 @@ Chef/Sharing/IncludeResourceExamples:
 ###############################
 
 Chef/Deprecations:
+  Enabled: true
   StyleGuideBaseURL: https://docs.chef.io/workstation/cookstyle/
 
 Chef/Deprecations/NodeDeepFetch:
@@ -1260,6 +1264,14 @@ Chef/Deprecations/PolicyfileCommunitySource:
   Include:
     - '**/Policyfile.rb'
 
+Chef/Deprecations/Delivery:
+  Description: Do not include a `.delivery` directory for the `delivery` command in your cookbooks. Chef Delivery (Workflow) went EOL Dec 31st 2021 and the delivery command was removed from Chef Workstation Feb 2022.
+  StyleGuide: 'chef_deprecations_delivery'
+  Enabled: true
+  VersionAdded: '7.31.0'
+  Include:
+    - '**/metadata.rb'
+
 Chef/Deprecations/DeprecatedSudoActions:
   Description: The `sudo` resource in the sudo cookbook 5.0 (2018) or Chef Infra Client 14 and later have replaced the existing `:install` and `:remove` actions with `:create` and `:delete` actions to better match other resources in Chef Infra.
   StyleGuide: 'chef_deprecations_deprecatedsudoactions'
@@ -1301,6 +1313,7 @@ Chef/Deprecations/DependsOnOmnibusUpdaterCookbook:
 ###############################
 
 Chef/Modernize:
+  Enabled: true
   StyleGuideBaseURL: https://docs.chef.io/workstation/cookstyle/
 
 Chef/Modernize/LegacyBerksfileSource:
@@ -1973,6 +1986,7 @@ Chef/Modernize/DeclareActionClass:
 ###############################
 
 Chef/RedundantCode:
+  Enabled: true
   StyleGuideBaseURL: https://docs.chef.io/workstation/cookstyle/
 
 Chef/RedundantCode/ConflictsMetadata:
@@ -2195,6 +2209,7 @@ Chef/RedundantCode/DoubleCompileTime:
 ###############################
 
 Chef/Effortless:
+  Enabled: true
   StyleGuideBaseURL: https://docs.chef.io/workstation/cookstyle/
 
 Chef/Effortless/CookbookUsesSearch:

data/config/upstream.yml

@@ -430,13 +430,13 @@ Layout/ClassStructure:
       - prepend
       - extend
   ExpectedOrder:
-      - module_inclusion
-      - constants
-      - public_class_methods
-      - initializer
-      - public_methods
-      - protected_methods
-      - private_methods
+    - module_inclusion
+    - constants
+    - public_class_methods
+    - initializer
+    - public_methods
+    - protected_methods
+    - private_methods
 
 Layout/ClosingHeredocIndentation:
   Description: 'Checks the indentation of here document closings.'
@@ -1900,7 +1900,7 @@ Lint/NestedPercentLiteral:
   VersionAdded: '0.52'
 
 Lint/NextWithoutAccumulator:
-  Description:  >-
+  Description: >-
                   Do not omit the accumulator when calling `next`
                   in a `reduce`/`inject` block.
   Enabled: true
@@ -3153,7 +3153,7 @@ Style/ClassMethodsDefinitions:
   StyleGuide: '#def-self-class-methods'
   Enabled: false
   VersionAdded: '0.89'
-  EnforcedStyle:  def_self
+  EnforcedStyle: def_self
   SupportedStyles:
     - def_self
     - self_class
@@ -3815,8 +3815,8 @@ Style/InverseMethods:
     :>: :<=
     # `ActiveSupport` defines some common inverse methods. They are listed below,
     # and not enabled by default.
-    #:present?: :blank?,
-    #:include?: :exclude?
+    # :present?: :blank?,
+    # :include?: :exclude?
   # `InverseBlocks` are methods that are inverted by inverting the return
   # of the block that is passed to the method
   InverseBlocks:

data/lib/cookstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "7.30.3" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.25.0'
+  VERSION = "7.31.3" # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '1.25.1'
 end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2022, 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 Deprecations
+        # The Delivery CLI from Chef Delivery/Workflow is no longer bundled with Chef Workstation as Chef Delivery is end of life as of Dec 31st 2021.
+        #
+        # Users of Delivery / Workflow would include a `.delivery` directory in their cookbooks. This directory would include Delivery local-mode configs
+        # or Delivery cookbooks. The contents of this directory are now obsolete and should be removed.
+        #
+        class Delivery < Base
+          include RangeHelp
+
+          MSG = 'Do not include a `.delivery` directory for the `delivery` command in your cookbooks. Chef Delivery (Workflow) went EOL Dec 31st 2021 and the delivery command was removed from Chef Workstation Feb 2022.'
+
+          def on_new_investigation
+            return unless File.exist?(File.join(File.dirname(processed_source.path) + '/.delivery'))
+
+            # Using range similar to RuboCop::Cop::Naming::Filename (file_name.rb)
+            range = source_range(processed_source.buffer, 1, 0)
+
+            add_offense(range, severity: :warning)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 #
-# Copyright:: 2020, Chef Software Inc.
+# Copyright:: 2020-2022, Chef Software Inc.
 # Author:: Tim Smith (<tsmith@chef.io>)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,6 +34,7 @@ module RuboCop
           DEPRECATED_MAPPING = {
             'amazon' => {
               '2017.12' => '2',
+              '> 2010' => true,
             },
             'aix' => {
               '~> 6' => true,
@@ -46,15 +47,15 @@ module RuboCop
               '> 16.04, < 18.04' => true,
             },
             'fedora' => {
-              '< 31' => '31',
+              '< 32' => '32',
             },
             'freebsd' => {
-              '~> 11.0, < 11.2' => '11',
               '= 12.0' => '12',
-              '< 11' => true,
+              '< 12' => true,
             },
             'mac_os_x' => {
               '< 10.14' => '10.15',
+              ' = 11.0' => '11',
             },
             'suse' => {
               '~> 12.0, < 12.4' => '12',
@@ -67,17 +68,17 @@ module RuboCop
             },
             'debian' => {
               '< 9' => true,
-              '> 9.0, < 9.11' => '9',
+              '> 9.0, < 9.12' => '9',
             },
             'centos' => {
               '< 6.0' => true,
               '~> 6.0, < 6.10' => '6',
-              '~> 7.0, < 7.7 ' => '7',
+              '~> 7.0, < 7.8 ' => '7',
             },
             'redhat' => {
               '< 6.0' => true,
               '~> 6.0, < 6.10' => '6',
-              '~> 7.0, < 7.7' => '7',
+              '~> 7.0, < 7.8' => '7',
             },
             'oracle' => {
               '< 6.0' => true,

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 #
-# Copyright:: 2020, Chef Software, Inc.
+# Copyright:: 2020-2022, Chef Software, Inc.
 # Author:: Tim Smith (<tsmith@chef.io>)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,6 +48,10 @@ module RuboCop
         #     action :delete
         #   end
         #
+        #   file "/etc/cron.d/#{job_name}" do
+        #     action :delete
+        #   end
+        #
         #   #### correct
         #   cron_d 'backup' do
         #     minute '1'
@@ -70,14 +74,19 @@ module RuboCop
           def_node_matcher :file_or_template?, <<-PATTERN
             (block
               (send nil? {:template :file :cookbook_file}
-                (str $_))
+                $(...))
               ...
             )
           PATTERN
 
           def on_block(node)
             file_or_template?(node) do |file_name|
-              return unless file_name.start_with?('/etc/cron.d/')
+              # weed out types we can't evaluate
+              return unless file_name.dstr_type? || file_name.str_type?
+
+              # weed out string values that aren't a cron.d file
+              return unless file_name.value.start_with?('/etc/cron.d/')
+
               add_offense(node, severity: :refactor)
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.30.3
+  version: 7.31.3
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.25.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 1.25.1
 description: 
 email:
 - thom@chef.io
@@ -103,6 +103,7 @@ files:
 - lib/rubocop/cop/chef/deprecation/chefspec_coverage_report.rb
 - lib/rubocop/cop/chef/deprecation/chefspec_legacy_runner.rb
 - lib/rubocop/cop/chef/deprecation/chocolatey_package_uninstall_action.rb
+- lib/rubocop/cop/chef/deprecation/delivery.rb
 - lib/rubocop/cop/chef/deprecation/depends_chef_nginx_cookbook.rb
 - lib/rubocop/cop/chef/deprecation/depends_chef_reporting_cookbook.rb
 - lib/rubocop/cop/chef/deprecation/depends_compat_resource.rb