kitchen-hyperv 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d8187d14da4cc530bcbfbb5c44c4386ee2cc119
-  data.tar.gz: 7e23e2dd069c756b6e28a553770520eb5225590c
+  metadata.gz: a4943e1bf989d84e45049694dfa9fcabae748992
+  data.tar.gz: 6c57a1373e0f713974be0917dbc4a2b3b21c6304
 SHA512:
-  metadata.gz: 9786ad82b471d5bcb3019effc0227c135b26335bfa500de4629f46e6034ea93f9c1f60664ec2d742575e5522c264f5cbe317519496631cbe2bd201670d065505
-  data.tar.gz: c2267765344ca3b4004304502c18138e964d22b6e762cb9da061192706711a90b3a52e2dafc13406de2fa86e056e8b2b7b0da520e9a629b3a79c4db7eaeab19f
+  metadata.gz: 09a93312d25a48bfa8b7601ef1f80b280950b4dc3f5d102f2ea8e3945ebbad46f9a105b847289697e07f447ce04d1ba8cde6cc34b08118f215ca4a4ee15bf9be
+  data.tar.gz: 3eb72a618d78f698d7bffd24db39b91f6343a1d82a540e2026f6d5ba9e9a6bf06d6eb050cdc4b91232956eaf0f26afa34990fb1a9aa8a851b40b92d9798924b7

data/CHANGELOG.md

@@ -0,0 +1,77 @@
+# Change Log
+
+## [v0.2.2](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.2.2) (2016-06-10)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.2.1...v0.2.2)
+
+**Merged pull requests:**
+
+- Support PowerShell v5.1 on the Insider Preview - updated [\#31](https://github.com/test-kitchen/kitchen-hyperv/pull/31) ([smurawski](https://github.com/smurawski))
+- Support PowerShell v5.1 on the Insider Preview [\#30](https://github.com/test-kitchen/kitchen-hyperv/pull/30) ([smurawski](https://github.com/smurawski))
+
+## [v0.2.1](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.2.1) (2016-05-25)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.20...v0.2.1)
+
+## [v0.1.20](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.20) (2016-05-17)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.10...v0.1.20)
+
+**Merged pull requests:**
+
+- More Configurable VM Networking [\#27](https://github.com/test-kitchen/kitchen-hyperv/pull/27) ([svmastersamurai](https://github.com/svmastersamurai))
+- Add -noprofile to powershell executions to prevent users' custom prof… [\#23](https://github.com/test-kitchen/kitchen-hyperv/pull/23) ([kriszentner](https://github.com/kriszentner))
+
+## [v0.1.10](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.10) (2015-12-03)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.9...v0.1.10)
+
+**Merged pull requests:**
+
+- update incorrect module name [\#21](https://github.com/test-kitchen/kitchen-hyperv/pull/21) ([jbruettcva](https://github.com/jbruettcva))
+
+## [v0.1.9](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.9) (2015-12-03)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.8...v0.1.9)
+
+## [v0.1.8](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.8) (2015-12-03)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.7...v0.1.8)
+
+**Merged pull requests:**
+
+- Updating readme.md to include image configuration, specifically winrm… [\#20](https://github.com/test-kitchen/kitchen-hyperv/pull/20) ([jbruettcva](https://github.com/jbruettcva))
+- Hyper-V module and Get-VMIP delay fix [\#19](https://github.com/test-kitchen/kitchen-hyperv/pull/19) ([jbruettcva](https://github.com/jbruettcva))
+- File copy feature [\#17](https://github.com/test-kitchen/kitchen-hyperv/pull/17) ([dpiessens](https://github.com/dpiessens))
+- Fixed NilClass exception if VM does not exist [\#16](https://github.com/test-kitchen/kitchen-hyperv/pull/16) ([dpiessens](https://github.com/dpiessens))
+- Add support for dynamic memory [\#15](https://github.com/test-kitchen/kitchen-hyperv/pull/15) ([brantb](https://github.com/brantb))
+
+## [v0.1.7](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.7) (2015-07-14)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.6...v0.1.7)
+
+**Merged pull requests:**
+
+- 64-bit windows support [\#8](https://github.com/test-kitchen/kitchen-hyperv/pull/8) ([ksubrama](https://github.com/ksubrama))
+
+## [v0.1.6](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.6) (2015-06-25)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.5...v0.1.6)
+
+## [v0.1.5](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.5) (2015-06-24)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.2...v0.1.5)
+
+**Merged pull requests:**
+
+- Adding support for mounting ISOs [\#6](https://github.com/test-kitchen/kitchen-hyperv/pull/6) ([smurawski](https://github.com/smurawski))
+
+## [v0.1.2](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.2) (2015-05-20)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.1...v0.1.2)
+
+**Merged pull requests:**
+
+- Smurawski/updating metadata [\#4](https://github.com/test-kitchen/kitchen-hyperv/pull/4) ([smurawski](https://github.com/smurawski))
+
+## [v0.1.1](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.1) (2015-05-20)
+[Full Changelog](https://github.com/test-kitchen/kitchen-hyperv/compare/v0.1.0...v0.1.1)
+
+## [v0.1.0](https://github.com/test-kitchen/kitchen-hyperv/tree/v0.1.0) (2015-05-20)
+**Merged pull requests:**
+
+- Prepping for release [\#3](https://github.com/test-kitchen/kitchen-hyperv/pull/3) ([smurawski](https://github.com/smurawski))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Rakefile

@@ -56,14 +56,13 @@ begin
   require "github_changelog_generator/task"
 
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    #config.issues = false
     config.future_release = "v#{Kitchen::Driver::HYPERV_VERSION}"
-    config.since_tag = "v0.1.10"
-    config.token = ENV["GITHUB_TOKEN"]
-    #config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
-    #config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
-    #config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion".split(",")
+    config.issues = false
+    config.pulls = true
+    config.user = 'test-kitchen'
+    config.project = 'kitchen-hyperv'
   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

data/lib/kitchen/driver/hyperv.rb

@@ -79,20 +79,6 @@ module Kitchen
 
       private
 
-      def mount_virtual_machine_iso
-        return unless config[:iso_path]
-        info("Mounting #{config[:iso_path]}")
-        run_ps mount_vm_iso
-      end
-
-      def vhd_folder?
-        config[:parent_vhd_folder] && Dir.exist?(config[:parent_vhd_folder])
-      end
-
-      def vhd?
-        config[:parent_vhd_name] && File.exist?(parent_vhd_path)
-      end
-
       def validate_vm_settings
         raise "Missing parent_vhd_folder" unless vhd_folder?
         raise "Missing parent_vhd_name" unless vhd?
@@ -108,6 +94,13 @@ module Kitchen
         config[:vm_switch] = vm_switch
       end
 
+      def create_new_differencing_disk
+        return if File.exist? differencing_disk_path
+        info("Creating differencing disk for #{instance.name}.")
+        run_ps new_differencing_disk_ps
+        info("Created differencing disk for #{instance.name}.")
+      end
+
       def vm_switch
         default_switch_object = run_ps vm_default_switch_ps
         if default_switch_object.nil? ||
@@ -118,20 +111,39 @@ module Kitchen
         default_switch_object['Name']
       end
 
-      def kitchen_vm_path
-        @kitchen_vm_path ||= File.join(config[:kitchen_root], ".kitchen/#{instance.name}")
+      def create_virtual_machine
+        return if vm_exists
+        info("Creating virtual machine for #{instance.name}.")
+        new_vm_object = run_ps new_vm_ps
+        @state[:id] = new_vm_object['Id']
+        info("Created virtual machine for #{instance.name}.")
       end
 
-      def boot_iso_path
-        @boot_iso_path ||= config[:boot_iso_path]
+      def update_state
+        vm_details
+        @state[:id] = @vm['Id']
+        @state[:hostname] = @vm['IpAddress']
+        @state[:vm_name] = @vm['Name']
       end
 
-      def differencing_disk_path
-        @differencing_disk_path ||= File.join(kitchen_vm_path, "diff" + "#{config[:disk_type]}")
+      def vm_details
+        run_ps set_vm_ipaddress_ps if config[:ip_address]
+        @vm = run_ps vm_details_ps
       end
 
-      def parent_vhd_path
-        @parent_vhd_path ||= File.join(config[:parent_vhd_folder], config[:parent_vhd_name])
+      def mount_virtual_machine_iso
+        return unless config[:iso_path]
+        info("Mounting #{config[:iso_path]}")
+        run_ps mount_vm_iso
+      end
+
+      def copy_vm_files
+        return if config[:copy_vm_files].nil?
+        info("Copying files to virtual machine")
+        config[:copy_vm_files].each do |file_info|
+          run_ps copy_vm_file_ps(file_info[:source], file_info[:dest])
+        end
+        info("Copied files to virtual machine")
       end
 
       def vm_exists
@@ -143,53 +155,55 @@ module Kitchen
         true
       end
 
+      def remove_virtual_machine
+        info("Deleting virtual machine for #{instance.name}")
+        run_ps delete_vm_ps
+        info("Deleted virtual machine for #{instance.name}")
+      end
+
       def remove_differencing_disk
         info("Removing the differencing disk for #{instance.name}.")
         FileUtils.rm(differencing_disk_path)
         info("Removed the differencing disk for #{instance.name}.")
       end
 
-      def create_new_differencing_disk
-        return if File.exist? differencing_disk_path
-        info("Creating differencing disk for #{instance.name}.")
-        run_ps new_differencing_disk_ps
-        info("Created differencing disk for #{instance.name}.")
+      def kitchen_vm_path
+        @kitchen_vm_path ||= File.join(config[:kitchen_root], ".kitchen/#{instance.name}")
       end
 
-      def remove_virtual_machine
-        info("Deleting virtual machine for #{instance.name}")
-        run_ps delete_vm_ps
-        info("Deleted virtual machine for #{instance.name}")
+      def boot_iso_path
+        @boot_iso_path ||= config[:boot_iso_path]
       end
 
-      def create_virtual_machine
-        return if vm_exists
-        info("Creating virtual machine for #{instance.name}.")
-        new_vm_object = run_ps new_vm_ps
-        @state[:id] = new_vm_object['Id']
-        info("Created virtual machine for #{instance.name}.")
+      def differencing_disk_path
+        @differencing_disk_path ||= File.join(kitchen_vm_path, "diff" + "#{config[:disk_type]}")
       end
 
-      def copy_vm_files
-        return if config[:copy_vm_files].nil?
-        info("Copying files to virtual machine")
-        config[:copy_vm_files].each do |file_info|
-          run_ps copy_vm_file_ps(file_info[:source], file_info[:dest])
-        end
-        info("Copied files to virtual machine")
+      def parent_vhd_path
+        @parent_vhd_path ||= File.join(config[:parent_vhd_folder], config[:parent_vhd_name])
       end
 
-      def update_state
-        vm_details
-        @state[:id] = @vm['Id']
-        @state[:hostname] = @vm['IpAddress']
-        @state[:vm_name] = @vm['Name']
+      def vhd_folder?
+        config[:parent_vhd_folder] && Dir.exist?(config[:parent_vhd_folder])
       end
 
-      def vm_details
-        run_ps set_vm_ipaddress_ps if config[:ip_address]
-        @vm = run_ps vm_details_ps
+      def vhd?
+        config[:parent_vhd_name] && File.exist?(parent_vhd_path)
       end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     end
   end
 end

data/lib/kitchen/driver/hyperv_version.rb

@@ -17,6 +17,6 @@
 
 module Kitchen
   module Driver
-    HYPERV_VERSION = '0.2.1'
+    HYPERV_VERSION = '0.2.3'.freeze
   end
 end

data/lib/kitchen/driver/powershell.rb

@@ -29,11 +29,18 @@ module Kitchen
 
       def is_64bit?
         os_arch = ENV['PROCESSOR_ARCHITEW6432'] || ENV['PROCESSOR_ARCHITECTURE']
-        os_arch == 'AMD64'
+        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?
+        if is_64bit? || is_32bit?
           'c:\windows\system32\windowspowershell\v1.0\powershell.exe'
         else
           'c:\windows\sysnative\windowspowershell\v1.0\powershell.exe'
@@ -43,7 +50,7 @@ module Kitchen
       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
+        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"
@@ -69,7 +76,12 @@ module Kitchen
         sh.run_command
         debug("Local Command END #{Util.duration(sh.execution_time)}")
         raise "Failed: #{sh.stderr}" if sh.error?
-        JSON.parse(sh.stdout) if sh.stdout.length > 2
+        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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-hyperv
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,8 +146,8 @@ files:
 - ".cane"
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
-- HISTORY.md
 - LICENSE.txt
 - README.md
 - Rakefile

data/HISTORY.md

@@ -1,21 +0,0 @@
-# 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