kitchen-hyperv 0.1.20 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1d4f93b043b3ffd049677de50956792b767beef
-  data.tar.gz: 16273be77c92281545407b43f51d8e47c5de8155
+  metadata.gz: 7fe9d9ccb046b8b131cfd899f51d4b3e804a4785
+  data.tar.gz: 0d10faf30ad3ce73c07231e41fce9a5216d1929d
 SHA512:
-  metadata.gz: feb8ed661a0989544fe2a1e1fc5030e0fb24f614da9a19ac85812c8aa5013f5aef5eb240b4a483155088eca8bb529ec523a56773d70318941b42e350ae41d700
-  data.tar.gz: 7d01d62bb019ba9b44d830742e8809857e89b8030503e71745e875fa5526df78a00e1f5339a8ce610c373c78b9c3cbc97bfecc3ae73556e8617ab34d0a054a7f
+  metadata.gz: 6deb6cbcae9d5b8c7c69277b82bd6b4577db267256e4c48fd627d57da4022fcb7f36d71b1ec28dc0f9794246d5d20b722239ee4893efaa76dcc7923c17691f6a
+  data.tar.gz: 1a6092559b6c67e6f7caaa2a79089f4a7e7bf1d3d652a59c281f6efa46836c56cd3af0a9c69fbc207d7785b482b0881552f4e721e8760cb1bbe838b9ef7a4a01

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/Gemfile

@@ -1,10 +1,15 @@
-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'
+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'
+gem 'rb-readline'
+gem 'pry'
+gem 'pry-stack_explorer'
+gem 'pry-byebug'
+gem 'github_changelog_generator'

data/{CHANGELOG.md → HISTORY.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/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

@@ -49,6 +49,8 @@ driver:
   * The virtual switch to attach the guest VMs.  Defaults to the first switch returned from Get-VMSwitch.
 * iso_path
   * Path on the host to the ISO to mount on the VMs.
+* boot_iso_path
+  * Path on the host to the ISO to mount before starting the VMs.
 * vm_generation
   * The generation for the hyper-v VM.  Defaults to 1.
 * disk_type

data/Rakefile

@@ -1,52 +1,69 @@
-# -*- 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 "kitchen/driver/hyperv_version"
+
+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]
+
+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(",")
+  end
+rescue LoadError
+  puts "github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs"
+end

data/kitchen-hyperv.gemspec

@@ -1,31 +1,32 @@
-# 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_development_dependency "countloc"
+
+  spec.add_dependency "test-kitchen", "~> 1.4"
+end

data/lib/kitchen/driver/hyperv.rb

@@ -47,6 +47,7 @@ module Kitchen
       default_config :subnet, '255.255.255.0'
       default_config :vm_switch
       default_config :iso_path
+      default_config :boot_iso_path
       default_config :vm_generation, 1
       default_config :disk_type do |driver|
         File.extname(driver[:parent_vhd_name])
@@ -84,24 +85,47 @@ module Kitchen
         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 config[:parent_vhd_folder]
-        raise "Missing parent_vhd_name" unless config[:parent_vhd_name]
+        raise "Missing parent_vhd_folder" unless vhd_folder?
+        raise "Missing parent_vhd_name" unless vhd?
         if config[:dynamic_memory]
           startup_bytes = config[:memory_startup_bytes]
           min = config[:dynamic_memory_min_bytes]
           max = config[:dynamic_memory_max_bytes]
           memory_valid = startup_bytes.between?(min, max)
-          raise "memory_startup_bytes (#{startup_bytes}) must fall within dynamic memory range (#{min}-#{max})" unless memory_valid
+          warning = "memory_startup_bytes (#{startup_bytes}) must" /
+                    " fall within dynamic memory range (#{min}-#{max})"
+          raise warning  unless memory_valid
+        end
+        config[:vm_switch] = vm_switch
+      end
+
+      def vm_switch
+        default_switch_object = run_ps vm_default_switch_ps
+        if default_switch_object.nil? ||
+           !default_switch_object.key?('Name') ||
+           default_switch_object['Name'].empty?
+          raise "Failed to find a default VM Switch."
         end
-        return if config[:vm_switch]
-        config[:vm_switch] = (run_ps vm_default_switch_ps)['Name']
+        default_switch_object['Name']
       end
 
       def kitchen_vm_path
         @kitchen_vm_path ||= File.join(config[:kitchen_root], ".kitchen/#{instance.name}")
       end
 
+      def boot_iso_path
+        @boot_iso_path ||= config[:boot_iso_path]
+      end
+
       def differencing_disk_path
         @differencing_disk_path ||= File.join(kitchen_vm_path, "diff" + "#{config[:disk_type]}")
       end
@@ -116,8 +140,7 @@ module Kitchen
         existing_vm = run_ps ensure_vm_running_ps
         return false if existing_vm.nil? || existing_vm['Id'].nil?
         info("Found an exising VM with an ID: #{existing_vm['Id']}")
-        return true
-        #fail('Failed to start existing VM.')
+        true
       end
 
       def remove_differencing_disk
@@ -146,9 +169,8 @@ module Kitchen
         @state[:id] = new_vm_object['Id']
         info("Created virtual machine for #{instance.name}.")
       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|

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.20'
-  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.2.0'
+  end
+end