cookstyle 7.0.0 → 7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7657520e64c1c6c6a5fb35520e8b03b7627c0cbf7f8c97c6b98876188174dd2
-  data.tar.gz: 541043c03cc4521990a973bad5b07834c89fa60d1d385ca449c63979917689ce
+  metadata.gz: 662226d3c6dc1e7ba00c89296274f8a46f04c7012abc658b0dd85b65e4d47126
+  data.tar.gz: a814e8b4190084045c668e3c82b8616640e593121046f4da0095373c614bf77c
 SHA512:
-  metadata.gz: 177c42fe47c369af9a4f83545c0b702ee0407e3e66eb7f055055fa644b24fdc2f99dcfcabe7c1b16c29ed58a90d351a5e8a573a6e7d5beb443cecf0f858e4751
-  data.tar.gz: 48ccb6906f3793eabd00fe6f3b3ff1651196375d509ef5d07018552364e1f7b7dce47434d3d8c766b1aa3910b734747c3f39669a5749174f275e51ae6a81fb61
+  metadata.gz: 3e56b4d1cd6fe22d917798beb027bdfd22a8b61d1e1ff55f6183707af0cabc80ba04fba87ae4e26bc5baae8d5c9603dcd39ddb48c8bfda1bbfb0419ca78fb3a6
+  data.tar.gz: a2c799f5706fc3ba55acbc2733392a4a162eec03199fab91c26ce8609cee96bcdd8d865ddd5f3361e1aed07e0ebeba82b5b42113d30a678c2dd073c6cccbf7df

data/config/cookstyle.yml

@@ -1137,6 +1137,23 @@ Chef/Deprecations/UseYamlDump:
   Enabled: true
   VersionAdded: '6.21.0'
 
+Chef/Deprecations/LibrarianChefSpec:
+  Description: The Librarian-Chef depsolving project is no longer maintained and ChefSpec should not use Librarian-Chef for cookbook depsolving. Consider using Policyfiles instead.
+  StyleGuide: '#chefdeprecationslibrarianchefspec'
+  Enabled: true
+  VersionAdded: '7.1.0'
+  Include:
+    - '**/specs/*.rb'
+
+Chef/Deprecations/FoodcriticTesting:
+  Description: The Foodcritic cookbook linter has been deprecated and should no longer be used for validating cookbooks
+  StyleGuide: '#chefdeprecationsfoodcritictesting'
+  Enabled: true
+  VersionAdded: '7.1.0'
+  Include:
+    - '**/Rakefile'
+    - '**/Gemfile'
+
 ###############################
 # Chef/Modernize: Cleaning up legacy code and using new built-in resources
 ###############################
@@ -2746,4 +2763,8 @@ Style/ExpandPathArguments:
 
 # Avoid a safe navigation operator if we don't need it
 Lint/RedundantSafeNavigation:
+  Enabled: true
+
+# Avoid using blocks to remove nils from a Hash/Array
+Style/CollectionCompact:
   Enabled: true

data/config/disable_all.yml

@@ -307,6 +307,8 @@ Lint/NestedPercentLiteral:
   Enabled: false
 Lint/NextWithoutAccumulator:
   Enabled: false
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
 Lint/NonDeterministicRequireOrder:
   Enabled: false
 Lint/NonLocalExitFromIterator:
@@ -515,6 +517,8 @@ Style/ClassMethodsDefinitions:
   Enabled: false
 Style/ClassVars:
   Enabled: false
+Style/CollectionCompact:
+  Enabled: false
 Style/CollectionMethods:
   Enabled: false
 Style/ColonMethodCall:
@@ -689,6 +693,8 @@ Style/MutableConstant:
   Enabled: false
 Style/NegatedIf:
   Enabled: false
+Style/NegatedIfElseCondition:
+  Enabled: false
 Style/NegatedUnless:
   Enabled: false
 Style/NegatedWhile:

data/config/upstream.yml

@@ -1478,6 +1478,7 @@ Lint/ElseLayout:
   Description: 'Check for odd code arrangement in an else block.'
   Enabled: true
   VersionAdded: '0.17'
+  VersionChanged: '1.2'
 
 Lint/EmptyBlock:
   Description: 'This cop checks for blocks without a body.'
@@ -1679,6 +1680,11 @@ Lint/NextWithoutAccumulator:
   Enabled: true
   VersionAdded: '0.36'
 
+Lint/NoReturnInBeginEndBlocks:
+  Description: 'Do not `return` inside `begin..end` blocks in assignment contexts.'
+  Enabled: pending
+  VersionAdded: '1.2'
+
 Lint/NonDeterministicRequireOrder:
   Description: 'Always sort arrays returned by Dir.glob when requiring files.'
   Enabled: true
@@ -2036,8 +2042,9 @@ Lint/UselessMethodDefinition:
 Lint/UselessSetterCall:
   Description: 'Checks for useless setter call to a local variable.'
   Enabled: true
+  SafeAutoCorrect: false
   VersionAdded: '0.13'
-  VersionChanged: '0.80'
+  VersionChanged: '1.2'
   Safe: false
 
 Lint/UselessTimes:
@@ -2181,6 +2188,7 @@ Naming/BinaryOperatorParameterName:
   StyleGuide: '#other-arg'
   Enabled: true
   VersionAdded: '0.50'
+  VersionChanged: '1.2'
 
 Naming/BlockParameterName:
   Description: >-
@@ -2287,6 +2295,7 @@ Naming/HeredocDelimiterCase:
   StyleGuide: '#heredoc-delimiters'
   Enabled: true
   VersionAdded: '0.50'
+  VersionChanged: '1.2'
   EnforcedStyle: uppercase
   SupportedStyles:
     - lowercase
@@ -2305,7 +2314,7 @@ Naming/MemoizedInstanceVariableName:
     Memoized method name should match memo instance variable name.
   Enabled: true
   VersionAdded: '0.53'
-  VersionChanged: '0.58'
+  VersionChanged: '1.2'
   EnforcedStyleForLeadingUnderscores: disallowed
   SupportedStylesForLeadingUnderscores:
     - disallowed
@@ -2403,14 +2412,18 @@ Naming/VariableName:
     - camelCase
 
 Naming/VariableNumber:
-  Description: 'Use the configured style when numbering variables.'
+  Description: 'Use the configured style when numbering symbols, methods and variables.'
+  StyleGuide: '#snake-case-symbols-methods-vars-with-numbers'
   Enabled: true
   VersionAdded: '0.50'
+  VersionChanged: '1.2'
   EnforcedStyle: normalcase
   SupportedStyles:
     - snake_case
     - normalcase
     - non_integer
+  CheckMethodNames: true
+  CheckSymbols: true
 
 #################### Security ##############################
 
@@ -2789,6 +2802,11 @@ Style/ClassVars:
   Enabled: true
   VersionAdded: '0.13'
 
+Style/CollectionCompact:
+  Description: 'Use `{Array,Hash}#{compact,compact!}` instead of custom logic to reject nils.'
+  Enabled: pending
+  VersionAdded: '1.2'
+
 # Align with the style guide.
 Style/CollectionMethods:
   Description: 'Preferred collection methods.'
@@ -2986,7 +3004,7 @@ Style/DoubleNegation:
   StyleGuide: '#no-bang-bang'
   Enabled: true
   VersionAdded: '0.19'
-  VersionChanged: '0.84'
+  VersionChanged: '1.2'
   EnforcedStyle: allowed_in_returns
   SafeAutoCorrect: false
   SupportedStyles:
@@ -3611,6 +3629,13 @@ Style/NegatedIf:
     - prefix
     - postfix
 
+Style/NegatedIfElseCondition:
+  Description: >-
+                This cop checks for uses of `if-else` and ternary operators with a negated condition
+                which can be simplified by inverting condition and swapping branches.
+  Enabled: pending
+  VersionAdded: '1.2'
+
 Style/NegatedUnless:
   Description: 'Favor if over unless for negative conditions.'
   StyleGuide: '#if-for-negatives'
@@ -3888,11 +3913,12 @@ Style/RaiseArgs:
   StyleGuide: '#exception-class-messages'
   Enabled: true
   VersionAdded: '0.14'
-  VersionChanged: '0.40'
+  VersionChanged: '1.2'
   EnforcedStyle: exploded
   SupportedStyles:
     - compact # raise Exception.new(msg)
     - exploded # raise Exception, msg
+  AllowedCompactTypes: []
 
 Style/RandomWithOffset:
   Description: >-

data/lib/cookstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "7.0.0" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.1.0'
+  VERSION = "7.1.2" # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '1.2.0'
 end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2020, 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 Foodcritic cookbook linter has been deprecated and should no longer be used for validating cookbooks.
+        #
+        # @example
+        #
+        #   # bad
+        #   gem 'foodcritic'
+        #   require 'foodcritic'
+        #
+        class FoodcriticTesting < Base
+          MSG = 'The Foodcritic cookbook linter has been deprecated and should no longer be used for validating cookbooks.'
+          RESTRICT_ON_SEND = [:require, :gem].freeze
+
+          def on_send(node)
+            return unless node.arguments.first == s(:str, 'foodcritic')
+
+            add_offense(node, message: MSG, severity: :warning)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2020, 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 Librarian-Chef depsolving project is no longer maintained and a Cheffile should not be used for cookbook depsolving. Consider using Policyfiles instead.
+        #
+        # @example
+        #
+        #   # bad
+        #   require 'chefspec/librarian'
+        #
+        class LibrarianChefSpec < Base
+          MSG = 'The Librarian-Chef depsolving project is no longer maintained and ChefSpec should not use Librarian-Chef for cookbook depsolving. Consider using Policyfiles instead.'
+          RESTRICT_ON_SEND = [:require].freeze
+
+          def on_send(node)
+            return unless node.arguments.first == s(:str, 'chefspec/librarian')
+
+            add_offense(node, message: MSG, severity: :warning)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -60,8 +60,8 @@ module RuboCop
                     (lvar _))}) nil?)
           PATTERN
 
-          def_node_matcher :package_array_install?, <<-PATTERN
-          (block
+          def_node_search :package_array_install, <<-PATTERN
+          $(block
             (send
               $(array ... ) :each)
             (args ... )
@@ -78,27 +78,31 @@ module RuboCop
           # see if all platforms in the when condition are multi-package compliant
           def multipackage_platforms?(condition_obj)
             condition_obj.all? do |p|
-              MULTIPACKAGE_PLATS.include?(p.value)
+              # make sure it's a string (not a regex) and it's in the array
+              p.str_type? && MULTIPACKAGE_PLATS.include?(p.value)
             end
           end
 
           def on_when(node)
             return unless platform_or_platform_family?(node.parent.condition) &&
-                          package_array_install?(node.body) &&
                           multipackage_platforms?(node.conditions)
-            check_offense(node.body)
+            return if node.body.nil? # don't blow up on empty whens
+
+            package_array_install(node.body) do |install_block, pkgs|
+              add_offense(install_block, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(install_block, "package #{pkgs.source}")
+              end
+            end
           end
 
           def on_if(node)
             platform_helper?(node) do |plats, blk, _pkgs|
-              check_offense(blk) if multipackage_platforms?(plats)
-            end
-          end
+              return unless multipackage_platforms?(plats)
 
-          def check_offense(node)
-            add_offense(node, message: MSG, severity: :refactor) do |corrector|
-              package_array_install?(node) do |vals|
-                corrector.replace(node, "package #{vals.source}")
+              add_offense(blk, message: MSG, severity: :refactor) do |corrector|
+                package_array_install(blk) do |install_block, pkgs|
+                  corrector.replace(install_block, "package #{pkgs.source}")
+                end
               end
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.2
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 description: 
 email:
 - thom@chef.io
@@ -113,11 +113,13 @@ files:
 - lib/rubocop/cop/chef/deprecation/erl_call.rb
 - lib/rubocop/cop/chef/deprecation/execute_path_property.rb
 - lib/rubocop/cop/chef/deprecation/execute_relative_creates_without_cwd.rb
+- lib/rubocop/cop/chef/deprecation/foodcritic_testing.rb
 - lib/rubocop/cop/chef/deprecation/hwrp_without_provides.rb
 - lib/rubocop/cop/chef/deprecation/inherits_compat_resource.rb
 - lib/rubocop/cop/chef/deprecation/launchd_deprecated_hash_property.rb
 - lib/rubocop/cop/chef/deprecation/legacy_notify_syntax.rb
 - lib/rubocop/cop/chef/deprecation/legacy_yum_cookbook_recipes.rb
+- lib/rubocop/cop/chef/deprecation/librarian_chefspec.rb
 - lib/rubocop/cop/chef/deprecation/locale_lc_all_property.rb
 - lib/rubocop/cop/chef/deprecation/log_resource_notifications.rb
 - lib/rubocop/cop/chef/deprecation/macos_userdefaults_global_property.rb