cookstyle 8.6.10 → 8.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9e00c677da7b0f5e5e7792aa8772ae2ce0f6b84742cd236e62f84abac2cf6fc
-  data.tar.gz: c2b5e2c2170adafeccc37c37d706eb0b05d9bbfa6a4dd04ee07a48d2cf7d51f8
+  metadata.gz: a181e0d054a32ed0c26adfaf90fdacaa4641d4f40f06ab5042aade9648879141
+  data.tar.gz: 825d1445e28601db25cddf29ad2421156edc618fef3c0af2b18cb925f9e9877d
 SHA512:
-  metadata.gz: 5b3f06243138e6a47cb55b88b7148cb3e4a5ea915d7c732e275e66a3632b72da0e65546a63d65beae7e5bf53516face8ffd3e80ef1762a765820c651f6409672
-  data.tar.gz: 846ffa7fe8a41c8b5948aab7289875798bda891260b8d9a1a9f828da5b4c0bcce70f116ba1283afb9eb958b1e91c53caa3460f196d13909a711c1cc4130de432
+  metadata.gz: dba569394dc9c18f79717c37e5de26581420a2136fa3bf8c26568286ad776b5ce8ecf13f596d339d9a0b0da485ea0a97443d9c205070806bee1d1d1213483c9f
+  data.tar.gz: 39660f1933a9bb99c5b99582facf640a05784c78ca5c3dc631dc281f9adce8c0aad2ac24e9d91baf020dfac8e0f0914ae346539f4a8d2d7f65b00032d26fda6d

data/config/chefstyle.yml

@@ -880,6 +880,42 @@ Style/ModuleMemberExistenceCheck:
 Style/NegativeArrayIndex:
   Enabled: true
 
+# avoid a map to single and then a join when just a join would do
+Style/MapJoin:
+   Enabled: true
+
+# Use .partition instead of calls to both .select and .reject
+Style/PartitionInsteadOfDoubleSelect:
+  Enabled: true
+
+# avoid unecessary blocks
+Style/PredicateWithKind:
+  Enabled: true
+
+# Use .to_h instead of rolling your own hash construction
+Style/ReduceToHash:
+  Enabled: true
+
+# Use .max and .min instead of max_by and min_by with a block
+Style/RedundantMinMaxBy:
+  Enabled: true
+
+# avoid keyword_init when it's not necessary
+Style/RedundantStructKeywordInit:
+  Enabled: true
+
+# avoid select and reject with an uncessary block to select on class
+Style/SelectByKind:
+  Enabled: true
+
+# use .grep and .grep_v for simple ranges
+Style/SelectByRange:
+  Enabled: true
+
+# Use new .tally method that is much simpler that group_by with a block
+Style/TallyMethod:
+  Enabled: true
+
 Chef/Deprecations/Ruby27KeywordArgumentWarnings:
   Description: Pass options to shell_out helpers without the brackets to avoid Ruby 2.7 deprecation warnings.
   Enabled: true

data/config/cookstyle.yml

@@ -3309,3 +3309,39 @@ Style/ModuleMemberExistenceCheck:
 # simplify array access
 Style/NegativeArrayIndex:
   Enabled: true
+
+# avoid a map to single and then a join when just a join would do
+Style/MapJoin:
+   Enabled: true
+
+# Use .partition instead of calls to both .select and .reject
+Style/PartitionInsteadOfDoubleSelect:
+  Enabled: true
+
+# avoid unecessary blocks
+Style/PredicateWithKind:
+  Enabled: true
+
+# Use .to_h instead of rolling your own hash construction
+Style/ReduceToHash:
+  Enabled: true
+
+# Use .max and .min instead of max_by and min_by with a block
+Style/RedundantMinMaxBy:
+  Enabled: true
+
+# avoid keyword_init when it's not necessary
+Style/RedundantStructKeywordInit:
+  Enabled: true
+
+# avoid select and reject with an uncessary block to select on class
+Style/SelectByKind:
+  Enabled: true
+
+# use .grep and .grep_v for simple ranges
+Style/SelectByRange:
+  Enabled: true
+
+# Use new .tally method that is much simpler that group_by with a block
+Style/TallyMethod:
+  Enabled: true

data/lib/cookstyle/version.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "8.6.10" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.84.2'
+  # version of cookstyle
+  VERSION = "8.7.6" # rubocop: disable Style/StringLiterals
+
+  # version of rubocop we pin to
+  RUBOCOP_VERSION = '1.86.1'
 end

data/lib/cookstyle.rb

@@ -8,6 +8,7 @@ require 'yaml' unless defined?(YAML)
 gem 'rubocop', "= #{Cookstyle::RUBOCOP_VERSION}"
 require 'rubocop'
 require_relative 'rubocop/monkey_patches/directive_comment'
+require_relative 'rubocop/monkey_patches/comment_config'
 
 # monkey patches needed for the TargetChefVersion config option
 require_relative 'rubocop/monkey_patches/config'

data/lib/rubocop/monkey_patches/comment_config.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module RuboCop
+  # RuboCop >= 1.40.0 introduced a performance fast-path in CommentConfig that
+  # skips directive parsing when the raw source does not contain the literal
+  # string "rubocop".  Because Cookstyle also supports "# cookstyle:disable"
+  # directives, we must also check for "cookstyle" so that those directives
+  # are not silently ignored.
+  class CommentConfig
+    alias_method :original_initialize, :initialize
+
+    def initialize(processed_source)
+      original_initialize(processed_source)
+      # Re-evaluate @no_directives to also consider "cookstyle" comments
+      if @no_directives && processed_source.raw_source.include?('cookstyle')
+        @no_directives = false
+      end
+    end
+  end
+end

data/lib/rubocop/monkey_patches/registry_cop.rb

@@ -3,12 +3,10 @@ module RuboCop
   module Cop
     class Registry
       # we monkeypatch this warning to replace rubocop with cookstyle
-      def print_warning(name, path)
-        message = "#{path}: Warning: no department given for #{name}."
-        if path.end_with?('.rb')
-          message += ' Run `cookstyle -a --only Migration/DepartmentName` to fix.'
-        end
-        warn message
+      def print_department_missing_warning(name, path)
+        message = "no department given for #{name}."
+        message += ' Run `cookstyle -a --only Migration/DepartmentName` to fix.' if path.end_with?('.rb')
+        emit_warning(path, message)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 8.6.10
+  version: 8.7.6
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-03-27 00:00:00.000000000 Z
+date: 2026-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.84.2
+        version: 1.86.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.84.2
+        version: 1.86.1
 description: 
 email:
 - thom@chef.io
@@ -312,6 +312,7 @@ files:
 - 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/comment_config.rb
 - lib/rubocop/monkey_patches/config.rb
 - lib/rubocop/monkey_patches/directive_comment.rb
 - lib/rubocop/monkey_patches/registry_cop.rb