Merge pull request #81 from bastelfreak/vr

voxpupuli-rubocop: Update to 2.5.0
voxpupuli · Apr 30, 2024 · cbf727f · cbf727f
2 parents bcdb384 + 3daf472
commit cbf727f
Show file tree

Hide file tree

Showing 14 changed files with 117 additions and 238 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,4 +1,5 @@
 ---
 inherit_from: .rubocop_todo.yml
+
 inherit_gem:
   voxpupuli-rubocop: rubocop.yml
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,17 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-03-27 17:58:31 UTC using RuboCop version 1.48.1.
+# on 2024-03-08 20:45:12 UTC using RuboCop version 1.61.0.
 # 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: 7
-# This cop supports safe autocorrection (--autocorrect).
-Lint/AmbiguousRegexpLiteral:
-  Exclude:
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowSafeAssignment.
@@ -20,6 +14,7 @@ Lint/AssignmentInCondition:
     - 'lib/beaker/hypervisor/vagrant.rb'
 
 # Offense count: 1
+# Configuration parameters: AllowedParentClasses.
 Lint/MissingSuper:
   Exclude:
     - 'lib/beaker/hypervisor/vagrant.rb'
@@ -30,32 +25,12 @@ Lint/NonDeterministicRequireOrder:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Lint/RedundantStringCoercion:
-  Exclude:
-    - 'lib/beaker/hypervisor/vagrant.rb'
-    - 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
-  Exclude:
-    - 'lib/beaker/hypervisor/vagrant.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
-Lint/UnusedMethodArgument:
-  Exclude:
-    - 'lib/beaker/hypervisor/vagrant.rb'
-    - 'lib/beaker/hypervisor/vagrant_custom.rb'
-
 # Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
 Lint/UselessAssignment:
   Exclude:
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
+    - 'spec/beaker/vagrant_spec.rb'
 
 # Offense count: 1
 Naming/AccessorMethodName:
@@ -68,146 +43,67 @@ Naming/AccessorMethodName:
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'Rakefile'
-    - 'spec/beaker/hypervisor/vagrant_custom_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
+    - 'spec/beaker/vagrant_custom_spec.rb'
+    - 'spec/beaker/vagrant_spec.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Performance/InefficientHashSearch:
   Exclude:
     - 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-Performance/RedundantMatch:
-  Exclude:
-    - 'lib/beaker/hypervisor/vagrant.rb'
-    - 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: MaxKeyValuePairs.
 Performance/RedundantMerge:
   Exclude:
-    - 'spec/beaker/hypervisor/vagrant_custom_spec.rb'
-
-# Offense count: 7
-# This cop supports safe autocorrection (--autocorrect).
-Performance/RegexpMatch:
-  Exclude:
-    - 'lib/beaker/hypervisor/vagrant.rb'
-    - 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
+    - 'spec/beaker/vagrant_custom_spec.rb'
 
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Performance/StringInclude:
   Exclude:
     - 'lib/beaker/hypervisor/vagrant.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: be, be_nil
-RSpec/BeNil:
-  Exclude:
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
-
 # Offense count: 14
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Exclude:
-    - 'spec/beaker/hypervisor/vagrant_custom_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_desktop_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_fusion_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_libvirt_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_parallels_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_virtualbox_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_workstation_spec.rb'
+    - 'spec/beaker/vagrant_custom_spec.rb'
+    - 'spec/beaker/vagrant_desktop_spec.rb'
+    - 'spec/beaker/vagrant_fusion_spec.rb'
+    - 'spec/beaker/vagrant_libvirt_spec.rb'
+    - 'spec/beaker/vagrant_parallels_spec.rb'
+    - 'spec/beaker/vagrant_spec.rb'
+    - 'spec/beaker/vagrant_virtualbox_spec.rb'
+    - 'spec/beaker/vagrant_workstation_spec.rb'
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: SkipBlocks, EnforcedStyle.
+# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
 # SupportedStyles: described_class, explicit
 RSpec/DescribedClass:
   Exclude:
-    - 'spec/beaker/hypervisor/vagrant_custom_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_parallels_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/EmptyLineAfterFinalLet:
-  Exclude:
-    - 'spec/beaker/hypervisor/vagrant_parallels_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_virtualbox_spec.rb'
+    - 'spec/beaker/vagrant_custom_spec.rb'
+    - 'spec/beaker/vagrant_parallels_spec.rb'
+    - 'spec/beaker/vagrant_spec.rb'
 
-# Offense count: 19
+# Offense count: 20
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 17
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: CustomTransform, IgnoredWords, DisallowedExamples.
-# DisallowedExamples: works
-RSpec/ExampleWording:
-  Exclude:
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
+  Max: 54
 
 # Offense count: 10
 RSpec/ExpectInHook:
   Exclude:
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
-
-# Offense count: 7
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
-# Include: **/*_spec*rb*, **/spec/**/*
-RSpec/FilePath:
-  Exclude:
-    - 'spec/beaker/hypervisor/vagrant_custom_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_desktop_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_fusion_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_libvirt_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_parallels_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_virtualbox_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_workstation_spec.rb'
-
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, each, example
-RSpec/HookArgument:
-  Exclude:
-    - 'spec/beaker/hypervisor/vagrant_custom_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
-
-# Offense count: 17
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_line_only, single_statement_only, disallow, require_implicit
-RSpec/ImplicitSubject:
-  Exclude:
-    - 'spec/beaker/hypervisor/vagrant_desktop_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_fusion_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_libvirt_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_parallels_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_virtualbox_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_workstation_spec.rb'
+    - 'spec/beaker/vagrant_spec.rb'
 
 # Offense count: 4
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
-    - 'spec/beaker/hypervisor/vagrant_custom_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/LeadingSubject:
-  Exclude:
-    - 'spec/beaker/hypervisor/vagrant_parallels_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_virtualbox_spec.rb'
+    - 'spec/beaker/vagrant_custom_spec.rb'
 
 # Offense count: 73
 # Configuration parameters: .
@@ -224,30 +120,28 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
   Max: 6
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: not_to, to_not
-RSpec/NotToNot:
-  Exclude:
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/ReceiveNever:
+# Offense count: 17
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
+RSpec/NamedSubject:
   Exclude:
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
+    - 'spec/beaker/vagrant_desktop_spec.rb'
+    - 'spec/beaker/vagrant_fusion_spec.rb'
+    - 'spec/beaker/vagrant_libvirt_spec.rb'
+    - 'spec/beaker/vagrant_parallels_spec.rb'
+    - 'spec/beaker/vagrant_virtualbox_spec.rb'
+    - 'spec/beaker/vagrant_workstation_spec.rb'
 
 # Offense count: 3
 RSpec/StubbedMock:
   Exclude:
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
+    - 'spec/beaker/vagrant_spec.rb'
 
 # Offense count: 1
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
+    - 'spec/beaker/vagrant_spec.rb'
 
 # Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
@@ -260,8 +154,8 @@ Rake/Desc:
 # Configuration parameters: AllowOnConstant, AllowOnSelfClass.
 Style/CaseEquality:
   Exclude:
-    - 'spec/beaker/hypervisor/vagrant_custom_spec.rb'
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
+    - 'spec/beaker/vagrant_custom_spec.rb'
+    - 'spec/beaker/vagrant_spec.rb'
 
 # Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -354,28 +248,10 @@ Style/StringConcatenation:
     - 'lib/beaker/hypervisor/vagrant.rb'
     - 'lib/beaker/hypervisor/vagrant_fusion.rb'
     - 'lib/beaker/hypervisor/vagrant_libvirt.rb'
-    - 'spec/beaker/hypervisor/vagrant_custom_spec.rb'
+    - 'spec/beaker/vagrant_custom_spec.rb'
     - 'spec/spec_helper.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArrayLiteral:
-  Exclude:
-    - 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
-
-# Offense count: 21
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'lib/beaker/hypervisor/vagrant_virtualbox.rb'
-    - 'spec/beaker/hypervisor/vagrant_spec.rb'
-
-# Offense count: 23
+# Offense count: 24
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https

diff --git a/beaker-vagrant.gemspec b/beaker-vagrant.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 1.1'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.5.0'
 
   s.add_runtime_dependency 'beaker', '>= 4', '< 6'
 end