chefstyle 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 803d5b4d210e33252e9cf445357a577321cfb570fdd265e2d2c1201adb959fef
-  data.tar.gz: 310644c9afee2356062482b09755b514b103953946060eef2c1efda388984de1
+  metadata.gz: bae50b8292f553fc2002075e7d7526ef65d050024c433a93b0d73861fe45068b
+  data.tar.gz: c5785b42ff6c818e02208a27dd2d344ee0a926fb4309d5e7ceafadf1071c53c9
 SHA512:
-  metadata.gz: ca3e77ab4f46a9f13a2305961b665196539b684d719ceeb5765b5f6ee759ecea10548d36b6aaf4ca5741b35bf8015173bc7bffe3874b3acc93a6347bc6843400
-  data.tar.gz: 129546eeaadf9f7cb700dfd1b3396fc8b07b14a7843be0cdb4502198540e36e9cfff0ef03c3d5fe23369d26723e71f1bc5e5a6b5975852e52933b275f8c5a7ef
+  metadata.gz: 6ff673315f4c611beb202d71b19b87d693c7b1e99f2385cef31b18dc86508bbca6ff3d7a4c6d9109fef41402db24033fe60ec6f358eb89c3d78f7bbba5237b3b
+  data.tar.gz: 673f0c42ca0850b566079fdf7a8194a9d82b519176f5893cbd087f4519d6dbf8cdd0397dc6911ceeb9a6ce16006727f5e3ee956af6f034516ab82353ae6145a0

data/config/chefstyle.yml

@@ -1,5 +1,7 @@
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: disable
+  DisabledByDefault: true
   SuggestExtensions: false
 
 #
@@ -43,8 +45,8 @@ Lint/DuplicateCaseCondition:
   Enabled: true
 Lint/DuplicateMethods:
   Enabled: true
-Lint/DuplicatedKey:
-  Enabled: true
+# Lint/DuplicatedKey: TODO broken with rubocop 1.25.1 move
+#   Enabled: true
 Lint/EachWithObjectArgument:
   Enabled: true
 Lint/ElseLayout:
@@ -60,8 +62,8 @@ Lint/EmptyWhen:
 Layout/EndAlignment:
   Enabled: true
   AutoCorrect: true
-Lint/EndInMethod:
-  Enabled: true
+# Lint/EndInMethod: TODO broken with rubocop 1.25.1 move
+#  Enabled: true
 Lint/EnsureReturn:
   Enabled: true
 Lint/FloatOutOfRange:
@@ -80,8 +82,8 @@ Lint/LiteralInInterpolation:
   Enabled: true
 Lint/Loop:
   Enabled: true
-Lint/MultipleCompare:
-  Enabled: true
+# Lint/MultipleCompare: TODO broken with rubocop 1.25.1 move
+#  Enabled: true
 Lint/NestedMethodDefinition:
   Enabled: true
 Lint/NextWithoutAccumulator:
@@ -104,14 +106,14 @@ Lint/ShadowedException:
   Enabled: true
 Lint/ShadowingOuterLocalVariable:
   Enabled: true
-Lint/StringConversionInInterpolation:
-  Enabled: true
+# Lint/StringConversionInInterpolation: TODO broken with rubocop 1.25.1 move
+#  Enabled: true
 Lint/UnderscorePrefixedVariableName:
   Enabled: true
 Lint/UnifiedInteger:
   Enabled: true
-Lint/UnneededSplatExpansion:
-  Enabled: true
+# Lint/UnneededSplatExpansion: TODO broken with rubocop 1.25.1 move
+#   Enabled: true
 Lint/UnreachableCode:
   Enabled: true
 Lint/UriEscapeUnescape:
@@ -120,8 +122,8 @@ Lint/UselessAccessModifier:
   Enabled: true
 Lint/UselessAssignment:
   Enabled: true
-Lint/UselessComparison:
-  Enabled: true
+# Lint/UselessComparison: TODO broken with rubocop 1.25.1 move
+#   Enabled: true
 Lint/UselessElseWithoutRescue:
   Enabled: true
 Lint/UselessSetterCall:
@@ -142,14 +144,14 @@ Lint/UnusedMethodArgument:
   Enabled: false
 
 # We ignore Exceptions a lot
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Enabled: false
 # We also decorate Exceptions a lot
 Lint/RescueException:
   Enabled: false
 
 # disabling this will make it easier to stage chefstyle rollouts
-Lint/UnneededCopDisableDirective:
+Lint/RedundantCopDisableDirective:
   Enabled: false
 
 #
@@ -193,17 +195,17 @@ Metrics/PerceivedComplexity:
 
 Layout/AccessModifierIndentation:
   Enabled: true
-Layout/AlignArguments:
-  Enabled: true
-  EnforcedStyle: with_fixed_indentation
-Layout/AlignParameters:
-  Enabled: true
-  EnforcedStyle: with_fixed_indentation
+# Layout/AlignArguments: TODO broken with rubocop 1.25.1 move
+#   Enabled: true
+#   EnforcedStyle: with_fixed_indentation
+# Layout/AlignParameters: TODO broken with rubocop 1.25.1 move
+#   Enabled: true
+#   EnforcedStyle: with_fixed_indentation
 # the "ignore_implict" is here for keyword args in method calls which are
 # "implicit" hashes, and those should not be treated like normal hashes
-Layout/AlignHash:
-  Enabled: true
-  EnforcedLastArgumentHashStyle: ignore_implicit
+# Layout/AlignHash: TODO broken with rubocop 1.25.1 move
+#   Enabled: true
+#   EnforcedLastArgumentHashStyle: ignore_implicit
 Style/AndOr:
   Enabled: true
 Style/ArrayJoin:
@@ -280,13 +282,13 @@ Style/IfUnlessModifierOfIfUnless:
   Enabled: true
 Style/IfWithSemicolon:
   Enabled: true
-Layout/IndentAssignment:
-  Enabled: true
-Layout/IndentFirstArgument:
-  EnforcedStyle: consistent
-  Enabled: true
-Layout/IndentHeredoc:
-  Enabled: true
+# Layout/IndentAssignment: TODO broken with rubocop 1.25.1 move
+#   Enabled: true
+# Layout/IndentFirstArgument: TODO broken with rubocop 1.25.1 move
+#   EnforcedStyle: consistent
+#   Enabled: true
+# Layout/IndentHeredoc: TODO broken with rubocop 1.25.1 move
+#   Enabled: true
 Layout/IndentationConsistency:
   Enabled: true
 Layout/IndentationWidth:
@@ -454,8 +456,8 @@ Style/SymbolProc:
   Enabled: true
 Layout/IndentationStyle:
   Enabled: true
-Layout/TrailingBlankLines:
-  Enabled: true
+# Layout/TrailingBlankLines: TODO broken with rubocop 1.25.1 move
+#   Enabled: true
 Style/TrailingCommaInArguments:
   Enabled: true
 # rubocop's default gets this completely backwards
@@ -469,9 +471,9 @@ Style/TrailingUnderscoreVariable:
   Enabled: true
 Layout/TrailingWhitespace:
   Enabled: true
-Style/UnneededCapitalW:
-  Enabled: true
-Style/UnneededInterpolation:
+# Style/UnneededCapitalW: TODO broken with rubocop 1.25.1 move
+#   Enabled: true
+Style/RedundantInterpolation:
   Enabled: false # buggy: https://github.com/rubocop-hq/rubocop/issues/6099
 #Style/UnneededPercentQ:  # would like to enable this one but its buggy as of 0.35.1
 #  Enabled: true
@@ -540,7 +542,7 @@ Style/IfUnlessModifier:
   Enabled: false
 
 # Dan is -1 on this one: https://github.com/chef/chef/pull/4526#issuecomment-179950045
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Enabled: false
 
 # This is overly aggressive and autofix broke stuff, would need to exclude classes
@@ -610,17 +612,13 @@ Naming/HeredocDelimiterNaming:
   Enabled: false
 Naming/PredicateName:
   Enabled: false
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 Naming/MemoizedInstanceVariableName:
   Enabled: false
 Naming/VariableNumber:
   Enabled: false
 
-# This breaks all kinds of specs in chef (i don't think it will ever quite work correctly)
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 # We almost never use format strings but this cop triggers on any string with "%{whatever}" in it and is 99% false positives
 Style/FormatStringToken:
   Enabled: false

data/config/default.yml

@@ -1,4 +1,2 @@
 inherit_from:
-  - upstream.yml
-  - disable_all.yml
   - chefstyle.yml

data/lib/chefstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Chefstyle
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
   RUBOCOP_VERSION = "1.25.1"
 end

data/lib/chefstyle.rb

@@ -5,26 +5,12 @@ require_relative "chefstyle/version"
 gem "rubocop", "= #{Chefstyle::RUBOCOP_VERSION}"
 require "rubocop"
 
-module RuboCop
-  class ConfigLoader
-    RUBOCOP_HOME.gsub!(
-      /^.*$/,
-      File.realpath(File.join(__dir__, ".."))
-    )
-
-    DEFAULT_FILE.gsub!(
-      /^.*$/,
-      File.join(RUBOCOP_HOME, "config", "default.yml")
-    )
-  end
-end
-
 # Chefstyle patches the RuboCop tool to set a new default configuration that
 # is vendored in the Chefstyle codebase.
 module Chefstyle
   # @return [String] the absolute path to the main RuboCop configuration YAML file
   def self.config
-    RuboCop::ConfigLoader::DEFAULT_FILE
+    File.realpath(File.join(__dir__, "..", "config", "default.yml"))
   end
 end
 
@@ -36,3 +22,5 @@ Dir.glob(__dir__ + "/rubocop/cop/chef/**/*.rb") do |file|
 
   require_relative file # not actually relative but require_relative is faster
 end
+
+RuboCop::ConfigLoader.default_configuration = RuboCop::ConfigLoader.configuration_from_file(Chefstyle.config)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chefstyle
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -37,8 +37,6 @@ files:
 - chefstyle.gemspec
 - config/chefstyle.yml
 - config/default.yml
-- config/disable_all.yml
-- config/upstream.yml
 - lib/chefstyle.rb
 - lib/chefstyle/version.rb
 - lib/rubocop/chef.rb