beaker-vagrant 0.7.1 → 1.0.0

data/lib/beaker/hypervisor/vagrant.rb

@@ -2,15 +2,14 @@ require 'open3'
 
 module Beaker
   class Vagrant < Beaker::Hypervisor
-
     require 'beaker/hypervisor/vagrant/mount_folder'
     require 'beaker/hypervisor/vagrant_virtualbox'
 
     def rand_chunk
-      (2 + rand(252)).to_s #don't want a 0, 1, or a 255
+      rand(2..254).to_s # don't want a 0, 1, or a 255
     end
 
-    def randip(hypervisor=nil)
+    def randip(hypervisor = nil)
       case hypervisor
       when /libvirt/
         "10.254.#{rand_chunk}.#{rand_chunk}"
@@ -20,12 +19,12 @@ 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"}\""
-      if host['network_mac']
-        private_network_string << ", :mac => \"#{host['network_mac']}\"\n"
-      else
-        private_network_string << "\n"
-      end
+      private_network_string = "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= '255.255.0.0'}\""
+      private_network_string << if host['network_mac']
+                                  ", :mac => \"#{host['network_mac']}\"\n"
+                                else
+                                  "\n"
+                                end
     end
 
     def connection_preference(host)
@@ -33,34 +32,35 @@ module Beaker
     end
 
     def shell_provisioner_generator(provisioner_config)
-      unless provisioner_config['path'].nil? || provisioner_config['path'].empty?
-        unless provisioner_config['args'].nil?
-          shell_provisioner_string = "    v.vm.provision 'shell', :path => '#{provisioner_config['path']}', :args => '#{provisioner_config['args']}' \n"
-        else
-          shell_provisioner_string = "    v.vm.provision 'shell', :path => '#{provisioner_config['path']}'\n"
-        end
-        shell_provisioner_string
+      if provisioner_config['path'].nil? || provisioner_config['path'].empty?
+        raise 'No path defined for shell_provisioner or path empty'
+      end
+
+      if provisioner_config['args'].nil?
+        "    v.vm.provision 'shell', :path => '#{provisioner_config['path']}'\n"
       else
-        raise "No path defined for shell_provisioner or path empty"
+        "    v.vm.provision 'shell', :path => '#{provisioner_config['path']}', :args => '#{provisioner_config['args']}' \n"
       end
     end
 
-    def make_vfile hosts, options = {}
-      #HACK HACK HACK - add checks here to ensure that we have box + box_url
-      #generate the VagrantFile
+    def make_vfile(hosts, options = {})
+      # HACK: HACK HACK - add checks here to ensure that we have box + box_url
+      # generate the VagrantFile
       v_file = "Vagrant.configure(\"2\") do |c|\n"
       v_file << "  c.ssh.forward_agent = true\n" if options[:forward_ssh_agent] == true
       v_file << "  c.ssh.insert_key = false\n"
 
       hosts.each do |host|
-        host.name.tr!('_','-') # Rewrite Hostname with hyphens instead of underscores to get legal hostname
+        host.name.tr!('_', '-') # Rewrite Hostname with hyphens instead of underscores to get legal hostname
         set_host_default_ip(host)
         v_file << "  c.vm.define '#{host.name}' do |v|\n"
         v_file << "    v.vm.hostname = '#{host.name}'\n"
         v_file << "    v.vm.box = '#{host['box']}'\n"
         v_file << "    v.vm.box_url = '#{host['box_url']}'\n" unless host['box_url'].nil?
         v_file << "    v.vm.box_version = '#{host['box_version']}'\n" unless host['box_version'].nil?
-        v_file << "    v.vm.box_download_insecure = '#{host['box_download_insecure']}'\n" unless host['box_download_insecure'].nil?
+        unless host['box_download_insecure'].nil?
+          v_file << "    v.vm.box_download_insecure = '#{host['box_download_insecure']}'\n"
+        end
         v_file << "    v.vm.box_check_update = '#{host['box_check_update'] ||= 'true'}'\n"
         v_file << "    v.vm.synced_folder '.', '/vagrant', disabled: true\n" if host['synced_folder'] == 'disabled'
         v_file << shell_provisioner_generator(host['shell_provisioner']) if host['shell_provisioner']
@@ -79,7 +79,7 @@ module Beaker
 
         unless host['forwarded_ports'].nil?
           host['forwarded_ports'].each do |_name, port|
-            fwd = "    v.vm.network :forwarded_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?
             fwd << " guest: #{port[:to]},"
@@ -92,9 +92,9 @@ module Beaker
         end
 
         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
+          # 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
           v_file << "    v.vm.network :forwarded_port, guest: 22, host: 2222, id: 'ssh', auto_correct: true\n"
           v_file << "    v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true\n"
           v_file << "    v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true\n"
@@ -119,11 +119,11 @@ module Beaker
           # http://www.secnetix.de/olli/FreeBSD/mnamelen.hawk
           # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=167105
           #
-          if host['vagrant_freebsd_nfs'].nil?
-            v_file << "    v.vm.synced_folder '.', '/vagrant', type: 'rsync'\n"
-          else
-            v_file << "    v.vm.synced_folder '.', '/vagrant', :nfs => true\n"
-          end
+          v_file << if host['vagrant_freebsd_nfs'].nil?
+                      "    v.vm.synced_folder '.', '/vagrant', type: 'rsync'\n"
+                    else
+                      "    v.vm.synced_folder '.', '/vagrant', :nfs => true\n"
+                    end
         end
 
         v_file << self.class.provider_vfile_section(host, options)
@@ -135,18 +135,16 @@ module Beaker
 
       # In case this is called directly
       FileUtils.mkdir_p(@vagrant_path)
-      File.open(@vagrant_file, 'w') do |f|
-        f.write(v_file)
-      end
+      File.write(@vagrant_file, v_file)
     end
 
-    def self.provider_vfile_section host, options
+    def self.provider_vfile_section(host, options)
       # Backwards compatibility; default to virtualbox
       Beaker::VagrantVirtualbox.provider_vfile_section(host, options)
     end
 
     def set_all_ssh_config
-      @logger.debug "configure vagrant boxes (set ssh-config, switch to root user, hack etc/hosts)"
+      @logger.debug 'configure vagrant boxes (set ssh-config, switch to root user, hack etc/hosts)'
       @hosts.each do |host|
         if host[:platform] =~ /windows/
           @logger.debug "skip ssh hacks on windows box #{host[:name]}"
@@ -158,16 +156,16 @@ module Beaker
 
         set_ssh_config host, 'vagrant'
 
-        #copy vagrant's keys to roots home dir, to allow for login as root
+        # copy vagrant's keys to roots home dir, to allow for login as root
         copy_ssh_to_root host, @options
-        #ensure that root login is enabled for this host
+        # ensure that root login is enabled for this host
         enable_root_login host, @options
-        #shut down connection, will reconnect on next exec
+        # shut down connection, will reconnect on next exec
         host.close
 
         set_ssh_config host, default_user
 
-        #allow the user to set the env
+        # allow the user to set the env
         begin
           host.ssh_permit_user_environment
           host.close
@@ -179,14 +177,12 @@ module Beaker
       hack_etc_hosts @hosts, @options
     end
 
-    def set_ssh_config host, user
+    def set_ssh_config(host, user)
       return unless Dir.exist?(@vagrant_path)
 
       ssh_config = Dir.chdir(@vagrant_path) do
         stdout, _, status = Open3.capture3(@vagrant_env, 'vagrant', 'ssh-config', host.name)
-        unless status.success?
-          raise "Failed to 'vagrant ssh-config' for #{host.name}"
-        end
+        raise "Failed to 'vagrant ssh-config' for #{host.name}" unless status.success?
 
         Tempfile.create do |f|
           f.write(stdout)
@@ -208,9 +204,10 @@ 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_file = File.expand_path(File.join(@vagrant_path, "Vagrantfile"))
-      @vagrant_env = { "RUBYLIB" => "", "RUBYOPT" => "" }
+      @vagrant_path = File.expand_path(File.join('.vagrant', 'beaker_vagrant_files',
+                                                 'beaker_' + File.basename(options[:hosts_file])))
+      @vagrant_file = File.expand_path(File.join(@vagrant_path, 'Vagrantfile'))
+      @vagrant_env = { 'RUBYLIB' => '', 'RUBYOPT' => '' }
     end
 
     def configure(opts = {})
@@ -227,13 +224,13 @@ module Beaker
     def provision(provider = nil)
       FileUtils.mkdir_p(@vagrant_path)
 
-      #setting up new vagrant hosts
-      #make sure that any old boxes are dead dead dead
+      # setting up new vagrant hosts
+      # make sure that any old boxes are dead dead dead
       begin
-        vagrant_cmd("destroy --force") if File.file?(@vagrant_file)
+        vagrant_cmd('destroy --force') if File.file?(@vagrant_file)
       rescue RuntimeError => e
         # LATER: use <<~MESSAGE once we're on Ruby 2.3
-        @logger.debug(%Q{
+        @logger.debug(%(
           Beaker failed to destroy the existing VM's. If you think this is
           an error or you upgraded from an older version of beaker try
           verifying the VM exists and deleting the existing Vagrantfile if
@@ -243,7 +240,7 @@ module Beaker
           vagrant status
           vagrant destroy # only need to run this is a VM is not created
           rm #{@vagrant_file} # only do this if all VM's are actually destroyed
-        }.each_line.map(&:strip).join("\n"))
+        ).each_line.map(&:strip).join("\n"))
         raise e
       end
 
@@ -255,42 +252,37 @@ module Beaker
     end
 
     def cleanup
-      @logger.debug "removing temporary ssh-config files per-vagrant box"
-      @logger.notify "Destroying vagrant boxes"
-      vagrant_cmd("destroy --force")
+      @logger.debug 'removing temporary ssh-config files per-vagrant box'
+      @logger.notify 'Destroying vagrant boxes'
+      vagrant_cmd('destroy --force')
       FileUtils.rm_rf(@vagrant_path)
     end
 
     def vagrant_cmd(args)
       Dir.chdir(@vagrant_path) do
-        begin
-          retries ||=0
-          Open3.popen3(@vagrant_env, "vagrant #{args}") {|stdin, stdout, stderr, wait_thr|
-            while line = stdout.gets
-              @logger.info(line)
-            end
-
-            unless wait_thr.value.success?
-              raise "Failed to exec 'vagrant #{args}'. Error was #{stderr.read}"
-            end
-          }
-        rescue => e
-          if e.to_s =~ /WinRM/m
-            sleep(10)
-
-            retry if (retries += 1) < 6
+        retries ||= 0
+        Open3.popen3(@vagrant_env, "vagrant #{args}") do |stdin, stdout, stderr, wait_thr|
+          while line = stdout.gets
+            @logger.info(line)
           end
 
-          raise e
+          raise "Failed to exec 'vagrant #{args}'. Error was #{stderr.read}" unless wait_thr.value.success?
         end
+      rescue StandardError => e
+        if e.to_s =~ /WinRM/m
+          sleep(10)
+
+          retry if (retries += 1) < 6
+        end
+
+        raise e
       end
     end
 
     def self.cpus(host, options)
-      case
-      when host['vagrant_cpus']
+      if host['vagrant_cpus']
         host['vagrant_cpus']
-      when options['vagrant_cpus']
+      elsif options['vagrant_cpus']
         options['vagrant_cpus']
       else
         '1'
@@ -298,17 +290,14 @@ module Beaker
     end
 
     def self.memsize(host, options)
-      case
-      when host['vagrant_memsize']
+      if host['vagrant_memsize']
         host['vagrant_memsize']
-      when options['vagrant_memsize']
+      elsif options['vagrant_memsize']
         options['vagrant_memsize']
+      elsif host['platform'] =~ /windows/
+        '2048'
       else
-        if host['platform'] =~ /windows/
-          '2048'
-        else
-          '1024'
-        end
+        '1024'
       end
     end
 

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_desktop.rb

@@ -5,13 +5,17 @@ class Beaker::VagrantDesktop < Beaker::Vagrant
     super
   end
 
-  def self.provider_vfile_section(host, options)   
+  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['memsize'] = '#{memsize(host, options)}'\n"
+    unless host['whitelist_verified'].nil?
+      v_provider <<  "      v.vmx['whitelist_verified'] = '#{host['whitelist_verified']}'\n"
+    end
+    v_provider << "      v.vmx['functional_hgfs'] = '#{host['functional_hgfs']}'\n" unless host['functional_hgfs'].nil?
+    unless host['unmount_default_hgfs'].nil?
+      v_provider <<  "      v.vmx['unmount_default_hgfs'] = '#{host['unmount_default_hgfs']}'\n"
+    end
     v_provider <<  "      v.vmx['utility_port'] = '#{host['utility_port']}'\n" unless host['utility_port'].nil?
     v_provider <<  "    end\n"
   end

data/lib/beaker/hypervisor/vagrant_libvirt.rb

@@ -8,7 +8,7 @@ class Beaker::VagrantLibvirt < Beaker::Vagrant
     # not affect VirtualBox
     vagrant_path_digest = Digest::SHA256.hexdigest(@vagrant_path)
     @vagrant_path += '_' + vagrant_path_digest[0..2] + vagrant_path_digest[-3..-1]
-    @vagrant_file = File.expand_path(File.join(@vagrant_path, "Vagrantfile"))
+    @vagrant_file = File.expand_path(File.join(@vagrant_path, 'Vagrantfile'))
   end
 
   def provision(provider = 'libvirt')

data/lib/beaker/hypervisor/vagrant_parallels.rb

@@ -6,10 +6,10 @@ class Beaker::VagrantParallels < Beaker::Vagrant
   end
 
   def self.provider_vfile_section(host, options)
-    provider_section  = ""
+    provider_section  = ''
     provider_section << "    v.vm.provider :parallels do |prl|\n"
     provider_section << "      prl.optimize_power_consumption = false\n"
-    provider_section << "      prl.memory = '#{memsize(host,options)}'\n"
+    provider_section << "      prl.memory = '#{memsize(host, options)}'\n"
     provider_section << "      prl.update_guest_tools = false\n" if options[:prl_update_guest_tools] == 'disable'
     provider_section << "    end\n"
 

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -1,12 +1,11 @@
 require 'beaker/hypervisor/vagrant'
 
 class Beaker::VagrantVirtualbox < Beaker::Vagrant
-
   CONTROLLER_OPTIONS = {
-    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' ]
+    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']
   }.freeze
 
   def provision(provider = 'virtualbox')
@@ -15,21 +14,24 @@ 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.to_s}'" }.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.to_s}'" }.join(', ')}]\n"
   end
 
   def self.provider_vfile_section(host, options)
     # Allow memory and CPUs to be set at a per node level or overall, and take the most specific setting
     # Removing audio is a workaround of a virtualbox bug that gives error message : "The specified string / bytes buffer was to small"
-    provider_section  = ""
+    provider_section  = ''
     provider_section << "    v.vm.provider :virtualbox do |vb|\n"
-    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{memsize(host,options)}', '--cpus', '#{cpus(host,options)}', '--audio', 'none']\n"
-    provider_section << "      vb.vbguest.auto_update = false" if options[:vbguest_plugin] == 'disable'
+    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{memsize(host,
+                                                                                     options)}', '--cpus', '#{cpus(
+                                                                                       host, options
+                                                                                     )}', '--audio', 'none']\n"
+    provider_section << '      vb.vbguest.auto_update = false' if options[:vbguest_plugin] == 'disable'
 
     # Guest volume support
     # - Creates a new controller (AHCI by default)
@@ -38,40 +40,41 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
     #   as 2:0:0:0, 3:0:0:0 ... much like you'd see on commercial storage boxes
     if host['volumes']
       controller = host['volume_storage_controller'].nil? ? 'IntelAHCI' : host['volume_storage_controller']
-      unless CONTROLLER_OPTIONS.keys.include? controller.to_sym
-        raise "Unknown controller type #{controller}"
-      end
-      if controller == 'USB'
-        provider_section << self.vb_customize_vm('modifyvm', [ '--usb', 'on' ])
-      end
-      provider_section << self.vb_customize_vm('storagectl', [
-        '--name', "Beaker #{controller} Controller" ] + CONTROLLER_OPTIONS[controller.to_sym]
-      )
+      raise "Unknown controller type #{controller}" unless CONTROLLER_OPTIONS.keys.include? controller.to_sym
+
+      provider_section << vb_customize_vm('modifyvm', ['--usb', 'on']) if controller == 'USB'
+      provider_section << vb_customize_vm('storagectl', [
+        '--name', "Beaker #{controller} Controller"
+      ] + CONTROLLER_OPTIONS[controller.to_sym])
       host['volumes'].keys.each_with_index do |volume, index|
         volume_path = "#{host.name}-#{volume}.vdi"
-        provider_section << self.vb_customize('createhd', [
-          '--filename', volume_path,
-          '--size', host['volumes'][volume]['size'],
-        ])
-        provider_section << self.vb_customize_vm('storageattach', [
-          '--storagectl', "Beaker #{controller} Controller",
-          '--port', index,
-          '--device', 0,
-          '--type', 'hdd',
-          '--medium', volume_path,
-        ])
+        provider_section << vb_customize('createhd', [
+                                           '--filename', volume_path,
+                                           '--size', host['volumes'][volume]['size'],
+                                         ])
+        provider_section << vb_customize_vm('storageattach', [
+                                              '--storagectl', "Beaker #{controller} Controller",
+                                              '--port', index,
+                                              '--device', 0,
+                                              '--type', 'hdd',
+                                              '--medium', volume_path,
+                                            ])
       end
     end
 
     provider_section << "      vb.customize ['modifyvm', :id, '--ioapic', 'on']\n" unless host['ioapic'].nil?
 
-    provider_section << "      vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']\n" unless host['natdns'].nil?
+    unless host['natdns'].nil?
+      provider_section << "      vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']\n"
+    end
 
     provider_section << "      vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']\n" unless host['natdns'].nil?
 
     provider_section << "      vb.gui = true\n" unless host['vb_gui'].nil?
 
-    provider_section << "      vb.customize ['modifyvm', :id, '--cpuidset', '1','000206a7','02100800','1fbae3bf','bfebfbff']\n" 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
 
     if host['disk_path']
       unless File.exist?(host['disk_path'])

data/lib/beaker/hypervisor/vagrant_workstation.rb

@@ -5,13 +5,17 @@ class Beaker::VagrantWorkstation < Beaker::Vagrant
     super
   end
 
-  def self.provider_vfile_section(host, options)   
+  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['memsize'] = '#{memsize(host, options)}'\n"
+    unless host['whitelist_verified'].nil?
+      v_provider <<  "      v.vmx['whitelist_verified'] = '#{host['whitelist_verified']}'\n"
+    end
+    v_provider << "      v.vmx['functional_hgfs'] = '#{host['functional_hgfs']}'\n" unless host['functional_hgfs'].nil?
+    unless host['unmount_default_hgfs'].nil?
+      v_provider <<  "      v.vmx['unmount_default_hgfs'] = '#{host['unmount_default_hgfs']}'\n"
+    end
     v_provider <<  "      v.vmx['utility_port'] = '#{host['utility_port']}'\n" unless host['utility_port'].nil?
     v_provider <<  "    end\n"
   end

data/lib/beaker-vagrant/version.rb

@@ -1,3 +1,3 @@
 module BeakerVagrant
-  VERSION = '0.7.1'
+  VERSION = '1.0.0'
 end

data/spec/beaker/hypervisor/vagrant_custom_spec.rb

@@ -1,25 +1,25 @@
 require 'spec_helper'
 
 describe Beaker::VagrantCustom do
-  let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
-  let( :vagrant ) { Beaker::VagrantCustom.new( @hosts, options ) }
+  let(:options) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double.as_null_object }) }
+  let(:vagrant) { Beaker::VagrantCustom.new(@hosts, options) }
 
   let(:test_dir) { 'tmp/tests' }
-  let(:custom_vagrant_file_path)  { File.expand_path(test_dir + '/CustomVagrantfile')   }
+  let(:custom_vagrant_file_path) { File.expand_path(test_dir + '/CustomVagrantfile') }
 
   before :each do
-    @hosts = make_hosts()
+    @hosts = make_hosts
   end
 
-  it "uses the vagrant_custom provider for provisioning" do
+  it 'uses the vagrant_custom 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" ).once
+    expect(vagrant).to receive(:hack_etc_hosts).with(@hosts, options).once
+    expect(vagrant).to receive(:vagrant_cmd).with('up').once
     FakeFS do
       vagrant.provision
     end
@@ -27,14 +27,14 @@ describe Beaker::VagrantCustom do
 
   context 'takes vagrant configuration from existing file' do
     it 'writes the vagrant file to the correct location' do
-      options.merge!({ :vagrantfile_path => custom_vagrant_file_path })
+      options.merge!({ vagrantfile_path: custom_vagrant_file_path })
 
       create_files([custom_vagrant_file_path])
 
-      vagrant_file_contents = <<-EOF
-FOO
+      vagrant_file_contents = <<~EOF
+        FOO
       EOF
-      File.open(custom_vagrant_file_path, 'w') { |file| file.write(vagrant_file_contents) }
+      File.write(custom_vagrant_file_path, vagrant_file_contents)
 
       vagrant_copy_location = "#{test_dir}/NewVagrantLocation"
       vagrant.instance_variable_set(:@vagrant_file, vagrant_copy_location)
@@ -42,6 +42,5 @@ FOO
       vagrant_copy_file = File.open(vagrant_copy_location, 'r')
       expect(vagrant_copy_file.read).to be === vagrant_file_contents
     end
-
   end
 end

data/spec/beaker/hypervisor/vagrant_desktop_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 describe Beaker::VagrantDesktop 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_desktop provider for provisioning" do
+  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
+      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
+    expect(vagrant).to receive(:hack_etc_hosts).with(hosts, options).once
+    expect(vagrant).to receive(:vagrant_cmd).with('up --provider vmware_desktop').once
     FakeFS do
       vagrant.provision
     end
@@ -27,32 +27,32 @@ describe Beaker::VagrantDesktop do
       end
     end
 
-    it "for a set of hosts" do
-      is_expected.to include( %Q{    v.vm.provider :vmware_desktop do |v|\n      v.vmx['memsize'] = '1024'\n    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))
     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