kitchen-hyperv 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f38aa0c96d1a11f6550fca5b6d5495208eda6ddd
-  data.tar.gz: 90d19dc17e48f18e170355f17b9db13055add317
+  metadata.gz: 8d3ff9e9f8b99293939c7c141455c2ec41abd93d
+  data.tar.gz: 0c2f6720c12e51087617bc30f26118ed8d5a94b7
 SHA512:
-  metadata.gz: b9338c50b2927f9604bdacbdf2567d9924c8988e05af5f72548b8747b9c10b8b77304aa13a3a94b2a934acf52cb0171972a809b6f98588eaf8701b2a12fbf406
-  data.tar.gz: 1b2169fa0f88fea07cd9e8ace57de159a2e31f15585cfc49024eabe5966ddcf27625b275789cc2f42b9ea366642ceb4ee912332e99c62c10e1c08fb561d55407
+  metadata.gz: d0c19962957e55d526736b5e8dc9ee0a94939c7e46192077ff13b29717294d68ded617672260025a8b8f3470737c798bca125560f53bbe77d262d0891897d566
+  data.tar.gz: 6d95718a8bd947220c7d6a12c82539ec03befc7509d8281e0e152b49c996cecd3b90bc7ceffdf6f4e38c5749798d0e9c4cde16c4c0af760e6cdad2b84f85ded9

data/CHANGELOG.md

@@ -1,10 +1,18 @@
 # Change Log
 
+## [v0.5.1](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.5.1) (2017-09-08)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.5.0...v0.5.1)
+
+**Merged pull requests:**
+
+- Change resize\_vhd parameter to -SizeBytes [\#58](https://github.com/test-kitchen/kitchen-hyperv/pull/58) ([jdoores](https://github.com/jdoores))
+
 ## [v0.5.0](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.5.0) (2017-07-05)
 [Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.4.1...v0.5.0)
 
 **Merged pull requests:**
 
+- version bump and changelog for v0.5.0 [\#55](https://github.com/test-kitchen/kitchen-hyperv/pull/55) ([smurawski](https://github.com/smurawski))
 - Fixed issue with existing stale diff disk [\#53](https://github.com/test-kitchen/kitchen-hyperv/pull/53) ([jdoores](https://github.com/jdoores))
 - Added static\_mac\_address feature [\#52](https://github.com/test-kitchen/kitchen-hyperv/pull/52) ([jdoores](https://github.com/jdoores))
 

data/Rakefile

@@ -13,13 +13,6 @@ end
 desc "Run all test suites"
 task :test => [:unit]
 
-desc "Display LOC stats"
-task :stats do
-  puts "\n## Production Code Stats"
-  sh "countloc -r lib"
-  puts "\n## Test Code Stats"
-  sh "countloc -r spec"
-end
 
 task :default => [:test]
 

data/lib/kitchen/driver/hyperv_version.rb

@@ -17,6 +17,6 @@
 
 module Kitchen
   module Driver
-    HYPERV_VERSION = '0.5.0'.freeze
+    HYPERV_VERSION = '0.5.1'.freeze
   end
 end

data/lib/kitchen/driver/powershell.rb

@@ -1,236 +1,236 @@
-#
-# Author:: Steven Murawski <smurawski@chef.io>
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'mixlib/shellout'
-require 'fileutils'
-require 'JSON'
-
-module Kitchen
-  module Driver
-    module PowerShellScripts
-      def encode_command(script)
-        encoded_script = script.encode('UTF-16LE', 'UTF-8')
-        Base64.strict_encode64(encoded_script)
-      end
-
-      def is_64bit?
-        os_arch = ENV['PROCESSOR_ARCHITEW6432'] || ENV['PROCESSOR_ARCHITECTURE']
-        ruby_arch = ['foo'].pack('p').size == 4 ? 32 : 64
-        os_arch == 'AMD64' && ruby_arch == 64
-      end
-
-      def is_32bit?
-        os_arch = ENV['PROCESSOR_ARCHITEW6432'] || ENV['PROCESSOR_ARCHITECTURE']
-        ruby_arch = ['foo'].pack('p').size == 4 ? 32 : 64
-        os_arch != 'AMD64' && ruby_arch == 32
-      end
-
-      def powershell_64_bit
-        if is_64bit? || is_32bit?
-          'c:\windows\system32\windowspowershell\v1.0\powershell.exe'
-        else
-          'c:\windows\sysnative\windowspowershell\v1.0\powershell.exe'
-        end
-      end
-
-      def wrap_command(script)
-        base_script_path = File.join(File.dirname(__FILE__), '/../../../support/hyperv.ps1')
-        debug("Loading functions from #{base_script_path}")
-        new_script = [ ". #{base_script_path}", "#{script}" ].join(";\n")
-        debug("Wrapped script: #{new_script}")
-        "#{powershell_64_bit} -noprofile -executionpolicy bypass" \
-        " -encodedcommand #{encode_command new_script} -outputformat Text"
-      end
-
-      # Convenience method to run a powershell command locally.
-      #
-      # @param cmd [String] command to run locally
-      # @param options [Hash] options hash
-      # @see Kitchen::ShellOut.run_command
-      # @api private
-      def run_ps(cmd, options = {})
-        cmd = "echo #{cmd}" if config[:dry_run]
-        debug('Preparing to run: ')
-        debug("  #{cmd}")
-        wrapped_command = wrap_command cmd
-        execute_command wrapped_command, options
-      end
-
-      def execute_command(cmd, options = {})
-        debug("#Local Command BEGIN (#{cmd})")
-        sh = Mixlib::ShellOut.new(cmd, options)
-        sh.run_command
-        debug("Local Command END #{Util.duration(sh.execution_time)}")
-        raise "Failed: #{sh.stderr}" if sh.error?
-        stdout = sanitize_stdout(sh.stdout)
-        JSON.parse(stdout) if stdout.length > 2
-      end
-
-      def sanitize_stdout(stdout)
-        stdout.split("\n").select { |s| !s.start_with?("PS") }.join("\n")
-      end
-
-      def new_differencing_disk_ps
-        <<-DIFF
-
-          New-DifferencingDisk -Path "#{differencing_disk_path}" -ParentPath "#{parent_vhd_path}"
-        DIFF
-      end
-
-      def new_additional_disk_ps(disk_path, disk_size)
-        <<-ADDDISK
-
-          New-VHD -Path "#{disk_path}" -SizeBytes #{disk_size}GB | Out-Null
-        ADDDISK
-      end
-
-      def ensure_vm_running_ps
-        <<-RUNNING
-
-          Assert-VmRunning -ID "#{@state[:id]}" | ConvertTo-Json
-        RUNNING
-      end
-
-      def new_vm_ps
-        <<-NEWVM
-
-          $NewVMParams = @{
-            Generation = #{config[:vm_generation]}
-            DisableSecureBoot = "#{config[:disable_secureboot]}"
-            MemoryStartupBytes = #{config[:memory_startup_bytes]}
-            StaticMacAddress = "#{config[:static_mac_address]}"
-            Name = "#{instance.name}"
-            Path = "#{kitchen_vm_path}"
-            VHDPath = "#{differencing_disk_path}"
-            SwitchName = "#{config[:vm_switch]}"
-            VlanId = #{config[:vm_vlan_id] || '$null'}
-            ProcessorCount = #{config[:processor_count]}
-            UseDynamicMemory = "#{config[:dynamic_memory]}"
-            DynamicMemoryMinBytes = #{config[:dynamic_memory_min_bytes]}
-            DynamicMemoryMaxBytes = #{config[:dynamic_memory_max_bytes]}
-            boot_iso_path = "#{boot_iso_path}"
-            EnableGuestServices = "#{config[:enable_guest_services]}"
-            #{additional_disks}
-          }
-          New-KitchenVM @NewVMParams | ConvertTo-Json
-        NEWVM
-      end
-
-      def additional_disks
-        return if config[:additional_disks].nil?
-        <<-EOH
-        AdditionalDisks = @("#{@additional_disk_objects.join('","')}")
-        EOH
-      end
-
-      def vm_details_ps
-        <<-DETAILS
-
-          Get-VmDetail -id "#{@state[:id]}" | ConvertTo-Json
-        DETAILS
-      end
-
-      def delete_vm_ps
-        <<-REMOVE
-
-          $null = Get-VM -ID "#{@state[:id]}" |
-            Stop-VM -Force -TurnOff -PassThru |
-            Remove-VM -Force
-        REMOVE
-      end
-
-      def set_vm_ipaddress_ps
-        <<-VMIP
-
-          (Get-VM -id "#{@state[:id]}").NetworkAdapters |
-            Set-VMNetworkConfiguration -ipaddress "#{config[:ip_address]}" `
-              -subnet "#{config[:subnet]}" `
-              -gateway "#{config[:gateway]}" `
-              -dnsservers #{ruby_array_to_ps_array(config[:dns_servers])} |
-            ConvertTo-Json
-        VMIP
-      end
-
-      def vm_default_switch_ps
-        <<-VMSWITCH
-          Get-DefaultVMSwitch #{config[:vm_switch]} | ConvertTo-Json
-        VMSWITCH
-      end
-
-      def mount_vm_iso
-        <<-MOUNTISO
-          mount-vmiso -id "#{@state[:id]}" -Path #{config[:iso_path]}
-        MOUNTISO
-      end
-
-      def resize_vhd
-        <<-VMNOTE
-          Resize-VHD -Path "#{parent_vhd_path}" -Size #{config[:resize_vhd]}
-        VMNOTE
-      end
-
-      def set_vm_note
-        <<-VMNOTE
-          Set-VM -Name (Get-VM | Where-Object{ $_.ID -eq "#{@state[:id]}"}).Name -Note "#{config[:vm_note]}"
-        VMNOTE
-      end
-
-      def copy_vm_file_ps(source, dest)
-        <<-FILECOPY
-          Function CopyFile ($VM, [string]$SourcePath, [string]$DestPath) {
-              $p = @{ CreateFullPath = $true ; FileSource = 'Host'; Force = $true }
-              $VM |
-                Copy-VMFile -SourcePath $SourcePath -DestinationPath $DestPath @p
-          }
-
-          $sourceLocation = '#{source}'
-          $destinationLocation = '#{dest}'
-          $vmId = '#{@state[:id]}'
-          If (Test-Path $sourceLocation) {
-              $vm = Get-VM -ID $vmId
-              $service = 'Guest Service Interface'
-
-              If ((Get-VMIntegrationService -Name $service -VM $vm).Enabled -ne $true) {
-                  Enable-VMIntegrationService -Name $service -VM $vm
-                  Start-Sleep -Seconds 3
-              }
-
-              If ((Get-Item $sourceLocation) -is [System.IO.DirectoryInfo]) {
-                  ForEach ($item in (Get-ChildItem -Path $sourceLocation -File)) {
-                      $destFullPath = (Join-Path $destinationLocation $item.Name)
-                      CopyFile $vm $item.FullName $destFullPath
-                  }
-              }
-              Else {
-                CopyFile $vm $sourceLocation $destinationLocation
-              }
-          }
-          else {
-              Write-Error "Source file path does not exist: $sourceLocation"
-          }
-        FILECOPY
-      end
-
-      private
-
-      def ruby_array_to_ps_array(list)
-        return "@()" if list.nil? || list.empty?
-        list.to_s.tr('[]','()').prepend('@')
-      end
-    end
-  end
-end
+#
+# Author:: Steven Murawski <smurawski@chef.io>
+# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'mixlib/shellout'
+require 'fileutils'
+require 'JSON'
+
+module Kitchen
+  module Driver
+    module PowerShellScripts
+      def encode_command(script)
+        encoded_script = script.encode('UTF-16LE', 'UTF-8')
+        Base64.strict_encode64(encoded_script)
+      end
+
+      def is_64bit?
+        os_arch = ENV['PROCESSOR_ARCHITEW6432'] || ENV['PROCESSOR_ARCHITECTURE']
+        ruby_arch = ['foo'].pack('p').size == 4 ? 32 : 64
+        os_arch == 'AMD64' && ruby_arch == 64
+      end
+
+      def is_32bit?
+        os_arch = ENV['PROCESSOR_ARCHITEW6432'] || ENV['PROCESSOR_ARCHITECTURE']
+        ruby_arch = ['foo'].pack('p').size == 4 ? 32 : 64
+        os_arch != 'AMD64' && ruby_arch == 32
+      end
+
+      def powershell_64_bit
+        if is_64bit? || is_32bit?
+          'c:\windows\system32\windowspowershell\v1.0\powershell.exe'
+        else
+          'c:\windows\sysnative\windowspowershell\v1.0\powershell.exe'
+        end
+      end
+
+      def wrap_command(script)
+        base_script_path = File.join(File.dirname(__FILE__), '/../../../support/hyperv.ps1')
+        debug("Loading functions from #{base_script_path}")
+        new_script = [ ". #{base_script_path}", "#{script}" ].join(";\n")
+        debug("Wrapped script: #{new_script}")
+        "#{powershell_64_bit} -noprofile -executionpolicy bypass" \
+        " -encodedcommand #{encode_command new_script} -outputformat Text"
+      end
+
+      # Convenience method to run a powershell command locally.
+      #
+      # @param cmd [String] command to run locally
+      # @param options [Hash] options hash
+      # @see Kitchen::ShellOut.run_command
+      # @api private
+      def run_ps(cmd, options = {})
+        cmd = "echo #{cmd}" if config[:dry_run]
+        debug('Preparing to run: ')
+        debug("  #{cmd}")
+        wrapped_command = wrap_command cmd
+        execute_command wrapped_command, options
+      end
+
+      def execute_command(cmd, options = {})
+        debug("#Local Command BEGIN (#{cmd})")
+        sh = Mixlib::ShellOut.new(cmd, options)
+        sh.run_command
+        debug("Local Command END #{Util.duration(sh.execution_time)}")
+        raise "Failed: #{sh.stderr}" if sh.error?
+        stdout = sanitize_stdout(sh.stdout)
+        JSON.parse(stdout) if stdout.length > 2
+      end
+
+      def sanitize_stdout(stdout)
+        stdout.split("\n").select { |s| !s.start_with?("PS") }.join("\n")
+      end
+
+      def new_differencing_disk_ps
+        <<-DIFF
+
+          New-DifferencingDisk -Path "#{differencing_disk_path}" -ParentPath "#{parent_vhd_path}"
+        DIFF
+      end
+
+      def new_additional_disk_ps(disk_path, disk_size)
+        <<-ADDDISK
+
+          New-VHD -Path "#{disk_path}" -SizeBytes #{disk_size}GB | Out-Null
+        ADDDISK
+      end
+
+      def ensure_vm_running_ps
+        <<-RUNNING
+
+          Assert-VmRunning -ID "#{@state[:id]}" | ConvertTo-Json
+        RUNNING
+      end
+
+      def new_vm_ps
+        <<-NEWVM
+
+          $NewVMParams = @{
+            Generation = #{config[:vm_generation]}
+            DisableSecureBoot = "#{config[:disable_secureboot]}"
+            MemoryStartupBytes = #{config[:memory_startup_bytes]}
+            StaticMacAddress = "#{config[:static_mac_address]}"
+            Name = "#{instance.name}"
+            Path = "#{kitchen_vm_path}"
+            VHDPath = "#{differencing_disk_path}"
+            SwitchName = "#{config[:vm_switch]}"
+            VlanId = #{config[:vm_vlan_id] || '$null'}
+            ProcessorCount = #{config[:processor_count]}
+            UseDynamicMemory = "#{config[:dynamic_memory]}"
+            DynamicMemoryMinBytes = #{config[:dynamic_memory_min_bytes]}
+            DynamicMemoryMaxBytes = #{config[:dynamic_memory_max_bytes]}
+            boot_iso_path = "#{boot_iso_path}"
+            EnableGuestServices = "#{config[:enable_guest_services]}"
+            #{additional_disks}
+          }
+          New-KitchenVM @NewVMParams | ConvertTo-Json
+        NEWVM
+      end
+
+      def additional_disks
+        return if config[:additional_disks].nil?
+        <<-EOH
+        AdditionalDisks = @("#{@additional_disk_objects.join('","')}")
+        EOH
+      end
+
+      def vm_details_ps
+        <<-DETAILS
+
+          Get-VmDetail -id "#{@state[:id]}" | ConvertTo-Json
+        DETAILS
+      end
+
+      def delete_vm_ps
+        <<-REMOVE
+
+          $null = Get-VM -ID "#{@state[:id]}" |
+            Stop-VM -Force -TurnOff -PassThru |
+            Remove-VM -Force
+        REMOVE
+      end
+
+      def set_vm_ipaddress_ps
+        <<-VMIP
+
+          (Get-VM -id "#{@state[:id]}").NetworkAdapters |
+            Set-VMNetworkConfiguration -ipaddress "#{config[:ip_address]}" `
+              -subnet "#{config[:subnet]}" `
+              -gateway "#{config[:gateway]}" `
+              -dnsservers #{ruby_array_to_ps_array(config[:dns_servers])} |
+            ConvertTo-Json
+        VMIP
+      end
+
+      def vm_default_switch_ps
+        <<-VMSWITCH
+          Get-DefaultVMSwitch #{config[:vm_switch]} | ConvertTo-Json
+        VMSWITCH
+      end
+
+      def mount_vm_iso
+        <<-MOUNTISO
+          mount-vmiso -id "#{@state[:id]}" -Path #{config[:iso_path]}
+        MOUNTISO
+      end
+
+      def resize_vhd
+        <<-VMNOTE
+          Resize-VHD -Path "#{parent_vhd_path}" -SizeBytes #{config[:resize_vhd]}
+        VMNOTE
+      end
+
+      def set_vm_note
+        <<-VMNOTE
+          Set-VM -Name (Get-VM | Where-Object{ $_.ID -eq "#{@state[:id]}"}).Name -Note "#{config[:vm_note]}"
+        VMNOTE
+      end
+
+      def copy_vm_file_ps(source, dest)
+        <<-FILECOPY
+          Function CopyFile ($VM, [string]$SourcePath, [string]$DestPath) {
+              $p = @{ CreateFullPath = $true ; FileSource = 'Host'; Force = $true }
+              $VM |
+                Copy-VMFile -SourcePath $SourcePath -DestinationPath $DestPath @p
+          }
+
+          $sourceLocation = '#{source}'
+          $destinationLocation = '#{dest}'
+          $vmId = '#{@state[:id]}'
+          If (Test-Path $sourceLocation) {
+              $vm = Get-VM -ID $vmId
+              $service = 'Guest Service Interface'
+
+              If ((Get-VMIntegrationService -Name $service -VM $vm).Enabled -ne $true) {
+                  Enable-VMIntegrationService -Name $service -VM $vm
+                  Start-Sleep -Seconds 3
+              }
+
+              If ((Get-Item $sourceLocation) -is [System.IO.DirectoryInfo]) {
+                  ForEach ($item in (Get-ChildItem -Path $sourceLocation -File)) {
+                      $destFullPath = (Join-Path $destinationLocation $item.Name)
+                      CopyFile $vm $item.FullName $destFullPath
+                  }
+              }
+              Else {
+                CopyFile $vm $sourceLocation $destinationLocation
+              }
+          }
+          else {
+              Write-Error "Source file path does not exist: $sourceLocation"
+          }
+        FILECOPY
+      end
+
+      private
+
+      def ruby_array_to_ps_array(list)
+        return "@()" if list.nil? || list.empty?
+        list.to_s.tr('[]','()').prepend('@')
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-hyperv
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler