vagrant-vsphere 0.19.0 → 0.19.1

data/lib/vSphere/action/get_state.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
         include Util::VimHelpers
         include Util::VmHelpers
 
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
@@ -26,9 +26,7 @@ module VagrantPlugins
 
           vm = get_vm_by_uuid connection, machine
 
-          if vm.nil?
-            return :not_created
-          end
+          return :not_created if vm.nil?
 
           if powered_on?(vm)
             :running
@@ -40,4 +38,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vSphere/action/is_created.rb

@@ -2,7 +2,7 @@ module VagrantPlugins
   module VSphere
     module Action
       class IsCreated
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
@@ -13,4 +13,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vSphere/action/is_running.rb

@@ -5,8 +5,8 @@ module VagrantPlugins
     module Action
       class IsRunning
         include Util::MachineHelpers
-        
-        def initialize(app, env)
+
+        def initialize(app, _env)
           @app = app
         end
 

data/lib/vSphere/action/message_already_created.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module VSphere
     module Action
       class MessageAlreadyCreated
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
@@ -15,4 +15,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vSphere/action/message_not_created.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module VSphere
     module Action
       class MessageNotCreated
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 

data/lib/vSphere/action/message_not_running.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module VSphere
     module Action
       class MessageNotRunning
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 

data/lib/vSphere/action/power_off.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
         include Util::VimHelpers
         include Util::VmHelpers
 
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
@@ -37,4 +37,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vSphere/action/power_on.rb

@@ -12,7 +12,7 @@ module VagrantPlugins
         include Util::VmHelpers
         include Util::MachineHelpers
 
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
@@ -21,10 +21,10 @@ module VagrantPlugins
 
           env[:ui].info I18n.t('vsphere.power_on_vm')
           power_on_vm(vm)
-          
-          # wait for SSH to be available 
+
+          # wait for SSH to be available
           wait_for_ssh env
-          
+
           @app.call env
         end
       end

data/lib/vSphere/config.rb

@@ -28,7 +28,7 @@ module VagrantPlugins
         errors = _detected_errors
 
         if password == :ask || password.nil?
-          self.password = machine.ui.ask("vSphere Password (will be hidden): ", echo: false)
+          self.password = machine.ui.ask('vSphere Password (will be hidden): ', echo: false)
         end
 
         # TODO: add blank?
@@ -38,7 +38,7 @@ module VagrantPlugins
         errors <<  I18n.t('vsphere.config.template') if template_name.nil?
 
         # Only required if we're cloning from an actual template
-        errors << I18n.t('vsphere.config.compute_resource') if compute_resource_name.nil? and not clone_from_vm
+        errors << I18n.t('vsphere.config.compute_resource') if compute_resource_name.nil? && !clone_from_vm
 
         { 'vSphere Provider' => errors }
       end

data/lib/vSphere/plugin.rb

@@ -1,13 +1,13 @@
 begin
-  require "vagrant"
+  require 'vagrant'
 rescue LoadError
-  raise "The Vagrant vSphere plugin must be run within Vagrant."
+  raise 'The Vagrant vSphere plugin must be run within Vagrant.'
 end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < "1.5"
-  raise "The Vagrant vSphere plugin is only compatible with Vagrant 1.5+"
+if Vagrant::VERSION < '1.5'
+  fail 'The Vagrant vSphere plugin is only compatible with Vagrant 1.5+'
 end
 
 module VagrantPlugins
@@ -30,11 +30,10 @@ module VagrantPlugins
         Provider
       end
 
-
       def self.setup_i18n
         I18n.load_path << File.expand_path('locales/en.yml', VSphere.source_root)
         I18n.reload!
       end
     end
   end
-end
+end

data/lib/vSphere/provider.rb

@@ -36,4 +36,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vSphere/util/machine_helpers.rb

@@ -3,16 +3,16 @@ module VagrantPlugins
     module Util
       module MachineHelpers
         def wait_for_ssh(env)
-          if not env[:machine].config.vm.communicator.nil? and env[:machine].config.vm.communicator == :winrm
-            env[:ui].info(I18n.t("vsphere.waiting_for_winrm"))
+          if !env[:machine].config.vm.communicator.nil? && env[:machine].config.vm.communicator == :winrm
+            env[:ui].info(I18n.t('vsphere.waiting_for_winrm'))
           else
-            env[:ui].info(I18n.t("vsphere.waiting_for_ssh"))
+            env[:ui].info(I18n.t('vsphere.waiting_for_ssh'))
           end
-          
-          while true                        
+
+          loop do
             break if env[:machine].communicate.ready?
             sleep 5
-          end  
+          end
         end
       end
     end

data/lib/vSphere/util/vim_helpers.rb

@@ -5,7 +5,7 @@ module VagrantPlugins
     module Util
       module VimHelpers
         def get_datacenter(connection, machine)
-          connection.serviceInstance.find_datacenter(machine.provider_config.data_center_name) or fail Errors::VSphereError, :missing_datacenter
+          connection.serviceInstance.find_datacenter(machine.provider_config.data_center_name) || fail(Errors::VSphereError, :missing_datacenter)
         end
 
         def get_vm_by_uuid(connection, machine)
@@ -13,16 +13,18 @@ module VagrantPlugins
         end
 
         def get_resource_pool(datacenter, machine)
-          computeResource = get_compute_resource(datacenter, machine)
-          rp = computeResource.resourcePool
-          if !(machine.provider_config.resource_pool_name.nil?)
-            rp = computeResource.resourcePool.find(machine.provider_config.resource_pool_name) or  fail Errors::VSphereError, :missing_resource_pool
+          compute_resource = get_compute_resource(datacenter, machine)
+          rp = compute_resource.resourcePool
+          unless machine.provider_config.resource_pool_name.nil?
+            rp = compute_resource.resourcePool.find(machine.provider_config.resource_pool_name)
+            fail Errors::VSphereError, :missing_resource_pool if rp.nil?
           end
           rp
         end
 
         def get_compute_resource(datacenter, machine)
-          cr = find_clustercompute_or_compute_resource(datacenter, machine.provider_config.compute_resource_name) or fail Errors::VSphereError, :missing_compute_resource
+          cr = find_clustercompute_or_compute_resource(datacenter, machine.provider_config.compute_resource_name)
+          fail Errors::VSphereError, :missing_compute_resource if cr.nil?
           cr
         end
 
@@ -36,50 +38,52 @@ module VagrantPlugins
           end
           return datacenter.hostFolder if es.empty?
           final = es.pop
-          
-          p = es.inject(datacenter.hostFolder) do |f,e|
+
+          p = es.inject(datacenter.hostFolder) do |f, e|
             f.find(e, RbVmomi::VIM::Folder) || return
           end
 
           begin
-            if x = p.find(final, RbVmomi::VIM::ComputeResource)
+            if (x = p.find(final, RbVmomi::VIM::ComputeResource))
               x
-            elsif x = p.find(final, RbVmomi::VIM::ClusterComputeResource)
+            elsif (x = p.find(final, RbVmomi::VIM::ClusterComputeResource))
               x
-            else
-              nil
             end
-          rescue Exception => e
-# When looking for the ClusterComputeResource there seems to be some parser error in RbVmomi Folder.find, try this instead
-            x = p.childEntity.find { |x| x.name == final }
-            if x.is_a? RbVmomi::VIM::ClusterComputeResource or x.is_a? RbVmomi::VIM::ComputeResource
+          rescue Exception
+            # When looking for the ClusterComputeResource there seems to be some parser error in RbVmomi Folder.find, try this instead
+            x = p.childEntity.find { |x2| x2.name == final }
+            if x.is_a?(RbVmomi::VIM::ClusterComputeResource) || x.is_a?(RbVmomi::VIM::ComputeResource)
               x
             else
-              puts "ex unknown type " + x.to_json
+              puts 'ex unknown type ' + x.to_json
               nil
             end
           end
-
         end
 
         def get_customization_spec_info_by_name(connection, machine)
           name = machine.provider_config.customization_spec_name
           return if name.nil? || name.empty?
 
-          manager = connection.serviceContent.customizationSpecManager or fail Errors::VSphereError, :null_configuration_spec_manager if manager.nil?
-          spec = manager.GetCustomizationSpec(:name => name) or fail Errors::VSphereError, :missing_configuration_spec if spec.nil?
+          manager = connection.serviceContent.customizationSpecManager
+          fail Errors::VSphereError, :null_configuration_spec_manager if manager.nil?
+
+          spec = manager.GetCustomizationSpec(name: name)
+          fail Errors::VSphereError, :missing_configuration_spec if spec.nil?
+
+          spec
         end
 
         def get_datastore(datacenter, machine)
           name = machine.provider_config.data_store_name
           return if name.nil? || name.empty?
 
-# find_datastore uses folder datastore that only lists Datastore and not StoragePod, if not found also try datastoreFolder which contains StoragePod(s)
-          datacenter.find_datastore name or datacenter.datastoreFolder.traverse name or fail Errors::VSphereError, :missing_datastore
+          # find_datastore uses folder datastore that only lists Datastore and not StoragePod, if not found also try datastoreFolder which contains StoragePod(s)
+          datacenter.find_datastore(name) || datacenter.datastoreFolder.traverse(name) || fail(Errors::VSphereError, :missing_datastore)
         end
 
         def get_network_by_name(dc, name)
-          dc.network.find { |f| f.name == name } or fail Errors::VSphereError, :missing_vlan
+          dc.network.find { |f| f.name == name } || fail(Errors::VSphereError, :missing_vlan)
         end
       end
     end

data/lib/vSphere/util/vm_helpers.rb

@@ -3,7 +3,6 @@ require 'rbvmomi'
 module VagrantPlugins
   module VSphere
     module Util
-
       module VmState
         POWERED_ON = 'poweredOn'
         POWERED_OFF = 'poweredOff'
@@ -37,4 +36,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '0.19.0'
+    VERSION = '0.19.1'
   end
 end

data/lib/vagrant-vsphere.rb

@@ -15,4 +15,4 @@ module VagrantPlugins
       @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
   end
-end
+end

data/spec/action_spec.rb

@@ -56,6 +56,7 @@ describe VagrantPlugins::VSphere::Action do
     end
 
     it 'should power off the VM' do
+      @machine.state.stub(:id).and_return(:running)
       VagrantPlugins::VSphere::Action::PowerOff.any_instance.should_receive(:call)
 
       run_destroy

data/spec/clone_spec.rb

@@ -9,26 +9,26 @@ describe VagrantPlugins::VSphere::Action::Clone do
 
   it "should create a CloneVM task with template's parent" do
     call
-    expect(@template).to have_received(:CloneVM_Task).with({
-      :folder => @data_center,
-      :name => NAME,
-      :spec => {:location => {:pool => @child_resource_pool}, 
-        :config => RbVmomi::VIM.VirtualMachineConfigSpec }
-    })
+    expect(@template).to have_received(:CloneVM_Task).with(
+      folder: @data_center,
+      name: NAME,
+      spec: { location: { pool: @child_resource_pool },
+              config: RbVmomi::VIM.VirtualMachineConfigSpec }
+    )
   end
 
   it 'should create a CloneVM task with custom folder when given vm base path' do
     custom_base_folder = double(CUSTOM_VM_FOLDER,
-                                :pretty_path => "#{@data_center.pretty_path}/#{CUSTOM_VM_FOLDER}")
+                                pretty_path: "#{@data_center.pretty_path}/#{CUSTOM_VM_FOLDER}")
     @machine.provider_config.stub(:vm_base_path).and_return(CUSTOM_VM_FOLDER)
     @data_center.vmFolder.stub(:traverse).with(CUSTOM_VM_FOLDER, RbVmomi::VIM::Folder, true).and_return(custom_base_folder)
     call
-    expect(@template).to have_received(:CloneVM_Task).with({
-      :folder => custom_base_folder,
-      :name => NAME,
-      :spec => {:location => {:pool => @child_resource_pool},
-        :config => RbVmomi::VIM.VirtualMachineConfigSpec }
-    })
+    expect(@template).to have_received(:CloneVM_Task).with(
+      folder: custom_base_folder,
+      name: NAME,
+      spec: { location: { pool: @child_resource_pool },
+              config: RbVmomi::VIM.VirtualMachineConfigSpec }
+    )
   end
 
   it 'should set the machine id to be the new UUID' do
@@ -43,46 +43,44 @@ describe VagrantPlugins::VSphere::Action::Clone do
 
   it 'should create a CloneVM spec with configured vlan' do
     @machine.provider_config.stub(:vlan).and_return('vlan')
-    network = double('network', :name => 'vlan')
+    network = double('network', name: 'vlan')
     network.stub(:config).and_raise(StandardError)
     @data_center.stub(:network).and_return([network])
     call
 
-    expected_config = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
-    expected_dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => @device, :operation => "edit")
+    expected_config = RbVmomi::VIM.VirtualMachineConfigSpec(deviceChange: Array.new)
+    expected_dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(device: @device, operation: 'edit')
     expected_config[:deviceChange].push expected_dev_spec
 
-    expect(@template).to have_received(:CloneVM_Task).with({
-      :folder => @data_center,
-      :name => NAME,
-      :spec => {:location => 
-        {:pool => @child_resource_pool},
-          :config => expected_config
+    expect(@template).to have_received(:CloneVM_Task).with(
+      folder: @data_center,
+      name: NAME,
+      spec: { location:         { pool: @child_resource_pool },
+              config: expected_config
       }
-    })
+    )
   end
 
   it 'should create a CloneVM spec with configured memory_mb' do
     @machine.provider_config.stub(:memory_mb).and_return(2048)
     call
-    expect(@template).to have_received(:CloneVM_Task).with({
-      :folder => @data_center,
-      :name => NAME,
-      :spec => {:location => {:pool => @child_resource_pool}, 
-        :config => RbVmomi::VIM.VirtualMachineConfigSpec(:memoryMB => 2048) },
-    })
+    expect(@template).to have_received(:CloneVM_Task).with(
+      folder: @data_center,
+      name: NAME,
+      spec: { location: { pool: @child_resource_pool },
+              config: RbVmomi::VIM.VirtualMachineConfigSpec(memoryMB: 2048) }
+    )
   end
 
-
   it 'should create a CloneVM spec with configured number of cpus' do
     @machine.provider_config.stub(:cpu_count).and_return(4)
     call
-    expect(@template).to have_received(:CloneVM_Task).with({
-      :folder => @data_center,
-      :name => NAME,
-      :spec => {:location => {:pool => @child_resource_pool}, 
-        :config => RbVmomi::VIM.VirtualMachineConfigSpec(:numCPUs => 4) },
-    })
+    expect(@template).to have_received(:CloneVM_Task).with(
+      folder: @data_center,
+      name: NAME,
+      spec: { location: { pool: @child_resource_pool },
+              config: RbVmomi::VIM.VirtualMachineConfigSpec(numCPUs: 4) }
+    )
   end
 
   it 'should set static IP when given config spec' do
@@ -94,11 +92,11 @@ describe VagrantPlugins::VSphere::Action::Clone do
   it 'should use root resource pool when cloning from template and no resource pool specified' do
     @machine.provider_config.stub(:resource_pool_name).and_return(nil)
     call
-    expect(@template).to have_received(:CloneVM_Task).with({
-      :folder => @data_center,
-      :name => NAME,
-      :spec => {:location => {:pool => @root_resource_pool }, 
-        :config => RbVmomi::VIM.VirtualMachineConfigSpec }
-    })
+    expect(@template).to have_received(:CloneVM_Task).with(
+      folder: @data_center,
+      name: NAME,
+      spec: { location: { pool: @root_resource_pool },
+              config: RbVmomi::VIM.VirtualMachineConfigSpec }
+    )
   end
 end