cookstyle 5.15.7 → 5.16.10

data/lib/rubocop/cop/chef/style/use_platform_helpers.rb

@@ -27,33 +27,49 @@ module RuboCop
         #   node['platform_family'] == 'debian'
         #   node['platform'] != 'ubuntu'
         #   node['platform_family'] != 'debian'
+        #   %w(rhel suse).include?(node['platform_family'])
         #
         #   # good
         #   platform?('ubuntu')
         #   !platform?('ubuntu')
         #   platform_family?('debian')
         #   !platform_family?('debian')
+        #   platform_family?('rhel', 'suse')
         #
         class UsePlatformHelpers < Cop
-          MSG = "Use platform? and platform_family? helpers for checking a node's platform".freeze
+          MSG = "Use platform? and platform_family? helpers to check a node's platform".freeze
 
-          def_node_matcher :platform_check?, <<-PATTERN
-            ( send (send (send nil? :node) :[] $(str {"platform" "platform_family"}) ) ${:== :!=} $str )
+          def_node_matcher :platform_equals?, <<-PATTERN
+            (send (send (send nil? :node) :[] $(str {"platform" "platform_family"}) ) ${:== :!=} $str )
+          PATTERN
+
+          def_node_matcher :platform_include?, <<-PATTERN
+            (send $(array ...) :include? (send (send nil? :node) :[] $(str {"platform" "platform_family"})))
           PATTERN
 
           def on_send(node)
-            platform_check?(node) do
+            platform_equals?(node) do
+              add_offense(node, location: :expression, message: MSG, severity: :refactor)
+            end
+
+            platform_include?(node) do
               add_offense(node, location: :expression, message: MSG, severity: :refactor)
             end
           end
 
           def autocorrect(node)
             lambda do |corrector|
-              platform_check?(node) do |type, operator, plat|
+              platform_equals?(node) do |type, operator, plat|
                 corrected_string = operator == :!= ? '!' : ''
                 corrected_string << "#{type.value}?('#{plat.value}')"
                 corrector.replace(node.loc.expression, corrected_string)
               end
+
+              platform_include?(node) do |plats, type|
+                platforms = plats.values.map { |x| x.str_type? ? "'#{x.value}'" : x.source }
+                corrected_string = "#{type.value}?(#{platforms.join(', ')})"
+                corrector.replace(node.loc.expression, corrected_string)
+              end
             end
           end
         end

data/lib/rubocop/cop/target_chef_version.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# shamelessly borrowed from rubocop-rails. Thanks!
+
+module RuboCop
+  module Cop
+    # Common functionality for checking target chef version.
+    module TargetChefVersion
+      def minimum_target_chef_version(version)
+        @minimum_target_chef_version = version
+      end
+
+      def support_target_chef_version?(version)
+        Gem::Version.new(@minimum_target_chef_version) <= Gem::Version.new(version)
+      end
+    end
+  end
+end

data/lib/rubocop/monkey_patches/commissioner.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    class Commissioner
+      def remove_irrelevant_cops(filename)
+        @cops.reject! { |cop| cop.excluded_file?(filename) }
+        @cops.reject! do |cop|
+          cop.class.respond_to?(:support_target_ruby_version?) &&
+            !cop.class.support_target_ruby_version?(cop.target_ruby_version)
+        end
+        @cops.reject! do |cop|
+          cop.class.respond_to?(:support_target_rails_version?) &&
+            !cop.class.support_target_rails_version?(cop.target_rails_version)
+        end
+
+        ### START COOKSTYLE MODIFICATION
+        @cops.reject! do |cop|
+          cop.class.respond_to?(:support_target_chef_version?) &&
+            !cop.class.support_target_chef_version?(cop.target_chef_version)
+        end
+        ### END COOKSTYLE MODIFICATION
+      end
+    end
+  end
+end

data/lib/rubocop/monkey_patches/config.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RuboCop
+  class Config
+    # This is a copy of the #target_rails_version method from Rubocop
+    def target_chef_version
+      @target_chef_version ||=
+        if for_all_cops['TargetChefVersion']
+          for_all_cops['TargetChefVersion'].to_f
+        else
+          99 # just set a high number so we don't need to update this later
+        end
+    end
+  end
+end

data/lib/rubocop/monkey_patches/cop.rb

@@ -0,0 +1,10 @@
+module RuboCop
+  module Cop
+    class Cop
+      # This is a copy of the #target_rails_version method from rubocop-rails
+      def target_chef_version
+        @config.target_chef_version
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 5.15.7
+  version: 5.16.10
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -50,13 +50,16 @@ files:
 - lib/rubocop/chef/platform_helpers.rb
 - lib/rubocop/cop/chef/correctness/block_guard_clause_string_only.rb
 - lib/rubocop/cop/chef/correctness/cb_depends_on_self.rb
+- lib/rubocop/cop/chef/correctness/dnf_package_allow_downgrades.rb
 - lib/rubocop/cop/chef/correctness/incorrect_library_injection.rb
+- lib/rubocop/cop/chef/correctness/invalid_notification_timing.rb
 - lib/rubocop/cop/chef/correctness/invalid_platform_family_helper.rb
 - lib/rubocop/cop/chef/correctness/invalid_platform_helper.rb
 - lib/rubocop/cop/chef/correctness/invalid_platform_metadata.rb
 - lib/rubocop/cop/chef/correctness/invalid_value_for_platform_family_helper.rb
 - lib/rubocop/cop/chef/correctness/invalid_value_for_platform_helper.rb
 - lib/rubocop/cop/chef/correctness/invalid_version_metadata.rb
+- lib/rubocop/cop/chef/correctness/malformed_value_for_platform.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
@@ -79,6 +82,7 @@ files:
 - lib/rubocop/cop/chef/deprecation/depends_partial_search.rb
 - lib/rubocop/cop/chef/deprecation/depends_poise.rb
 - lib/rubocop/cop/chef/deprecation/deprecated_mixins.rb
+- lib/rubocop/cop/chef/deprecation/deprecated_platform_methods.rb
 - lib/rubocop/cop/chef/deprecation/deprecated_yum_repository_properties.rb
 - lib/rubocop/cop/chef/deprecation/easy_install.rb
 - lib/rubocop/cop/chef/deprecation/eol_audit_mode.rb
@@ -103,6 +107,7 @@ files:
 - lib/rubocop/cop/chef/deprecation/resource_uses_dsl_name_method.rb
 - lib/rubocop/cop/chef/deprecation/resource_uses_provider_base_method.rb
 - lib/rubocop/cop/chef/deprecation/resource_uses_updated_method.rb
+- lib/rubocop/cop/chef/deprecation/ruby_block_create_action.rb
 - lib/rubocop/cop/chef/deprecation/run_command_helper.rb
 - lib/rubocop/cop/chef/deprecation/search_uses_positional_parameters.rb
 - lib/rubocop/cop/chef/deprecation/use_inline_resources.rb
@@ -131,7 +136,10 @@ files:
 - lib/rubocop/cop/chef/modernize/depends_zypper_cookbook.rb
 - lib/rubocop/cop/chef/modernize/empty_resource_initialize.rb
 - lib/rubocop/cop/chef/modernize/execute_apt_update.rb
+- lib/rubocop/cop/chef/modernize/execute_sc_exe.rb
+- lib/rubocop/cop/chef/modernize/execute_sleep.rb
 - lib/rubocop/cop/chef/modernize/execute_tzutil.rb
+- lib/rubocop/cop/chef/modernize/foodcritic_comments.rb
 - lib/rubocop/cop/chef/modernize/if_provides_default_action.rb
 - lib/rubocop/cop/chef/modernize/includes_mixin_shellout.rb
 - lib/rubocop/cop/chef/modernize/libarchive_file.rb
@@ -152,6 +160,7 @@ files:
 - lib/rubocop/cop/chef/modernize/respond_to_metadata.rb
 - lib/rubocop/cop/chef/modernize/respond_to_provides.rb
 - lib/rubocop/cop/chef/modernize/respond_to_resource_name.rb
+- lib/rubocop/cop/chef/modernize/sc_windows_resource.rb
 - lib/rubocop/cop/chef/modernize/seven_zip_archive.rb
 - lib/rubocop/cop/chef/modernize/shellouts_to_chocolatey.rb
 - lib/rubocop/cop/chef/modernize/systctl_param_resource.rb
@@ -172,7 +181,9 @@ files:
 - lib/rubocop/cop/chef/redundant/recipe_metadata.rb
 - lib/rubocop/cop/chef/redundant/replaces_metadata.rb
 - lib/rubocop/cop/chef/redundant/resource_with_nothing_action.rb
+- lib/rubocop/cop/chef/redundant/sensitive_property_in_resource.rb
 - lib/rubocop/cop/chef/redundant/suggests_metadata.rb
+- lib/rubocop/cop/chef/redundant/unnecessary_desired_state.rb
 - lib/rubocop/cop/chef/redundant/unnecessary_name_property.rb
 - lib/rubocop/cop/chef/sharing/default_maintainer_metadata.rb
 - lib/rubocop/cop/chef/sharing/empty_metadata_field.rb
@@ -184,9 +195,16 @@ files:
 - lib/rubocop/cop/chef/style/comments_default_copyright.rb
 - lib/rubocop/cop/chef/style/comments_format.rb
 - lib/rubocop/cop/chef/style/file_mode.rb
+- lib/rubocop/cop/chef/style/immediate_notification_timing.rb
 - lib/rubocop/cop/chef/style/simplify_platform_major_version_check.rb
+- lib/rubocop/cop/chef/style/true_false_resource_properties.rb
+- lib/rubocop/cop/chef/style/unnecessary_platform_case_statement.rb
 - lib/rubocop/cop/chef/style/use_platform_helpers.rb
+- lib/rubocop/cop/target_chef_version.rb
 - lib/rubocop/monkey_patches/comment_config.rb
+- lib/rubocop/monkey_patches/commissioner.rb
+- lib/rubocop/monkey_patches/config.rb
+- lib/rubocop/monkey_patches/cop.rb
 - lib/rubocop/monkey_patches/json_formatter.rb
 homepage: 
 licenses: