beaker-vagrant 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad3e004b7c1a2dd497d2e1e6a2ad657888f9197349385c458d359c034cca393f
-  data.tar.gz: 90307a775cd0d87ab5c45a46906379610358009794ef5b092b9b4b428d4e4a8f
+  metadata.gz: c46e26b66456dbc91b5458646e1e9fe57184b23b0c94d60e94f80391e161acbe
+  data.tar.gz: 38786118f734830631fe46392992a3f46668f1f282f4b2cc9a8ec4f37255bca5
 SHA512:
-  metadata.gz: 3bf0e47364ea0fff8c2f6b14bd5f1a0f6829b3426861fcac23c27deb23b829e5bf499d2d1152fc27629c3b62a2628bdd9d243cf6768e88c832143817abec9d87
-  data.tar.gz: 4d172b71383ef108ecd3026d2f6374c765e4f4c3aca53c5f4097769575cc7a1339fed1ad7dbb64ec77b758722beb86d5f9022619ca42cd37e4500eeff2180a2f
+  metadata.gz: 8c0c72401b0d37fb457dce60b7b71e8bcbf1ecb2191f4d9549280a5d098d3f677adc97893e274b7cb34558078e26adddc71ffd8156766fa135f48c1a56ce05bc
+  data.tar.gz: c3cd786b9f57ae1fd147e171c779fdb69f9a980612e9e37ae32de7a522f6c507a7c1d8f4db15518e6116267b0ad0f81901499955cee3acb6eb98c1253bf12a9e

data/.github/workflows/release.yml

@@ -11,10 +11,10 @@ jobs:
     if: github.repository_owner == 'voxpupuli'
     steps:
       - uses: actions/checkout@v3
-      - name: Install Ruby 3.0
+      - name: Install Ruby 3.3
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.3'
         env:
           BUNDLE_WITHOUT: release:development:rubocop
       - name: Build gem

data/.github/workflows/test.yml

@@ -32,6 +32,7 @@ jobs:
           - ruby: "3.0"
           - ruby: "3.1"
           - ruby: "3.2"
+          - ruby: "3.3"
     env:
       COVERAGE: ${{ matrix.coverage }}
     name: RSpec - Ruby ${{ matrix.ruby }}

data/.rubocop.yml

@@ -1,4 +1,5 @@
 ---
 inherit_from: .rubocop_todo.yml
+
 inherit_gem:
   voxpupuli-rubocop: rubocop.yml

data/.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,8 +43,8 @@ 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).
@@ -77,26 +52,12 @@ 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).
@@ -104,110 +65,45 @@ 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

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.3.0](https://github.com/voxpupuli/beaker-vagrant/tree/1.3.0) (2024-04-30)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-vagrant/compare/1.2.0...1.3.0)
+
+**Implemented enhancements:**
+
+- Add Ruby 3.3 to CI [\#84](https://github.com/voxpupuli/beaker-vagrant/pull/84) ([bastelfreak](https://github.com/bastelfreak))
+- Use shorter directory names for beaker-hostgenerator [\#80](https://github.com/voxpupuli/beaker-vagrant/pull/80) ([ekohl](https://github.com/ekohl))
+
+**Merged pull requests:**
+
+- Gemfile: add faraday as GCG dependency [\#85](https://github.com/voxpupuli/beaker-vagrant/pull/85) ([bastelfreak](https://github.com/bastelfreak))
+- Use .each\_value when only the value is needed [\#82](https://github.com/voxpupuli/beaker-vagrant/pull/82) ([ekohl](https://github.com/ekohl))
+- voxpupuli-rubocop: Update to 2.5.0 [\#81](https://github.com/voxpupuli/beaker-vagrant/pull/81) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [1.2.0](https://github.com/voxpupuli/beaker-vagrant/tree/1.2.0) (2023-04-28)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-vagrant/compare/1.1.0...1.2.0)

data/Gemfile

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec
+
 group :release do
-  gem 'github_changelog_generator', require: false
+  gem 'faraday-retry', '~> 2.1', require: false
+  gem 'github_changelog_generator', '~> 1.16.4', require: false
 end

data/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

data/lib/beaker/hypervisor/vagrant.rb

@@ -19,7 +19,7 @@ module Beaker
     end
 
     def private_network_generator(host)
-      private_network_string = "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= '255.255.0.0'}\""
+      private_network_string = "    v.vm.network :private_network, ip: \"#{host['ip']}\", :netmask => \"#{host['netmask'] ||= '255.255.0.0'}\""
       private_network_string << if host['network_mac']
                                   ", :mac => \"#{host['network_mac']}\"\n"
                                 else
@@ -27,7 +27,7 @@ module Beaker
                                 end
     end
 
-    def connection_preference(host)
+    def connection_preference(_host)
       [:hostname]
     end
 
@@ -78,7 +78,7 @@ module Beaker
         end
 
         unless host['forwarded_ports'].nil?
-          host['forwarded_ports'].each do |_name, port|
+          host['forwarded_ports'].each_value do |port|
             fwd = '    v.vm.network :forwarded_port,'
             fwd << " protocol: '#{port[:protocol]}'," unless port[:protocol].nil?
             fwd << " guest_ip: '#{port[:to_ip]}'," unless port[:to_ip].nil?
@@ -91,7 +91,7 @@ module Beaker
           end
         end
 
-        if /windows/i.match(host['platform'])
+        if /windows/i.match?(host['platform'])
           # due to a regression bug in versions of vagrant 1.6.2, 1.6.3, 1.6.4, >= 1.7.3 ssh fails to forward
           # automatically (note <=1.6.1, 1.6.5, 1.7.0 - 1.7.2 are uneffected)
           # Explicitly setting SSH port forwarding due to this bug
@@ -102,12 +102,12 @@ module Beaker
           v_file << "    v.vm.communicator = 'winrm'\n"
         end
 
-        if /osx/i.match(host['platform'])
+        if /osx/i.match?(host['platform'])
           v_file << "    v.vm.network 'private_network', ip: '10.0.1.10'\n"
           v_file << "    v.vm.synced_folder '.', '/vagrant', :nfs => true\n"
         end
 
-        if /freebsd/i.match(host['platform'])
+        if /freebsd/i.match?(host['platform'])
           v_file << "    v.ssh.shell = 'sh'\n"
           v_file << "    v.vm.guest = :freebsd\n"
 
@@ -146,7 +146,7 @@ module Beaker
     def set_all_ssh_config
       @logger.debug 'configure vagrant boxes (set ssh-config, switch to root user, hack etc/hosts)'
       @hosts.each do |host|
-        if host[:platform] =~ /windows/
+        if /windows/.match?(host[:platform])
           @logger.debug "skip ssh hacks on windows box #{host[:name]}"
           set_ssh_config host, host['user']
           next
@@ -204,8 +204,12 @@ module Beaker
       @options = options
       @logger = options[:logger]
       @hosts = vagrant_hosts
-      @vagrant_path = File.expand_path(File.join('.vagrant', 'beaker_vagrant_files',
-                                                 'beaker_' + File.basename(options[:hosts_file])))
+      vagrant_directory = if options[:hosts_file_generated]
+                            "beaker_hostgenerator_#{@hosts.map(&:name).join('-')}"
+                          else
+                            "beaker_#{File.basename(options[:hosts_file])}"
+                          end
+      @vagrant_path = File.expand_path(File.join('.vagrant', 'beaker_vagrant_files', vagrant_directory))
       @vagrant_file = File.expand_path(File.join(@vagrant_path, 'Vagrantfile'))
       @vagrant_env = {}
     end
@@ -262,7 +266,7 @@ module Beaker
       Dir.chdir(@vagrant_path) do
         retries ||= 0
         with_unbundled_env do
-          Open3.popen3(@vagrant_env, "vagrant #{args}") do |stdin, stdout, stderr, wait_thr|
+          Open3.popen3(@vagrant_env, "vagrant #{args}") do |_stdin, stdout, stderr, wait_thr|
             while line = stdout.gets
               @logger.info(line)
             end
@@ -271,7 +275,7 @@ module Beaker
           end
         end
       rescue StandardError => e
-        if e.to_s =~ /WinRM/m
+        if /WinRM/m.match?(e.to_s)
           sleep(10)
 
           retry if (retries += 1) < 6
@@ -296,7 +300,7 @@ module Beaker
         host['vagrant_memsize']
       elsif options['vagrant_memsize']
         options['vagrant_memsize']
-      elsif host['platform'] =~ /windows/
+      elsif /windows/.match?(host['platform'])
         '2048'
       else
         '1024'

data/lib/beaker/hypervisor/vagrant_custom.rb

@@ -5,7 +5,7 @@ class Beaker::VagrantCustom < Beaker::Vagrant
     super
   end
 
-  def make_vfile(hosts, options = {})
+  def make_vfile(_hosts, _options = {})
     FileUtils.mkdir_p(@vagrant_path)
     FileUtils.cp(@options[:vagrantfile_path], @vagrant_file)
   end

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -5,7 +5,7 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
     LSILogic: ['--add', 'scsi', '--portcount', '16', '--controller', 'LSILogic', '--bootable', 'off'],
     IntelAHCI: ['--add', 'sata', '--portcount', '2', '--controller', 'IntelAHCI', '--bootable', 'off'],
     PIIX4: ['--add', 'ide', '--portcount', '2', '--controller', 'PIIX4', '--bootable', 'off'],
-    USB: ['--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off']
+    USB: ['--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off'],
   }.freeze
 
   def provision(provider = 'virtualbox')
@@ -14,12 +14,12 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
 
   # Generate a VM customization string
   def self.vb_customize(command, args)
-    "      vb.customize ['#{command}', #{args.map { |a| "'#{a.to_s}'" }.join(', ')}]\n"
+    "      vb.customize ['#{command}', #{args.map { |a| "'#{a}'" }.join(', ')}]\n"
   end
 
   # Generate a VM customization string for the current VM
   def self.vb_customize_vm(command, args)
-    "      vb.customize ['#{command}', :id, #{args.map { |a| "'#{a.to_s}'" }.join(', ')}]\n"
+    "      vb.customize ['#{command}', :id, #{args.map { |a| "'#{a}'" }.join(', ')}]\n"
   end
 
   def self.provider_vfile_section(host, options)
@@ -44,7 +44,7 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
 
       provider_section << vb_customize_vm('modifyvm', ['--usb', 'on']) if controller == 'USB'
       provider_section << vb_customize_vm('storagectl', [
-        '--name', "Beaker #{controller} Controller"
+        '--name', "Beaker #{controller} Controller",
       ] + CONTROLLER_OPTIONS[controller.to_sym])
       host['volumes'].keys.each_with_index do |volume, index|
         volume_path = "#{host.name}-#{volume}.vdi"
@@ -72,7 +72,7 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
 
     provider_section << "      vb.gui = true\n" unless host['vb_gui'].nil?
 
-    if /osx/i.match(host['platform'])
+    if /osx/i.match?(host['platform'])
       provider_section << "      vb.customize ['modifyvm', :id, '--cpuidset', '1','000206a7','02100800','1fbae3bf','bfebfbff']\n"
     end
 

data/lib/beaker-vagrant/version.rb

@@ -1,3 +1,3 @@
 module BeakerVagrant
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/beaker/{hypervisor/vagrant_custom_spec.rb → vagrant_custom_spec.rb}

@@ -7,7 +7,7 @@ describe Beaker::VagrantCustom do
   let(:test_dir) { 'tmp/tests' }
   let(:custom_vagrant_file_path) { File.expand_path(test_dir + '/CustomVagrantfile') }
 
-  before :each do
+  before do
     @hosts = make_hosts
   end
 

data/spec/beaker/{hypervisor/vagrant_desktop_spec.rb → vagrant_desktop_spec.rb}

@@ -28,7 +28,7 @@ describe Beaker::VagrantDesktop do
     end
 
     it 'for a set of hosts' do
-      is_expected.to include(%(    v.vm.provider :vmware_desktop do |v|\n      v.vmx['memsize'] = '1024'\n    end))
+      expect(subject).to include(%(    v.vm.provider :vmware_desktop do |v|\n      v.vmx['memsize'] = '1024'\n    end))
     end
 
     context 'with whitelist_verified' do

data/spec/beaker/{hypervisor/vagrant_fusion_spec.rb → vagrant_fusion_spec.rb}

@@ -26,7 +26,7 @@ describe Beaker::VagrantFusion do
     end
 
     it 'has a provider section' do
-      is_expected.to include(%(    v.vm.provider :vmware_fusion do |v|\n      v.vmx['memsize'] = '1024'\n    end))
+      expect(subject).to include(%(    v.vm.provider :vmware_fusion do |v|\n      v.vmx['memsize'] = '1024'\n    end))
     end
   end
 end

data/spec/beaker/{hypervisor/vagrant_libvirt_spec.rb → vagrant_libvirt_spec.rb}

@@ -37,23 +37,23 @@ describe Beaker::VagrantLibvirt do
     end
 
     it 'has a provider section' do
-      is_expected.to include(%(    v.vm.provider :libvirt do |node|))
+      expect(subject).to include(%(    v.vm.provider :libvirt do |node|))
     end
 
     it 'has no private network' do
-      is_expected.to include('v.vm.network :private_network')
+      expect(subject).to include('v.vm.network :private_network')
     end
 
     it 'can specify the memory as an integer' do
-      is_expected.to include('node.memory = 1024')
+      expect(subject).to include('node.memory = 1024')
     end
 
     it 'can specify the number of cpus' do
-      is_expected.to include('node.cpus = 2')
+      expect(subject).to include('node.cpus = 2')
     end
 
     it 'can specify any libvirt option' do
-      is_expected.to include("node.uri = 'qemu+ssh://root@host/system'")
+      expect(subject).to include("node.uri = 'qemu+ssh://root@host/system'")
     end
   end
 end

data/spec/beaker/{hypervisor/vagrant_parallels_spec.rb → vagrant_parallels_spec.rb}

@@ -26,16 +26,17 @@ describe Beaker::VagrantParallels do
     end
 
     it 'can make a Vagrantfile for a set of hosts' do
-      is_expected.to include(%(    v.vm.provider :parallels do |prl|\n      prl.optimize_power_consumption = false\n      prl.memory = '1024'\n    end))
+      expect(subject).to include(%(    v.vm.provider :parallels do |prl|\n      prl.optimize_power_consumption = false\n      prl.memory = '1024'\n    end))
     end
   end
 
   context 'disabled guest tools' do
-    let(:options) { super().merge({ prl_update_guest_tools: 'disable' }) }
     subject { vagrant.class.provider_vfile_section(hosts.first, options) }
 
+    let(:options) { super().merge({ prl_update_guest_tools: 'disable' }) }
+
     it 'can disable the auto-update functionality of the Parallels Guest Tools' do
-      is_expected.to match(/prl.update_guest_tools = false/)
+      expect(subject).to match(/prl.update_guest_tools = false/)
     end
   end
 end

data/spec/beaker/{hypervisor/vagrant_spec.rb → vagrant_spec.rb}

@@ -13,18 +13,18 @@ module Beaker
 
     let(:vagrant) { Beaker::Vagrant.new(@hosts, options) }
 
-    before :each do
+    before do
       @hosts = make_hosts({
                             mount_folders: {
                               test_temp: { from: './', to: '/temp' },
-                              test_tmp: { from: '../', to: '/tmp' }
+                              test_tmp: { from: '../', to: '/tmp' },
                             },
                             forwarded_ports: {
                               http: { from: 10_080, to: 80 },
                               ssl: { from: 4443, to: 443 },
-                              tomcat: { from: 8080, to: 8080 }
+                              tomcat: { from: 8080, to: 8080 },
                             },
-                            platform: Beaker::Platform.new('centos-8-x86_64')
+                            platform: Beaker::Platform.new('centos-8-x86_64'),
                           })
     end
 
@@ -107,7 +107,7 @@ module Beaker
       path = vagrant.instance_variable_get(:@vagrant_path)
 
       host = make_host('name-with_underscore', {})
-      vagrant.make_vfile([host,], options)
+      vagrant.make_vfile([host], options)
 
       vagrantfile = File.read(File.expand_path(File.join(path, 'Vagrantfile')))
       expect(vagrantfile).to match(/v.vm.hostname = .*name-with-underscore/)
@@ -140,7 +140,7 @@ module Beaker
                            test_invalid1: { host_path: '/invalid1', container_path: '/invalid1' },
                            test_invalid2: { from: '/invalid2', container_path: '/invalid2' },
                            test_invalid3: { host_path: '/invalid3', to: '/invalid3' },
-                           test_valid: { from: '/valid', to: '/valid' }
+                           test_valid: { from: '/valid', to: '/valid' },
                          } }, 1)
       vagrant.make_vfile(hosts, options)
 
@@ -158,8 +158,8 @@ module Beaker
       shell_path = '/path/to/shell/script'
       hosts = make_hosts({
                            shell_provisioner: {
-                             path: shell_path
-                           }
+                             path: shell_path,
+                           },
                          }, 1)
       vagrant.make_vfile(hosts, options)
 
@@ -175,8 +175,8 @@ module Beaker
       hosts = make_hosts({
                            shell_provisioner: {
                              path: shell_path,
-                             args: shell_args
-                           }
+                             args: shell_args,
+                           },
                          }, 1)
       vagrant.make_vfile(hosts, options)
 
@@ -199,8 +199,8 @@ module Beaker
       empty_shell_path = ''
       hosts = make_hosts({
                            shell_provisioner: {
-                             path: empty_shell_path
-                           }
+                             path: empty_shell_path,
+                           },
                          }, 1)
       expect do
         vagrant.make_vfile(hosts, options)
@@ -218,23 +218,23 @@ module Beaker
       end
 
       it 'has the proper port forwarding for RDP' do
-        expect(@generated_file).to match /v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true/
+        expect(@generated_file).to match(/v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true/)
       end
 
       it 'has the proper port forwarding for WinRM' do
-        expect(@generated_file).to match /v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true/
+        expect(@generated_file).to match(/v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true/)
       end
 
       it 'configures the guest type to windows' do
-        expect(@generated_file).to match /v.vm.guest = :windows/
+        expect(@generated_file).to match(/v.vm.guest = :windows/)
       end
 
       it 'configures the guest type to use winrm' do
-        expect(@generated_file).to match /v.vm.communicator = 'winrm'/
+        expect(@generated_file).to match(/v.vm.communicator = 'winrm'/)
       end
 
       it 'sets a non-default memsize' do
-        expect(@generated_file).to match /'--memory', '2048',/
+        expect(@generated_file).to match(/'--memory', '2048',/)
       end
     end
 
@@ -249,11 +249,11 @@ module Beaker
       end
 
       it 'has the proper ssh shell' do
-        expect(@generated_file).to match /v.ssh.shell = 'sh'\n/
+        expect(@generated_file).to match(/v.ssh.shell = 'sh'\n/)
       end
 
       it 'has the proper guest setting' do
-        expect(@generated_file).to match /v.vm.guest = :freebsd\n/
+        expect(@generated_file).to match(/v.vm.guest = :freebsd\n/)
       end
     end
 
@@ -266,7 +266,7 @@ module Beaker
 
       match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', 'hello!', '--cpus', '1', '--audio', 'none'\]/)
 
-      expect(match).to_not be nil
+      expect(match).not_to be_nil
     end
 
     it 'uses the cpus defined per vagrant host' do
@@ -278,7 +278,7 @@ module Beaker
 
       match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', '1024', '--cpus', 'goodbye!', '--audio', 'none'\]/)
 
-      expect(match).to_not be nil
+      expect(match).not_to be_nil
     end
 
     context 'port forwarding rules' do
@@ -293,9 +293,9 @@ module Beaker
                 from_ip: '127.0.0.1',
                 to: 80,
                 to_ip: '0.0.0.0',
-                protocol: 'udp'
-              }
-            }
+                protocol: 'udp',
+              },
+            },
           }, 1
         )
         vagrant.make_vfile(hosts, options)
@@ -314,8 +314,8 @@ module Beaker
                 from: 10_080,
                 from_ip: '127.0.0.1',
                 to: 80,
-              }
-            }
+              },
+            },
           }, 1
         )
         vagrant.make_vfile(hosts, options)
@@ -334,8 +334,8 @@ module Beaker
                 from: 10_080,
                 to: 80,
                 to_ip: '0.0.0.0',
-              }
-            }
+              },
+            },
           }, 1
         )
         vagrant.make_vfile(hosts, options)
@@ -353,9 +353,9 @@ module Beaker
               http: {
                 from: 10_080,
                 to: 80,
-                protocol: 'udp'
-              }
-            }
+                protocol: 'udp',
+              },
+            },
           }, 1
         )
         vagrant.make_vfile(hosts, options)
@@ -392,7 +392,7 @@ module Beaker
         host[:platform] = 'windows'
         expect(host).to receive(:is_cygwin?).and_return(true)
 
-        expect(Command).to_not receive(:new).with('sudo fixfiles restore /root')
+        expect(Command).not_to receive(:new).with('sudo fixfiles restore /root')
         expect(Command).to receive(:new).with('cp -r .ssh /cygdrive/c/Users/Administrator/.').once
         expect(Command).to receive(:new).with('chown -R Administrator /cygdrive/c/Users/Administrator/.ssh').once
 
@@ -425,7 +425,7 @@ module Beaker
       let(:name) { host.name }
       let(:override_options) { {} }
 
-      before :each do
+      before do
         # FakeFS is just broken with Tempfile
         FakeFS.deactivate!
         Dir.mktmpdir do |dir|
@@ -457,7 +457,7 @@ module Beaker
           { forward_ssh_agent: false }
         end
 
-        it 'should keep IdentitiesOnly to yes' do
+        it 'keeps IdentitiesOnly to yes' do
           expect(host['ssh'][:keys_only]).to be === true
         end
       end
@@ -516,7 +516,7 @@ module Beaker
     end
 
     describe 'provisioning and cleanup' do
-      before :each do
+      before do
         expect(vagrant).to receive(:vagrant_cmd).with('up').once
         @hosts.each do |host|
           host_prev_name = host['user']
@@ -530,7 +530,7 @@ module Beaker
       it 'can provision a set of hosts' do
         options = vagrant.instance_variable_get(:@options)
         expect(vagrant).to receive(:make_vfile).with(@hosts, options).once
-        expect(vagrant).to receive(:vagrant_cmd).with('destroy --force').never
+        expect(vagrant).not_to receive(:vagrant_cmd).with('destroy --force')
         vagrant.provision
       end
 
@@ -557,7 +557,7 @@ module Beaker
     end
 
     describe 'provisioning and cleanup on windows' do
-      before :each do
+      before do
         expect(vagrant).to receive(:vagrant_cmd).with('up').once
         @hosts.each do |host|
           host[:platform] = 'windows'
@@ -572,7 +572,7 @@ module Beaker
       it 'can provision a set of hosts' do
         options = vagrant.instance_variable_get(:@options)
         expect(vagrant).to receive(:make_vfile).with(@hosts, options).once
-        expect(vagrant).to receive(:vagrant_cmd).with('destroy --force').never
+        expect(vagrant).not_to receive(:vagrant_cmd).with('destroy --force')
         vagrant.provision
       end
 

data/spec/beaker/{hypervisor/vagrant_virtualbox_spec.rb → vagrant_virtualbox_spec.rb}

@@ -27,7 +27,7 @@ describe Beaker::VagrantVirtualbox do
     end
 
     it 'can make a Vagrantfile for a set of hosts' do
-      is_expected.to include(%(    v.vm.provider :virtualbox do |vb|\n      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']\n    end))
+      expect(subject).to include(%(    v.vm.provider :virtualbox do |vb|\n      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']\n    end))
     end
 
     context 'with ioapic(multiple cores)' do
@@ -49,13 +49,13 @@ describe Beaker::VagrantVirtualbox do
       it { is_expected.to include(" vb.customize ['modifyvm', :id, '--usb', 'on']") }
 
       it {
-        is_expected.to include(" vb.customize ['storagectl', :id, '--name', 'Beaker USB Controller', '--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off']")
+        expect(subject).to include(" vb.customize ['storagectl', :id, '--name', 'Beaker USB Controller', '--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off']")
       }
 
       it { is_expected.to include(" vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']") }
 
       it {
-        is_expected.to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker USB Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
+        expect(subject).to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker USB Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
       }
     end
 
@@ -65,13 +65,13 @@ describe Beaker::VagrantVirtualbox do
       end
 
       it {
-        is_expected.to include(" vb.customize ['storagectl', :id, '--name', 'Beaker LSILogic Controller', '--add', 'scsi', '--portcount', '16', '--controller', 'LSILogic', '--bootable', 'off']")
+        expect(subject).to include(" vb.customize ['storagectl', :id, '--name', 'Beaker LSILogic Controller', '--add', 'scsi', '--portcount', '16', '--controller', 'LSILogic', '--bootable', 'off']")
       }
 
       it { is_expected.to include(" vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']") }
 
       it {
-        is_expected.to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker LSILogic Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
+        expect(subject).to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker LSILogic Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
       }
     end
 
@@ -79,21 +79,22 @@ describe Beaker::VagrantVirtualbox do
       let(:hosts) { make_hosts({ volumes: { 'test_disk' => { size: '5120' } } }) }
 
       it {
-        is_expected.to include(" vb.customize ['storagectl', :id, '--name', 'Beaker IntelAHCI Controller', '--add', 'sata', '--portcount', '2', '--controller', 'IntelAHCI', '--bootable', 'off']")
+        expect(subject).to include(" vb.customize ['storagectl', :id, '--name', 'Beaker IntelAHCI Controller', '--add', 'sata', '--portcount', '2', '--controller', 'IntelAHCI', '--bootable', 'off']")
       }
 
       it { is_expected.to include(" vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']") }
 
       it {
-        is_expected.to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker IntelAHCI Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
+        expect(subject).to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker IntelAHCI Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
       }
     end
   end
 
   context 'disabled vb guest plugin' do
-    let(:options) { super().merge({ vbguest_plugin: 'disable' }) }
     subject { vagrant.class.provider_vfile_section(hosts.first, options) }
 
+    let(:options) { super().merge({ vbguest_plugin: 'disable' }) }
+
     it { is_expected.to match(/vb\.vbguest\.auto_update = false/) }
   end
 end

data/spec/beaker/{hypervisor/vagrant_workstation_spec.rb → vagrant_workstation_spec.rb}

@@ -28,7 +28,7 @@ describe Beaker::VagrantWorkstation do
     end
 
     it 'for a set of hosts' do
-      is_expected.to include(%(    v.vm.provider :vmware_workstation do |v|\n      v.vmx['memsize'] = '1024'\n    end))
+      expect(subject).to include(%(    v.vm.provider :vmware_workstation do |v|\n      v.vmx['memsize'] = '1024'\n    end))
     end
 
     context 'with whitelist_verified' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -95,14 +95,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: beaker
   requirement: !ruby/object:Gem::Requirement
@@ -159,14 +159,14 @@ files:
 - lib/beaker/hypervisor/vagrant_parallels.rb
 - lib/beaker/hypervisor/vagrant_virtualbox.rb
 - lib/beaker/hypervisor/vagrant_workstation.rb
-- 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
 - spec/spec_helper.rb
 homepage: https://github.com/puppetlabs/beaker-vagrant
 licenses:
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Beaker DSL Extension Helpers!