cookstyle 7.4.0 → 7.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afe67bc1be4b70753843d22598cd29dd7edded20c3762230d4cbfb08ba2ed240
-  data.tar.gz: f4f3c739c446a6560b8f9319c63b87dc48c2d338ad45316369a1ed848d40222a
+  metadata.gz: '01118e6811d695f00d05bc6ff6fbadffdc7180cc0488ff23967fa2e2477d630a'
+  data.tar.gz: e1fb1c02d972c9412189868c2d8f8938c8b3b8bcf38884b3043005b2ffc704f8
 SHA512:
-  metadata.gz: 64ec5f89be1438ba7e29f1e19e9f8b6ebbac1320550f5b32d2a5d58b7ea1994ed4fe08f1243a1328beb46acca4da67608d6ba4b0f3944487adc8af90f9e8fc5e
-  data.tar.gz: 7b6118d966b9585555db7cd3d7b61114e5229a792d9bd9ee23e71a0330ca004187f8ca11cda4b6922c57007ddd0d8e57d30e925f957517dce27ee24532da7cfa
+  metadata.gz: e81aaa04919a2e4d2f00b60beb00d4641d6f2290434d36a7cee05e444fb79df7173492597fea7349000afe76571f690ab3dd2576d9f5c9a960f6e3a25a621f07
+  data.tar.gz: 0a799de7b53c5708542e00e92501b7cab4c92eb4dc9ee2d33b6990229f6a60bca3adaf12527275dd3f92bf3134411ee570cd39ad39ec1a08a07d75c7d48bf8b5

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:
@@ -613,6 +617,8 @@ Style/HashAsLastArrayItem:
   Enabled: false
 Style/HashEachMethods:
   Enabled: false
+Style/HashExcept:
+  Enabled: false
 Style/HashLikeCase:
   Enabled: false
 Style/HashSyntax:

data/config/upstream.yml

@@ -473,7 +473,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 +1192,13 @@ 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'
+  Safe: false
+
 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.'
@@ -1472,6 +1485,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.'
@@ -1842,6 +1858,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.'
@@ -2045,6 +2063,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.'
@@ -2895,7 +2918,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 +2933,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 +2997,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: >-
@@ -3328,6 +3357,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
@@ -3482,6 +3518,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 +3557,7 @@ Style/MethodCallWithArgsParentheses:
   StyleGuide: '#method-invocation-parens'
   Enabled: false
   VersionAdded: '0.47'
-  VersionChanged: '0.61'
+  VersionChanged: '1.7'
   IgnoreMacros: true
   IgnoredMethods: []
   IgnoredPatterns: []
@@ -3554,7 +3591,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 +3697,7 @@ Style/MultilineMethodSignature:
   Description: 'Avoid multi-line method signatures.'
   Enabled: false
   VersionAdded: '0.59'
+  VersionChanged: '1.7'
 
 Style/MultilineTernaryOperator:
   Description: >-
@@ -4026,12 +4064,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 +4330,7 @@ Style/SingleLineMethods:
   StyleGuide: '#no-single-line-methods'
   Enabled: true
   VersionAdded: '0.9'
-  VersionChanged: '0.19'
+  VersionChanged: '1.7'
   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.5.1" # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '1.7.0'
 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.5.1
 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: 2020-12-30 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.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.7.0
 description: 
 email:
 - thom@chef.io