cookstyle 7.4.0 → 7.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afe67bc1be4b70753843d22598cd29dd7edded20c3762230d4cbfb08ba2ed240
-  data.tar.gz: f4f3c739c446a6560b8f9319c63b87dc48c2d338ad45316369a1ed848d40222a
+  metadata.gz: c26a8975b37722a6d4b7be270e87fc5e9a7ac499755b2401e8d3ec5dd8627c82
+  data.tar.gz: ed69abecf1251fd184ed42b16dcbc0f55bfb06201a98abfd05b6fd69f1812c26
 SHA512:
-  metadata.gz: 64ec5f89be1438ba7e29f1e19e9f8b6ebbac1320550f5b32d2a5d58b7ea1994ed4fe08f1243a1328beb46acca4da67608d6ba4b0f3944487adc8af90f9e8fc5e
-  data.tar.gz: 7b6118d966b9585555db7cd3d7b61114e5229a792d9bd9ee23e71a0330ca004187f8ca11cda4b6922c57007ddd0d8e57d30e925f957517dce27ee24532da7cfa
+  metadata.gz: 332eb06789dc7db421b6d38a8234557225e680725ce949a4d8727f1a613c1cd1bdbdd0cfba2ed09b7e60a7091c1296e505cbacef1b0d40f2acd29af1394a611b
+  data.tar.gz: 670702283e8aa31d186156ad809e60d262293b600381a5219c829ca3957a554002888883b74406a6b3f0091fc591265e1780a903fdc7cd353d3115f996c30620

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 group :debug do
   gem 'pry'
   gem 'pry-byebug'
-  gem 'pry-stack_explorer', '~> 0.4.0' # 0.5.0 drops support for Ruby < 2.6
+  gem 'pry-stack_explorer', '< 0.4.13' # 0.4.13+ drops support for Ruby < 2.6
 end
 
 group :docs do
@@ -26,4 +26,4 @@ end
 group :development do
   gem 'rake'
   gem 'rspec', '>= 3.4'
-end
+end

data/bin/cookstyle

@@ -12,8 +12,13 @@ unless ARGV.include?('--fail-level')
   ARGV << 'C'
 end
 
-# if only -v is passed we'll get 3 args (-v, --fail-level, and C)
-if ARGV.size == 3 && %w(-v --version).include?(ARGV.first)
+# we want to link to our docs
+unless ARGV.include?('--display-style-guide')
+  ARGV << '--display-style-guide'
+end
+
+# if only -v is passed we'll get 4 args (-v, --fail-level. --display-style-guide, and C)
+if ARGV.size == 4 && %w(-v --version).include?(ARGV.first)
   puts "Cookstyle #{Cookstyle::VERSION}"
   print '  * RuboCop '
 end

data/config/cookstyle.yml

@@ -2324,7 +2324,7 @@ Style/SymbolLiteral:
   Enabled: true
 Layout/IndentationStyle:
   Enabled: true
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Enabled: true
 Style/TrailingCommaInArguments:
   Enabled: true
@@ -2803,3 +2803,7 @@ Lint/RedundantSafeNavigation:
 # Avoid using blocks to remove nils from a Hash/Array
 Style/CollectionCompact:
   Enabled: true
+
+# eventually these constants are going to break code so fix them
+Lint/DeprecatedConstants:
+  Enabled: true

data/config/disable_all.yml

@@ -169,6 +169,8 @@ Layout/SpaceAroundOperators:
   Enabled: false
 Layout/SpaceBeforeBlockBraces:
   Enabled: false
+Layout/SpaceBeforeBrackets:
+  Enabled: false
 Layout/SpaceBeforeComma:
   Enabled: false
 Layout/SpaceBeforeComment:
@@ -201,6 +203,8 @@ Layout/TrailingEmptyLines:
   Enabled: false
 Layout/TrailingWhitespace:
   Enabled: false
+Lint/AmbiguousAssignment:
+  Enabled: false
 Lint/AmbiguousBlockAssociation:
   Enabled: false
 Lint/AmbiguousOperator:
@@ -225,6 +229,8 @@ Lint/Debugger:
   Enabled: false
 Lint/DeprecatedClassMethods:
   Enabled: false
+Lint/DeprecatedConstants:
+  Enabled: false
 Lint/DeprecatedOpenSSLConstant:
   Enabled: false
 Lint/DisjunctiveAssignmentInConstructor:
@@ -291,6 +297,8 @@ Lint/IneffectiveAccessModifier:
   Enabled: false
 Lint/InterpolationCheck:
   Enabled: false
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: false
 Lint/LiteralAsCondition:
   Enabled: false
 Lint/LiteralInInterpolation:
@@ -319,6 +327,10 @@ Lint/NonLocalExitFromIterator:
   Enabled: false
 Lint/NumberConversion:
   Enabled: false
+Lint/NumberedParameterAssignment:
+  Enabled: false
+Lint/OrAssignmentToConstant:
+  Enabled: false
 Lint/OrderedMagicComments:
   Enabled: false
 Lint/OutOfRangeRegexpRef:
@@ -337,6 +349,8 @@ Lint/RedundantCopDisableDirective:
   Enabled: false
 Lint/RedundantCopEnableDirective:
   Enabled: false
+Lint/RedundantDirGlobSort:
+  Enabled: false
 Lint/RedundantRequireStatement:
   Enabled: false
 Lint/RedundantSafeNavigation:
@@ -381,6 +395,8 @@ Lint/StructNewOverride:
   Enabled: false
 Lint/SuppressedException:
   Enabled: false
+Lint/SymbolConversion:
+  Enabled: false
 Lint/Syntax:
   Enabled: false
 Lint/ToEnumArguments:
@@ -391,6 +407,8 @@ Lint/TopLevelReturnWithArgument:
   Enabled: false
 Lint/TrailingCommaInAttributeDeclaration:
   Enabled: false
+Lint/TripleQuotes:
+  Enabled: false
 Lint/UnderscorePrefixedVariableName:
   Enabled: false
 Lint/UnexpectedBlockArity:
@@ -579,6 +597,8 @@ Style/EmptyLiteral:
   Enabled: false
 Style/EmptyMethod:
   Enabled: false
+Style/EndlessMethod:
+  Enabled: false
 Style/Encoding:
   Enabled: false
 Style/EndBlock:
@@ -613,6 +633,8 @@ Style/HashAsLastArrayItem:
   Enabled: false
 Style/HashEachMethods:
   Enabled: false
+Style/HashExcept:
+  Enabled: false
 Style/HashLikeCase:
   Enabled: false
 Style/HashSyntax:
@@ -629,6 +651,8 @@ Style/IfUnlessModifier:
   Enabled: false
 Style/IfUnlessModifierOfIfUnless:
   Enabled: false
+Style/IfWithBooleanLiteralBranches:
+  Enabled: false
 Style/IfWithSemicolon:
   Enabled: false
 Style/ImplicitRuntimeError:

data/config/upstream.yml

@@ -132,12 +132,13 @@ AllCops:
   # If a value is specified for TargetRubyVersion then it is used. Acceptable
   # values are specificed as a float (i.e. 2.5); the teeny version of Ruby
   # should not be included. If the project specifies a Ruby version in the
-  # .ruby-version file, Gemfile or gems.rb file, RuboCop will try to determine
-  # the desired version of Ruby by inspecting the .ruby-version file first,
-  # followed by the Gemfile.lock or gems.locked file. (Although the Ruby version
-  # is specified in the Gemfile or gems.rb file, RuboCop reads the final value
-  # from the lock file.) If the Ruby version is still unresolved, RuboCop will
-  # use the oldest officially supported Ruby version (currently Ruby 2.4).
+  # .tool-versions or .ruby-version files, Gemfile or gems.rb file, RuboCop will
+  # try to determine the desired version of Ruby by inspecting the
+  # .tool-versions file first, then .ruby-version, followed by the Gemfile.lock
+  # or gems.locked file. (Although the Ruby version is specified in the Gemfile
+  # or gems.rb file, RuboCop reads the final value from the lock file.) If the
+  # Ruby version is still unresolved, RuboCop will use the oldest officially
+  # supported Ruby version (currently Ruby 2.4).
   TargetRubyVersion: ~
   # Determines if a notification for extension libraries should be shown when
   # rubocop is run. Keys are the name of the extension, and values are an array
@@ -473,7 +474,7 @@ Layout/EmptyLineBetweenDefs:
   StyleGuide: '#empty-lines-between-methods'
   Enabled: true
   VersionAdded: '0.49'
-  VersionChanged: '1.4'
+  VersionChanged: '1.7'
   EmptyLineBetweenMethodDefs: true
   EmptyLineBetweenClassDefs: true
   EmptyLineBetweenModuleDefs: true
@@ -1192,6 +1193,12 @@ Layout/SpaceBeforeBlockBraces:
     - no_space
   VersionChanged: '0.52'
 
+Layout/SpaceBeforeBrackets:
+  Description: 'Checks for receiver with a space before the opening brackets.'
+  StyleGuide: '#space-in-brackets-access'
+  Enabled: pending
+  VersionAdded: '1.7'
+
 Layout/SpaceBeforeComma:
   Description: 'No spaces before commas.'
   Enabled: true
@@ -1354,6 +1361,11 @@ Layout/TrailingWhitespace:
 #################### Lint ##################################
 ### Warnings
 
+Lint/AmbiguousAssignment:
+  Description: 'Checks for mistyped shorthand assignments.'
+  Enabled: pending
+  VersionAdded: '1.7'
+
 Lint/AmbiguousBlockAssociation:
   Description: >-
                  Checks for ambiguous block association with method when param passed without
@@ -1396,6 +1408,7 @@ Lint/BinaryOperatorWithIdenticalOperands:
   Enabled: true
   Safe: false
   VersionAdded: '0.89'
+  VersionChanged: '1.7'
 
 Lint/BooleanSymbol:
   Description: 'Check for `:true` and `:false` symbols.'
@@ -1456,6 +1469,34 @@ Lint/DeprecatedClassMethods:
   Enabled: true
   VersionAdded: '0.19'
 
+Lint/DeprecatedConstants:
+  Description: 'Checks for deprecated constants.'
+  Enabled: pending
+  VersionAdded: '1.8'
+  # You can configure deprecated constants.
+  # If there is an alternative method, you can set alternative value as `Alternative`.
+  # And you can set the deprecated version as `DeprecatedVersion`.
+  # These options can be omitted if they are not needed.
+  #
+  # DeprecatedConstants:
+  #   'DEPRECATED_CONSTANT':
+  #     Alternative: 'alternative_value'
+  #     DeprecatedVersion: 'deprecated_version'
+  #
+  DeprecatedConstants:
+    'NIL':
+      Alternative: 'nil'
+      DeprecatedVersion: '2.4'
+    'TRUE':
+      Alternative: 'true'
+      DeprecatedVersion: '2.4'
+    'FALSE':
+      Alternative: 'false'
+      DeprecatedVersion: '2.4'
+    'Random::DEFAULT':
+      Alternative: 'Random.new'
+      DeprecatedVersion: '3.0'
+
 Lint/DeprecatedOpenSSLConstant:
   Description: "Don't use algorithm constants for `OpenSSL::Cipher` and `OpenSSL::Digest`."
   Enabled: true
@@ -1472,6 +1513,9 @@ Lint/DuplicateBranch:
   Description: Checks that there are no repeated bodies within `if/unless`, `case-when` and `rescue` constructs.
   Enabled: pending
   VersionAdded: '1.3'
+  VersionChanged: '1.7'
+  IgnoreLiteralBranches: false
+  IgnoreConstantBranches: false
 
 Lint/DuplicateCaseCondition:
   Description: 'Do not repeat values in case conditionals.'
@@ -1658,6 +1702,11 @@ Lint/InterpolationCheck:
   VersionAdded: '0.50'
   VersionChanged: '0.87'
 
+Lint/LambdaWithoutLiteralBlock:
+  Description: 'Checks uses of lambda without a literal block.'
+  Enabled: pending
+  VersionAdded: '1.8'
+
 Lint/LiteralAsCondition:
   Description: 'Checks of literals used in conditions.'
   Enabled: true
@@ -1757,6 +1806,17 @@ Lint/NumberConversion:
     - Time
     - DateTime
 
+Lint/NumberedParameterAssignment:
+  Description: 'Checks for uses of numbered parameter assignment.'
+  Enabled: pending
+  VersionAdded: '1.9'
+
+Lint/OrAssignmentToConstant:
+  Description: 'Checks unintended or-assignment to constant.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '1.9'
+
 Lint/OrderedMagicComments:
   Description: 'Checks the proper ordering of magic comments and whether a magic comment is not placed before a shebang.'
   Enabled: true
@@ -1820,6 +1880,11 @@ Lint/RedundantCopEnableDirective:
   Enabled: true
   VersionAdded: '0.76'
 
+Lint/RedundantDirGlobSort:
+  Description: 'Checks for redundant `sort` method to `Dir.glob` and `Dir[]`.'
+  Enabled: pending
+  VersionAdded: '1.8'
+
 Lint/RedundantRequireStatement:
   Description: 'Checks for unnecessary `require` statement.'
   Enabled: true
@@ -1842,6 +1907,8 @@ Lint/RedundantSplatExpansion:
   Description: 'Checks for splat unnecessarily being called on literals.'
   Enabled: true
   VersionAdded: '0.76'
+  VersionChanged: '1.7'
+  AllowPercentLiteralArrayArgument: true
 
 Lint/RedundantStringCoercion:
   Description: 'Checks for Object#to_s usage in string interpolation.'
@@ -1976,12 +2043,16 @@ Lint/SuppressedException:
   VersionAdded: '0.9'
   VersionChanged: '0.81'
 
+Lint/SymbolConversion:
+  Description: 'Checks for unnecessary symbol conversions.'
+  Enabled: pending
+  VersionAdded: '1.9'
+
 Lint/Syntax:
-  Description: 'Checks syntax error.'
+  Description: 'Checks for syntax errors.'
   Enabled: true
   VersionAdded: '0.9'
 
-
 Lint/ToEnumArguments:
   Description: 'This cop ensures that `to_enum`/`enum_for`, called for the current method, has correct arguments.'
   Enabled: pending
@@ -2002,6 +2073,11 @@ Lint/TrailingCommaInAttributeDeclaration:
   Enabled: true
   VersionAdded: '0.90'
 
+Lint/TripleQuotes:
+  Description: 'Checks for useless triple quote constructs.'
+  Enabled: pending
+  VersionAdded: '1.9'
+
 Lint/UnderscorePrefixedVariableName:
   Description: 'Do not use prefix `_` for a variable that is used.'
   Enabled: true
@@ -2045,6 +2121,11 @@ Lint/UnreachableLoop:
   Description: 'This cop checks for loops that will have at most one iteration.'
   Enabled: true
   VersionAdded: '0.89'
+  VersionChanged: '1.7'
+  IgnoredPatterns:
+    # RSpec uses `times` in its message expectations
+    # eg. `exactly(2).times`
+    - !ruby/regexp /(exactly|at_least|at_most)\(\d+\)\.times/
 
 Lint/UnusedBlockArgument:
   Description: 'Checks for unused block arguments.'
@@ -2479,10 +2560,12 @@ Naming/VariableName:
   StyleGuide: '#snake-case-symbols-methods-vars'
   Enabled: true
   VersionAdded: '0.50'
+  VersionChanged: '1.8'
   EnforcedStyle: snake_case
   SupportedStyles:
     - snake_case
     - camelCase
+  AllowedIdentifiers: []
 
 Naming/VariableNumber:
   Description: 'Use the configured style when numbering symbols, methods and variables.'
@@ -2626,7 +2709,8 @@ Style/AsciiComments:
   Enabled: true
   VersionAdded: '0.9'
   VersionChanged: '0.52'
-  AllowedChars: []
+  AllowedChars:
+    - ©
 
 Style/Attr:
   Description: 'Checks for uses of Module#attr.'
@@ -2895,7 +2979,7 @@ Style/CollectionMethods:
   StyleGuide: '#map-find-select-reduce-include-size'
   Enabled: false
   VersionAdded: '0.9'
-  VersionChanged: '0.27'
+  VersionChanged: '1.7'
   Safe: false
   # Mapping from undesired method to desired method
   # e.g. to use `detect` over `find`:
@@ -2910,6 +2994,11 @@ Style/CollectionMethods:
     detect: 'find'
     find_all: 'select'
     member?: 'include?'
+  # Methods in this array accept a final symbol as an implicit block
+  # eg. `inject(:+)`
+  MethodsAcceptingSymbol:
+    - inject
+    - reduce
 
 Style/ColonMethodCall:
   Description: 'Do not use :: for method call.'
@@ -2969,6 +3058,7 @@ Style/CommentedKeyword:
   Description: 'Do not place comments on the same line as certain keywords.'
   Enabled: true
   VersionAdded: '0.51'
+  VersionChanged: '1.7'
 
 Style/ConditionalAssignment:
   Description: >-
@@ -3051,6 +3141,8 @@ Style/DisableCopsWithinSourceCodeDirective:
                  Forbids disabling/enabling cops within source code.
   Enabled: false
   VersionAdded: '0.82'
+  VersionChanged: '1.9'
+  AllowedCops: []
 
 Style/DocumentDynamicEvalDefinition:
   Description: >-
@@ -3168,6 +3260,17 @@ Style/EndBlock:
   VersionAdded: '0.9'
   VersionChanged: '0.81'
 
+Style/EndlessMethod:
+  Description: 'Avoid the use of multi-lined endless method definitions.'
+  StyleGuide: '#endless-methods'
+  Enabled: pending
+  VersionAdded: '1.8'
+  EnforcedStyle: allow_single_line
+  SupportedStyles:
+    - allow_single_line
+    - allow_always
+    - disallow
+
 Style/EvalWithLocation:
   Description: 'Pass `__FILE__` and `__LINE__` to `eval` method, as they are used by backtraces.'
   Enabled: true
@@ -3191,9 +3294,8 @@ Style/ExplicitBlockArgument:
                   that just passes its arguments to another block.
   StyleGuide: '#block-argument'
   Enabled: true
-  # May change the yielding arity.
-  Safe: false
   VersionAdded: '0.89'
+  VersionChanged: '1.8'
 
 Style/ExponentialNotation:
   Description: 'When using exponential notation, favor a mantissa between 1 (inclusive) and 10 (exclusive).'
@@ -3212,7 +3314,8 @@ Style/FloatDivision:
   Reference: 'https://blog.rubystyle.guide/ruby/2019/06/21/float-division.html'
   Enabled: true
   VersionAdded: '0.72'
-  VersionChanged: '1.6'
+  VersionChanged: '1.9'
+  Safe: false
   EnforcedStyle: single_coerce
   SupportedStyles:
     - left_coerce
@@ -3260,6 +3363,7 @@ Style/FormatStringToken:
   MaxUnannotatedPlaceholdersAllowed: 1
   VersionAdded: '0.49'
   VersionChanged: '1.0'
+  IgnoredMethods: []
 
 Style/FrozenStringLiteralComment:
   Description: >-
@@ -3328,6 +3432,13 @@ Style/HashEachMethods:
   VersionAdded: '0.80'
   Safe: false
 
+Style/HashExcept:
+  Description: >-
+                 Checks for usages of `Hash#reject`, `Hash#select`, and `Hash#filter` methods
+                 that can be replaced with `Hash#except` method.
+  Enabled: pending
+  VersionAdded: '1.7'
+
 Style/HashLikeCase:
   Description: >-
                   Checks for places where `case-when` represents a simple 1:1
@@ -3406,6 +3517,14 @@ Style/IfUnlessModifierOfIfUnless:
   VersionAdded: '0.39'
   VersionChanged: '0.87'
 
+Style/IfWithBooleanLiteralBranches:
+  Description: 'Checks for redundant `if` with boolean literal branches.'
+  Enabled: pending
+  VersionAdded: '1.9'
+  SafeAutoCorrect: false
+  AllowedMethods:
+    - nonzero?
+
 Style/IfWithSemicolon:
   Description: 'Do not use if x; .... Use the ternary operator instead.'
   StyleGuide: '#no-semicolon-ifs'
@@ -3482,6 +3601,7 @@ Style/KeywordParametersOrder:
   StyleGuide: '#keyword-parameters-order'
   Enabled: true
   VersionAdded: '0.90'
+  VersionChanged: '1.7'
 
 Style/Lambda:
   Description: 'Use the new lambda literal syntax for single-line blocks.'
@@ -3520,7 +3640,7 @@ Style/MethodCallWithArgsParentheses:
   StyleGuide: '#method-invocation-parens'
   Enabled: false
   VersionAdded: '0.47'
-  VersionChanged: '0.61'
+  VersionChanged: '1.7'
   IgnoreMacros: true
   IgnoredMethods: []
   IgnoredPatterns: []
@@ -3554,7 +3674,7 @@ Style/MethodDefParentheses:
   StyleGuide: '#method-parens'
   Enabled: true
   VersionAdded: '0.16'
-  VersionChanged: '0.35'
+  VersionChanged: '1.7'
   EnforcedStyle: require_parentheses
   SupportedStyles:
     - require_parentheses
@@ -3660,6 +3780,7 @@ Style/MultilineMethodSignature:
   Description: 'Avoid multi-line method signatures.'
   Enabled: false
   VersionAdded: '0.59'
+  VersionChanged: '1.7'
 
 Style/MultilineTernaryOperator:
   Description: >-
@@ -3688,7 +3809,8 @@ Style/MutableConstant:
   Description: 'Do not assign mutable objects to constants.'
   Enabled: true
   VersionAdded: '0.34'
-  VersionChanged: '0.65'
+  VersionChanged: '1.8'
+  SafeAutoCorrect: false
   EnforcedStyle: literals
   SupportedStyles:
     # literals: freeze literals assigned to constants
@@ -4026,12 +4148,16 @@ Style/RedundantArgument:
   Enabled: pending
   Safe: false
   VersionAdded: '1.4'
-  VersionChanged: '1.6'
+  VersionChanged: '1.7'
   Methods:
     # Array#join
     join: ''
     # String#split
     split: ' '
+    # String#chomp
+    chomp: "\n"
+    # String#chomp!
+    chomp!: "\n"
 
 Style/RedundantAssignment:
   Description: 'Checks for redundant assignment before returning.'
@@ -4288,7 +4414,7 @@ Style/SingleLineMethods:
   StyleGuide: '#no-single-line-methods'
   Enabled: true
   VersionAdded: '0.9'
-  VersionChanged: '0.19'
+  VersionChanged: '1.8'
   AllowIfMethodIsEmpty: true
 
 Style/SlicingWithRange:

data/lib/cookstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "7.4.0" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.6.1'
+  VERSION = "7.7.2" # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '1.9.1'
 end

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

@@ -64,7 +64,7 @@ module RuboCop
             'opensuse' => {
               '< 14' => true,
               '~> 42.0' => true,
-              '= 15.0' => '15',
+              '~> 15.0, < 15.2' => '15',
             },
             'debian' => {
               '< 9' => true,
@@ -73,12 +73,12 @@ module RuboCop
             'centos' => {
               '< 6.0' => true,
               '~> 6.0, < 6.10' => '6',
-              '~> 7.0, < 7.6 ' => '7',
+              '~> 7.0, < 7.7 ' => '7',
             },
             'redhat' => {
               '< 6.0' => true,
               '~> 6.0, < 6.10' => '6',
-              '~> 7.0, < 7.6' => '7',
+              '~> 7.0, < 7.7' => '7',
             },
             'oracle' => {
               '< 6.0' => true,

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

@@ -74,7 +74,7 @@ module RuboCop
                                 when :str
                                   "'#{type.source}[#{name.value}]'"
                                 when :dstr
-                                  "\"#{type.source}[#{name.value.source}]\""
+                                  "\"#{type.source}[#{name.value}]\""
                                 else
                                   "\"#{type.source}[\#{#{name.source}}]\""
                                 end

data/lib/rubocop/cop/chef/redundant/unnecessary_name_property.rb

@@ -28,6 +28,7 @@ module RuboCop
         #   property :name, String, name_property: true
         #   attribute :name, kind_of: String
         #   attribute :name, kind_of: String, name_attribute: true
+        #   attribute :name, name_attribute: true, kind_of: String
         #
         class UnnecessaryNameProperty < Base
           extend AutoCorrector
@@ -35,36 +36,25 @@ module RuboCop
           MSG = 'There is no need to define a property or attribute named :name in a resource as Chef Infra defines this on all resources by default.'
           RESTRICT_ON_SEND = [:property, :attribute].freeze
 
-          def_node_matcher :name_attribute?, <<-PATTERN
-          (send nil? :attribute
-            (sym :name)
-            (hash
-              (pair
-                (sym :kind_of)
-                (const nil? :String))
-              (pair
-                (sym :name_attribute)
-                (true))?))
-          PATTERN
-
           def_node_matcher :name_property?, <<-PATTERN
-            (send nil? :property
-              (sym :name)
-              (const nil? :String)
-              (hash
-                (pair
-                  (sym :name_property)
-                  (true)))?)
+          (send nil? {:attribute :property}
+            (sym :name)
+            (const nil? :String)?
+            (hash $...)?
+          )
           PATTERN
 
           def on_send(node)
-            name_property?(node) do
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
-                corrector.remove(node.source_range)
+            name_property?(node) do |hash_vals|
+              # It's perfectly valid to redefine the name property if you give it non-default values
+              # We do this in a few of our core resources where we give it a default value of "" for nameless resources
+              # If there are hash vals in this attribute/property compare them with the default keys and if there's anything
+              # else return so we don't alert
+              unless hash_vals.empty?
+                hash_keys = hash_vals.first.map { |x| x.key.value }
+                return unless (hash_keys - [:kind_of, :name_attribute, :name_property]).empty?
               end
-            end
 
-            name_attribute?(node) do
               add_offense(node, message: MSG, severity: :refactor) do |corrector|
                 corrector.remove(node.source_range)
               end

data/lib/rubocop/cop/chef/sharing/include_resource_descriptions.rb

@@ -49,4 +49,4 @@ module RuboCop
       end
     end
   end
-end
+end

data/lib/rubocop/cop/chef/sharing/include_resource_examples.rb

@@ -57,4 +57,4 @@ module RuboCop
       end
     end
   end
-end
+end

data/lib/rubocop/cop/chef/sharing/invalid_license_string.rb

@@ -31,11 +31,13 @@ module RuboCop
         #   license 'Apache-2.0'
         #   license 'all rights reserved'
         #
-        # list of valid SPDX.org license strings. To build an array run this:
+        # list of valid SPDX.org license strings. To build an array run this ruby:
+        # ```ruby
         # require 'json'
         # require 'net/http'
         # json_data = JSON.parse(Net::HTTP.get(URI('https://raw.githubusercontent.com/spdx/license-list-data/master/json/licenses.json')))
         # licenses = json_data['licenses'].map {|l| l['licenseId'] }.sort
+        # ```
         #
         class InvalidLicenseString < Base
           extend AutoCorrector
@@ -59,6 +61,7 @@ module RuboCop
             AML
             AMPAS
             ANTLR-PD
+            ANTLR-PD-fallback
             APAFML
             APL-1.0
             APSL-1.0
@@ -82,6 +85,7 @@ module RuboCop
             BSD-2-Clause-FreeBSD
             BSD-2-Clause-NetBSD
             BSD-2-Clause-Patent
+            BSD-2-Clause-Views
             BSD-3-Clause
             BSD-3-Clause-Attribution
             BSD-3-Clause-Clear
@@ -95,6 +99,7 @@ module RuboCop
             BSD-Protection
             BSD-Source-Code
             BSL-1.0
+            BUSL-1.1
             Bahyph
             Barr
             Beerware
@@ -102,11 +107,15 @@ module RuboCop
             BitTorrent-1.1
             BlueOak-1.0.0
             Borceux
+            CAL-1.0
+            CAL-1.0-Combined-Work-Exception
             CATOSL-1.1
             CC-BY-1.0
             CC-BY-2.0
             CC-BY-2.5
             CC-BY-3.0
+            CC-BY-3.0-AT
+            CC-BY-3.0-US
             CC-BY-4.0
             CC-BY-NC-1.0
             CC-BY-NC-2.0
@@ -117,6 +126,7 @@ module RuboCop
             CC-BY-NC-ND-2.0
             CC-BY-NC-ND-2.5
             CC-BY-NC-ND-3.0
+            CC-BY-NC-ND-3.0-IGO
             CC-BY-NC-ND-4.0
             CC-BY-NC-SA-1.0
             CC-BY-NC-SA-2.0
@@ -130,8 +140,10 @@ module RuboCop
             CC-BY-ND-4.0
             CC-BY-SA-1.0
             CC-BY-SA-2.0
+            CC-BY-SA-2.0-UK
             CC-BY-SA-2.5
             CC-BY-SA-3.0
+            CC-BY-SA-3.0-AT
             CC-BY-SA-4.0
             CC-PDDC
             CC0-1.0
@@ -147,6 +159,9 @@ module RuboCop
             CECILL-C
             CERN-OHL-1.1
             CERN-OHL-1.2
+            CERN-OHL-P-2.0
+            CERN-OHL-S-2.0
+            CERN-OHL-W-2.0
             CNRI-Jython
             CNRI-Python
             CNRI-Python-GPL-Compatible
@@ -168,6 +183,7 @@ module RuboCop
             ECL-2.0
             EFL-1.0
             EFL-2.0
+            EPICS
             EPL-1.0
             EPL-2.0
             EUDatagrid
@@ -185,15 +201,28 @@ module RuboCop
             Frameworx-1.0
             FreeImage
             GFDL-1.1
+            GFDL-1.1-invariants-only
+            GFDL-1.1-invariants-or-later
+            GFDL-1.1-no-invariants-only
+            GFDL-1.1-no-invariants-or-later
             GFDL-1.1-only
             GFDL-1.1-or-later
             GFDL-1.2
+            GFDL-1.2-invariants-only
+            GFDL-1.2-invariants-or-later
+            GFDL-1.2-no-invariants-only
+            GFDL-1.2-no-invariants-or-later
             GFDL-1.2-only
             GFDL-1.2-or-later
             GFDL-1.3
+            GFDL-1.3-invariants-only
+            GFDL-1.3-invariants-or-later
+            GFDL-1.3-no-invariants-only
+            GFDL-1.3-no-invariants-or-later
             GFDL-1.3-only
             GFDL-1.3-or-later
             GL2PS
+            GLWTPL
             GPL-1.0
             GPL-1.0+
             GPL-1.0-only
@@ -218,7 +247,9 @@ module RuboCop
             Glulxe
             HPND
             HPND-sell-variant
+            HTMLTIDY
             HaskellReport
+            Hippocratic-2.1
             IBM-pibs
             ICU
             IJG
@@ -269,6 +300,7 @@ module RuboCop
             MIT-advertising
             MIT-enna
             MIT-feh
+            MIT-open-group
             MITNFA
             MPL-1.0
             MPL-1.1
@@ -280,12 +312,17 @@ module RuboCop
             MakeIndex
             MirOS
             Motosoto
+            MulanPSL-1.0
+            MulanPSL-2.0
             Multics
             Mup
             NASA-1.3
             NBPL-1.0
+            NCGL-UK-2.0
             NCSA
             NGPL
+            NIST-PD
+            NIST-PD-fallback
             NLOD-1.0
             NLPL
             NOSL
@@ -294,6 +331,7 @@ module RuboCop
             NPOSL-3.0
             NRL
             NTP
+            NTP-0
             Naumen
             Net-SNMP
             NetCDF
@@ -301,12 +339,19 @@ module RuboCop
             Nokia
             Noweb
             Nunit
+            O-UDA-1.0
             OCCT-PL
             OCLC-2.0
             ODC-By-1.0
             ODbL-1.0
             OFL-1.0
+            OFL-1.0-RFN
+            OFL-1.0-no-RFN
             OFL-1.1
+            OFL-1.1-RFN
+            OFL-1.1-no-RFN
+            OGC-1.0
+            OGL-Canada-2.0
             OGL-UK-1.0
             OGL-UK-2.0
             OGL-UK-3.0
@@ -339,8 +384,12 @@ module RuboCop
             PDDL-1.0
             PHP-3.0
             PHP-3.01
+            PSF-2.0
             Parity-6.0.0
+            Parity-7.0.0
             Plexus
+            PolyForm-Noncommercial-1.0.0
+            PolyForm-Small-Business-1.0.0
             PostgreSQL
             Python-2.0
             QPL-1.0
@@ -366,6 +415,8 @@ module RuboCop
             SMPPL
             SNIA
             SPL-1.0
+            SSH-OpenSSH
+            SSH-short
             SSPL-1.0
             SWL
             Saxpath
@@ -386,6 +437,7 @@ module RuboCop
             TOSL
             TU-Berlin-1.0
             TU-Berlin-2.0
+            UCL-1.0
             UPL-1.0
             Unicode-DFS-2015
             Unicode-DFS-2016
@@ -425,10 +477,12 @@ module RuboCop
             dvipdfm
             eCos-2.0
             eGenix
+            etalab-2.0
             gSOAP-1.3b
             gnuplot
             iMatix
             libpng-2.0
+            libselinux-1.0
             libtiff
             mpich2
             psfrag

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.7.2
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-21 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.9.1
 description: 
 email:
 - thom@chef.io
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+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