chef-provisioning-vsphere 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37f82ea348c58634c6971b8714c71b31c91c0cc5
-  data.tar.gz: d31a7417afd87dd0b475a81ffb529a6c990de31e
+  metadata.gz: fee187b088f7b218b9e783f294da04188b0e38ba
+  data.tar.gz: 1fcb11378516dc70fc0a1acd9b2381cc58c219ca
 SHA512:
-  metadata.gz: 2653688852fe8b84876266ffc34a674cc82f038b39958af172c378d80ddabf7e0921a0daaaff11c5d4a7be69ea670faae77a744ef136df41dbd81d421bfff0a5
-  data.tar.gz: da5199536bf1a4122085fab98ab11b5db08cecad6ef346b19fc17337b1d2c948d9c0f6b3c3e911c89650ab24a19ee9f0d2342b728b97cc80baf8e7d731b5621f
+  metadata.gz: 9e8545b0d2035c652ff75d6d661938f8fb2b7a866e2393c2084120672b923d32bd65da35bd6c0a1cf4364e5b81093cbfb485c7a779eefc55ae8451c13ed702b8
+  data.tar.gz: 9b1d22263be24c51ef3392b32e17e9d836827b55ee3a4fa7a3b2836519faef09df295951673bb0ca33de6c55173d2d9d67685f78b8b6219d2cc61ccaa96cb301

data/.travis.yml

@@ -5,10 +5,12 @@ branches:
     - master
 rvm:
   - 2.3.3
-  - 2.4.1
+  - 2.4.3
+  - 2.5.0
+  - ruby-head
 
 script:
-  - bundle exec rake style
+  - bundle exec rake style:chefstyle
   - bundle exec rake unit
   - bundle exec rake yard
 

data/CHANGELOG.md

@@ -1,7 +1,16 @@
 # Change Log
 
-## [v2.2.2](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v2.2.2)
+## [v2.3.0](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v2.3.0)
 
+[Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.2.2...v2.3.0)
+
+**Merged pull requests:**
+
+- Fix missing\_method deprecation from Cheffish::MergedConfig [\#88](https://github.com/chef-partners/chef-provisioning-vsphere/pull/88) ([josh-barker](https://github.com/josh-barker))
+- Trying to make travis happy [\#87](https://github.com/chef-partners/chef-provisioning-vsphere/pull/87) ([jjasghar](https://github.com/jjasghar))
+- Trying to get back to standards [\#86](https://github.com/chef-partners/chef-provisioning-vsphere/pull/86) ([jjasghar](https://github.com/jjasghar))
+
+## [v2.2.2](https://github.com/chef-partners/chef-provisioning-vsphere/tree/v2.2.2) (2018-06-05)
 [Full Changelog](https://github.com/chef-partners/chef-provisioning-vsphere/compare/v2.2.1...v2.2.2)
 
 **Merged pull requests:**

data/Gemfile

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 gemspec

data/Rakefile

@@ -1,41 +1,75 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'chef/provisioning/vsphere_driver/version'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
-require 'yard'
+require "bundler/gem_tasks"
+require "chef/provisioning/vsphere_driver/version"
+require "rspec/core/rake_task"
+require "rubocop/rake_task"
+require "yard"
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/lib')
-
-RuboCop::RakeTask.new(:style) do |task|
-  task.options << '--display-cop-names'
-end
+$LOAD_PATH.unshift(File.dirname(__FILE__) + "/lib")
 
 RSpec::Core::RakeTask.new(:unit) do |task|
-  task.pattern = 'spec/unit_tests/*_spec.rb'
-  task.rspec_opts = ['--color', '-f documentation']
+  task.pattern = "spec/unit_tests/*_spec.rb"
+  task.rspec_opts = ["--color", "-f documentation"]
 end
 
 RSpec::Core::RakeTask.new(:integration) do |task|
-  task.pattern = 'spec/integration_tests/*_spec.rb'
-  task.rspec_opts = ['--color', '-f documentation', '--out rspec.txt']
+  task.pattern = "spec/integration_tests/*_spec.rb"
+  task.rspec_opts = ["--color", "-f documentation", "--out rspec.txt"]
 end
 
 begin
-  require 'github_changelog_generator/task'
+  require "github_changelog_generator/task"
 
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     config.future_release = ChefProvisioningVsphere::VERSION
     config.issues = true
   end
 rescue LoadError
-  puts 'github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs'
+  puts "github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs"
 end
 
 YARD::Rake::YardocTask.new do |t|
-  t.files = ['lib/**/*.rb'] # optional
-  t.stats_options = ['--list-undoc'] # optional
+  t.files = ["lib/**/*.rb"] # optional
+  t.stats_options = ["--list-undoc"] # optional
 end
 
-task default: %i(style unit)
+task default: %i{style unit}
+
+namespace :style do
+  begin
+    require "rubocop/rake_task"
+
+    desc "Run Cookbook Ruby style checks"
+    RuboCop::RakeTask.new(:cookstyle) do |t|
+      t.requires = ["cookstyle"]
+      t.patterns = ["lib/chef-dk/skeletons/code_generator"]
+      t.options = ["--display-cop-names"]
+    end
+  rescue LoadError => e
+    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV["CI"]
+  end
+
+  begin
+    require "rubocop/rake_task"
+
+    ignore_dirs = Regexp.union(%w{
+      lib/chef-dk/skeletons/code_generator
+      spec/unit/fixtures/chef-runner-cookbooks
+      spec/unit/fixtures/cookbook_cache
+      spec/unit/fixtures/example_cookbook
+      spec/unit/fixtures/example_cookbook_metadata_json_only
+      spec/unit/fixtures/example_cookbook_no_metadata
+      spec/unit/fixtures/local_path_cookbooks
+    })
+
+    desc "Run Chef Ruby style checks"
+    RuboCop::RakeTask.new(:chefstyle) do |t|
+      t.requires = ["chefstyle"]
+      t.patterns = `rubocop --list-target-files`.split("\n").reject { |f| f =~ ignore_dirs }
+      t.options = ["--display-cop-names"]
+    end
+  rescue LoadError => e
+    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV["CI"]
+  end
+end

data/chef-provisioning-vsphere.gemspec

@@ -1,39 +1,39 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/lib')
-require 'chef/provisioning/vsphere_driver/version'
+$LOAD_PATH.unshift(File.dirname(__FILE__) + "/lib")
+require "chef/provisioning/vsphere_driver/version"
 
 # rubocop Metrics/ModuleLength
 Gem::Specification.new do |s|
-  s.name = 'chef-provisioning-vsphere'
+  s.name = "chef-provisioning-vsphere"
   s.version = ChefProvisioningVsphere::VERSION
   s.platform = Gem::Platform::RUBY
-  s.extra_rdoc_files = ['README.md']
-  s.summary = 'Provisioner for creating vSphere VM instances in Chef Provisioning.'
+  s.extra_rdoc_files = ["README.md"]
+  s.summary = "Provisioner for creating vSphere VM instances in Chef Provisioning."
   s.description = s.summary
-  s.authors = ['CenturyLink Cloud', 'JJ Asghar']
-  s.email = 'jj@chef.io'
-  s.homepage = 'https://github.com/chef-partners/chef-provisioning-vsphere'
-  s.license = 'MIT'
-  s.bindir       = 'bin'
-  s.executables  = %w()
-  s.require_path = 'lib'
+  s.authors = ["CenturyLink Cloud", "JJ Asghar"]
+  s.email = "jj@chef.io"
+  s.homepage = "https://github.com/chef-partners/chef-provisioning-vsphere"
+  s.license = "MIT"
+  s.bindir       = "bin"
+  s.executables  = %w{}
+  s.require_path = "lib"
   s.files        = `git ls-files -z`.split("\x0")
   s.test_files   = s.files.grep(%r{^(test|spec|features)/})
 
-  s.add_dependency 'chef', '>= 12.0'
-  s.add_dependency 'chef-provisioning', '~> 2.0'
-  s.add_dependency 'cheffish', '>= 4.0'
-  s.add_dependency 'rbvmomi', '~> 1.10'
+  s.add_dependency "chef", ">= 12.0"
+  s.add_dependency "chef-provisioning", "~> 2.0"
+  s.add_dependency "cheffish", ">= 4.0"
+  s.add_dependency "rbvmomi", "~> 1.10"
 
-  s.add_development_dependency 'chefstyle'
-  s.add_development_dependency 'github_changelog_generator'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'pry-byebug'
-  s.add_development_dependency 'pry-stack_explorer'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rb-readline'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'yard'
+  s.add_development_dependency "chefstyle"
+  s.add_development_dependency "github_changelog_generator"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "pry-byebug"
+  s.add_development_dependency "pry-stack_explorer"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rb-readline"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "simplecov"
+  s.add_development_dependency "yard"
 end

data/examples/ubuntu-provision.rb

@@ -1,31 +1,32 @@
-require 'chef/provisioning'
-require 'chef/provisioning/vsphere_driver'
+# frozen_string_literal: true
+require "chef/provisioning"
+require "chef/provisioning/vsphere_driver"
 
 #
 # This is the main way to connect to vSphere
 #
-with_vsphere_driver host: '172.16.20.2',
-  insecure: true,
-  user:     'administrator@vsphere.local',
-  password: 'PASSWORD'
+with_vsphere_driver host: "172.16.20.2",
+                    insecure: true,
+                    user:     "administrator@vsphere.local",
+                    password: "PASSWORD"
 
 #
 # These are the machine_options that you need to declare
 #
-with_machine_options :bootstrap_options => {
-                               num_cpus: 2,
-                               memory_mb: 4096,
-                               datacenter: 'Datacenter',
-                               resource_pool: 'Cluster',
-                               template_folder: 'Linux',
-                               template_name: 'ubuntu16',
-                               :ssh => {
-                                 :user => 'admini',
-                                 :password => 'PASSWORD',
-                                 :paranoid => false,
-                               }
-                             },
-                :sudo => true
+with_machine_options bootstrap_options: {
+  num_cpus: 2,
+  memory_mb: 4096,
+  datacenter: "Datacenter",
+  resource_pool: "Cluster",
+  template_folder: "Linux",
+  template_name: "ubuntu16",
+  ssh: {
+    user: "admini",
+    password: "PASSWORD",
+    paranoid: false,
+  },
+},
+                     sudo: true
 
 #
 # This is where you can declare the machine

data/examples/win-provision.rb

@@ -1,42 +1,41 @@
-require 'chef/provisioning'
-require 'chef/provisioning/vsphere_driver'
-
+# frozen_string_literal: true
+require "chef/provisioning"
+require "chef/provisioning/vsphere_driver"
 
 #
 # This is the main way to connect to vSphere
 #
-with_vsphere_driver host: '172.16.20.2',
-  insecure: true,
-  user:     'administrator@vsphere.local',
-  password: 'PASSWORD'
+with_vsphere_driver host: "172.16.20.2",
+                    insecure: true,
+                    user:     "administrator@vsphere.local",
+                    password: "PASSWORD"
 
 #
 # These are the machine_options that you need to declare
 #
-win_bootstrap_options = { :bootstrap_options => {
-                            num_cpus: 2,
-                            memory_mb: 8096,
-                            datacenter: 'Datacenter',
-                            resource_pool: 'Cluster',
-                            template_folder: 'Windows',
-                            template_name: 'windows2012R2',
-                            :ssh => {
-                              :user => 'Administrator',
-                              :password => 'P@ssw0rd!!!',
-                              :paranoid => false,
-                              :port => "5985"
-                            }
-                          },
-                          ssh_options: { :keepalive => true, :keepalive_interval => 50, :user_known_hosts_file => '/dev/null' },
-                          ready_timeout: '30'
-                        }
+win_bootstrap_options = { bootstrap_options: {
+  num_cpus: 2,
+  memory_mb: 8096,
+  datacenter: "Datacenter",
+  resource_pool: "Cluster",
+  template_folder: "Windows",
+  template_name: "windows2012R2",
+  ssh: {
+    user: "Administrator",
+    password: "P@ssw0rd!!!",
+    paranoid: false,
+    port: "5985",
+  },
+},
+                          ssh_options: { keepalive: true, keepalive_interval: 50, user_known_hosts_file: "/dev/null" },
+                          ready_timeout: "30" }
 
 #
 # WinRM requires a Chef server (not sure why) so you need to declare it here
 #
 with_chef_server "https://api.chef.io/organizations/ORG",
-                 :client_name => Chef::Config[:node_name],
-                 :signing_key_filename => Chef::Config[:client_key]
+                 client_name: Chef::Config[:node_name],
+                 signing_key_filename: Chef::Config[:client_key]
 
 #
 # This is where you can declare the machine

data/lib/chef/provisioning/driver_init/vsphere.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require 'chef/provisioning/vsphere_driver'
+require "chef/provisioning/vsphere_driver"
 
-Chef::Provisioning.register_driver_class('vsphere', ChefProvisioningVsphere::VsphereDriver)
+Chef::Provisioning.register_driver_class("vsphere", ChefProvisioningVsphere::VsphereDriver)

data/lib/chef/provisioning/vsphere_driver.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'chef/provisioning'
-require 'chef/provisioning/vsphere_driver/driver'
+require "chef/provisioning"
+require "chef/provisioning/vsphere_driver/driver"
 
 # The main Chef class for all the Chef code!
 class Chef

data/lib/chef/provisioning/vsphere_driver/clone_spec_builder.rb

@@ -43,7 +43,7 @@ module ChefProvisioningVsphere
       end
 
       unless options[:network_name].nil?
-        deviceAdditions, changes = vsphere_helper.network_device_changes(
+        deviceAdditions, changes = vsphere_helper.network_device_changes( # rubocop:disable Naming/VariableName, Lint/UselessAssignment
           action_handler,
           vm_template,
           options
@@ -78,12 +78,12 @@ module ChefProvisioningVsphere
       elsif vm_template.config.template && !host.nil?
         rspec.pool = host.parent.resourcePool # assign to the "invisible" pool root
       elsif vm_template.config.template
-        raise 'either :host or :resource_pool must be specified when cloning from a VM Template'
+        raise "either :host or :resource_pool must be specified when cloning from a VM Template"
       end
 
       if options[:use_linked_clone]
         if vm_template.config.template
-          Chef::Log.warn('Using a VM Template, ignoring use_linked_clone.')
+          Chef::Log.warn("Using a VM Template, ignoring use_linked_clone.")
         else
           vsphere_helper.create_delta_disk(vm_template)
           rspec.diskMoveType = :moveChildMostDiskBacking
@@ -105,16 +105,16 @@ module ChefProvisioningVsphere
     def customization_options_from(vm_template, vm_name, options)
       if options.key?(:customization_spec)
         if options[:customization_spec].is_a?(Hash) ||
-           options[:customization_spec].is_a?(Cheffish::MergedConfig)
+            options[:customization_spec].is_a?(Cheffish::MergedConfig)
           cust_options = options[:customization_spec]
           ip_settings = cust_options[:ipsettings]
           cust_domain = cust_options[:domain]
 
-          raise ArgumentError, 'domain is required' unless cust_domain
+          raise ArgumentError, "domain is required" unless cust_domain
           cust_ip_settings = nil
           if ip_settings && ip_settings.key?(:ip)
             unless cust_options[:ipsettings].key?(:subnetMask)
-              raise ArgumentError, 'subnetMask is required for static ip'
+              raise ArgumentError, "subnetMask is required for static ip"
             end
             cust_ip_settings = RbVmomi::VIM::CustomizationIPSettings.new(
               ip_settings
@@ -145,7 +145,7 @@ module ChefProvisioningVsphere
           cust_hwclockutc = cust_options[:hw_clock_utc]
           cust_timezone = cust_options[:time_zone]
 
-          cust_prep = if vm_template.config.guestId.start_with?('win')
+          cust_prep = if vm_template.config.guestId.start_with?("win")
                         windows_prep_for(options, vm_name)
                       else
                         RbVmomi::VIM::CustomizationLinuxPrep.new(
@@ -158,7 +158,7 @@ module ChefProvisioningVsphere
           cust_adapter_mapping = [
             RbVmomi::VIM::CustomizationAdapterMapping.new(
               adapter: cust_ip_settings
-            )
+            ),
           ]
           RbVmomi::VIM::CustomizationSpec.new(
             identity: cust_prep,
@@ -179,7 +179,7 @@ module ChefProvisioningVsphere
       hostname = options[:hostname] || vm_name
       test = /^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])$/
       unless hostname.match?(test)
-        raise 'Only letters, numbers or hyphens in hostnames allowed'
+        raise "Only letters, numbers or hyphens in hostnames allowed"
       end
       RbVmomi::VIM::CustomizationFixedName.new(name: hostname)
     end
@@ -200,10 +200,10 @@ module ChefProvisioningVsphere
         plainText: true,
         value: options[:ssh][:password]
       )
-      if cust_options.key?(:domain) && (cust_options[:domain] != 'local')
+      if cust_options.key?(:domain) && (cust_options[:domain] != "local")
         cust_domain_password = RbVmomi::VIM::CustomizationPassword(
           plainText: true,
-          value: ENV['domainAdminPassword'] || cust_options[:domainAdminPassword]
+          value: ENV["domainAdminPassword"] || cust_options[:domainAdminPassword]
         )
         cust_id = RbVmomi::VIM::CustomizationIdentification.new(
           joinDomain: cust_options[:domain],
@@ -214,7 +214,7 @@ module ChefProvisioningVsphere
           with user: #{cust_options[:domainAdmin]}"
       else
         cust_id = RbVmomi::VIM::CustomizationIdentification.new(
-          joinWorkgroup: 'WORKGROUP'
+          joinWorkgroup: "WORKGROUP"
         )
       end
       cust_gui_unattended = RbVmomi::VIM::CustomizationGuiUnattended.new(