beaker-vagrant 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74c1cb569c6a0c707030b00ca1a05d16642a0c53
-  data.tar.gz: 91b7008f99327d8e84d668a289430b52b9c4e642
+  metadata.gz: b0507afd930ed4038b5828c44deaba498093bce5
+  data.tar.gz: 2936af72e1c7ca90377b1179ec783fc2257ff697
 SHA512:
-  metadata.gz: 6d9fa34cb3d014bb41bfe680a76a7814d9bf163573e3d86fa5cdab6b3bb32c6743d2357fda231ca157c74f196fe15dfe653d8ebf054e2d6a79c32adcae0838e0
-  data.tar.gz: e64456d0bc01007038eadb0eaa94355818b8f6da4d58ac45373f9be98e22e14183bd01a75ba4888dad6345161d995c82eea9bc110dbf8f003d5fba90d9274bec
+  metadata.gz: 4b513ccb24fcdd1f0dd5fb13c4779629d0b913988398fbab3bf69bb48ec181678ff50c3d2ed3e26209588c42fd3454ec5204ba52a4534faf0c2b114c6e108928
+  data.tar.gz: 423b6c4bff4c7561750f38017986a682327d37563bc99737a1351ee2363ac7d9918f14357cadf423c37add92bfef912508b96b8745c8f58c6366b020a8784b91

data/lib/beaker-vagrant/version.rb

@@ -1,3 +1,3 @@
 module BeakerVagrant
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/beaker/hypervisor/vagrant.rb

@@ -3,6 +3,7 @@ require 'open3'
 module Beaker
   class Vagrant < Beaker::Hypervisor
 
+    require 'beaker/hypervisor/vagrant/mount_folder'
     require 'beaker/hypervisor/vagrant_virtualbox'
     # Return a random mac address
     #
@@ -56,7 +57,12 @@ module Beaker
 
         unless host['mount_folders'].nil?
           host['mount_folders'].each do |name, folder|
-            v_file << "    v.vm.synced_folder '#{folder[:from]}', '#{folder[:to]}', create: true\n"
+            mount_folder = Vagrant::MountFolder.new(name, folder)
+            if mount_folder.required_keys_present?
+              v_file << "    v.vm.synced_folder '#{mount_folder.from}', '#{mount_folder.to}', create: true\n"
+            else
+              @logger.warn "Using 'mount_folders' requires options 'from' and 'to' for vagrant node, given #{folder.inspect}"
+            end
           end
         end
 

data/lib/beaker/hypervisor/vagrant/mount_folder.rb

@@ -0,0 +1,20 @@
+module Beaker
+  class Vagrant::MountFolder
+    def initialize(name, spec)
+      @name = name
+      @spec = spec
+    end
+
+    def required_keys_present?
+      not from.nil? and not to.nil?
+    end
+
+    def from
+      @spec[:from]
+    end
+
+    def to
+      @spec[:to]
+    end
+  end
+end

data/lib/beaker/hypervisor/vagrant_desktop.rb

@@ -0,0 +1,18 @@
+require 'beaker/hypervisor/vagrant'
+
+class Beaker::VagrantDesktop < Beaker::Vagrant
+  def provision(provider = 'vmware_desktop')
+    super
+  end
+
+  def self.provider_vfile_section(host, options)   
+    v_provider = "    v.vm.provider :vmware_desktop do |v|\n"
+    v_provider <<  "      v.vmx['gui'] = true\n" if host['gui'] == true
+    v_provider <<  "      v.vmx['memsize'] = '#{memsize(host,options)}'\n"
+    v_provider <<  "      v.vmx['whitelist_verified'] = '#{host['whitelist_verified']}'\n" unless host['whitelist_verified'].nil?
+    v_provider <<  "      v.vmx['functional_hgfs'] = '#{host['functional_hgfs']}'\n" unless host['functional_hgfs'].nil?
+    v_provider <<  "      v.vmx['unmount_default_hgfs'] = '#{host['unmount_default_hgfs']}'\n" unless host['unmount_default_hgfs'].nil?
+    v_provider <<  "      v.vmx['utility_port'] = '#{host['utility_port']}'\n" unless host['utility_port'].nil?
+    v_provider <<  "    end\n"
+  end
+end

data/lib/beaker/hypervisor/vagrant_workstation.rb

@@ -5,9 +5,14 @@ class Beaker::VagrantWorkstation < Beaker::Vagrant
     super
   end
 
-  def self.provider_vfile_section(host, options)
-    "    v.vm.provider :vmware_workstation do |v|\n" +
-      "      v.vmx['memsize'] = '#{memsize(host,options)}'\n" +
-      "    end\n"
+  def self.provider_vfile_section(host, options)   
+    v_provider = "    v.vm.provider :vmware_workstation do |v|\n"
+    v_provider <<  "      v.vmx['gui'] = true\n" if host['gui'] == true
+    v_provider <<  "      v.vmx['memsize'] = '#{memsize(host,options)}'\n"
+    v_provider <<  "      v.vmx['whitelist_verified'] = '#{host['whitelist_verified']}'\n" unless host['whitelist_verified'].nil?
+    v_provider <<  "      v.vmx['functional_hgfs'] = '#{host['functional_hgfs']}'\n" unless host['functional_hgfs'].nil?
+    v_provider <<  "      v.vmx['unmount_default_hgfs'] = '#{host['unmount_default_hgfs']}'\n" unless host['unmount_default_hgfs'].nil?
+    v_provider <<  "      v.vmx['utility_port'] = '#{host['utility_port']}'\n" unless host['utility_port'].nil?
+    v_provider <<  "    end\n"
   end
 end

data/spec/beaker/hypervisor/vagrant_desktop_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Beaker::VagrantDesktop do
+  let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
+  let( :vagrant ) { Beaker::VagrantDesktop.new( @hosts, options ) }
+
+  before :each do
+    @hosts = make_hosts()
+  end
+
+  it "uses the vmware_desktop 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
+    end
+    expect( vagrant ).to receive( :hack_etc_hosts ).with( @hosts, options ).once
+    expect( vagrant ).to receive( :vagrant_cmd ).with( "up --provider vmware_desktop" ).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_desktop do |v|\n      v.vmx['memsize'] = '1024'\n    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
+
+  it "can enable functional_hgfs on hosts" do 
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    hosts = make_hosts({:functional_hgfs => true},1)
+
+    vagrant.make_vfile( hosts )
+
+    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
+    expect( vagrantfile ).to include( %Q{ v.vmx['functional_hgfs'] = '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)
+
+    vagrant.make_vfile( hosts )
+
+    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
+    expect( vagrantfile ).to include( %Q{ v.vmx['unmount_default_hgfs'] = 'true'})
+  end
+
+  it "can enable gui on hosts" do 
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    hosts = make_hosts({:gui => true},1)
+
+    vagrant.make_vfile( hosts )
+
+    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
+    expect( vagrantfile ).to include( %Q{ v.vmx['gui'] = true})
+  end
+end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -110,7 +110,7 @@ EOF
       path = vagrant.instance_variable_get( :@vagrant_path )
       allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
-      host = make_host( 'name-with_underscore', {} ) 
+      host = make_host( 'name-with_underscore', {} )
       vagrant.make_vfile( [host,], options )
 
       vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
@@ -159,6 +159,25 @@ EOF
       expect( vagrantfile ).to match(/v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0"/)
     end
 
+    it "can make a Vagrantfile with improper keys for synced folders" do
+      path = vagrant.instance_variable_get( :@vagrant_path )
+
+      hosts = make_hosts({:mount_folders => {
+        :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'}
+      }},1)
+      vagrant.make_vfile( hosts, options )
+
+      vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
+
+      expect( vagrantfile ).not_to match(/v.vm.synced_folder '', '', create: true/)
+      expect( vagrantfile ).not_to match(/v.vm.synced_folder '\/invalid2', '', create: true/)
+      expect( vagrantfile ).not_to match(/v.vm.synced_folder '', '\/invalid3', create: true/)
+      expect( vagrantfile ).to match(/v.vm.synced_folder '\/valid', '\/valid', create: true/)
+    end
+
     context "when generating a windows config" do
       before do
         path = vagrant.instance_variable_get( :@vagrant_path )

data/spec/beaker/hypervisor/vagrant_workstation_spec.rb

@@ -29,4 +29,44 @@ describe Beaker::VagrantWorkstation do
     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})
   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
+
+  it "can enable functional_hgfs on hosts" do 
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    hosts = make_hosts({:functional_hgfs => true},1)
+
+    vagrant.make_vfile( hosts )
+
+    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
+    expect( vagrantfile ).to include( %Q{ v.vmx['functional_hgfs'] = '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)
+
+    vagrant.make_vfile( hosts )
+
+    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
+    expect( vagrantfile ).to include( %Q{ v.vmx['unmount_default_hgfs'] = 'true'})
+  end
+
+  it "can enable gui on hosts" do 
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    hosts = make_hosts({:gui => true},1)
+
+    vagrant.make_vfile( hosts )
+
+    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
+    expect( vagrantfile ).to include( %Q{ v.vmx['gui'] = true})
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -173,13 +173,16 @@ files:
 - docs/vagrant_libvirt.md
 - lib/beaker-vagrant/version.rb
 - lib/beaker/hypervisor/vagrant.rb
+- lib/beaker/hypervisor/vagrant/mount_folder.rb
 - lib/beaker/hypervisor/vagrant_custom.rb
+- lib/beaker/hypervisor/vagrant_desktop.rb
 - lib/beaker/hypervisor/vagrant_fusion.rb
 - lib/beaker/hypervisor/vagrant_libvirt.rb
 - 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