vagrant-vsphere 1.13.3 → 1.14.0.pre1

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.3'
+    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,
@@ -91,6 +94,7 @@ RSpec.configure do |config|
                       :data_dir => Pathname.new(''),
                       :id => nil,
                       :id= => nil,
+                      :name => nil,
                       :guest => double('guest', capability: nil)
 
     @env = {

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.'
 
-  # force the use of Nokogiri 1.5.x to prevent conflicts with older versions of zlib
-  s.add_dependency 'nokogiri', '~>1.5'
+  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', '<=1.1.1'
+  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,49 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.14.0.pre1
 platform: ruby
 authors:
 - Andrew Grauch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        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
@@ -51,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.4
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,23 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.4
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     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
@@ -124,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
@@ -203,7 +191,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -214,13 +202,12 @@ 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: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: VMWare vSphere provider
 test_files: