knife-vsphere 4.1.3 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 307f7c1cd017840eedf083fc9100f88db74a408dd9c9bcd08c7b2a401851f8b4
-  data.tar.gz: 3b35e982f80c555bca6be48b81f7379b49f57ec6d261bd06c016af5d7039c606
+  metadata.gz: c00668de094b7f296fd0a8774b4ff8632536fd835399157eddcc7eaaf766c78a
+  data.tar.gz: 9b5cac6fc7308b91b0268dd2c184786e1868c632acac8a9ca1ebcd8cbd5eb0c4
 SHA512:
-  metadata.gz: d5b7d2579d4dfd42b376ea7617e293275804e05d24472b6f8c89ce014011c733d6f5d327b22cb6f4b8b0fde681d4a048e878be67e67da650e5e9b605fcd6f98b
-  data.tar.gz: 20498b9a638555471299bdece10201351ff16c0757d8057bc8a8fccae0bdfe48f72f0538661a880ef3d9d000b778cb5e9d500ce1cd4f3d391079bd3b1689b5da
+  metadata.gz: 01b6f219e7ee6768ab3ec270d2d56bb92d49be85916027ef841aac4f425c2d06feb5187ed1c5c4ab5906e5052cce38655f49ff717ffd47f931586cc696f7b8bb
+  data.tar.gz: 3f129ca6bb146dab1bd13697ba07ab1dd6e6de4712789e7d93dd3c8d285b4e408580fd5e520b5d65a8c58d504196a5d3dbc9ea380a547eef27e1ace4f0bf5fb8

data/lib/chef/knife/helpers/base_vsphere_command.rb

@@ -23,9 +23,9 @@ class Chef
       deps do
         require "rbvmomi"
         Chef::Knife::Bootstrap.load_deps
-        require "base64"
+        require "base64" unless defined?(Base64)
         require "filesize"
-        require "socket"
+        require "socket" unless defined?(Socket)
         require "net/ssh/multi"
         require "readline"
         require "chef/json_compat"
@@ -122,7 +122,7 @@ class Chef
       end
 
       def get_password_from_stdin
-        @password ||= ui.ask("Enter your password: ") { |q| q.echo = false }
+        @password ||= ui.ask("Enter your password: ") { |q| q.echo(false) }
       end
 
       def traverse_folders_for_pools(folder)

data/lib/chef/knife/vsphere_hosts_list.rb

@@ -8,7 +8,7 @@ class Chef::Knife::VsphereHostsList < Chef::Knife::BaseVsphereCommand
 
   deps do
     Chef::Knife::BaseVsphereCommand.load_deps
-    require "netaddr"
+    require "netaddr" unless defined?(NetAddr)
   end
 
   common_options

data/lib/chef/knife/vsphere_pool_query.rb

@@ -7,7 +7,7 @@ class Chef::Knife::VspherePoolQuery < Chef::Knife::BaseVsphereCommand
 
   deps do
     Chef::Knife::BaseVsphereCommand.load_deps
-    require "netaddr"
+    require "netaddr" unless defined?(NetAddr)
   end
 
   common_options

data/lib/chef/knife/vsphere_pool_show.rb

@@ -6,7 +6,7 @@ class Chef::Knife::VspherePoolShow < Chef::Knife::BaseVsphereCommand
 
   deps do
     Chef::Knife::BaseVsphereCommand.load_deps
-    require "netaddr"
+    require "netaddr" unless defined?(NetAddr)
   end
 
   common_options

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -15,9 +15,9 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
   deps do
     Chef::Knife::BaseVsphereCommand.load_deps
-    require "ipaddr"
-    require "netaddr"
-    require "securerandom"
+    require "ipaddr" unless defined?(IPAddr)
+    require "netaddr" unless defined?(NetAddr)
+    require "securerandom" unless defined?(SecureRandom)
     require "chef/json_compat"
 
     require_relative "helpers/search_helper"
@@ -678,11 +678,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
         ident = RbVmomi::VIM.CustomizationLinuxPrep
         ident.hostName = RbVmomi::VIM.CustomizationFixedName(name: hostname)
 
-        ident.domain = if get_config(:customization_domain)
-                         get_config(:customization_domain)
-                       else
-                         ""
-                       end
+        ident.domain = (get_config(:customization_domain) || "")
         cust_spec.identity = ident
       else
         ui.error("Customization only supports Linux and Windows currently.")

data/lib/chef/knife/vsphere_vm_network_add.rb

@@ -25,7 +25,7 @@ class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
     required: false
 
   deps do
-    require "netaddr"
+    require "netaddr" unless defined?(NetAddr)
   end
 
   common_options

data/lib/chef/knife/vsphere_vm_vmdk_add.rb

@@ -216,7 +216,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     end
 
     # ensure we don't try to add the controllers SCSI ID
-    new_unit_number = available_unit_numbers.sort[0]
+    new_unit_number = available_unit_numbers.min
     puts "using SCSI ID #{new_unit_number}"
 
     vmdk_backing = RbVmomi::VIM::VirtualDiskFlatVer2BackingInfo(

data/lib/knife-vsphere/version.rb

@@ -1,5 +1,5 @@
 # The main knife-vsphere module.
 module KnifeVsphere
   # The version of this gem.
-  VERSION = "4.1.3".freeze
+  VERSION = "5.0.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 5.0.0
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -33,7 +33,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -70,28 +70,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: knife
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.1'
+        version: '17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '15.1'
+        version: '17'
 description: VMware vSphere support for Chef Infra's Knife command
 email: ezra@cpan.org
 executables: []
@@ -157,14 +157,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: VMware vSphere support for Chef Infra's Knife command