vagrant-vsphere 1.13.5 → 1.14.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa08d8d6114c99130e7734b30a121ce7974b405927ad2ae1dfdf7b5df75c0e7a
-  data.tar.gz: fad32b2024c114ef16cd30372cdee7056d785c1ea3886cbff64f9f11c259166f
+  metadata.gz: a2c2f3104d84ad0220c48752678d997a9a856527790961de1bf874c174f2ca91
+  data.tar.gz: d341a5d0d4c15da2376e33946fbcaca800e561e384d21677ce059522fe2255ca
 SHA512:
-  metadata.gz: cd46b2452ec25e62735b21deee3489bafff11f8624f50dfeba604b4b1254401d9aeed2833402838f058e8a33e287a8f2bfc87f9eab1b27106cc7f6c65b262913
-  data.tar.gz: ee875addfb3c573036b7be6bd2621162bb2701009071f4392e5203fc1bbca78fb4271556e149cf07c33feb1c5973efdbe5408f8379a34cf92d12e060de7b9410
+  metadata.gz: dcbcfa728e970b142bae1c3353ba6c87be4a4988586df400dc7a80c742bb53970de31650c2e62a287dde3c1aa295c43817f7436d326d26283e7b51711cbaa46e
+  data.tar.gz: 6567b087ba97251076ec7f282b48c1214d8c5e8d67aa3f0107316c33461a5cfd62937ad434ea5c43054e325123feb90a9f739892e313851174e4fe116a9f79b1

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.13.5
+current_version = 1.14.0.pre1
 tag = true
 commit = true
 
@@ -8,3 +8,4 @@ commit = true
 [bumpversion:file:README.md]
 parse = version: (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
 serialize = version: {major}.{minor}.{patch}
+

data/.rubocop.yml

@@ -32,3 +32,18 @@ Metrics/ModuleLength:
 
 Metrics/PerceivedComplexity:
   Enabled: false
+
+# Disabled these cops upgrading rubocop to 1.25.0
+# TODO:Correct the issues found by these cops someday
+Lint/MissingSuper:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Naming:
+  Enabled: false
+
+# TODO: Add required ruby version to gemspec
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+ruby-3.0.2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.14.0 (2022-04-12)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.14.0.pre1)
+
+  - Update gem to ruby 3.0.2
+  - Support for vagrant >=2.2.17
+  - Update nokogiri dependency (1.13.4) to take care of dependabot alerts
+  - Update rbvmomi, rake, rubocop dependencies
+
 ## [1.13.5 (2021-01-05)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.13.5)
   - Pin nokogiri to 1.10.10. This fixes an issue where vagrant-vsphere failed to install due to 
     nokogiri requiring Ruby >=2.5.  This is a workaround until the vagrant-nsidc plugin is updated

data/Gemfile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', github: 'mitchellh/vagrant', ref: 'v2.2.6'
+  gem 'vagrant', github: 'mitchellh/vagrant', ref: 'v2.2.19'
 end
 
 group :plugins do

data/README.md

@@ -19,9 +19,9 @@ This provider is built on top of the
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**version: 1.13.5**
+**version: 1.14.0.pre1**
 
-vagrant-vsphere (**version: 1.13.5**) is available from
+vagrant-vsphere (**version: 1.14.0.pre1**) is available from
 [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler/setup'
 require 'rspec/core/rake_task'
@@ -9,7 +11,7 @@ $stdout.sync = true
 $stderr.sync = true
 
 # Change to the directory of this file.
-Dir.chdir(File.expand_path('../', __FILE__))
+Dir.chdir(File.expand_path(__dir__))
 
 Bundler::GemHelper.install_tasks
 
@@ -17,4 +19,4 @@ RSpec::Core::RakeTask.new
 
 RuboCop::RakeTask.new
 
-task default: %w(rubocop spec)
+task default: %w[rubocop spec]

data/lib/vSphere/action/clone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'
@@ -19,14 +21,15 @@ module VagrantPlugins
           name = get_name machine, config, env[:root_path]
           dc = get_datacenter connection, machine
           template = dc.find_vm config.template_name
-          fail Errors::VSphereError, :'missing_template' if template.nil?
+          raise Errors::VSphereError, :'missing_template' if template.nil?
+
           vm_base_folder = get_vm_base_folder dc, template, config
-          fail Errors::VSphereError, :'invalid_base_path' if vm_base_folder.nil?
+          raise 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
             ds = get_datastore dc, machine
-            fail Errors::VSphereError, :'invalid_configuration_linked_clone_with_sdrs' if config.linked_clone && ds.is_a?(RbVmomi::VIM::StoragePod)
+            raise Errors::VSphereError, :'invalid_configuration_linked_clone_with_sdrs' if config.linked_clone && ds.is_a?(RbVmomi::VIM::StoragePod)
 
             location = get_location ds, dc, machine, template
             spec = RbVmomi::VIM.VirtualMachineCloneSpec location: location, powerOn: true, template: false
@@ -74,9 +77,7 @@ module VagrantPlugins
 
               recommendation = result.recommendations[0]
               key = recommendation.key ||= ''
-              if key == ''
-                fail Errors::VSphereError, :missing_datastore_recommendation
-              end
+              raise Errors::VSphereError, :missing_datastore_recommendation if key == ''
 
               env[:ui].info I18n.t('vsphere.creating_cloned_vm_sdrs')
               env[:ui].info " -- Storage DRS recommendation: #{recommendation.target.name} #{recommendation.reasonText}"
@@ -125,13 +126,13 @@ module VagrantPlugins
           while wait
             events = query_customization_succeeded(vm, vem)
 
-            if events.size > 0
+            if events.size.positive?
               events.each do |e|
                 env[:ui].info e.fullFormattedMessage
               end
               wait = false
             elsif waited_seconds >= timeout
-              fail Errors::VSphereError, :'sysprep_timeout'
+              raise Errors::VSphereError, :'sysprep_timeout'
             else
               sleep(sleep_time)
               waited_seconds += sleep_time
@@ -154,7 +155,7 @@ module VagrantPlugins
           return customization_spec if private_networks.nil?
 
           # make sure we have enough NIC settings to override with the private network settings
-          fail Errors::VSphereError, :'too_many_private_networks' if private_networks.length > customization_spec.nicSettingMap.length
+          raise 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|
@@ -212,7 +213,7 @@ module VagrantPlugins
           return config.name unless config.name.nil?
 
           prefix = "#{root_path.basename}_#{machine.name}"
-          prefix.gsub!(/[^-a-z0-9_\.]/i, '')
+          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(100_000)}"
         end
@@ -229,7 +230,7 @@ module VagrantPlugins
           spec[:config][:deviceChange] ||= []
           @card ||= template.config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).first
 
-          fail Errors::VSphereError, :missing_network_card if @card.nil?
+          raise Errors::VSphereError, :missing_network_card if @card.nil?
 
           yield(@card)
 
@@ -241,7 +242,7 @@ module VagrantPlugins
         def add_custom_address_type(template, spec, addressType)
           spec[:config][:deviceChange] = []
           config = template.config
-          card = config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).first || fail(Errors::VSphereError, :missing_network_card)
+          card = config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).first || raise(Errors::VSphereError, :missing_network_card)
           card.addressType = addressType
           card_spec = { :deviceChange => [{ :operation => :edit, :device => card }] }
           template.ReconfigVM_Task(:spec => card_spec).wait_for_completion
@@ -257,13 +258,13 @@ module VagrantPlugins
           network = get_network_by_name(dc, vlan)
 
           modify_network_card(template, spec) do |card|
-            begin
-              switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(switchUuid: network.config.distributedVirtualSwitch.uuid, portgroupKey: network.key)
-              card.backing = RbVmomi::VIM::VirtualEthernetCardDistributedVirtualPortBackingInfo(port: switch_port)
-            rescue
-              # not connected to a distibuted switch?
-              card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(network: network, deviceName: network.name)
-            end
+
+            switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(switchUuid: network.config.distributedVirtualSwitch.uuid, portgroupKey: network.key)
+            card.backing = RbVmomi::VIM::VirtualEthernetCardDistributedVirtualPortBackingInfo(port: switch_port)
+          rescue StandardError
+            # not connected to a distibuted switch?
+            card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(network: network, deviceName: network.name)
+
           end
         end
 

data/lib/vSphere/action/close_vsphere.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 
 module VagrantPlugins

data/lib/vSphere/action/connect_vsphere.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 
 module VagrantPlugins

data/lib/vSphere/action/destroy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'
@@ -23,6 +25,7 @@ module VagrantPlugins
 
         def destroy_vm(env)
           return if env[:machine].state.id == :not_created
+
           vm = get_vm_by_uuid env[:vSphere_connection], env[:machine]
           return if vm.nil?
 

data/lib/vSphere/action/get_ssh_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'vSphere/util/vim_helpers'
 
@@ -21,12 +23,13 @@ module VagrantPlugins
         def filter_guest_nic(vm, machine)
           return vm.guest.ipAddress unless machine.provider_config.real_nic_ip
 
-          interfaces = vm.guest.net.select { |g| g.deviceConfigId > 0 }
+          interfaces = vm.guest.net.select { |g| g.deviceConfigId.positive? }
           ip_addresses = interfaces.map { |i| i.ipConfig.ipAddress.select { |a| a.state == 'preferred' } }.flatten
 
           return (vm.guest.ipAddress || nil) if ip_addresses.empty?
 
-          fail Errors::VSphereError.new, :'multiple_interface_with_real_nic_ip_set' if ip_addresses.size > 1
+          raise Errors::VSphereError.new, :'multiple_interface_with_real_nic_ip_set' if ip_addresses.size > 1
+
           ip_addresses.first.ipAddress
         end
 
@@ -35,8 +38,10 @@ module VagrantPlugins
 
           vm = get_vm_by_uuid connection, machine
           return nil if vm.nil?
+
           ip_address = filter_guest_nic(vm, machine)
           return nil if ip_address.nil? || ip_address.empty?
+
           {
             host: ip_address,
             port: 22

data/lib/vSphere/action/get_state.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'vSphere/util/vim_helpers'
 require 'vSphere/util/vm_helpers'
@@ -22,7 +24,7 @@ module VagrantPlugins
         private
 
         def get_state(connection, machine)
-          return :not_created  if machine.id.nil?
+          return :not_created if machine.id.nil?
 
           vm = get_vm_by_uuid connection, machine
 

data/lib/vSphere/action/is_created.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module VSphere
     module Action

data/lib/vSphere/action/is_running.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module VSphere
     module Action

data/lib/vSphere/action/is_suspended.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module VSphere
     module Action

data/lib/vSphere/action/message_already_created.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 
 module VagrantPlugins

data/lib/vSphere/action/message_not_created.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 
 module VagrantPlugins

data/lib/vSphere/action/message_not_running.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 
 module VagrantPlugins

data/lib/vSphere/action/message_not_suspended.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 
 module VagrantPlugins

data/lib/vSphere/action/power_off.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'

data/lib/vSphere/action/power_on.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'

data/lib/vSphere/action/resume.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'

data/lib/vSphere/action/snapshot_delete.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vSphere/util/vim_helpers'
 require 'vSphere/util/vm_helpers'
 
@@ -16,8 +18,9 @@ module VagrantPlugins
           vm = get_vm_by_uuid(env[:vSphere_connection], env[:machine])
 
           env[:ui].info(I18n.t(
-            "vagrant.actions.vm.snapshot.deleting",
-            name: env[:snapshot_name]))
+                          "vagrant.actions.vm.snapshot.deleting",
+                          name: env[:snapshot_name]
+                        ))
 
           delete_snapshot(vm, env[:snapshot_name]) do |progress|
             env[:ui].clear_line
@@ -27,8 +30,9 @@ module VagrantPlugins
           env[:ui].clear_line
 
           env[:ui].info(I18n.t(
-            "vagrant.actions.vm.snapshot.deleted",
-            name: env[:snapshot_name]))
+                          "vagrant.actions.vm.snapshot.deleted",
+                          name: env[:snapshot_name]
+                        ))
 
           @app.call env
         end

data/lib/vSphere/action/snapshot_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vSphere/util/vim_helpers'
 require 'vSphere/util/vm_helpers'
 

data/lib/vSphere/action/snapshot_restore.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vSphere/util/vim_helpers'
 require 'vSphere/util/vm_helpers'
 
@@ -16,8 +18,9 @@ module VagrantPlugins
           vm = get_vm_by_uuid(env[:vSphere_connection], env[:machine])
 
           env[:ui].info(I18n.t(
-            "vagrant.actions.vm.snapshot.restoring",
-            name: env[:snapshot_name]))
+                          "vagrant.actions.vm.snapshot.restoring",
+                          name: env[:snapshot_name]
+                        ))
 
           restore_snapshot(vm, env[:snapshot_name]) do |progress|
             env[:ui].clear_line

data/lib/vSphere/action/snapshot_save.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vSphere/util/vim_helpers'
 require 'vSphere/util/vm_helpers'
 
@@ -16,8 +18,9 @@ module VagrantPlugins
           vm = get_vm_by_uuid(env[:vSphere_connection], env[:machine])
 
           env[:ui].info(I18n.t(
-            "vagrant.actions.vm.snapshot.saving",
-            name: env[:snapshot_name]))
+                          "vagrant.actions.vm.snapshot.saving",
+                          name: env[:snapshot_name]
+                        ))
 
           create_snapshot(vm, env[:snapshot_name]) do |progress|
             env[:ui].clear_line
@@ -27,8 +30,9 @@ module VagrantPlugins
           env[:ui].clear_line
 
           env[:ui].success(I18n.t(
-            "vagrant.actions.vm.snapshot.saved",
-            name: env[:snapshot_name]))
+                             "vagrant.actions.vm.snapshot.saved",
+                             name: env[:snapshot_name]
+                           ))
           @app.call env
         end
       end

data/lib/vSphere/action/suspend.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'i18n'
 require 'vSphere/util/vim_helpers'

data/lib/vSphere/action/wait_for_ip_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ipaddr'
 require 'timeout'
 

data/lib/vSphere/action.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vagrant'
 require 'vagrant/action/builder'
 
@@ -224,7 +226,7 @@ module VagrantPlugins
       end
 
       # TODO: Remove the if guard when Vagrant 1.8.0 is the minimum version.
-      # rubocop:disable IndentationWidth
+      # rubocop:disable Layout/IndentationWidth
       if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0')
       def self.action_snapshot_delete
         Vagrant::Action::Builder.new.tap do |b|
@@ -292,11 +294,11 @@ module VagrantPlugins
           b.use CloseVSphere
         end
       end
-      end # Vagrant > 1.8.0 guard
-      # rubocop:enable IndentationWidth
+      end
+      # rubocop:enable Layout/IndentationWidth
 
       # autoload
-      action_root = Pathname.new(File.expand_path('../action', __FILE__))
+      action_root = Pathname.new(File.expand_path('action', __dir__))
       autoload :Clone, action_root.join('clone')
       autoload :CloseVSphere, action_root.join('close_vsphere')
       autoload :ConnectVSphere, action_root.join('connect_vsphere')
@@ -317,14 +319,14 @@ module VagrantPlugins
       autoload :WaitForIPAddress, action_root.join('wait_for_ip_address')
 
       # TODO: Remove the if guard when Vagrant 1.8.0 is the minimum version.
-      # rubocop:disable IndentationWidth
+      # rubocop:disable Layout/IndentationWidth
       if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0')
       autoload :SnapshotDelete, action_root.join('snapshot_delete')
       autoload :SnapshotList, action_root.join('snapshot_list')
       autoload :SnapshotRestore, action_root.join('snapshot_restore')
       autoload :SnapshotSave, action_root.join('snapshot_save')
       end
-      # rubocop:enable IndentationWidth
+      # rubocop:enable Layout/IndentationWidth
     end
   end
 end

data/lib/vSphere/cap/public_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module VSphere
     module Cap
@@ -7,6 +9,7 @@ module VagrantPlugins
 
           ssh_info = machine.ssh_info
           return nil unless ssh_info
+
           ssh_info[:host]
         end
       end

data/lib/vSphere/cap/snapshot_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module VSphere
     module Cap

data/lib/vSphere/config.rb

@@ -1,36 +1,11 @@
+# frozen_string_literal: true
+
 require 'vagrant'
 
 module VagrantPlugins
   module VSphere
     class Config < Vagrant.plugin('2', :config)
-      attr_accessor :ip_address_timeout # Time to wait for an IP address when booting, in seconds @return [Integer]
-      attr_accessor :host
-      attr_accessor :insecure
-      attr_accessor :user
-      attr_accessor :password
-      attr_accessor :data_center_name
-      attr_accessor :compute_resource_name
-      attr_accessor :resource_pool_name
-      attr_accessor :clone_from_vm
-      attr_accessor :template_name
-      attr_accessor :name
-      attr_accessor :vm_base_path
-      attr_accessor :customization_spec_name
-      attr_accessor :data_store_name
-      attr_accessor :linked_clone
-      attr_accessor :proxy_host
-      attr_accessor :proxy_port
-      attr_accessor :vlan
-      attr_accessor :addressType
-      attr_accessor :mac
-      attr_accessor :memory_mb
-      attr_accessor :cpu_count
-      attr_accessor :cpu_reservation
-      attr_accessor :mem_reservation
-      attr_accessor :extra_config
-      attr_accessor :real_nic_ip
-      attr_accessor :notes
-      attr_accessor :wait_for_sysprep
+      attr_accessor :ip_address_timeout, :host, :insecure, :user, :password, :data_center_name, :compute_resource_name, :resource_pool_name, :clone_from_vm, :template_name, :name, :vm_base_path, :customization_spec_name, :data_store_name, :linked_clone, :proxy_host, :proxy_port, :vlan, :addressType, :mac, :memory_mb, :cpu_count, :cpu_reservation, :mem_reservation, :extra_config, :real_nic_ip, :notes, :wait_for_sysprep # Time to wait for an IP address when booting, in seconds @return [Integer]
 
       attr_reader :custom_attributes
 
@@ -53,9 +28,7 @@ module VagrantPlugins
       def validate(machine)
         errors = _detected_errors
 
-        if password == :ask || password.nil?
-          self.password = machine.ui.ask('vSphere Password (will be hidden): ', echo: false)
-        end
+        self.password = machine.ui.ask('vSphere Password (will be hidden): ', echo: false) if password == :ask || password.nil?
 
         # TODO: add blank?
         errors << I18n.t('vsphere.config.host') if host.nil?

data/lib/vSphere/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vagrant'
 
 module VagrantPlugins

data/lib/vSphere/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'vagrant'
 rescue LoadError
@@ -6,9 +8,7 @@ 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'
-  fail 'The Vagrant vSphere plugin is only compatible with Vagrant 1.5+'
-end
+raise 'The Vagrant vSphere plugin is only compatible with Vagrant 1.5+' if Vagrant::VERSION < '1.5'
 
 module VagrantPlugins
   module VSphere
@@ -36,14 +36,14 @@ module VagrantPlugins
       end
 
       # TODO: Remove the if guard when Vagrant 1.8.0 is the minimum version.
-      # rubocop:disable IndentationWidth
+      # rubocop:disable Layout/IndentationWidth
       if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0')
       provider_capability('vsphere', 'snapshot_list') do
         require_relative 'cap/snapshot_list'
         Cap::SnapshotList
       end
       end
-      # rubocop:enable IndentationWidth
+      # rubocop:enable Layout/IndentationWidth
 
       def self.setup_i18n
         I18n.load_path << File.expand_path('locales/en.yml', VSphere.source_root)

data/lib/vSphere/provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vagrant'
 
 module VagrantPlugins
@@ -10,6 +12,7 @@ module VagrantPlugins
       def action(name)
         action_method = "action_#{name}"
         return Action.send(action_method) if Action.respond_to?(action_method)
+
         nil
       end
 

data/lib/vSphere/util/vim_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 
 module VagrantPlugins
@@ -5,7 +7,7 @@ module VagrantPlugins
     module Util
       module VimHelpers
         def get_datacenter(connection, machine)
-          connection.serviceInstance.find_datacenter(machine.provider_config.data_center_name) || fail(Errors::VSphereError, :missing_datacenter)
+          connection.serviceInstance.find_datacenter(machine.provider_config.data_center_name) || raise(Errors::VSphereError, :missing_datacenter)
         end
 
         def get_vm_by_uuid(connection, machine)
@@ -20,16 +22,18 @@ module VagrantPlugins
           entity_array = resource_pool_name.split('/')
           entity_array.each do |entity_array_item|
             next if entity_array_item.empty?
-            if rp.is_a? RbVmomi::VIM::Folder
-              rp = rp.childEntity.find { |f| f.name == entity_array_item } || fail(Errors::VSphereError, :missing_resource_pool)
-            elsif rp.is_a? RbVmomi::VIM::ClusterComputeResource
-              rp = rp.resourcePool.resourcePool.find { |f| f.name == entity_array_item } || fail(Errors::VSphereError, :missing_resource_pool)
-            elsif rp.is_a? RbVmomi::VIM::ResourcePool
-              rp = rp.resourcePool.find { |f| f.name == entity_array_item } || fail(Errors::VSphereError, :missing_resource_pool)
-            elsif rp.is_a? RbVmomi::VIM::ComputeResource
-              rp = rp.resourcePool.find(resource_pool_name) || fail(Errors::VSphereError, :missing_resource_pool)
+
+            case rp
+            when RbVmomi::VIM::Folder
+              rp = rp.childEntity.find { |f| f.name == entity_array_item } || raise(Errors::VSphereError, :missing_resource_pool)
+            when RbVmomi::VIM::ClusterComputeResource
+              rp = rp.resourcePool.resourcePool.find { |f| f.name == entity_array_item } || raise(Errors::VSphereError, :missing_resource_pool)
+            when RbVmomi::VIM::ResourcePool
+              rp = rp.resourcePool.find { |f| f.name == entity_array_item } || raise(Errors::VSphereError, :missing_resource_pool)
+            when RbVmomi::VIM::ComputeResource
+              rp = rp.resourcePool.find(resource_pool_name) || raise(Errors::VSphereError, :missing_resource_pool)
             else
-              fail Errors::VSphereError, :missing_resource_pool
+              raise Errors::VSphereError, :missing_resource_pool
             end
           end
           rp = rp.resourcePool if !rp.is_a?(RbVmomi::VIM::ResourcePool) && rp.respond_to?(:resourcePool)
@@ -38,19 +42,22 @@ module VagrantPlugins
 
         def get_compute_resource(datacenter, machine)
           cr = find_clustercompute_or_compute_resource(datacenter, machine.provider_config.compute_resource_name)
-          fail Errors::VSphereError, :missing_compute_resource if cr.nil?
+          raise Errors::VSphereError, :missing_compute_resource if cr.nil?
+
           cr
         end
 
         def find_clustercompute_or_compute_resource(datacenter, path)
-          if path.is_a? String
+          case path
+          when String
             es = path.split('/').reject(&:empty?)
-          elsif path.is_a? Enumerable
+          when Enumerable
             es = path
           else
-            fail "unexpected path class #{path.class}"
+            raise "unexpected path class #{path.class}"
           end
           return datacenter.hostFolder if es.empty?
+
           final = es.pop
 
           p = es.inject(datacenter.hostFolder) do |f, e|
@@ -69,7 +76,7 @@ module VagrantPlugins
             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
@@ -80,10 +87,10 @@ module VagrantPlugins
           return if name.nil? || name.empty?
 
           manager = connection.serviceContent.customizationSpecManager
-          fail Errors::VSphereError, :null_configuration_spec_manager if manager.nil?
+          raise Errors::VSphereError, :null_configuration_spec_manager if manager.nil?
 
           spec = manager.GetCustomizationSpec(name: name)
-          fail Errors::VSphereError, :missing_configuration_spec if spec.nil?
+          raise Errors::VSphereError, :missing_configuration_spec if spec.nil?
 
           spec
         end
@@ -93,11 +100,11 @@ module VagrantPlugins
           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) || datacenter.datastoreFolder.traverse(name) || fail(Errors::VSphereError, :missing_datastore)
+          datacenter.find_datastore(name) || datacenter.datastoreFolder.traverse(name) || raise(Errors::VSphereError, :missing_datastore)
         end
 
         def get_network_by_name(dc, name)
-          dc.network.find { |f| f.name == name } || fail(Errors::VSphereError, :missing_vlan)
+          dc.network.find { |f| f.name == name } || raise(Errors::VSphereError, :missing_vlan)
         end
       end
     end

data/lib/vSphere/util/vm_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 
 module VagrantPlugins
@@ -55,11 +57,11 @@ module VagrantPlugins
         def enumerate_snapshots(vm)
           snapshot_info = vm.snapshot
 
-          if snapshot_info.nil?
-            snapshot_root = []
-          else
-            snapshot_root = snapshot_info.rootSnapshotList
-          end
+          snapshot_root = if snapshot_info.nil?
+                            []
+                          else
+                            snapshot_info.rootSnapshotList
+                          end
 
           recursor = lambda do |snapshot_list|
             Enumerator.new do |yielder|
@@ -95,7 +97,8 @@ module VagrantPlugins
           task = vm.CreateSnapshot_Task(
             name: name,
             memory: false,
-            quiesce: false)
+            quiesce: false
+          )
 
           if block_given?
             task.wait_for_progress do |progress|

data/lib/vSphere/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module VSphere
-    VERSION = '1.13.5'
+    VERSION = '1.14.0.pre1'
   end
 end

data/lib/vagrant-vsphere.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 require 'vSphere/plugin'
 
 module VagrantPlugins
   module VSphere
-    lib_path = Pathname.new(File.expand_path('../vSphere', __FILE__))
+    lib_path = Pathname.new(File.expand_path('vSphere', __dir__))
     autoload :Action, lib_path.join('action')
     autoload :Errors, lib_path.join('errors')
 
@@ -12,7 +14,7 @@ module VagrantPlugins
     #
     # @return [Pathname]
     def self.source_root
-      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+      @source_root ||= Pathname.new(File.expand_path('..', __dir__))
     end
   end
 end

data/spec/action_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'vagrant'
 

data/spec/clone_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 CUSTOM_VM_FOLDER = 'custom_vm_folder'
@@ -55,9 +57,8 @@ describe VagrantPlugins::VSphere::Action::Clone do
     expect(@template).to have_received(:CloneVM_Task).with(
       folder: @data_center,
       name: NAME,
-      spec: { location:         { pool: @child_resource_pool },
-              config: expected_config
-      }
+      spec: { location: { pool: @child_resource_pool },
+              config: expected_config }
     )
   end
 
@@ -102,10 +103,11 @@ describe VagrantPlugins::VSphere::Action::Clone do
 
   it 'should set extraConfig if specified' do
     @machine.provider_config.stub(:extra_config).and_return(
-      'guestinfo.hostname' => 'somehost.testvm')
+      'guestinfo.hostname' => 'somehost.testvm'
+    )
     expected_config = RbVmomi::VIM.VirtualMachineConfigSpec(extraConfig: [
-      { 'key' => 'guestinfo.hostname', 'value' => 'somehost.testvm' }
-    ])
+                                                              { 'key' => 'guestinfo.hostname', 'value' => 'somehost.testvm' }
+                                                            ])
 
     call
     expect(@template).to have_received(:CloneVM_Task).with(

data/spec/connect_vsphere_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe VagrantPlugins::VSphere::Action::ConnectVSphere do

data/spec/destroy_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe VagrantPlugins::VSphere::Action::Destroy do

data/spec/get_ssh_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe VagrantPlugins::VSphere::Action::GetSshInfo do
@@ -51,9 +53,7 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
                                  ipAddress: [double('NetIpConfigInfoIpAddress',
                                                     ipAddress: 'bad address', state: 'unknown'),
                                              double('NetIpConfigInfoIpAddress',
-                                                    ipAddress: '127.0.0.1', state: 'preferred')]
-                                )
-               ),
+                                                    ipAddress: '127.0.0.1', state: 'preferred')])),
          double('GuestNicInfo',
                 ipAddress: ['bad address', '255.255.255.255'],
                 deviceConfigId: -1,
@@ -61,10 +61,7 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
                                  ipAddress: [double('NetIpConfigInfoIpAddress',
                                                     ipAddress: 'bad address', state: 'unknown'),
                                              double('NetIpConfigInfoIpAddress',
-                                                    ipAddress: '255.255.255.255', state: 'preferred')]
-                                )
-               )
-        ]
+                                                    ipAddress: '255.255.255.255', state: 'preferred')]))]
       }
     end
 
@@ -89,9 +86,7 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
                                      ipAddress: [double('NetIpConfigInfoIpAddress',
                                                         ipAddress: 'bad address', state: 'unknown'),
                                                  double('NetIpConfigInfoIpAddress',
-                                                        ipAddress: '127.0.0.2', state: 'preferred')]
-                                    )
-                   ),
+                                                        ipAddress: '127.0.0.2', state: 'preferred')])),
              double('GuestNicInfo',
                     ipAddress: ['bad address', '255.255.255.255'],
                     deviceConfigId: 2000,
@@ -99,10 +94,7 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
                                      ipAddress: [double('NetIpConfigInfoIpAddress',
                                                         ipAddress: 'bad address', state: 'unknown'),
                                                  double('NetIpConfigInfoIpAddress',
-                                                        ipAddress: '255.255.255.255', state: 'preferred')]
-                                    )
-                   )
-            ]
+                                                        ipAddress: '255.255.255.255', state: 'preferred')]))]
           }
 
         end

data/spec/get_state_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'vSphere/util/vim_helpers'
 

data/spec/is_created_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'vSphere/action/is_created'
 

data/spec/power_off_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe VagrantPlugins::VSphere::Action::PowerOff do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbvmomi'
 require 'pathname'
 require 'vSphere/errors'
@@ -29,7 +31,7 @@ RSpec.configure do |config|
   # removes deprecation warnings.
   # http://stackoverflow.com/questions/20275510/how-to-avoid-deprecation-warning-for-stub-chain-in-rspec-3-0/20296359#20296359
   config.mock_with :rspec do |c|
-    c.syntax = [:should, :expect]
+    c.syntax = %i[should expect]
   end
 
   config.before(:each) do
@@ -38,36 +40,37 @@ RSpec.configure do |config|
     end
 
     provider_config = double(
-        host: 'testhost.com',
-        user: 'testuser',
-        password: 'testpassword',
-        data_center_name: nil,
-        compute_resource_name: 'testcomputeresource',
-        resource_pool_name: 'testresourcepool',
-        vm_base_path: nil,
-        template_name: TEMPLATE,
-        name: NAME,
-        insecure: true,
-        validate: [],
-        customization_spec_name: nil,
-        data_store_name: nil,
-        clone_from_vm: nil,
-        linked_clone: nil,
-        proxy_host: nil,
-        proxy_port: nil,
-        vlan: nil,
-        memory_mb: nil,
-        cpu_count: nil,
-        mac: nil,
-        addressType: nil,
-        cpu_reservation: nil,
-        mem_reservation: nil,
-        custom_attributes: {},
-        notes: nil,
-        extra_config: {},
-        ip_address_timeout: 1,
-        real_nic_ip: false,
-        wait_for_sysprep: false)
+      host: 'testhost.com',
+      user: 'testuser',
+      password: 'testpassword',
+      data_center_name: nil,
+      compute_resource_name: 'testcomputeresource',
+      resource_pool_name: 'testresourcepool',
+      vm_base_path: nil,
+      template_name: TEMPLATE,
+      name: NAME,
+      insecure: true,
+      validate: [],
+      customization_spec_name: nil,
+      data_store_name: nil,
+      clone_from_vm: nil,
+      linked_clone: nil,
+      proxy_host: nil,
+      proxy_port: nil,
+      vlan: nil,
+      memory_mb: nil,
+      cpu_count: nil,
+      mac: nil,
+      addressType: nil,
+      cpu_reservation: nil,
+      mem_reservation: nil,
+      custom_attributes: {},
+      notes: nil,
+      extra_config: {},
+      ip_address_timeout: 1,
+      real_nic_ip: false,
+      wait_for_sysprep: false
+    )
     vm_config = double(
       vm: double('config_vm',
                  box: nil,

data/vSphere.gemspec

@@ -1,4 +1,6 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'vSphere/version'
 
 Gem::Specification.new do |s|
@@ -11,18 +13,17 @@ Gem::Specification.new do |s|
   s.summary = 'VMWare vSphere provider'
   s.description = 'Enables Vagrant to manage machines with VMWare vSphere.'
 
-  # pin nokogiri to 1.10.10 to get around 1.11.0 requiring ruby >=2.5
-  s.add_dependency 'nokogiri', '1.10.10'
+  s.add_dependency 'nokogiri', '1.13.4'
 
-  s.add_dependency 'rbvmomi', '>=1.11.5', '<2.0.0'
+  s.add_dependency 'rbvmomi', '3.0.0'
 
   s.add_dependency 'i18n', '>=0.6.4'
 
-  s.add_development_dependency 'rake', '11.1.2' # pinned to accommodate rubocop 0.32.1
+  s.add_development_dependency 'rake', '13.0.6'
   s.add_development_dependency 'rspec-core'
   s.add_development_dependency 'rspec-expectations'
   s.add_development_dependency 'rspec-mocks'
-  s.add_development_dependency 'rubocop', '~> 0.32.1'
+  s.add_development_dependency 'rubocop', '1.25.0'
 
   s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.executables = s.files.grep(/^bin\//) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.13.5
+  version: 1.14.0.pre1
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,34 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.10
+        version: 1.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.10
+        version: 1.13.4
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.5
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.5
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -118,16 +112,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 1.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 1.25.0
 description: Enables Vagrant to manage machines with VMWare vSphere.
 email:
 - andrew.grauch@nsidc.org
@@ -208,11 +202,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: VMWare vSphere provider