Merge pull request #136 from bastelfreak/vpr

voxpupuli-rubocop: Require 2.7.0

.rubocop_todo.yml

@@ -1,12 +1,14 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-03-27 16:58:25 UTC using RuboCop version 1.48.1.
+# on 2024-05-28 09:46:46 UTC using RuboCop version 1.63.5.
 # 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: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AutoCorrect.
 Lint/UselessAssignment:
   Exclude:
     - 'lib/beaker-rspec/helpers/serverspec.rb'
@@ -22,6 +24,7 @@ Naming/AccessorMethodName:
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
+    - 'Rakefile.rb'
     - 'lib/beaker-rspec.rb'
 
 # Offense count: 1

beaker-rspec.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakefs', '>= 0.6', '< 3'
   s.add_development_dependency 'minitest', '~> 5.4'
   s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 1.3'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.7.0'
 
   # Run time dependencies
   s.add_runtime_dependency 'beaker', '>= 4.0', '< 6'

lib/beaker-rspec/spec_helper.rb

@@ -39,10 +39,10 @@
   # process options to construct beaker command string
   nodesetdir = options[:nodesetdir] || File.join('spec', 'acceptance', 'nodesets')
   nodesetfile = options[:nodesetfile] || File.join(nodesetdir, "#{options[:nodeset]}.yml")
-  fresh_nodes = options[:provision] == 'no' ? '--no-provision' : nil
+  fresh_nodes = (options[:provision] == 'no') ? '--no-provision' : nil
   keyfile = options[:keyfile] ? ['--keyfile', options[:keyfile]] : nil
-  debug = options[:debug] && options[:debug] != 'no' ? ['--log-level', 'debug'] : nil
-  color = options[:color] == 'no' ? ['--no-color'] : nil
+  debug = (options[:debug] && options[:debug] != 'no') ? ['--log-level', 'debug'] : nil
+  color = (options[:color] == 'no') ? ['--no-color'] : nil
   options_file = options[:optionsfile] ? ['--options-file', options[:optionsfile]] : nil
 
   # Configure all nodes in nodeset