test-kitchen 1.5.0 → 1.6.0

data/spec/kitchen/verifier/shell_spec.rb

@@ -22,6 +22,7 @@ require "logger"
 require "stringio"
 
 require "kitchen/verifier/shell"
+require "kitchen/transport/ssh"
 
 describe Kitchen::Verifier::Shell do
 

data/test-kitchen.gemspec

@@ -29,16 +29,16 @@ Gem::Specification.new do |gem|
   gem.add_dependency "safe_yaml",       "~> 1.0"
   gem.add_dependency "thor",            "~> 0.18"
   gem.add_dependency "mixlib-install",  "~> 0.7"
-  gem.add_dependency "chef-config",     ">= 12.5.1"
 
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-byebug"
   gem.add_development_dependency "pry-stack_explorer"
-  gem.add_development_dependency "winrm-transport", "~> 1.0", ">= 1.0.3"
-  gem.add_development_dependency "winrm-s", "~> 0.3"
+  gem.add_development_dependency "winrm", "~> 1.6"
+  gem.add_development_dependency "winrm-fs", "~> 0.3"
 
   gem.add_development_dependency "bundler",   "~> 1.3"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "github_changelog_generator", "1.11.3"
 
   gem.add_development_dependency "aruba",     "~> 0.11.1"
   gem.add_development_dependency "fakefs",    "~> 0.4"

data/testing_windows.md

@@ -0,0 +1,37 @@
+## Testing test-kitchen contributions against windows test instances
+
+### Choose a windows based cookbook
+The [windows cookbook](https://github.com/chef-cookbooks/windows) is a grand choice.
+
+### Edit the `Gemfile` 
+Ensure that the cookbook's root directory includes a `Gemfile` that includes your local test-kitchen repo on the branch you would like to test as well as required windows-only needed gems:
+```
+gem 'test-kitchen', git: 'https://github.com/mwrock/test-kitchen', branch: 'winrm-fs'
+gem 'winrm', '~> 1.6'
+gem 'winrm-fs', '~> 0.3'
+```
+The above would target the `winrm-fs` branch in mwrock's test-kitchen repo.
+
+### Finding a windows image
+Make sure you have a windows test image handy. You can use your favorite cloud or hypervisor. An easy vagrant option is `mwrock/Windows2012R2` which is publicly available on atlas. To use that, edit your cookbook's `.kitchen.yml` to include:
+```
+platforms:
+  - name: win2012r2-standard
+    driver:
+      box: mwrock/Windows2012R2
+```
+
+For other windows OS versions, you can spin up instances in your favorite cloud provider or create your own vagrant box. The windows packer templates found in the [boxcutter repo](https://github.com/boxcutter/windows) provide a good place to start here.
+
+### `bundle install`
+
+From the root of your cookbook directory run `bundle install`
+
+### Converge and test!
+
+Now run `bundle exec kitchen verify`.
+
+If your cookbook has multiple suites (like the windows cookbook), you likely just want to run one:
+```
+bundle exec kitchen verify feature
+```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -106,20 +106,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: chef-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.5.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -163,27 +149,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: winrm-transport
+  name: winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: winrm-s
+  name: winrm-fs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -224,6 +204,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -460,6 +454,7 @@ files:
 - lib/kitchen/provisioner/chef/berkshelf.rb
 - lib/kitchen/provisioner/chef/common_sandbox.rb
 - lib/kitchen/provisioner/chef/librarian.rb
+- lib/kitchen/provisioner/chef_apply.rb
 - lib/kitchen/provisioner/chef_base.rb
 - lib/kitchen/provisioner/chef_solo.rb
 - lib/kitchen/provisioner/chef_zero.rb
@@ -507,6 +502,7 @@ files:
 - spec/kitchen/metadata_chopper_spec.rb
 - spec/kitchen/platform_spec.rb
 - spec/kitchen/provisioner/base_spec.rb
+- spec/kitchen/provisioner/chef_apply_spec.rb
 - spec/kitchen/provisioner/chef_base_spec.rb
 - spec/kitchen/provisioner/chef_solo_spec.rb
 - spec/kitchen/provisioner/chef_zero_spec.rb
@@ -558,6 +554,7 @@ files:
 - templates/init/chefignore.erb
 - templates/init/kitchen.yml.erb
 - test-kitchen.gemspec
+- testing_windows.md
 homepage: http://kitchen.ci
 licenses:
 - Apache 2.0
@@ -578,7 +575,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure
@@ -624,6 +621,7 @@ test_files:
 - spec/kitchen/metadata_chopper_spec.rb
 - spec/kitchen/platform_spec.rb
 - spec/kitchen/provisioner/base_spec.rb
+- spec/kitchen/provisioner/chef_apply_spec.rb
 - spec/kitchen/provisioner/chef_base_spec.rb
 - spec/kitchen/provisioner/chef_solo_spec.rb
 - spec/kitchen/provisioner/chef_zero_spec.rb