vagrant-vsphere 0.19.0 → 0.19.1

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 # Immediately sync all stdout so that tools like buildbot can
 # immediately load in the output.
@@ -14,4 +15,6 @@ Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new
 
-task :default => 'spec'
+RuboCop::RakeTask.new
+
+task default: %w(rubocop spec)

data/lib/vSphere/action.rb

@@ -6,18 +6,16 @@ module VagrantPlugins
     module Action
       include Vagrant::Action::Builtin
 
-      #Vagrant commands
+      # Vagrant commands
       def self.action_destroy
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use ConnectVSphere
 
           b.use Call, IsRunning do |env, b2|
-            if [:result]
-              b2.use Call, GracefulHalt, :poweroff, :running do |env, b3|
-                if !env[:result]
-                  b3.use PowerOff
-                end
+            if env[:result]
+              b2.use Call, GracefulHalt, :poweroff, :running do |env2, b3|
+                b3.use PowerOff unless env2[:result]
               end
             end
           end
@@ -29,13 +27,13 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
 
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
+            b2.use Call, IsRunning do |env2, b3|
+              unless env2[:result]
                 b3.use MessageNotRunning
                 next
               end
@@ -51,13 +49,13 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
 
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
+            b2.use Call, IsRunning do |env2, b3|
+              unless env2[:result]
                 b3.use MessageNotRunning
                 next
               end
@@ -72,13 +70,13 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
 
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
+            b2.use Call, IsRunning do |env2, b3|
+              unless env2[:result]
                 b3.use MessageNotRunning
                 next
               end
@@ -103,9 +101,7 @@ module VagrantPlugins
             b2.use Clone
           end
           b.use Call, IsRunning do |env, b2|
-            if !env[:result]
-              b2.use PowerOn
-            end
+            b2.use PowerOn unless env[:result]
           end
           b.use CloseVSphere
           b.use Provision
@@ -119,21 +115,19 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use ConnectVSphere
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
 
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
+            b2.use Call, IsRunning do |env2, b3|
+              unless env2[:result]
                 b3.use MessageNotRunning
                 next
               end
 
-              b3.use Call, GracefulHalt, :poweroff, :running do |env, b4|
-                if !env[:result]
-                  b4.use PowerOff
-                end
+              b3.use Call, GracefulHalt, :poweroff, :running do |env3, b4|
+                b4.use PowerOff unless env3[:result]
               end
             end
           end
@@ -145,7 +139,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConnectVSphere
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -155,7 +149,7 @@ module VagrantPlugins
         end
       end
 
-      #vSphere specific actions
+      # vSphere specific actions
       def self.action_get_state
         Vagrant::Action::Builder.new.tap do |b|
           b.use HandleBox
@@ -175,7 +169,7 @@ module VagrantPlugins
         end
       end
 
-      #autoload
+      # autoload
       action_root = Pathname.new(File.expand_path('../action', __FILE__))
       autoload :Clone, action_root.join('clone')
       autoload :CloseVSphere, action_root.join('close_vsphere')

data/lib/vSphere/action/clone.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
         include Util::VimHelpers
         include Util::MachineHelpers
 
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
@@ -21,17 +21,17 @@ module VagrantPlugins
           name = get_name machine, config, env[:root_path]
           dc = get_datacenter connection, machine
           template = dc.find_vm config.template_name
-          raise Errors::VSphereError, :'missing_template' if template.nil?
+          fail Errors::VSphereError, :'missing_template' if template.nil?
           vm_base_folder = get_vm_base_folder dc, template, config
-          raise Errors::VSphereError, :'invalid_base_path' if vm_base_folder.nil?
+          fail Errors::VSphereError, :'invalid_base_path' if vm_base_folder.nil?
 
           begin
-# Storage DRS does not support vSphere linked clones. http://www.vmware.com/files/pdf/techpaper/vsphere-storage-drs-interoperability.pdf
+            # Storage DRS does not support vSphere linked clones. http://www.vmware.com/files/pdf/techpaper/vsphere-storage-drs-interoperability.pdf
             ds = get_datastore dc, machine
-            raise Errors::VSphereError, :'invalid_configuration_linked_clone_with_sdrs' if config.linked_clone and datastore.is_a? RbVmomi::VIM::StoragePod
+            fail Errors::VSphereError, :'invalid_configuration_linked_clone_with_sdrs' if config.linked_clone && datastore.is_a?(RbVmomi::VIM::StoragePod)
 
             location = get_location ds, dc, machine, template
-            spec = RbVmomi::VIM.VirtualMachineCloneSpec :location => location, :powerOn => true, :template => false
+            spec = RbVmomi::VIM.VirtualMachineCloneSpec location: location, powerOn: true, template: false
             spec[:config] = RbVmomi::VIM.VirtualMachineConfigSpec
             customization_info = get_customization_spec_info_by_name connection, machine
 
@@ -41,47 +41,47 @@ module VagrantPlugins
             add_custom_memory(spec, config.memory_mb) unless config.memory_mb.nil?
             add_custom_cpu(spec, config.cpu_count) unless config.cpu_count.nil?
 
-            if !config.clone_from_vm and ds.is_a? RbVmomi::VIM::StoragePod
+            if !config.clone_from_vm && ds.is_a?(RbVmomi::VIM::StoragePod)
 
-              storageMgr = connection.serviceContent.storageResourceManager
-              podSpec = RbVmomi::VIM.StorageDrsPodSelectionSpec(:storagePod => ds)
-# TODO: May want to add option on type? 
-              storageSpec = RbVmomi::VIM.StoragePlacementSpec(:type => 'clone', :cloneName => name, :folder => vm_base_folder, :podSelectionSpec => podSpec, :vm => template, :cloneSpec => spec)
+              storage_mgr = connection.serviceContent.storageResourceManager
+              pod_spec = RbVmomi::VIM.StorageDrsPodSelectionSpec(storagePod: ds)
+              # TODO: May want to add option on type?
+              storage_spec = RbVmomi::VIM.StoragePlacementSpec(type: 'clone', cloneName: name, folder: vm_base_folder, podSelectionSpec: pod_spec, vm: template, cloneSpec: spec)
 
               env[:ui].info I18n.t('vsphere.requesting_sdrs_recommendation')
               env[:ui].info " -- DatastoreCluster: #{ds.name}"
               env[:ui].info " -- Template VM: #{template.pretty_path}"
               env[:ui].info " -- Target VM: #{vm_base_folder.pretty_path}/#{name}"
 
-              result = storageMgr.RecommendDatastores(:storageSpec => storageSpec)
+              result = storage_mgr.RecommendDatastores(storageSpec: storage_spec)
 
               recommendation = result.recommendations[0]
               key = recommendation.key ||= ''
               if key == ''
-                raise Errors::VSphereError, :missing_datastore_recommendation
+                fail Errors::VSphereError, :missing_datastore_recommendation
               end
 
               env[:ui].info I18n.t('vsphere.creating_cloned_vm_sdrs')
               env[:ui].info " -- Storage DRS recommendation: #{recommendation.target.name} #{recommendation.reasonText}"
 
-              applySRresult = storageMgr.ApplyStorageDrsRecommendation_Task(:key => [key]).wait_for_completion
-              new_vm = applySRresult.vm
+              apply_sr_result = storage_mgr.ApplyStorageDrsRecommendation_Task(key: [key]).wait_for_completion
+              new_vm = apply_sr_result.vm
 
             else
 
               env[:ui].info I18n.t('vsphere.creating_cloned_vm')
-              env[:ui].info " -- #{config.clone_from_vm ? "Source" : "Template"} VM: #{template.pretty_path}"
+              env[:ui].info " -- #{config.clone_from_vm ? 'Source' : 'Template'} VM: #{template.pretty_path}"
               env[:ui].info " -- Target VM: #{vm_base_folder.pretty_path}/#{name}"
 
-              new_vm = template.CloneVM_Task(:folder => vm_base_folder, :name => name, :spec => spec).wait_for_completion
+              new_vm = template.CloneVM_Task(folder: vm_base_folder, name: name, spec: spec).wait_for_completion
             end
-          rescue Errors::VSphereError => e
+          rescue Errors::VSphereError
             raise
-          rescue Exception => e
+          rescue StandardError => e
             raise Errors::VSphereError.new, e.message
           end
 
-          #TODO: handle interrupted status in the environment, should the vm be destroyed?
+          # TODO: handle interrupted status in the environment, should the vm be destroyed?
 
           machine.id = new_vm.config.uuid
 
@@ -103,7 +103,7 @@ module VagrantPlugins
           return customization_spec if private_networks.nil?
 
           # make sure we have enough NIC settings to override with the private network settings
-          raise Errors::VSphereError, :'too_many_private_networks' if private_networks.length > customization_spec.nicSettingMap.length
+          fail Errors::VSphereError, :'too_many_private_networks' if private_networks.length > customization_spec.nicSettingMap.length
 
           # assign the private network IP to the NIC
           private_networks.each_index do |idx|
@@ -124,28 +124,28 @@ module VagrantPlugins
             # Thus, this code first create a delta disk on top of the base disk for
             # the to-be-cloned VM, if delta disks aren't used already.
             disks = template.config.hardware.device.grep(RbVmomi::VIM::VirtualDisk)
-            disks.select { |disk| disk.backing.parent == nil }.each do |disk|
+            disks.select { |disk| disk.backing.parent.nil? }.each do |disk|
               spec = {
-                  :deviceChange => [
-                      {
-                          :operation => :remove,
-                          :device => disk
-                      },
-                      {
-                          :operation => :add,
-                          :fileOperation => :create,
-                          :device => disk.dup.tap { |new_disk|
-                            new_disk.backing = new_disk.backing.dup
-                            new_disk.backing.fileName = "[#{disk.backing.datastore.name}]"
-                            new_disk.backing.parent = disk.backing
-                          },
-                      }
-                  ]
+                deviceChange: [
+                  {
+                    operation: :remove,
+                    device: disk
+                  },
+                  {
+                    operation: :add,
+                    fileOperation: :create,
+                    device: disk.dup.tap do |new_disk|
+                              new_disk.backing = new_disk.backing.dup
+                              new_disk.backing.fileName = "[#{disk.backing.datastore.name}]"
+                              new_disk.backing.parent = disk.backing
+                            end
+                  }
+                ]
               }
-              template.ReconfigVM_Task(:spec => spec).wait_for_completion
+              template.ReconfigVM_Task(spec: spec).wait_for_completion
             end
 
-            location = RbVmomi::VIM.VirtualMachineRelocateSpec(:diskMoveType => :moveChildMostDiskBacking)
+            location = RbVmomi::VIM.VirtualMachineRelocateSpec(diskMoveType: :moveChildMostDiskBacking)
           elsif datastore.is_a? RbVmomi::VIM::StoragePod
             location = RbVmomi::VIM.VirtualMachineRelocateSpec
           else
@@ -160,17 +160,17 @@ module VagrantPlugins
         def get_name(machine, config, root_path)
           return config.name unless config.name.nil?
 
-          prefix = "#{root_path.basename.to_s}_#{machine.name}"
-          prefix.gsub!(/[^-a-z0-9_\.]/i, "")
+          prefix = "#{root_path.basename}_#{machine.name}"
+          prefix.gsub!(/[^-a-z0-9_\.]/i, '')
           # milliseconds + random number suffix to allow for simultaneous `vagrant up` of the same box in different dirs
-          prefix + "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
+          prefix + "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100_000)}"
         end
 
         def get_vm_base_folder(dc, template, config)
           if config.vm_base_path.nil?
             template.parent
           else
-            dc.vmFolder.traverse(config.vm_base_path, RbVmomi::VIM::Folder, create = true)
+            dc.vmFolder.traverse(config.vm_base_path, RbVmomi::VIM::Folder, true)
           end
         end
 
@@ -182,7 +182,7 @@ module VagrantPlugins
 
           yield(@card)
 
-          dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => @card, :operation => "edit")
+          dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(device: @card, operation: 'edit')
           spec[:config][:deviceChange].push dev_spec
           spec[:config][:deviceChange].uniq!
         end
@@ -198,11 +198,11 @@ module VagrantPlugins
 
           modify_network_card(template, spec) do |card|
             begin
-              switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(:switchUuid => network.config.distributedVirtualSwitch.uuid, :portgroupKey => network.key)
+              switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(switchUuid: network.config.distributedVirtualSwitch.uuid, portgroupKey: network.key)
               card.backing.port = switch_port
             rescue
               # not connected to a distibuted switch?
-              card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(:network => network, :deviceName => network.name)
+              card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(network: network, deviceName: network.name)
             end
           end
         end

data/lib/vSphere/action/close_vsphere.rb

@@ -4,21 +4,19 @@ module VagrantPlugins
   module VSphere
     module Action
       class CloseVSphere
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
         def call(env)
-          begin
-            env[:vSphere_connection].close
-            @app.call env
-          rescue Errors::VSphereError => e
-            raise
-          rescue Exception => e
-            raise Errors::VSphereError.new, e.message
-          end
+          env[:vSphere_connection].close
+          @app.call env
+        rescue Errors::VSphereError
+          raise
+        rescue StandardError => e
+          raise Errors::VSphereError.new, e.message
         end
       end
     end
   end
-end
+end

data/lib/vSphere/action/connect_vsphere.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module VSphere
     module Action
       class ConnectVSphere
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
@@ -13,13 +13,13 @@ module VagrantPlugins
 
           begin
             env[:vSphere_connection] = RbVmomi::VIM.connect host: config.host,
-              user: config.user, password: config.password,
-              insecure: config.insecure, proxyHost: config.proxy_host,
-              proxyPort: config.proxy_port
+                                                            user: config.user, password: config.password,
+                                                            insecure: config.insecure, proxyHost: config.proxy_host,
+                                                            proxyPort: config.proxy_port
             @app.call env
-          rescue Errors::VSphereError => e
+          rescue Errors::VSphereError
             raise
-          rescue Exception => e
+          rescue StandardError => e
             raise Errors::VSphereError.new, e.message
           end
         end

data/lib/vSphere/action/destroy.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
       class Destroy
         include Util::VimHelpers
 
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
@@ -19,8 +19,8 @@ module VagrantPlugins
           @app.call env
         end
 
-        private 
-        
+        private
+
         def destroy_vm(env)
           vm = get_vm_by_uuid env[:vSphere_connection], env[:machine]
           return if vm.nil?
@@ -28,13 +28,13 @@ module VagrantPlugins
           begin
             env[:ui].info I18n.t('vsphere.destroy_vm')
             vm.Destroy_Task.wait_for_completion
-          rescue Errors::VSphereError => e
+          rescue Errors::VSphereError
             raise
-          rescue Exception => e
+          rescue StandardError => e
             raise Errors::VSphereError.new, e.message
           end
         end
       end
     end
   end
-end
+end

data/lib/vSphere/action/get_ssh_info.rb

@@ -7,8 +7,7 @@ module VagrantPlugins
       class GetSshInfo
         include Util::VimHelpers
 
-
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
         end
 
@@ -27,9 +26,9 @@ module VagrantPlugins
 
           return nil if vm.nil?
           return nil if vm.guest.ipAddress.nil? || vm.guest.ipAddress.empty?
-          return {
-              :host => vm.guest.ipAddress,
-              :port => 22
+          {
+            host: vm.guest.ipAddress,
+            port: 22
           }
         end
       end