kitchen-hyperv 0.1.10 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e34b84dd7e2463baa68a448fcad48faf91d99c55
-  data.tar.gz: 507d81b5c1fb7ea6faafa1c189121854b1870eb8
+  metadata.gz: c1d4f93b043b3ffd049677de50956792b767beef
+  data.tar.gz: 16273be77c92281545407b43f51d8e47c5de8155
 SHA512:
-  metadata.gz: 54b782a1a66f60716d700733144c016619cc5c027e807b1ca813325a1e2d7419226d4f4e8796f2ba61b08e4ee6a04cb0008491d1d8f34c7341e2649cac8e6c55
-  data.tar.gz: da830ca060e563b1c80fdba8d15ce29eb004a6bc8ac12cbd672344c0b81711185def65532bbff84fe345d3c5f2d836fae1fe675e279445b438b764b9e44206e0
+  metadata.gz: feb8ed661a0989544fe2a1e1fc5030e0fb24f614da9a19ac85812c8aa5013f5aef5eb240b4a483155088eca8bb529ec523a56773d70318941b42e350ae41d700
+  data.tar.gz: 7d01d62bb019ba9b44d830742e8809857e89b8030503e71745e875fa5526df78a00e1f5339a8ce610c373c78b9c3cbc97bfecc3ae73556e8617ab34d0a054a7f

data/.cane

@@ -1,2 +1,2 @@
---no-doc
+--no-doc
 --style-measure 100

data/.gitignore

@@ -1,15 +1,15 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-*.gem
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+*.gem

data/CHANGELOG.md

@@ -1,21 +1,21 @@
-# 0.1.10 / 12-03-2015
-
-I really need to add some tests to this project. ;)
-
-* [PR #21](https://github.com/test-kitchen/kitchen-hyperv/pull/21) : Wrong module name
-
-
-# 0.1.9 / 12-03-2015
-
-Missed a merge conflict.
-
-# 0.1.8 / 12-03-2015
-
-* [PR #15](https://github.com/test-kitchen/kitchen-hyperv/pull/15) : Dynamic Memory support
-* [PR #17](https://github.com/test-kitchen/kitchen-hyperv/pull/17) : File copy support
-* [PR #19](https://github.com/test-kitchen/kitchen-hyperv/pull/19) : Explict import of hyper-v module and delay in getting ip  (wait for DHCP)
-* [PR #20](https://github.com/test-kitchen/kitchen-hyperv/pull/20) : Doc the required WinRM Settings
-
-# 0.1.7 / 07-14-2015
-
-* [PR #8](https://github.com/test-kitchen/kitchen-hyperv/pull/8) : Add support for 64 bit ruby
+# 0.1.10 / 12-03-2015
+
+I really need to add some tests to this project. ;)
+
+* [PR #21](https://github.com/test-kitchen/kitchen-hyperv/pull/21) : Wrong module name
+
+
+# 0.1.9 / 12-03-2015
+
+Missed a merge conflict.
+
+# 0.1.8 / 12-03-2015
+
+* [PR #15](https://github.com/test-kitchen/kitchen-hyperv/pull/15) : Dynamic Memory support
+* [PR #17](https://github.com/test-kitchen/kitchen-hyperv/pull/17) : File copy support
+* [PR #19](https://github.com/test-kitchen/kitchen-hyperv/pull/19) : Explict import of hyper-v module and delay in getting ip  (wait for DHCP)
+* [PR #20](https://github.com/test-kitchen/kitchen-hyperv/pull/20) : Doc the required WinRM Settings
+
+# 0.1.7 / 07-14-2015
+
+* [PR #8](https://github.com/test-kitchen/kitchen-hyperv/pull/8) : Add support for 64 bit ruby

data/Gemfile

@@ -1,10 +1,10 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in kitchen-hyperv.gemspec
-gemspec
-
-gem 'win32-process'
-gem 'win32-api'
-gem 'windows-pr'
-gem 'windows-api'
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in kitchen-hyperv.gemspec
+gemspec
+
+gem 'win32-process'
+gem 'win32-api'
+gem 'windows-pr'
+gem 'windows-api'
 gem 'ffi'

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2015 Steven Murawski
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2015 Steven Murawski
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -39,6 +39,12 @@ driver:
   * The minimum and maximum amount of memory Hyper-V will allocate to a virtual machine if dynamic_memory is enabled. Defaults to 536,870,912 and 2,147,483,648 (512MB-2GB)
 * ip_address
   * IP address for the virtual machine.  If the VM is not on a network with DHCP, this can be used to assign an IP that can be reached from the host machine.
+* subnet
+  * The subnet of the virtual machine. Defaults to `255.255.255.0`
+* gateway
+  * The default gateway of the virtual machine.
+* dns_servers
+  * A list of DNS Servers that can be reached on the virtual network.
 * vm_switch
   * The virtual switch to attach the guest VMs.  Defaults to the first switch returned from Get-VMSwitch.
 * iso_path

data/Rakefile

@@ -1,52 +1,52 @@
-# -*- encoding: utf-8 -*-
-
-require "bundler/gem_tasks"
-
-require "rake/testtask"
-Rake::TestTask.new(:unit) do |t|
-  t.libs.push "lib"
-  t.test_files = FileList["spec/**/*_spec.rb"]
-  t.verbose = true
-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
-
-require "finstyle"
-require "rubocop/rake_task"
-RuboCop::RakeTask.new(:style) do |task|
-  task.options << "--display-cop-names"
-  task.options << "--lint"
-  task.options << '--config' << '.rubocop.yml'
-  task.patterns = ['lib/**/*.rb']
-end
-
-require "cane/rake_task"
-desc "Run cane to check quality metrics"
-Cane::RakeTask.new do |cane|
-  cane.canefile = "./.cane"
-end
-
-desc "Run all quality tasks"
-task :quality => [:cane, :style, :stats]
-
-require "yard"
-YARD::Rake::YardocTask.new
-
-desc "Generate gem dependency graph"
-task :viz do
-  Bundler.with_clean_env do
-    sh "bundle viz --without test development guard " \
-      "--requirements --version"
-  end
-end
-
-task :default => [:test, :quality]
+# -*- encoding: utf-8 -*-
+
+require "bundler/gem_tasks"
+
+require "rake/testtask"
+Rake::TestTask.new(:unit) do |t|
+  t.libs.push "lib"
+  t.test_files = FileList["spec/**/*_spec.rb"]
+  t.verbose = true
+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
+
+require "finstyle"
+require "rubocop/rake_task"
+RuboCop::RakeTask.new(:style) do |task|
+  task.options << "--display-cop-names"
+  task.options << "--lint"
+  task.options << '--config' << '.rubocop.yml'
+  task.patterns = ['lib/**/*.rb']
+end
+
+require "cane/rake_task"
+desc "Run cane to check quality metrics"
+Cane::RakeTask.new do |cane|
+  cane.canefile = "./.cane"
+end
+
+desc "Run all quality tasks"
+task :quality => [:cane, :style, :stats]
+
+require "yard"
+YARD::Rake::YardocTask.new
+
+desc "Generate gem dependency graph"
+task :viz do
+  Bundler.with_clean_env do
+    sh "bundle viz --without test development guard " \
+      "--requirements --version"
+  end
+end
+
+task :default => [:test, :quality]

data/kitchen-hyperv.gemspec

@@ -1,31 +1,31 @@
-# encoding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'kitchen/driver/hyperv_version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "kitchen-hyperv"
-  spec.version       = Kitchen::Driver::HYPERV_VERSION
-  spec.authors       = ["Steven Murawski"]
-  spec.email         = ["steven.murawski@gmail.com"]
-  spec.summary       = 'Hyper-V Driver for Test-Kitchen'
-  spec.description   = 'Hyper-V Driver for Test-Kitchen'
-  spec.homepage      = "https://github.com/test-kitchen/kitchen-hyperv"
-  spec.license       = "Apache 2"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "pry", "~> 0.10"
-  spec.add_development_dependency "cane"
-  spec.add_development_dependency "finstyle"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "yard"
-
-  spec.add_dependency "test-kitchen", "~> 1.4"
-end
+# encoding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'kitchen/driver/hyperv_version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "kitchen-hyperv"
+  spec.version       = Kitchen::Driver::HYPERV_VERSION
+  spec.authors       = ["Steven Murawski"]
+  spec.email         = ["steven.murawski@gmail.com"]
+  spec.summary       = 'Hyper-V Driver for Test-Kitchen'
+  spec.description   = 'Hyper-V Driver for Test-Kitchen'
+  spec.homepage      = "https://github.com/test-kitchen/kitchen-hyperv"
+  spec.license       = "Apache 2"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "pry", "~> 0.10"
+  spec.add_development_dependency "cane"
+  spec.add_development_dependency "finstyle"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "yard"
+
+  spec.add_dependency "test-kitchen", "~> 1.4"
+end

data/lib/kitchen/driver/hyperv.rb

@@ -42,6 +42,9 @@ module Kitchen
       default_config :dynamic_memory, false
       default_config :processor_count, 2
       default_config :ip_address
+      default_config :gateway
+      default_config :dns_servers
+      default_config :subnet, '255.255.255.0'
       default_config :vm_switch
       default_config :iso_path
       default_config :vm_generation, 1

data/lib/kitchen/driver/hyperv_version.rb

@@ -1,22 +1,22 @@
-#
-# 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.
-
-module Kitchen
-  module Driver
-      HYPERV_VERSION = '0.1.10'
-  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.
+
+module Kitchen
+  module Driver
+      HYPERV_VERSION = '0.1.20'
+  end
+end

data/lib/kitchen/driver/powershell.rb

@@ -1,184 +1,194 @@
-#
-# 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']
-        os_arch == 'AMD64'
-      end
-
-      def powershell_64_bit
-        if is_64bit?
-          '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
-        debug("Wrapped script: #{new_script}")
-        "#{powershell_64_bit} -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
-
-      # rubocop:disable Metrics/AbcSize
-      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)}")
-        fail "Failed: #{sh.stderr}" if sh.error?
-        JSON.parse(sh.stdout) if sh.stdout.length > 2
-      end
-      # rubocop:enable Metrics/AbcSize
-
-      def new_differencing_disk_ps
-        <<-DIFF
-
-          New-DifferencingDisk -Path "#{differencing_disk_path}" -ParentPath "#{parent_vhd_path}"
-        DIFF
-      end
-
-      def ensure_vm_running_ps
-        <<-RUNNING
-
-          Assert-VmRunning -ID "#{@state[:id]}" | ConvertTo-Json
-        RUNNING
-      end
-
-      # rubocop:disable Metrics/MethodLength
-      def new_vm_ps
-        <<-NEWVM
-
-          $NewVMParams = @{
-            Generation = #{config[:vm_generation]}
-            MemoryStartupBytes = #{config[:memory_startup_bytes]}
-            Name = "#{instance.name}"
-            Path = "#{kitchen_vm_path}"
-            VHDPath = "#{differencing_disk_path}"
-            SwitchName = "#{config[:vm_switch]}"
-            ProcessorCount = #{config[:processor_count]}
-            UseDynamicMemory = "#{config[:dynamic_memory]}"
-            DynamicMemoryMinBytes = #{config[:dynamic_memory_min_bytes]}
-            DynamicMemoryMaxBytes = #{config[:dynamic_memory_max_bytes]}
-          }
-          New-KitchenVM @NewVMParams | ConvertTo-Json
-        NEWVM
-      end
-      # rubocop:enable Metrics/MethodLength
-
-      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 255.255.255.0 |
-            ConvertTo-Json
-        VMIP
-      end
-
-      def vm_default_switch_ps
-        <<-VMSWITCH
-          Get-DefaultVMSwitch | ConvertTo-Json
-        VMSWITCH
-      end
-
-      def mount_vm_iso
-        <<-MOUNTISO
-          mount-vmiso -id "#{@state[:id]}" -Path #{config[:iso_path]}
-        MOUNTISO
-      end
-      
-      def copy_vm_file_ps(source, dest)
-        <<-FILECOPY
-          Function CopyFile ($VM, [string]$SourcePath, [string]$DestPath) {
-              #Write-Host "Copying file to VM - Source: $SourcePath Destination $DestPath"
-              $VM | Copy-VMFile -SourcePath $SourcePath -DestinationPath $DestPath -CreateFullPath -FileSource Host -Force
-          }
-          
-          $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
-    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']
+        os_arch == 'AMD64'
+      end
+
+      def powershell_64_bit
+        if is_64bit?
+          '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
+        debug("Wrapped script: #{new_script}")
+        "#{powershell_64_bit} -noprofile -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
+
+      # rubocop:disable Metrics/AbcSize
+      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)}")
+        fail "Failed: #{sh.stderr}" if sh.error?
+        JSON.parse(sh.stdout) if sh.stdout.length > 2
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      def new_differencing_disk_ps
+        <<-DIFF
+
+          New-DifferencingDisk -Path "#{differencing_disk_path}" -ParentPath "#{parent_vhd_path}"
+        DIFF
+      end
+
+      def ensure_vm_running_ps
+        <<-RUNNING
+
+          Assert-VmRunning -ID "#{@state[:id]}" | ConvertTo-Json
+        RUNNING
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def new_vm_ps
+        <<-NEWVM
+
+          $NewVMParams = @{
+            Generation = #{config[:vm_generation]}
+            MemoryStartupBytes = #{config[:memory_startup_bytes]}
+            Name = "#{instance.name}"
+            Path = "#{kitchen_vm_path}"
+            VHDPath = "#{differencing_disk_path}"
+            SwitchName = "#{config[:vm_switch]}"
+            ProcessorCount = #{config[:processor_count]}
+            UseDynamicMemory = "#{config[:dynamic_memory]}"
+            DynamicMemoryMinBytes = #{config[:dynamic_memory_min_bytes]}
+            DynamicMemoryMaxBytes = #{config[:dynamic_memory_max_bytes]}
+          }
+          New-KitchenVM @NewVMParams | ConvertTo-Json
+        NEWVM
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      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 | ConvertTo-Json
+        VMSWITCH
+      end
+
+      def mount_vm_iso
+        <<-MOUNTISO
+          mount-vmiso -id "#{@state[:id]}" -Path #{config[:iso_path]}
+        MOUNTISO
+      end
+      
+      def copy_vm_file_ps(source, dest)
+        <<-FILECOPY
+          Function CopyFile ($VM, [string]$SourcePath, [string]$DestPath) {
+              #Write-Host "Copying file to VM - Source: $SourcePath Destination $DestPath"
+              $VM | Copy-VMFile -SourcePath $SourcePath -DestinationPath $DestPath -CreateFullPath -FileSource Host -Force
+          }
+          
+          $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

data/spec/kitchen/driver/hyperv_spec.rb

@@ -1,70 +1,70 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2015, Fletcher Nichol
-#
-# 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_relative "../../spec_helper"
-
-require "logger"
-require "stringio"
-require "kitchen"
-require 'kitchen/driver/hyperv_version'
-require "kitchen/driver/hyperv"
-require "kitchen/provisioner/dummy"
-require "kitchen/transport/dummy"
-require "kitchen/verifier/dummy"
-
-describe Kitchen::Driver::Hyperv do
-
-  let(:logged_output) { StringIO.new }
-  let(:logger)        { Logger.new(logged_output) }
-  let(:config)        { { :kitchen_root => "c:/test_root" } }
-  let(:platform)      { Kitchen::Platform.new(:name => "fooos-99") }
-  let(:suite)         { Kitchen::Suite.new(:name => "suitey") }
-  let(:verifier)      { Kitchen::Verifier::Dummy.new }
-  let(:provisioner)   { Kitchen::Provisioner::Dummy.new }
-  let(:transport)     { Kitchen::Transport::Dummy.new }
-  let(:state_file)    { stub("state_file") }
-  let(:state)         { Hash.new }
-  let(:env)           { Hash.new }
-
-  let(:driver_object) { Kitchen::Driver::Hyperv.new(config) }
-
-  let(:driver) do
-    d = driver_object
-    instance
-    d
-  end
-
-  let(:instance) do
-    Kitchen::Instance.new(
-      :verifier => verifier,
-      :driver => driver_object,
-      :logger => logger,
-      :suite => suite,
-      :platform => platform,
-      :provisioner => provisioner,
-      :transport => transport,
-      :state_file => state_file
-    )
-  end
-
-  #before { stub_const("ENV", env) }
-
-  it 'driver api_version is 2' do
-    driver.diagnose_plugin[:api_version].must_equal(2)
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher (<fnichol@nichol.ca>)
+#
+# Copyright (C) 2015, Fletcher Nichol
+#
+# 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_relative "../../spec_helper"
+
+require "logger"
+require "stringio"
+require "kitchen"
+require 'kitchen/driver/hyperv_version'
+require "kitchen/driver/hyperv"
+require "kitchen/provisioner/dummy"
+require "kitchen/transport/dummy"
+require "kitchen/verifier/dummy"
+
+describe Kitchen::Driver::Hyperv do
+
+  let(:logged_output) { StringIO.new }
+  let(:logger)        { Logger.new(logged_output) }
+  let(:config)        { { :kitchen_root => "c:/test_root" } }
+  let(:platform)      { Kitchen::Platform.new(:name => "fooos-99") }
+  let(:suite)         { Kitchen::Suite.new(:name => "suitey") }
+  let(:verifier)      { Kitchen::Verifier::Dummy.new }
+  let(:provisioner)   { Kitchen::Provisioner::Dummy.new }
+  let(:transport)     { Kitchen::Transport::Dummy.new }
+  let(:state_file)    { stub("state_file") }
+  let(:state)         { Hash.new }
+  let(:env)           { Hash.new }
+
+  let(:driver_object) { Kitchen::Driver::Hyperv.new(config) }
+
+  let(:driver) do
+    d = driver_object
+    instance
+    d
+  end
+
+  let(:instance) do
+    Kitchen::Instance.new(
+      :verifier => verifier,
+      :driver => driver_object,
+      :logger => logger,
+      :suite => suite,
+      :platform => platform,
+      :provisioner => provisioner,
+      :transport => transport,
+      :state_file => state_file
+    )
+  end
+
+  #before { stub_const("ENV", env) }
+
+  it 'driver api_version is 2' do
+    driver.diagnose_plugin[:api_version].must_equal(2)
+  end
+end

data/spec/spec_helper.rb

@@ -1,43 +1,43 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2012, Fletcher Nichol
-#
-# 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.
-
-gem "minitest"
-gem "minitest-stub-const"
-
-if ENV["CODECLIMATE_REPO_TOKEN"]
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-elsif ENV["COVERAGE"]
-  require "simplecov"
-  SimpleCov.profiles.define "gem" do
-    command_name "Specs"
-
-    add_filter ".gem/"
-    add_filter "/spec/"
-    add_filter "/lib/vendor/"
-
-    add_group "Libraries", "/lib/"
-  end
-  SimpleCov.start "gem"
-end
-
-require 'minitest'
-require 'minitest/stub_const'
-require "minitest/autorun"
-require "mocha/setup"
-require "tempfile"
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+#
+# Copyright (C) 2012, Fletcher Nichol
+#
+# 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.
+
+gem "minitest"
+gem "minitest-stub-const"
+
+if ENV["CODECLIMATE_REPO_TOKEN"]
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+elsif ENV["COVERAGE"]
+  require "simplecov"
+  SimpleCov.profiles.define "gem" do
+    command_name "Specs"
+
+    add_filter ".gem/"
+    add_filter "/spec/"
+    add_filter "/lib/vendor/"
+
+    add_group "Libraries", "/lib/"
+  end
+  SimpleCov.start "gem"
+end
+
+require 'minitest'
+require 'minitest/stub_const'
+require "minitest/autorun"
+require "mocha/setup"
+require "tempfile"

data/spec/support/hyperv.Tests.ps1

@@ -1,2 +1,2 @@
-. $PSScriptRoot\..\..\support\hyperv.ps1
-
+. $PSScriptRoot\..\..\support\hyperv.ps1
+

data/support/hyperv.ps1

@@ -113,6 +113,8 @@ Function Set-VMNetworkConfiguration
         [parameter(valuefrompipeline)]
         [object]$NetworkAdapter,
         [String[]]$IPAddress = @(),
+        [String[]]$Gateway = @(),
+        [String[]]$DNSServers = @(),
         [String[]]$Subnet = @()
     )
 
@@ -134,6 +136,8 @@ Function Set-VMNetworkConfiguration
     }
 
     $NetworkSettings[0].IPAddresses = $IPAddress
+    $NetworkSettings[0].DefaultGateways = $Gateway
+    $NetworkSettings[0].DNSServers = $DNSServers
     $NetworkSettings[0].Subnets = $Subnet
     $NetworkSettings[0].ProtocolIFType = 4096
     $NetworkSettings[0].DHCPEnabled = $false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-hyperv
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.20
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Hyper-V Driver for Test-Kitchen