beaker-vagrant 0.6.4 → 0.7.1

data/spec/beaker/hypervisor/vagrant_virtualbox_spec.rb

@@ -2,86 +2,77 @@ require 'spec_helper'
 
 describe Beaker::VagrantVirtualbox do
   let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
-  let( :vagrant ) { Beaker::VagrantVirtualbox.new( @hosts, options ) }
-
-  before :each do
-    @hosts = make_hosts()
-  end
+  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
-    @hosts.each do |host|
+    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
     end
-    expect( vagrant ).to receive( :hack_etc_hosts ).with( @hosts, options ).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
 
-  it "can make a Vagranfile for a set of hosts" do
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
-
-    vagrant.make_vfile( @hosts )
-
-    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include( %Q{    v.vm.provider :virtualbox do |vb|\n      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']\n    end})
-  end
-
-  it "can disable the vb guest plugin" do
-    options.merge!({ :vbguest_plugin => 'disable' })
+  context 'can make a Vagrantfile' do
+    subject do
+      FakeFS do
+        vagrant.make_vfile(hosts)
+        File.read(vagrant.instance_variable_get(:@vagrant_file))
+      end
+    end
 
-    vfile_section = vagrant.class.provider_vfile_section( @hosts.first, options )
+    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})
+    end
 
-    match = vfile_section.match(/vb.vbguest.auto_update = false/)
+    context 'with ioapic(multiple cores)' do
+      let(:hosts) { make_hosts({:ioapic => 'true'}, 1) }
 
-    expect( match ).to_not be nil
+      it { is_expected.to include( " vb.customize ['modifyvm', :id, '--ioapic', 'on']") }
+    end
 
-  end
+    context 'with NAT DNS' do
+      let(:hosts) { make_hosts({:natdns => 'on'}, 1) }
 
-  it "can enable ioapic(multiple cores) on hosts" do 
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    hosts = make_hosts({:ioapic => 'true'},1)
+      it { is_expected.to include( " vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']") }
+      it { is_expected.to include( " vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']") }
+    end
 
-    vagrant.make_vfile( hosts )
+    context 'storage with the USB controller' do
+      let(:hosts) { make_hosts({:volumes => { 'test_disk' => { size: '5120' }}, :volume_storage_controller => 'USB' }) }
 
-    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include( %Q{ vb.customize ["modifyvm", :id, "--ioapic", "on"]})
-  end
+      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 ['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']") }
+    end
 
-  it "correctly provisions storage with the USB controller" do
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    hosts = make_hosts({:volumes => { 'test_disk' => { size: '5120' }}, :volume_storage_controller => 'USB' })
+    context 'storage with the LSILogic controller' do
+      let(:hosts) { make_hosts({:volumes => { 'test_disk' => { size: '5120' }}, :volume_storage_controller => 'LSILogic' }) }
 
-    vagrant.make_vfile( hosts )
-    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include(%Q{ vb.customize ['modifyvm', :id, '--usb', 'on']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['storagectl', :id, '--name', 'Beaker USB Controller', '--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['storageattach', :id, '--storagectl', 'Beaker USB Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']})
-  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 ['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']") }
+    end
 
-  it "correctly provisions storage with the LSILogic controller" do
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    hosts = make_hosts({:volumes => { 'test_disk' => { size: '5120' }}, :volume_storage_controller => 'LSILogic' })
+    context "storage with the default controller" do
+      let(:hosts) { make_hosts({:volumes => { 'test_disk' => { size: '5120' }}}) }
 
-    vagrant.make_vfile( hosts )
-    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include(%Q{ vb.customize ['storagectl', :id, '--name', 'Beaker LSILogic Controller', '--add', 'scsi', '--portcount', '16', '--controller', 'LSILogic', '--bootable', 'off']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']})
-    expect( vagrantfile ).to include(%Q{ 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 ['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']") }
+    end
   end
 
-  it "correctly provisions storage with the default controller" do
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    hosts = make_hosts({:volumes => { 'test_disk' => { size: '5120' }}})
+  context 'disabled vb guest plugin' do
+    let(:options) { super().merge({ :vbguest_plugin => 'disable' }) }
+    subject { vagrant.class.provider_vfile_section( hosts.first, options ) }
 
-    vagrant.make_vfile( hosts )
-    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include(%Q{ vb.customize ['storagectl', :id, '--name', 'Beaker IntelAHCI Controller', '--add', 'sata', '--portcount', '2', '--controller', 'IntelAHCI', '--bootable', 'off']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['storageattach', :id, '--storagectl', 'Beaker IntelAHCI Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']})
+    it { is_expected.to match(/vb\.vbguest\.auto_update = false/) }
   end
 end

data/spec/beaker/hypervisor/vagrant_workstation_spec.rb

@@ -2,71 +2,57 @@ require 'spec_helper'
 
 describe Beaker::VagrantWorkstation do
   let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
-  let( :vagrant ) { Beaker::VagrantWorkstation.new( @hosts, options ) }
-
-  before :each do
-    @hosts = make_hosts()
-  end
+  let( :vagrant ) { described_class.new( hosts, options ) }
+  let( :hosts ) { make_hosts() }
 
   it "uses the vmware_workstation provider for provisioning" do
-    @hosts.each do |host|
+    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
     end
-    expect( vagrant ).to receive( :hack_etc_hosts ).with( @hosts, options ).once
+    expect( vagrant ).to receive( :hack_etc_hosts ).with( hosts, options ).once
     expect( vagrant ).to receive( :vagrant_cmd ).with( "up --provider vmware_workstation" ).once
-    vagrant.provision
-  end
-
-  it "can make a Vagranfile for a set of hosts" do
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
-
-    vagrant.make_vfile( @hosts )
-
-    vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
-    expect( vagrantfile ).to include( %Q{    v.vm.provider :vmware_workstation do |v|\n      v.vmx['memsize'] = '1024'\n    end})
+    FakeFS do
+      vagrant.provision
+    end
   end
 
-  it "can enable whitelist_verified on hosts" do 
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    hosts = make_hosts({:whitelist_verified => true},1)
-
-    vagrant.make_vfile( hosts )
-
-    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include( %Q{ v.vmx['whitelist_verified'] = 'true'})
-  end
+  context 'can make a Vagrantfile' do
+    subject do
+      FakeFS do
+        vagrant.make_vfile(hosts)
+        File.read(vagrant.instance_variable_get(:@vagrant_file))
+      end
+    end
 
-  it "can enable functional_hgfs on hosts" do 
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    hosts = make_hosts({:functional_hgfs => true},1)
+    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})
+    end
 
-    vagrant.make_vfile( hosts )
+    context 'with whitelist_verified' do
+      let(:hosts) { make_hosts({:whitelist_verified => true}, 1) }
 
-    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include( %Q{ v.vmx['functional_hgfs'] = 'true'})
-  end
+      it { is_expected.to include( %Q{ v.vmx['whitelist_verified'] = 'true'}) }
+    end
 
-  it "can enable unmount_default_hgfs on hosts" do 
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    hosts = make_hosts({:unmount_default_hgfs => true},1)
+    context 'with functional_hgfs' do
+      let(:hosts) { make_hosts({:functional_hgfs => true}, 1) }
 
-    vagrant.make_vfile( hosts )
+      it { is_expected.to include( %Q{ v.vmx['functional_hgfs'] = 'true'}) }
+    end
 
-    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include( %Q{ v.vmx['unmount_default_hgfs'] = 'true'})
-  end
+    context 'with unmount_default_hgfs' do
+      let(:hosts) { make_hosts({:unmount_default_hgfs => true}, 1) }
 
-  it "can enable gui on hosts" do 
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    hosts = make_hosts({:gui => true},1)
+      it { is_expected.to include( %Q{ v.vmx['unmount_default_hgfs'] = 'true'}) }
+    end
 
-    vagrant.make_vfile( hosts )
+    context "with gui" do
+      let(:hosts) { make_hosts({:gui => true},1) }
 
-    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include( %Q{ v.vmx['gui'] = true})
+      it { is_expected.to include( %Q{ v.vmx['gui'] = true}) }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.1
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -42,30 +42,36 @@ dependencies:
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +128,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: stringify-hash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
 description: For use for the Beaker acceptance testing tool
 email:
 - rishi.javia@puppet.com, kevin.imber@puppet.com, tony.vu@puppet.com
@@ -144,9 +136,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -195,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Beaker DSL Extension Helpers!