knife-vsphere 2.1.1 → 2.1.3

data/lib/chef/knife/vsphere_vm_toolsconfig.rb

@@ -1,21 +1,21 @@
 # Author:: Malte Heidenreich
 # License:: Apache License, Version 2.0
 
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'chef/knife/search_helper'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
+require "chef/knife/search_helper"
 
 # Vspherevmtoolsconfig extends the BaseVspherecommand
 class Chef::Knife::VsphereVmToolsconfig < Chef::Knife::BaseVsphereCommand
   include SearchHelper
-  banner "knife vsphere vm toolsconfig PROPERTY VALUE.
+  banner "knife vsphere vm toolsconfig VMNAME PROPERTY VALUE
           See \"https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.ToolsConfigInfo.html\"
           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
@@ -25,22 +25,22 @@ class Chef::Knife::VsphereVmToolsconfig < Chef::Knife::BaseVsphereCommand
     vmname = @name_args[0]
     if vmname.nil?
       show_usage
-      fatal_exit('You must specify a virtual machine name')
+      fatal_exit("You must specify a virtual machine name")
     end
 
     property = @name_args[1]
     if property.nil?
       show_usage
-      fatal_exit('You must specify a property to modify')
+      fatal_exit("You must specify a property to modify")
     end
 
     value = @name_args[2]
     if value.nil? && !get_config(:empty)
       show_usage
-      fatal_exit('You must specify a value')
+      fatal_exit("You must specify a value")
     end
 
-    value = '' if get_config(:empty)
+    value = "" if get_config(:empty)
 
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 

data/lib/chef/knife/vsphere_vm_vmdk_add.rb

@@ -2,27 +2,27 @@
 # Author:: Brian Flad (<bflad417@gmail.com>)
 # License:: Apache License, Version 2.0
 #
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'chef/knife/search_helper'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
+require "chef/knife/search_helper"
 
 # Add a new disk to a virtual machine
 # VsphereVmvmdkadd extends the BaseVspherecommand
 class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
   include SearchHelper
-  banner 'knife vsphere vm vmdk add VMNAME DISK_GB'
+  banner "knife vsphere vm vmdk add VMNAME DISK_GB"
 
   common_options
 
   option :vmdk_type,
-         long: '--vmdk-type TYPE',
-         description: 'Type of VMDK',
+         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'
+         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
   #
@@ -32,13 +32,13 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     vmname = @name_args[0]
     if vmname.nil?
       show_usage
-      ui.fatal('You must specify a virtual machine name')
+      ui.fatal("You must specify a virtual machine name")
       exit 1
     end
 
     size = @name_args[1]
     if size.nil?
-      ui.fatal 'You need a VMDK size!'
+      ui.fatal "You need a VMDK size!"
       show_usage
       exit 1
     end
@@ -81,10 +81,10 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     next_vmdk = 1
     pc = vmdk_datastore._connection.serviceContent.propertyCollector
     vms = vmdk_datastore.vm
-    vm_files = pc.collectMultiple vms, 'layoutEx.file'
+    vm_files = pc.collectMultiple vms, "layoutEx.file"
     vm_files.keys.each do |vmFile|
-      vm_files[vmFile]['layoutEx.file'].each do |layout|
-        if layout.name.match(/^\[#{vmdk_datastore.name}\] #{vmname}\/#{vmname}_([0-9]+).vmdk/)
+      vm_files[vmFile]["layoutEx.file"].each do |layout|
+        if layout.name =~ /^\[#{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
@@ -93,17 +93,17 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
     vmdk_file_name = "#{vmname}/#{vmname}_#{next_vmdk}.vmdk"
     vmdk_name = "[#{vmdk_datastore.name}] #{vmdk_file_name}"
     vmdk_type = get_config(:vmdk_type)
-    vmdk_type = 'preallocated' if vmdk_type == 'thick'
+    vmdk_type = "preallocated" if vmdk_type == "thick"
     puts "Next vmdk name is => #{vmdk_name}"
 
     # create the disk
     unless vmdk_datastore.exists? vmdk_file_name
       vmdk_spec = RbVmomi::VIM::FileBackedVirtualDiskSpec(
-        adapterType: 'lsiLogic',
+        adapterType: "lsiLogic",
         capacityKb: vmdk_size_kb,
         diskType: vmdk_type
       )
-      ui.info 'Creating VMDK'
+      ui.info "Creating VMDK"
       ui.info "#{ui.color 'Capacity:', :cyan} #{size} GB"
       ui.info "#{ui.color 'Disk:', :cyan} #{vmdk_name}"
 
@@ -127,20 +127,20 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
       if device.is_a? RbVmomi::VIM::VirtualSCSIController
         if scsi_tree[device.controllerKey].nil?
           scsi_tree[device.key] = {}
-          scsi_tree[device.key]['children'] = []
+          scsi_tree[device.key]["children"] = []
         end
-        scsi_tree[device.key]['device'] = device
+        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'] = []
+        scsi_tree[device.controllerKey]["children"] = []
       end
-      scsi_tree[device.controllerKey]['children'].push(device)
+      scsi_tree[device.controllerKey]["children"].push(device)
     end
     scsi_tree.keys.sort.each do |controller|
-      if scsi_tree[controller]['children'].length < 15
-        available_controllers.push(scsi_tree[controller]['device'].deviceInfo.label)
+      if scsi_tree[controller]["children"].length < 15
+        available_controllers.push(scsi_tree[controller]["device"].deviceInfo.label)
       end
     end
 
@@ -152,9 +152,9 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
       if scsi_tree.keys.length < 4
 
         # Add a controller if none are available
-        puts 'no controllers available. Will attempt to create'
+        puts "no controllers available. Will attempt to create"
         new_scsi_key = scsi_tree.keys.sort[scsi_tree.length - 1] + 1
-        new_scsi_bus_number = scsi_tree[scsi_tree.keys.sort[scsi_tree.length - 1]]['device'].busNumber + 1
+        new_scsi_bus_number = scsi_tree[scsi_tree.keys.sort[scsi_tree.length - 1]]["device"].busNumber + 1
 
         controller_device = RbVmomi::VIM::VirtualLsiLogicController(
           key: new_scsi_key,
@@ -164,7 +164,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
 
         device_config_spec = RbVmomi::VIM::VirtualDeviceConfigSpec(
           device: controller_device,
-          operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation('add')
+          operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation("add")
         )
 
         vm_config_spec = RbVmomi::VIM::VirtualMachineConfigSpec(
@@ -177,7 +177,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
           vm.ReconfigVM_Task(spec: vm_config_spec).wait_for_completion
         end
       else
-        ui.info 'Controllers maxed out at 4.'
+        ui.info "Controllers maxed out at 4."
         exit(-1)
       end
     end
@@ -194,9 +194,9 @@ 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|
+      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)
       end
     end
@@ -215,7 +215,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
 
     vmdk_backing = RbVmomi::VIM::VirtualDiskFlatVer2BackingInfo(
       datastore: vmdk_datastore,
-      diskMode: 'persistent',
+      diskMode: "persistent",
       fileName: vmdk_name
     )
 
@@ -229,7 +229,7 @@ class Chef::Knife::VsphereVmVmdkAdd < Chef::Knife::BaseVsphereCommand
 
     device_config_spec = RbVmomi::VIM::VirtualDeviceConfigSpec(
       device: device,
-      operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation('add')
+      operation: RbVmomi::VIM::VirtualDeviceConfigSpecOperation("add")
     )
 
     vm_config_spec = RbVmomi::VIM::VirtualMachineConfigSpec(

data/lib/chef/knife/vsphere_vm_vnc_set.rb

@@ -2,23 +2,23 @@
 # Author:: Scott Williams (<scott@backups.net.au>)
 # License:: Apache License, Version 2.0
 #
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'chef/knife/search_helper'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
+require "chef/knife/search_helper"
 
 # Main class VsphereVMvncset extends the BaseVspherecommand
 class Chef::Knife::VsphereVmVncset < Chef::Knife::BaseVsphereCommand
   include SearchHelper
-  banner 'knife vsphere vm vncset VMNAME COMMAND ARGS'
+  banner "knife vsphere vm vncset VMNAME"
 
   option :vnc_port,
-         long: '--vnc-port PORT',
-         description: 'Port to run VNC on',
+         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',
+         long: "--vnc-password PASSWORD",
+         description: "Password for connecting to VNC",
          required: true
 
   common_options
@@ -30,23 +30,23 @@ class Chef::Knife::VsphereVmVncset < Chef::Knife::BaseVsphereCommand
     vmname = @name_args[0]
     if vmname.nil?
       show_usage
-      fatal_exit('You must specify a virtual machine name')
+      fatal_exit("You must specify a virtual machine name")
     end
 
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
-    extra_config, = vm.collect('config.extraConfig')
+    extra_config, = vm.collect("config.extraConfig")
 
     vm.ReconfigVM_Task(
       spec: {
         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.enabled", value: "true" },
+          { key: "RemoteDisplay.vnc.port", value: config[:vnc_port].to_s },
+          { key: "RemoteDisplay.vnc.password", value: config[:vnc_password].to_s }
+        ],
       }
     ).wait_for_completion
 
-    puts extra_config.detect { |x| 'RemoteDisplay.vnc.enabled'.casecmp(x.key) && 'true'.casecmp(x.value.downcase) }
+    puts extra_config.detect { |x| "RemoteDisplay.vnc.enabled".casecmp(x.key) && "true".casecmp(x.value.downcase) }
   end
 end

data/lib/chef/knife/vsphere_vm_wait_sysprep.rb

@@ -4,10 +4,10 @@
 # License:: Apache License, Version 2.0
 #
 
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-require 'chef/knife/search_helper'
-require 'chef/knife/customization_helper'
+require "chef/knife"
+require "chef/knife/base_vsphere_command"
+require "chef/knife/search_helper"
+require "chef/knife/customization_helper"
 
 # Wait for vm finishing Sysprep.
 # usage:
@@ -17,18 +17,18 @@ class Chef::Knife::VsphereVmWaitSysprep < Chef::Knife::BaseVsphereCommand
   include SearchHelper
   include CustomizationHelper
 
-  banner 'knife vsphere vm wait sysprep VMNAME (options)'
+  banner "knife vsphere vm wait sysprep VMNAME (options)"
 
   common_options
 
   option :sleep,
-         long: '--sleep TIME',
-         description: 'The time in seconds to wait between queries for CustomizationSucceeded event. Default: 60 seconds',
+         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',
+         long: "--timeout TIME",
+         description: "The timeout in seconds before aborting. Default: 300 seconds",
          default: 300
 
   # The main run method for vm_wait_sysprep.
@@ -39,7 +39,7 @@ class Chef::Knife::VsphereVmWaitSysprep < Chef::Knife::BaseVsphereCommand
     vmname = @name_args[0]
     if vmname.nil?
       show_usage
-      fatal_exit('You must specify a virtual machine name')
+      fatal_exit("You must specify a virtual machine name")
     end
 
     sleep_time = get_config(:sleep).to_i
@@ -48,7 +48,6 @@ class Chef::Knife::VsphereVmWaitSysprep < Chef::Knife::BaseVsphereCommand
     vim = vim_connection
     vm = get_vm_by_name(vmname, get_config(:folder)) || fatal_exit("Could not find #{vmname}")
 
-
     CustomizationHelper.wait_for_sysprep(vm, vim, sleep_timeout, sleep_time)
   end
 end

data/lib/knife-vsphere/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows
@@ -80,90 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '11.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '11.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-readline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: VMware vSphere Support for Chef's Knife Command
 email: ezra@cpan.org
 executables: []
@@ -216,9 +132,9 @@ files:
 - lib/chef/knife/vsphere_vm_vnc_set.rb
 - lib/chef/knife/vsphere_vm_wait_sysprep.rb
 - lib/knife-vsphere/version.rb
-homepage: http://github.com/chef-partners/knife-vsphere
+homepage: http://github.com/chef/knife-vsphere
 licenses:
-- Apache
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -236,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: vSphere Support for Knife