knife-vsphere 3.0.1 → 4.0.1

data/lib/chef/knife/vsphere_vm_state.rb

@@ -23,24 +23,24 @@ class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
   common_options
 
   option :state,
-         short: "-s STATE",
-         long: "--state STATE",
-         description: "The power state to transition the VM into; one of on|off|suspended|reboot"
+    short: "-s STATE",
+    long: "--state STATE",
+    description: "The power state to transition the VM into; one of on|off|suspended|reboot"
 
   option :wait_port,
-         short: "-w PORT",
-         long: "--wait-port PORT",
-         description: "Wait for VM to be accessible on a port"
+    short: "-w PORT",
+    long: "--wait-port PORT",
+    description: "Wait for VM to be accessible on a port"
 
   option :shutdown,
-         short: "-g",
-         long: "--shutdown",
-         description: "Guest OS shutdown"
+    short: "-g",
+    long: "--shutdown",
+    description: "Guest OS shutdown"
 
   option :recursive,
-         short: "-r",
-         long: "--recursive",
-         description: "Search all folders"
+    short: "-r",
+    long: "--recursive",
+    description: "Search all folders"
 
   # The main run method for vm_state
   #

data/lib/chef/knife/vsphere_vm_toolsconfig.rb

@@ -13,9 +13,9 @@ class Chef::Knife::VsphereVmToolsconfig < Chef::Knife::BaseVsphereCommand
           for available properties and types."
 
   option :empty,
-         short: "-e",
-         long: "--empty",
-         description: "Allow empty string"
+    short: "-e",
+    long: "--empty",
+    description: "Allow empty string"
   common_options
 
   # The main run method for vm_toolsconfig

data/lib/chef/knife/vsphere_vm_vmdk_add.rb

@@ -15,14 +15,14 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
   common_options
 
   option :vmdk_type,
-         long: "--vmdk-type TYPE",
-         description: "Type of VMDK",
-         # this is a bad idea as it will let you overcommit SAN by 400% or more. thick is a more "sane" default
-         default: "thin"
+    long: "--vmdk-type TYPE",
+    description: "Type of VMDK",
+    # this is a bad idea as it will let you overcommit SAN by 400% or more. thick is a more "sane" default
+    default: "thin"
 
   option :target_lun,
-         long: "--target-lun NAME",
-         description: "name of target LUN"
+    long: "--target-lun NAME",
+    description: "name of target LUN"
 
   # The main run method for vm_vmdk_add
   #
@@ -68,7 +68,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
         rescue RbVmomi::Fault => e
           ui.warn "Ignoring a fault when trying to create #{vmdk_dir}. This may be related to issue #213."
           if log_verbose?
-            puts "Chose #{vmdk_datastore.name} out of #{vmdk_datastores.map(&:name).join(', ')}"
+            puts "Chose #{vmdk_datastore.name} out of #{vmdk_datastores.map(&:name).join(", ")}"
             puts e
           end
         end
@@ -84,7 +84,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     vm_files = pc.collectMultiple vms, "layoutEx.file"
     vm_files.keys.each do |vmFile|
       vm_files[vmFile]["layoutEx.file"].each do |layout|
-        if layout.name =~ /^\[#{vmdk_datastore.name}\] #{vmname}\/#{vmname}_([0-9]+).vmdk/
+        if layout.name =~ %r{^\[#{vmdk_datastore.name}\] #{vmname}/#{vmname}_([0-9]+).vmdk}
           num = Regexp.last_match(1)
           next_vmdk = num.to_i + 1 if next_vmdk <= num.to_i
         end
@@ -104,11 +104,11 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
         diskType: vmdk_type
       )
       ui.info "Creating VMDK"
-      ui.info "#{ui.color 'Capacity:', :cyan} #{size} GB"
-      ui.info "#{ui.color 'Disk:', :cyan} #{vmdk_name}"
+      ui.info "#{ui.color "Capacity:", :cyan} #{size} GB"
+      ui.info "#{ui.color "Disk:", :cyan} #{vmdk_name}"
 
       if get_config(:noop)
-        ui.info "#{ui.color 'Skipping disk creation process because --noop specified.', :red}"
+        ui.info "#{ui.color "Skipping disk creation process because --noop specified.", :red}"
       else
         vdm.CreateVirtualDisk_Task(
           datacenter: datacenter,
@@ -132,6 +132,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
         scsi_tree[device.key]["device"] = device
       end
       next unless device.class == RbVmomi::VIM::VirtualDisk
+
       if scsi_tree[device.controllerKey].nil?
         scsi_tree[device.controllerKey] = {}
         scsi_tree[device.controllerKey]["children"] = []
@@ -172,7 +173,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
         )
 
         if get_config(:noop)
-          ui.info "#{ui.color 'Skipping controller creation process because --noop specified.', :red}"
+          ui.info "#{ui.color "Skipping controller creation process because --noop specified.", :red}"
         else
           vm.ReconfigVM_Task(spec: vm_config_spec).wait_for_completion
         end
@@ -195,6 +196,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     used_unit_numbers = []
     scsi_tree.keys.sort.each do |c|
       next unless controller.key == scsi_tree[c]["device"].key
+
       used_unit_numbers.push(scsi_tree[c]["device"].scsiCtlrUnitNumber)
       scsi_tree[c]["children"].each do |disk|
         used_unit_numbers.push(disk.unitNumber)
@@ -237,7 +239,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     )
 
     if get_config(:noop)
-      ui.info "#{ui.color 'Skipping disk attaching process because --noop specified.', :red}"
+      ui.info "#{ui.color "Skipping disk attaching process because --noop specified.", :red}"
     else
       vm.ReconfigVM_Task(spec: vm_config_spec).wait_for_completion
     end

data/lib/chef/knife/vsphere_vm_vnc_set.rb

@@ -12,14 +12,14 @@ class Chef::Knife::VsphereVmVncset < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere vm vncset VMNAME"
 
   option :vnc_port,
-         long: "--vnc-port PORT",
-         description: "Port to run VNC on",
-         required: true
+    long: "--vnc-port PORT",
+    description: "Port to run VNC on",
+    required: true
 
   option :vnc_password,
-         long: "--vnc-password PASSWORD",
-         description: "Password for connecting to VNC",
-         required: true
+    long: "--vnc-password PASSWORD",
+    description: "Password for connecting to VNC",
+    required: true
 
   common_options
 
@@ -42,7 +42,7 @@ class Chef::Knife::VsphereVmVncset < Chef::Knife::BaseVsphereCommand
         extraConfig: [
           { key: "RemoteDisplay.vnc.enabled", value: "true" },
           { key: "RemoteDisplay.vnc.port", value: config[:vnc_port].to_s },
-          { key: "RemoteDisplay.vnc.password", value: config[:vnc_password].to_s }
+          { key: "RemoteDisplay.vnc.password", value: config[:vnc_password].to_s },
         ],
       }
     ).wait_for_completion

data/lib/chef/knife/vsphere_vm_wait_sysprep.rb

@@ -22,14 +22,14 @@ class Chef::Knife::VsphereVmWaitSysprep < Chef::Knife::BaseVsphereCommand
   common_options
 
   option :sleep,
-         long: "--sleep TIME",
-         description: "The time in seconds to wait between queries for CustomizationSucceeded event. Default: 60 seconds",
-         default: 60
+    long: "--sleep TIME",
+    description: "The time in seconds to wait between queries for CustomizationSucceeded event. Default: 60 seconds",
+    default: 60
 
   option :timeout,
-         long: "--timeout TIME",
-         description: "The timeout in seconds before aborting. Default: 300 seconds",
-         default: 300
+    long: "--timeout TIME",
+    description: "The timeout in seconds before aborting. Default: 300 seconds",
+    default: 300
 
   # The main run method for vm_wait_sysprep.
   #

data/lib/knife-vsphere/version.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.1
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: knife-windows
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '15.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '15.1'
+- !ruby/object:Gem::Dependency
+  name: chef-bin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '15.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '15.1'
 description: VMware vSphere support for Chef Infra's Knife command
 email: ezra@cpan.org
 executables: []
@@ -144,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="