cookstyle 7.21.0 → 7.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e9eba9990f29d5ece83efea73a5ceba5c49ed781909b437c40c43da790210a
-  data.tar.gz: 9f177a0a2cadc3cb703ec87337bd4485e872ae748d9af95f53473dec22eebd7d
+  metadata.gz: 2f991818edd484753a75e2c0ae4e0d363f48b9213189cd4240bda17b08e260d4
+  data.tar.gz: fa69ed0eb47f5276d723b7f75acd6c08f21e8c57391f6c1b8c71f2e74c023880
 SHA512:
-  metadata.gz: fbeebdde748ba5abca797bf203ab8465c74e1b1714847d27e35576b3801daae3e962b9bfb3516c84f684e69a3088535d8811ea7df74005f6262005bb844295a7
-  data.tar.gz: 4e3c683249684fdae3717f88b9ea92c9eb26147d55eb90e43e024f7c0ce03870d03c66b4f2c7ad6eb9c057cf1eb687ce28ed44efea7b2a61e5a9002b3b143628
+  metadata.gz: 5f5a09a0805b0b184e1fe10e90bbdd0270a537b4c823560f74f1b4cfd6e6ea332fc62fc6695595b92cf35733db3871d94a037b4747681572bd0925525c7a3da9
+  data.tar.gz: 5118bf5677557d03e0e730de31670c7defcd943d5d356147f40eed1c86118f463f29083f081d4af0e622c7375db9415c5b9e57da933291c441c500ee658d6265

data/config/cookstyle.yml

@@ -979,7 +979,7 @@ Chef/Deprecations/DeprecatedPlatformMethods:
     - '**/providers/*.rb'
 
 Chef/Deprecations/DeprecatedChefSpecPlatform:
-  Description: Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version so it's always best to be less specific ie. 10 instead of 10.3
+  Description: Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/main/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version so it's always best to be less specific ie. 10 instead of 10.3
   StyleGuide: 'chef_deprecations_deprecatedchefspecplatform'
   Enabled: true
   VersionAdded: '5.20.0'
@@ -1198,7 +1198,7 @@ Chef/Deprecations/DeprecatedYumRepositoryActions:
     - '**/Rakefile'
 
 Chef/Deprecations/ChefSugarHelpers:
-  Description: Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/master/chef-utils#getting-started
+  Description: Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/main/chef-utils#getting-started
   StyleGuide: 'chef_deprecations_chefsugarhelpers'
   Enabled: true
   VersionAdded: '7.3.0'
@@ -1906,6 +1906,16 @@ Chef/Modernize/UseChefLanguageEnvHelpers:
     - '**/providers/*.rb'
     - '**/recipes/*.rb'
 
+Chef/Modernize/UseChefLanguageCloudHelpers:
+  Description: hef Infra Client 15.5 and later include cloud helpers to make detecting instance that run on public and private clouds easier.
+  StyleGuide: 'chef_modernize_usecheflanguagecloudhelpers'
+  Enabled: true
+  VersionAdded: '7.22.0'
+  Include:
+    - '**/resources/*.rb'
+    - '**/providers/*.rb'
+    - '**/recipes/*.rb'
+    
 ###############################
 # Chef/RedundantCode: Cleanup unnecessary code in your cookbooks regardless of Chef Infra Client release
 ###############################

data/config/disable_all.yml

@@ -5,6 +5,8 @@ Bundler/DuplicatedGem:
   Enabled: false
 Bundler/GemComment:
   Enabled: false
+Bundler/GemFilename:
+  Enabled: false
 Bundler/GemVersion:
   Enabled: false
 Bundler/InsecureProtocolSource:

data/config/upstream.yml

@@ -174,6 +174,20 @@ Bundler/GemComment:
   IgnoredGems: []
   OnlyFor: []
 
+Bundler/GemFilename:
+  Description: 'Enforces the filename for managing gems.'
+  Enabled: true
+  VersionAdded: '1.20'
+  EnforcedStyle: 'Gemfile'
+  SupportedStyles:
+    - 'Gemfile'
+    - 'gems.rb'
+  Include:
+    - '**/Gemfile'
+    - '**/gems.rb'
+    - '**/Gemfile.lock'
+    - '**/gems.locked'
+
 Bundler/GemVersion:
   Description: 'Requires or forbids specifying gem versions.'
   Enabled: false
@@ -1519,6 +1533,11 @@ Lint/Debugger:
     Capybara:
       - save_and_open_page
       - save_and_open_screenshot
+    debug.rb:
+      - binding.b
+      - binding.break
+      - Kernel.binding.b
+      - Kernel.binding.break
     Pry:
       - binding.pry
       - binding.remote_pry
@@ -1527,6 +1546,8 @@ Lint/Debugger:
     Rails:
       - debugger
       - Kernel.debugger
+    RubyJard:
+      - jard
     WebConsole:
       - binding.console
 
@@ -3149,7 +3170,7 @@ Style/CommentAnnotation:
   StyleGuide: '#annotate-keywords'
   Enabled: true
   VersionAdded: '0.10'
-  VersionChanged: '1.3'
+  VersionChanged: '1.20'
   Keywords:
     - TODO
     - FIXME
@@ -4692,8 +4713,9 @@ Style/StructInheritance:
   Description: 'Checks for inheritance from Struct.new.'
   StyleGuide: '#no-extend-struct-new'
   Enabled: true
+  SafeAutoCorrect: false
   VersionAdded: '0.29'
-  VersionChanged: '0.86'
+  VersionChanged: '1.20'
 
 Style/SwapValues:
   Description: 'This cop enforces the use of shorthand-style swapping of 2 variables.'

data/cookstyle.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata = {
     'homepage_uri' => 'https://github.com/chef/cookstyle',
-    'changelog_uri' => 'https://github.com/chef/cookstyle/blob/master/CHANGELOG.md',
+    'changelog_uri' => 'https://github.com/chef/cookstyle/blob/main/CHANGELOG.md',
     'source_code_uri' => 'https://github.com/chef/cookstyle',
     'documentation_uri' => 'https://docs.chef.io/workstation/cookstyle/',
     'bug_tracker_uri' => 'https://github.com/chef/cookstyle/issues',

data/lib/cookstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "7.21.0" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.19.0'
+  VERSION = "7.22.3" # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '1.20.0'
 end

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/master/chef-utils#getting-started
+        # Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/main/chef-utils#getting-started
         #
         # @example
         #
@@ -42,7 +42,7 @@ module RuboCop
         #   opensolaris?
         #
         class ChefSugarHelpers < Base
-          MSG = 'Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/master/chef-utils#getting-started'
+          MSG = 'Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/main/chef-utils#getting-started'
           RESTRICT_ON_SEND = [:vagrant_key?, :vagrant_domain?, :vagrant_user?, :require_chef_gem, :best_ip_for, :nexus?, :ios_xr?, :ruby_20?, :ruby_19?, :includes_recipe?, :wrlinux?, :dev_null, :nexentacore_platform?, :opensolaris_platform?, :nexentacore?, :opensolaris?].freeze
 
           def on_send(node)

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version values so it's always best to be less specific ie. 10 instead of 10.3
+        # Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/main/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version values so it's always best to be less specific ie. 10 instead of 10.3
         #
         # @example
         #
@@ -29,7 +29,7 @@ module RuboCop
           include RuboCop::Chef::CookbookHelpers
           extend AutoCorrector
 
-          MSG = "Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version so it's always best to be less specific ie. 10 instead of 10.3"
+          MSG = "Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/main/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version so it's always best to be less specific ie. 10 instead of 10.3"
 
           DEPRECATED_MAPPING = {
             'amazon' => {

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Chef Infra Client 15.3 and later include a new Unified Mode that simplies the execution of resoures by replace the traditional compile and converge phases with a single phase. Unified mode simplies writing advanced resources and avoids confusing errors that often occur when mixing ruby and Chef Infra resources. Chef Infra Client 17.0 and later will beging warning that `unified_mode true` should be set in all resources to validate that they will continue to function in Chef Infra Client 18.0 (April 2022) when Unified Mode becomes the default.
+        # Chef Infra Client 15.3 and later include a new Unified Mode that simplifies the execution of resources by replace the traditional compile and converge phases with a single phase. Unified mode simplifies writing advanced resources and avoids confusing errors that often occur when mixing ruby and Chef Infra resources. Chef Infra Client 17.0 and later will begin warning that `unified_mode true` should be set in all resources to validate that they will continue to function in Chef Infra Client 18.0 (April 2022) when Unified Mode becomes the default.
         #
         # @example
         #

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Chef Infra Client 15.3 and later include a new Unified Mode that simplies the execution of resoures by replace the traditional compile and converge phases with a single phase. Unified mode simplies writing advanced resources and avoids confusing errors that often occur when mixing ruby and Chef Infra resources. Chef Infra Client 17.0 and later will beging warning that `unified_mode true` should be set in all resources to validate that they will continue to function in Chef Infra Client 18.0 (April 2022) when Unified Mode becomes the default.
+        # Chef Infra Client 15.3 and later include a new Unified Mode that simplifies the execution of resources by replace the traditional compile and converge phases with a single phase. Unified mode simplies writing advanced resources and avoids confusing errors that often occur when mixing ruby and Chef Infra resources. Chef Infra Client 17.0 and later will begin warning that `unified_mode true` should be set in all resources to validate that they will continue to function in Chef Infra Client 18.0 (April 2022) when Unified Mode becomes the default.
         #
         # @example
         #

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

@@ -24,17 +24,33 @@ module RuboCop
         # @example
         #
         #   #### incorrect
-        #   ENV['CI']
-        #   ENV['TEST_KITCHEN']
+        #   node['cloud']['provider'] == 'alibaba'
+        #   node['cloud']['provider'] == 'ec2'
+        #   node['cloud']['provider'] == 'gce'
+        #   node['cloud']['provider'] == 'rackspace'
+        #   node['cloud']['provider'] == 'eucalyptus'
+        #   node['cloud']['provider'] == 'linode'
+        #   node['cloud']['provider'] == 'openstack'
+        #   node['cloud']['provider'] == 'azure'
+        #   node['cloud']['provider'] == 'digital_ocean'
+        #   node['cloud']['provider'] == 'softlayer'
         #
         #   #### correct
-        #   ci?
-        #   kitchen?
+        #   alibaba?
+        #   ec2?
+        #   gce?
+        #   rackspace?
+        #   eucalyptus?
+        #   linode?
+        #   openstack?
+        #   azure?
+        #   digital_ocean?
+        #   softlayer?
         #
         class UseChefLanguageCloudHelpers < Base
           extend AutoCorrector
 
-          MSG = 'Chef Infra Client 15.5 and later include cloud helpers to make detecting instance that run on public and private clouds easier.'.freeze
+          MSG = 'Chef Infra Client 15.5 and later include cloud helpers to make detecting instance that run on public and private clouds easier.'
           RESTRICT_ON_SEND = [:==, :[]].freeze
           VALID_CLOUDS = %w(alibaba ec2 gce rackspace eucalyptus linode openstack azure digital_ocean softlayer).freeze
 
@@ -48,12 +64,6 @@ module RuboCop
               (str $_))
           PATTERN
 
-          def_node_matcher :node_check?, <<-PATTERN
-            (send
-              (send nil? :node) :[]
-              (str ${"ec2"}))
-          PATTERN
-
           def_node_matcher :node_cloud?, <<-PATTERN
             (send
               (send nil? :node) :[]
@@ -61,19 +71,13 @@ module RuboCop
           PATTERN
 
           def on_send(node)
-            node_check?(node) do |cloud_name|
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
-                corrector.replace(node, "#{cloud_name}?")
-              end
-            end
-
             provider_comparison?(node) do |cloud_name|
               # skip it if someone was checking for a bogus cloud provider
               next unless VALID_CLOUDS.include?(cloud_name)
 
               # if they were checking for node['cloud'] and the provider replace it all
               node = node.parent if node.parent.and_type? && node_cloud?(node.left_sibling)
-              
+
               add_offense(node, message: MSG, severity: :refactor) do |corrector|
                 corrector.replace(node, "#{cloud_name}?")
               end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.21.0
+  version: 7.22.3
 platform: ruby
 authors:
 - Thom May
 - Tim Smith
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,15 +17,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.19.0
-description:
+        version: 1.20.0
+description: 
 email:
 - thom@chef.io
 - tsmith@chef.io
@@ -305,11 +305,11 @@ licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://github.com/chef/cookstyle
-  changelog_uri: https://github.com/chef/cookstyle/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/chef/cookstyle/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/chef/cookstyle
   documentation_uri: https://docs.chef.io/workstation/cookstyle/
   bug_tracker_uri: https://github.com/chef/cookstyle/issues
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -324,8 +324,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Cookstyle is a code linting tool that helps you to write better Chef Infra
   cookbooks by detecting and automatically correcting style, syntax, and logic mistakes