diff --git a/.rubocop.yml b/.rubocop.yml index 636ab39..b0ad999 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -9,3 +9,6 @@ inherit_gem: Naming/FileName: Exclude: - "*.gemspec" + +AllCops: + TargetRubyVersion: 3.2 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index fc9f593..f2ba964 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,17 +1,18 @@ # This configuration was generated by -# `rubocop --auto-gen-config` -# on 2023-04-21 12:08:55 UTC using RuboCop version 1.50.2. +# `rubocop --auto-gen-config --no-auto-gen-timestamp` +# using RuboCop version 1.79.2. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. # Offense count: 1 -Lint/UselessAssignment: +# This cop supports safe autocorrection (--autocorrect). +Lint/RedundantCopDisableDirective: Exclude: - - 'lib/puppet-lint/plugins/check_strict_indent.rb' + - 'spec/puppet-lint/plugins/check_strict_indent_spec.rb' -# Offense count: 4 +# Offense count: 8 # Configuration parameters: ForbiddenDelimiters. # ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$)) Naming/HeredocDelimiterNaming: @@ -19,13 +20,13 @@ Naming/HeredocDelimiterNaming: - 'puppet-lint-strict_indent-check.gemspec' - 'spec/puppet-lint/plugins/check_strict_indent_spec.rb' -# Offense count: 5 +# Offense count: 6 # Configuration parameters: MinSize. Performance/CollectionLiteralInLoop: Exclude: - 'lib/puppet-lint/plugins/check_strict_indent.rb' -# Offense count: 4 +# Offense count: 6 # Configuration parameters: Prefixes, AllowedPatterns. # Prefixes: when, with, without RSpec/ContextWording: @@ -43,7 +44,7 @@ RSpec/DescribeClass: - '**/spec/views/**/*' - 'spec/puppet-lint/plugins/check_strict_indent_spec.rb' -# Offense count: 10 +# Offense count: 17 # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: EnforcedStyle. # SupportedStyles: always, conditionals @@ -53,20 +54,19 @@ Style/AndOr: # Offense count: 1 # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle, AllowComments. +# Configuration parameters: AutoCorrect, EnforcedStyle, AllowComments. # SupportedStyles: empty, nil, both Style/EmptyElse: Exclude: - 'lib/puppet-lint/plugins/check_strict_indent.rb' -# Offense count: 5 +# Offense count: 3 # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: EnforcedStyle. # SupportedStyles: always, always_true, never Style/FrozenStringLiteralComment: Exclude: - - 'Gemfile' - - 'Rakefile' + - '**/*.arb' - 'lib/puppet-lint/plugins/check_strict_indent.rb' - 'puppet-lint-strict_indent-check.gemspec' - 'spec/puppet-lint/plugins/check_strict_indent_spec.rb' @@ -77,7 +77,14 @@ Style/MultilineBlockChain: - 'lib/puppet-lint/plugins/check_strict_indent.rb' - 'spec/puppet-lint/plugins/check_strict_indent_spec.rb' -# Offense count: 2 +# Offense count: 1 +# This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: AllowMethodComparison, ComparisonsThreshold. +Style/MultipleComparison: + Exclude: + - 'lib/puppet-lint/plugins/check_strict_indent.rb' + +# Offense count: 3 # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns. # SupportedStyles: predicate, comparison @@ -102,7 +109,7 @@ Style/WhileUntilModifier: # Offense count: 2 # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns. +# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings. # URISchemes: http, https Layout/LineLength: Max: 137 diff --git a/Gemfile b/Gemfile index 6d8c9d3..549e640 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,6 @@ group :development do gem 'rake', '~> 13.0', '>= 13.0.6' gem 'rspec', '~> 3.12' gem 'rspec-collection_matchers', '~> 1.2' - gem 'rspec-its', '~> 1.3' - gem 'voxpupuli-rubocop', '~> 2.0' + gem 'rspec-its', '>= 1.3', '< 3' + gem 'voxpupuli-rubocop', '~> 4.2.0' end diff --git a/puppet-lint-strict_indent-check.gemspec b/puppet-lint-strict_indent-check.gemspec index 40e5580..e04929f 100644 --- a/puppet-lint-strict_indent-check.gemspec +++ b/puppet-lint-strict_indent-check.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| Extends puppet-lint to ensure that your manifests follow a strict indentation pattern. EOF - spec.required_ruby_version = '>= 2.7.0' + spec.required_ruby_version = '>= 3.2' - spec.add_dependency 'puppet-lint', '>= 3', '< 5' + spec.add_dependency 'puppet-lint', '~> 5.1' end