cookstyle 7.31.7 → 7.31.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0041f7691cd8703343c065df3ff9845f59018276336bf8fe0bf199a802533fc8
-  data.tar.gz: 782fa56469ebdc5895320bcf4c815a1bb9964aced211c52b007b3945cb331adc
+  metadata.gz: 77ad4617e8e89f4b34622dfc962e39037e28c5d9779cbc3198a64c7155b426ed
+  data.tar.gz: cf9fdce4231a1b0c55e8166628affc51abe3eb188ba5a8d75c08cd57f0d49470
 SHA512:
-  metadata.gz: 6a67d211251cf6443c9cdd6fbc5cd696f13d3fdd178fa3ea8bef7bd6c3495869b935f0dd01083cf5ca8a9a705ad32370ea8e640c390dbeda9629ee260fe06234
-  data.tar.gz: e7fac0be14547d1fb7ac86a61d8a23923d47d2958bc2f5df466eb487d4d67abd0f28b6f0d76afa4c803fc3f952981fa1c3fd3e03d5763d1eb63217665be3f64b
+  metadata.gz: db4d6bf2c6a01d8bbd4c49f3ed8a13cf23b70d664f15c515536ae64e509af4d2caa6151825161d9dc554d19088527465b009e37ff13fbac1a04829308fb90684
+  data.tar.gz: 192f218ee77783b63d7712a0c51837c2a50ebffef4cf1f12112cfcd0008599e9bdf25fb6250f7f4f2c2206f15ae856ef62a6ee2183abb8cb86ad959823df98f6

data/config/cookstyle.yml

@@ -2,6 +2,12 @@ AllCops:
   SuggestExtensions: false
   TargetRubyVersion: 2.5
   TargetChefVersion: ~
+  inherit_mode:
+    merge:
+     - Include
+  Include:
+    - '**/.delivery/project.toml'      # required by Chef/Deprecations/Delivery
+    - '**/.delivery/config.json'       # required by Chef/Deprecations/Delivery
   Exclude:
     - '**/files/**/*'
     - '**/vendor/**/*'
@@ -1265,12 +1271,13 @@ Chef/Deprecations/PolicyfileCommunitySource:
     - '**/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.
+  Description: Do not include Chef Delivery (Workflow) configuration 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'
+    - '**/.delivery/project.toml'
+    - '**/.delivery/config.json'
 
 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.
@@ -1954,7 +1961,7 @@ Chef/Modernize/UseChefLanguageCloudHelpers:
     - '**/resources/*.rb'
     - '**/providers/*.rb'
     - '**/recipes/*.rb'
-    
+
 Chef/Modernize/ClassEvalActionClass:
   Description: In Chef Infra Client 12.9 and later it is no longer necessary to call the class_eval method on the action class block.
   StyleGuide: 'chef_modernize_classevalactionclass'
@@ -2332,7 +2339,7 @@ Chef/Security/SshPrivateKey:
     - '**/recipes/*.rb'
     - '**/attributes/*.rb'
     - '**/definitions/*.rb'
-    
+
 #### The base rubocop 0.37 enabled.yml file we started with ####
 
 Layout/AccessModifierIndentation:
@@ -3094,4 +3101,4 @@ Style/FileRead:
 
 # reduce file write complexity
 Style/FileWrite:
-  Enabled: true
+  Enabled: true

data/lib/cookstyle/version.rb

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

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

@@ -27,16 +27,20 @@ module RuboCop
         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.'
+          MSG = 'Do not include Chef Delivery (Workflow) configuration in your cookbooks. It 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'))
+          def on_other_file
+            return unless processed_source.path.end_with?('/.delivery/project.toml', '/.delivery/config.json')
 
             # 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
+
+          # An empty / simple TOML file can also be syntatically valid Ruby, so
+          # RuboCop may start an investigation instead of calling on_other_file.
+          alias_method :on_new_investigation, :on_other_file
         end
       end
     end

data/lib/rubocop/monkey_patches/allow_invalid_ruby.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+require 'rubocop/rspec/expect_offense'
+# rubocop:disable Lint/DuplicateMethods
+
+module RuboCop
+  module RSpec
+    module ExpectOffense
+      # Yields to a block with `parse_processed_source` patched to not raise an
+      # exception.
+      #
+      # RSpec's `expect_offense` helper calls a method called
+      # `parse_processed_source` that parses source code and raises an exception
+      # if it is not valid Ruby. Raising an exception prevents RuboCop from
+      # calling the cop's `on_other_file` method for checking non-Ruby files.
+      def allow_invalid_ruby(&block)
+        alias :parse_processed_source :_parse_invalid_source
+        yield block
+        alias :parse_processed_source :_orig_parse_processed_source
+      end
+
+      alias :_orig_parse_processed_source :parse_processed_source
+
+      def _parse_invalid_source(source, file = nil)
+        parse_source(source, file)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.31.7
+  version: 7.31.9
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -303,6 +303,7 @@ files:
 - lib/rubocop/cop/inspec/deprecation/attribute_default.rb
 - lib/rubocop/cop/inspec/deprecation/attribute_helper.rb
 - lib/rubocop/cop/target_chef_version.rb
+- lib/rubocop/monkey_patches/allow_invalid_ruby.rb
 - lib/rubocop/monkey_patches/base.rb
 - lib/rubocop/monkey_patches/config.rb
 - lib/rubocop/monkey_patches/directive_comment.rb