beaker-vagrant 0.7.1 → 1.1.0

data/spec/beaker/hypervisor/vagrant_virtualbox_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
 describe Beaker::VagrantVirtualbox do
-  let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
-  let( :vagrant ) { described_class.new( hosts, options ) }
-  let(:vagrantfile_path) { vagrant.instance_variable_get( :@vagrant_file ) }
-  let(:hosts) { make_hosts() }
+  let(:options) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double.as_null_object }) }
+  let(:vagrant) { described_class.new(hosts, options) }
+  let(:vagrantfile_path) { vagrant.instance_variable_get(:@vagrant_file) }
+  let(:hosts) { make_hosts }
 
-  it "uses the virtualbox provider for provisioning" do
+  it 'uses the virtualbox provider for provisioning' do
     hosts.each do |host|
       host_prev_name = host['user']
-      expect( vagrant ).to receive( :set_ssh_config ).with( host, 'vagrant' ).once
-      expect( vagrant ).to receive( :copy_ssh_to_root ).with( host, options ).once
-      expect( vagrant ).to receive( :set_ssh_config ).with( host, host_prev_name ).once
+      expect(vagrant).to receive(:set_ssh_config).with(host, 'vagrant').once
+      expect(vagrant).to receive(:copy_ssh_to_root).with(host, options).once
+      expect(vagrant).to receive(:set_ssh_config).with(host, host_prev_name).once
     end
-    expect( vagrant ).to receive( :hack_etc_hosts ).with( hosts, options ).once
-    expect( vagrant ).to receive( :vagrant_cmd ).with( "up --provider virtualbox" ).once
+    expect(vagrant).to receive(:hack_etc_hosts).with(hosts, options).once
+    expect(vagrant).to receive(:vagrant_cmd).with('up --provider virtualbox').once
     vagrant.provision
   end
 
@@ -26,52 +26,73 @@ describe Beaker::VagrantVirtualbox do
       end
     end
 
-    it "can make a Vagrantfile for a set of hosts" do
-      is_expected.to include( %Q{    v.vm.provider :virtualbox do |vb|\n      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']\n    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))
     end
 
     context 'with ioapic(multiple cores)' do
-      let(:hosts) { make_hosts({:ioapic => 'true'}, 1) }
+      let(:hosts) { make_hosts({ ioapic: 'true' }, 1) }
 
-      it { is_expected.to include( " vb.customize ['modifyvm', :id, '--ioapic', 'on']") }
+      it { is_expected.to include(" vb.customize ['modifyvm', :id, '--ioapic', 'on']") }
     end
 
     context 'with NAT DNS' do
-      let(:hosts) { make_hosts({:natdns => 'on'}, 1) }
+      let(:hosts) { make_hosts({ natdns: 'on' }, 1) }
 
-      it { is_expected.to include( " vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']") }
-      it { is_expected.to include( " vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']") }
+      it { is_expected.to include(" vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']") }
+      it { is_expected.to include(" vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']") }
     end
 
     context 'storage with the USB controller' do
-      let(:hosts) { make_hosts({:volumes => { 'test_disk' => { size: '5120' }}, :volume_storage_controller => 'USB' }) }
+      let(:hosts) { make_hosts({ volumes: { 'test_disk' => { size: '5120' } }, volume_storage_controller: 'USB' }) }
 
       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']") }
+
+      it {
+        is_expected.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']") }
+
+      it {
+        is_expected.to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker USB Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
+      }
     end
 
     context 'storage with the LSILogic controller' do
-      let(:hosts) { make_hosts({:volumes => { 'test_disk' => { size: '5120' }}, :volume_storage_controller => 'LSILogic' }) }
+      let(:hosts) do
+        make_hosts({ volumes: { 'test_disk' => { size: '5120' } }, volume_storage_controller: 'LSILogic' })
+      end
+
+      it {
+        is_expected.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 ['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']") }
+
+      it {
+        is_expected.to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker LSILogic Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
+      }
     end
 
-    context "storage with the default controller" do
-      let(:hosts) { make_hosts({:volumes => { 'test_disk' => { size: '5120' }}}) }
+    context 'storage with the default controller' 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']")
+      }
 
-      it { is_expected.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']") }
+
+      it {
+        is_expected.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' }) }
+    subject { vagrant.class.provider_vfile_section(hosts.first, options) }
 
     it { is_expected.to match(/vb\.vbguest\.auto_update = false/) }
   end

data/spec/beaker/hypervisor/vagrant_workstation_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 describe Beaker::VagrantWorkstation do
-  let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
-  let( :vagrant ) { described_class.new( hosts, options ) }
-  let( :hosts ) { make_hosts() }
+  let(:options) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double.as_null_object }) }
+  let(:vagrant) { described_class.new(hosts, options) }
+  let(:hosts) { make_hosts }
 
-  it "uses the vmware_workstation provider for provisioning" do
+  it 'uses the vmware_workstation provider for provisioning' do
     hosts.each do |host|
       host_prev_name = host['user']
-      expect( vagrant ).to receive( :set_ssh_config ).with( host, 'vagrant' ).once
-      expect( vagrant ).to receive( :copy_ssh_to_root ).with( host, options ).once
-      expect( vagrant ).to receive( :set_ssh_config ).with( host, host_prev_name ).once
+      expect(vagrant).to receive(:set_ssh_config).with(host, 'vagrant').once
+      expect(vagrant).to receive(:copy_ssh_to_root).with(host, options).once
+      expect(vagrant).to receive(:set_ssh_config).with(host, host_prev_name).once
     end
-    expect( vagrant ).to receive( :hack_etc_hosts ).with( hosts, options ).once
-    expect( vagrant ).to receive( :vagrant_cmd ).with( "up --provider vmware_workstation" ).once
+    expect(vagrant).to receive(:hack_etc_hosts).with(hosts, options).once
+    expect(vagrant).to receive(:vagrant_cmd).with('up --provider vmware_workstation').once
     FakeFS do
       vagrant.provision
     end
@@ -27,32 +27,32 @@ describe Beaker::VagrantWorkstation do
       end
     end
 
-    it "for a set of hosts" do
-      is_expected.to include( %Q{    v.vm.provider :vmware_workstation do |v|\n      v.vmx['memsize'] = '1024'\n    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))
     end
 
     context 'with whitelist_verified' do
-      let(:hosts) { make_hosts({:whitelist_verified => true}, 1) }
+      let(:hosts) { make_hosts({ whitelist_verified: true }, 1) }
 
-      it { is_expected.to include( %Q{ v.vmx['whitelist_verified'] = 'true'}) }
+      it { is_expected.to include(%( v.vmx['whitelist_verified'] = 'true')) }
     end
 
     context 'with functional_hgfs' do
-      let(:hosts) { make_hosts({:functional_hgfs => true}, 1) }
+      let(:hosts) { make_hosts({ functional_hgfs: true }, 1) }
 
-      it { is_expected.to include( %Q{ v.vmx['functional_hgfs'] = 'true'}) }
+      it { is_expected.to include(%( v.vmx['functional_hgfs'] = 'true')) }
     end
 
     context 'with unmount_default_hgfs' do
-      let(:hosts) { make_hosts({:unmount_default_hgfs => true}, 1) }
+      let(:hosts) { make_hosts({ unmount_default_hgfs: true }, 1) }
 
-      it { is_expected.to include( %Q{ v.vmx['unmount_default_hgfs'] = 'true'}) }
+      it { is_expected.to include(%( v.vmx['unmount_default_hgfs'] = 'true')) }
     end
 
-    context "with gui" do
-      let(:hosts) { make_hosts({:gui => true},1) }
+    context 'with gui' do
+      let(:hosts) { make_hosts({ gui: true }, 1) }
 
-      it { is_expected.to include( %Q{ v.vmx['gui'] = true}) }
+      it { is_expected.to include(%( v.vmx['gui'] = true)) }
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,7 @@
 require 'simplecov'
-require 'rspec/its'
 require 'beaker'
 
-Dir.glob(Dir.pwd + '/lib/beaker/hypervisor/*.rb') {|file| require file}
+Dir.glob(Dir.pwd + '/lib/beaker/hypervisor/*.rb') { |file| require file }
 
 # setup & require beaker's spec_helper.rb
 beaker_gem_spec = Gem::Specification.find_by_name('beaker')

metadata

@@ -1,77 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.1.0
 platform: ruby
 authors:
-- Rishi Javia, Kevin Imber, Tony Vu
+- Vox Pupuli
+- Rishi Javia
+- Kevin Imber
+- Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -87,50 +90,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 description: For use for the Beaker acceptance testing tool
-email:
-- rishi.javia@puppet.com, kevin.imber@puppet.com, tony.vu@puppet.com
+email: voxpupuli@groups.io
 executables:
 - beaker-vagrant
 extensions: []
@@ -141,6 +129,8 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".simplecov"
 - CHANGELOG.md
 - Gemfile
@@ -184,14 +174,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Beaker DSL Extension Helpers!