cookstyle 7.15.1 → 7.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af99d51e19e15818c6e7abfc5568ad41eb3177b22a12b100a3504dbc0eeb7a93
-  data.tar.gz: 9aa6ba0fed844a339352cbd3f7df53f33a6a8de9dc43b4efd9fee5b4e5306ed6
+  metadata.gz: '029dae7e633891d64673dbd8098a21e80f6d2486d887dc01c593fed5c16d9677'
+  data.tar.gz: 2eb8ce0b238dc9c1783bca17b2800f0511c9f1ce02f7ff47d7a3857e7dc2bb5f
 SHA512:
-  metadata.gz: 495d1fe5dd18b8af274968bbb5a191314f1b36489376b7190fd225a43bd496e77ec8a176e035200f66f8c2489a5cdf2a283eb9a8a49fdcd4a900aa46de403f5e
-  data.tar.gz: b8f3bdc192e31b5bfd62e890a417c3b87e194197f4d8ab17381e5751a1ff6d1a0e2debf9af867dd36ece02cb0d07dcfabe0691922cbc4f0483fdc2d048615ce1
+  metadata.gz: 49abaf63bbf1c6e6a11909d4fcad7385256472ea66093459b371e67c438b022fb337554b265c9f55d2ccaaa2c904b4a1d6c91a8f4e936ac74d9017d1757b8975
+  data.tar.gz: c0ff0119835855ac64d543b15b586302da74659768926517fd107b0d3b4e3fba502b97d6fd5640a31eb4cd3a3b9544d29e418e0ae25900eda958e7deade23764

data/config/cookstyle.yml

@@ -481,6 +481,14 @@ Chef/Correctness/OctalModeAsString:
     - '**/metadata.rb'
     - '**/Berksfile'
 
+Chef/Correctness/MetadataMalformedDepends:
+  Description: Don't represent file modes as strings containing octal values. Use standard base 10 file modes instead.
+  StyleGuide: 'chef_correctness_metadatamalformeddepends'
+  Enabled: true
+  VersionAdded: '7.16'
+  Include:
+    - '**/metadata.rb'
+
 ###############################
 # Chef/Sharing: Issues that prevent sharing code with other teams or with the Chef community in general
 ###############################
@@ -1206,6 +1214,7 @@ Chef/Deprecations/ResourceWithoutUnifiedTrue:
   Include:
     - '**/resources/*.rb'
   Exclude:
+    - '**/resources/_*.rb'
     - '**/spec/**/*.rb'
 
 Chef/Deprecations/PolicyfileCommunitySource:
@@ -2449,6 +2458,8 @@ Lint/HandleExceptions:
   Enabled: true
 Lint/ImplicitStringConcatenation:
   Enabled: true
+  Exclude:
+    - '**/metadata.rb' # this prevents conflicts with Chef/Correctness/MetadataMalformedDepends
 Lint/IneffectiveAccessModifier:
   Enabled: true
 Lint/LiteralAsCondition:

data/lib/cookstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "7.15.1" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.18.3'
+  VERSION = "7.16.1" # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '1.18.4'
 end

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

@@ -0,0 +1,58 @@
+# 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 Correctness
+        # metadata.rb cookbook dependencies and version constraints should be comma separated
+        #
+        # @example
+        #
+        #   #### incorrect
+        #   depends 'some_awesome_cookbook' '= 4.5.5'
+        #   depends 'some_other_cool_cookbook' '< 8.0'
+        #
+        #   #### correct
+        #   depends 'some_awesome_cookbook', '= 4.5.5'
+        #   depends 'some_other_cool_cookbook', '< 8.0'
+        #
+        class MetadataMalformedDepends < Base
+          extend RuboCop::Cop::AutoCorrector
+
+          RESTRICT_ON_SEND = [:depends].freeze
+          MSG = 'metadata.rb cookbook dependencies and version constraints should be comma separated'
+
+          def_node_matcher :depends_without_comma?, <<-PATTERN
+            (send nil? :depends
+              (dstr
+                $(str _ )
+                $(str _ )))
+          PATTERN
+
+          def on_send(node)
+            depends_without_comma?(node) do |cb, ver|
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(node, "depends '#{cb.value}', '#{ver.value}'")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 #
-# Copyright:: 2019, Chef Software Inc.
+# Copyright:: 2019-2021, Chef Software Inc.
 # Author:: Tim Smith (<tsmith@chef.io>)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,7 @@ module RuboCop
         #   name 'foo'
         #
         class MetadataMissingName < Base
+          extend AutoCorrector
           include RangeHelp
 
           MSG = 'metadata.rb needs to include the name method or it will fail on Chef Infra Client 12 and later.'
@@ -37,11 +38,10 @@ module RuboCop
             # Using range similar to RuboCop::Cop::Naming::Filename (file_name.rb)
             return if cb_name?(processed_source.ast)
             range = source_range(processed_source.buffer, 1, 0)
-            add_offense(range, message: MSG, severity: :refactor) do |_corrector|
+            add_offense(range, message: MSG, severity: :refactor) do |corrector|
               path = processed_source.path
               cb_name = File.basename(File.dirname(path))
-              metadata = IO.read(path)
-              IO.write(path, "name '#{cb_name}'\n" + metadata)
+              corrector.insert_before(processed_source.ast, "name '#{cb_name}'\n")
             end
           end
         end

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

@@ -54,6 +54,9 @@ module RuboCop
           def_node_search :provides, '(send nil? :provides ...)'
 
           def on_new_investigation
+            # gracefully fail if the resource is empty
+            return if processed_source.ast.nil?
+
             # Using range similar to RuboCop::Cop::Naming::Filename (file_name.rb)
             return if unified_mode?(processed_source.ast)
             range = source_range(processed_source.buffer, 1, 0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.15.1
+  version: 7.16.1
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.18.3
+        version: 1.18.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.18.3
+        version: 1.18.4
 description: 
 email:
 - thom@chef.io
@@ -69,6 +69,7 @@ files:
 - lib/rubocop/cop/chef/correctness/lazy_in_resource_guard.rb
 - lib/rubocop/cop/chef/correctness/macos_userdefaults_invalid_type.rb
 - lib/rubocop/cop/chef/correctness/malformed_value_for_platform.rb
+- lib/rubocop/cop/chef/correctness/metadata_malformed_version.rb
 - lib/rubocop/cop/chef/correctness/metadata_missing_name.rb
 - lib/rubocop/cop/chef/correctness/node_normal.rb
 - lib/rubocop/cop/chef/correctness/node_normal_unless.rb