test-kitchen 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac352970d9bb62f576ca7a3c8a1390382fa2fb5d
-  data.tar.gz: cd340da33b93b212a7c21de7ccaa212f05be52e8
+  metadata.gz: ed6240c00a8d6ca35986ab16735134c1fe4368b1
+  data.tar.gz: 3b4324d554794093cc15ebd2f82e9bca3c426074
 SHA512:
-  metadata.gz: dd350ae343edb32bac0914df75405d166546274cc7056104859926641fa930c080084686847b5699d01a250e690c4d40aba8444033094aa7fe06f69ea7175daa
-  data.tar.gz: c801ac18f1c2019301e6ab80f2b99a73e381064e8df489aa205bd68f3c94d40eb8bf3265f11fc5868eac720b047cdbfa345e8f4e6c2cf0720621c9ba8211ba99
+  metadata.gz: d1949f7688de24d288aa21d15f4d1bc80dc049937b60ab56e3ac445211e7c68c57fcb7c2b1f3fc93fa25e341f2dd9907494ecdcfcda4518dd2939cbed22fec3f
+  data.tar.gz: a8713a783d3ff9b2dff382e790a1496ec75b1f305bab75b02d0a5a36f505995c4b998f2a0a057d6d7443371757b50d69aa732b1d16a467211378500b021836d3

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.4.2
+
+### Potentially breaking changes
+
+### Bug fixes
+
+* PR [#801][]: Use compression `true` instead of `'zlib'` by default, supports net-ssh 2.10.  Old values of `'zlib'` and `'none'` are cast to `'zlib[@openssh][].com'` and `false` respectively but are deprecated.  In 2.0 this casting will be removed. ([@coderanger][])
+* PR [#802][]: net-ssh 2.10 throws a different error than 2.9 when connection times out, so we need to retry that. We now retry both the 2.9 and 2.10 errors. ([@Annih][])
+* Pinning to net-ssh < 2.10 because 2.10 no longer works with Ruby 1.9 and TK still does ([@tyler-ball][])
+
+### New features
+
+### Improvements
+
+* PR [#689][]: Fixing tests to run on Windows and adding AppVeyor builds. ([@tyler-ball][] and [@smurawski][])
+
 ## 1.4.1 / 2015-06-18
 
 ### Potentially breaking changes
@@ -745,6 +761,7 @@ The initial release.
 [#674]: https://github.com/test-kitchen/test-kitchen/issues/674
 [#675]: https://github.com/test-kitchen/test-kitchen/issues/675
 [#688]: https://github.com/test-kitchen/test-kitchen/issues/688
+[#689]: https://github.com/test-kitchen/test-kitchen/issues/689
 [#704]: https://github.com/test-kitchen/test-kitchen/issues/704
 [#711]: https://github.com/test-kitchen/test-kitchen/issues/711
 [#728]: https://github.com/test-kitchen/test-kitchen/issues/728
@@ -752,6 +769,9 @@ The initial release.
 [#734]: https://github.com/test-kitchen/test-kitchen/issues/734
 [#736]: https://github.com/test-kitchen/test-kitchen/issues/736
 [#737]: https://github.com/test-kitchen/test-kitchen/issues/737
+[#801]: https://github.com/test-kitchen/test-kitchen/issues/801
+[#802]: https://github.com/test-kitchen/test-kitchen/issues/802
+[@Annih]: https://github.com/Annih
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@MarkGibbons]: https://github.com/MarkGibbons
 [@adamhjk]: https://github.com/adamhjk
@@ -804,6 +824,7 @@ The initial release.
 [@mthssdrbrg]: https://github.com/mthssdrbrg
 [@mwrock]: https://github.com/mwrock
 [@oferrigni]: https://github.com/oferrigni
+[@openssh]: https://github.com/openssh
 [@patcon]: https://github.com/patcon
 [@portertech]: https://github.com/portertech
 [@rarenerd]: https://github.com/rarenerd
@@ -821,6 +842,7 @@ The initial release.
 [@scotthain]: https://github.com/scotthain
 [@sethvargo]: https://github.com/sethvargo
 [@smith]: https://github.com/smith
+[@smurawski]: https://github.com/smurawski
 [@someara]: https://github.com/someara
 [@srenatus]: https://github.com/srenatus
 [@stevendanna]: https://github.com/stevendanna
@@ -829,4 +851,4 @@ The initial release.
 [@tyler-ball]: https://github.com/tyler-ball
 [@whiteley]: https://github.com/whiteley
 [@zl4bv]: https://github.com/zl4bv
-[@zts]: https://github.com/zts
+[@zts]: https://github.com/zts

data/Rakefile

@@ -12,7 +12,7 @@ end
 require "cucumber"
 require "cucumber/rake/task"
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = ["features", "-x", "--format progress"]
+  t.cucumber_opts = ["features", "-x", "--format progress", "--no-color"]
 end
 
 desc "Run all test suites"
@@ -29,7 +29,7 @@ end
 require "finstyle"
 require "rubocop/rake_task"
 RuboCop::RakeTask.new(:style) do |task|
-  task.options << "--display-cop-names"
+  task.options += ["--display-cop-names", "--no-color"]
 end
 
 if RUBY_ENGINE != "jruby"

data/appveyor.yml

@@ -0,0 +1,34 @@
+version: "master-{build}"
+
+os: Windows Server 2012
+platform:
+  - x64
+
+environment:
+  matrix:
+    - ruby_version: "200"
+
+clone_folder: c:\projects\test_kitchen
+clone_depth: 1
+skip_tags: true
+
+branches:
+  only:
+    - master
+
+install:
+  - winrm quickconfig -q
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - echo %PATH%
+  - ruby --version
+  - gem --version
+  - gem install bundler --quiet --no-ri --no-rdoc
+  - bundler --version
+
+build_script:
+  - bundle install || bundle install || bundle install
+
+test_script:
+  - SET SPEC_OPTS=--format progress
+  - bundle exec rake unit
+  - bundle exec rake quality

data/features/support/env.rb

@@ -10,7 +10,11 @@ require "kitchen/cli"
 class ArubaHelper
 
   def initialize(argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)
-    @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
+    @argv = argv
+    @stdin = stdin
+    @stdout = stdout
+    @stderr = stderr
+    @kernel = kernel
   end
 
   def execute!
@@ -27,12 +31,12 @@ Before do
   @aruba_timeout_seconds = 15
   @cleanup_dirs = []
 
-  Aruba::InProcess.main_class = ArubaHelper
-  Aruba.process = Aruba::InProcess
+  Aruba::Processes::InProcess.main_class = ArubaHelper
+  Aruba.process = Aruba::Processes::InProcess
 end
 
 Before("@spawn") do
-  Aruba.process = Aruba::SpawnProcess
+  Aruba.process = Aruba::Processes::SpawnProcess
 end
 
 After do |s|

data/lib/kitchen.rb

@@ -89,10 +89,10 @@ module Kitchen
       log_location = log_location.to_s
 
       Logger.new(
-          :stdout => $stdout,
-          :logdev => log_location,
-          :level => Util.to_logger_level(level),
-          :log_overwrite => log_overwrite
+        :stdout => $stdout,
+        :logdev => log_location,
+        :level => Util.to_logger_level(level),
+        :log_overwrite => log_overwrite
       )
     end
 

data/lib/kitchen/base64_stream.rb

@@ -31,7 +31,7 @@ module Kitchen
     # @param io_in [#read] input stream
     # @param io_out [#write] output stream
     def self.strict_encode(io_in, io_out)
-      buffer = "" # rubocop:disable Lint/UselessAssignment
+      buffer = ""
       while io_in.read(3 * 1000, buffer)
         io_out.write([buffer].pack("m0"))
       end
@@ -45,7 +45,7 @@ module Kitchen
     # @param io_in [#read] input stream
     # @param io_out [#write] output stream
     def self.strict_decode(io_in, io_out)
-      buffer = "" # rubocop:disable Lint/UselessAssignment
+      buffer = ""
       while io_in.read(3 * 1000, buffer)
         io_out.write(buffer.unpack("m0").first)
       end

data/lib/kitchen/driver/base.rb

@@ -108,11 +108,9 @@ module Kitchen
       #
       # @param version [Integer,String] a version number
       #
-      # rubocop:disable Style/TrivialAccessors
       def self.kitchen_driver_api_version(version)
         @api_version = version
       end
-      # rubocop:enable Style/TrivialAccessors
 
       private
 

data/lib/kitchen/generator/driver_create.rb

@@ -129,7 +129,7 @@ module Kitchen
       #   found
       # @api private
       def author
-        git_user_name = %x{git config user.name}.chomp
+        git_user_name = `git config user.name`.chomp
         git_user_name.empty? ? "TODO: Write your name" : git_user_name
       end
 
@@ -137,7 +137,7 @@ module Kitchen
       #   if found
       # @api private
       def email
-        git_user_email = %x{git config user.email}.chomp
+        git_user_email = `git config user.email`.chomp
         git_user_email.empty? ? "TODO: Write your email" : git_user_email
       end
 

data/lib/kitchen/provisioner/base.rb

@@ -176,11 +176,9 @@ module Kitchen
       #
       # @param version [Integer,String] a version number
       #
-      # rubocop:disable Style/TrivialAccessors
       def self.kitchen_provisioner_api_version(version)
         @api_version = version
       end
-      # rubocop:enable Style/TrivialAccessors
 
       private
 

data/lib/kitchen/provisioner/chef_base.rb

@@ -19,6 +19,7 @@
 require "fileutils"
 require "pathname"
 require "json"
+require "cgi"
 
 require "kitchen/provisioner/chef/berkshelf"
 require "kitchen/provisioner/chef/common_sandbox"
@@ -112,7 +113,7 @@ module Kitchen
 
         url = "#{base}#{metadata_project_from_options}"
         url << "?p=windows&m=x86_64&pv=2008r2" # same pacakge for all versions
-        url << "&v=#{version.to_s.downcase}"
+        url << "&v=#{CGI.escape(version.to_s.downcase)}"
         url
       end
 
@@ -257,7 +258,7 @@ module Kitchen
       # @return [String] shell variable lines
       # @api private
       def install_command_vars_for_bourne(version)
-        install_flags = %w[latest true].include?(version) ? "" : "-v #{version}"
+        install_flags = %w[latest true].include?(version) ? "" : "-v #{CGI.escape(version)}"
         if config[:chef_omnibus_install_options]
           install_flags << " " << config[:chef_omnibus_install_options]
         end

data/lib/kitchen/provisioner/chef_zero.rb

@@ -99,10 +99,10 @@ module Kitchen
         # these flags are modern/chef-client local most only and will not work
         # on older versions of chef-client
         if config[:chef_zero_host]
-          args <<  "--chef-zero-host #{config[:chef_zero_host]}"
+          args << "--chef-zero-host #{config[:chef_zero_host]}"
         end
         if config[:chef_zero_port]
-          args <<  "--chef-zero-port #{config[:chef_zero_port]}"
+          args << "--chef-zero-port #{config[:chef_zero_port]}"
         end
       end
 
@@ -169,7 +169,13 @@ module Kitchen
         when nil, false, true, 11, "11", "latest"
           true
         else
-          Gem::Version.new(version) >= Gem::Version.new("11.8.0") ? true : false
+          if Gem::Version.correct?(version)
+            Gem::Version.new(version) >= Gem::Version.new("11.8.0") ? true : false
+          else
+            # Build versions of chef, for example
+            # 12.5.0-current.0+20150721082808.git.14.c91b337-1
+            true
+          end
         end
       end
 

data/lib/kitchen/provisioner/dummy.rb

@@ -58,7 +58,7 @@ module Kitchen
       #
       # @api private
       def failure_if_set
-        if config[:"fail"]
+        if config[:fail]
           debug("Failure for Provisioner #{name}.")
           raise ActionFailed, "Action #converge failed for #{instance.to_str}."
         elsif config[:random_failure] && randomly_fail?

data/lib/kitchen/transport/base.rb

@@ -161,11 +161,9 @@ module Kitchen
       #
       # @param version [Integer,String] a version number
       #
-      # rubocop:disable Style/TrivialAccessors
       def self.kitchen_transport_api_version(version)
         @api_version = version
       end
-      # rubocop:enable Style/TrivialAccessors
     end
   end
 end

data/lib/kitchen/transport/ssh.rb

@@ -52,16 +52,26 @@ module Kitchen
       default_config :ssh_key, nil
       expand_path_for :ssh_key
 
-      default_config :compression, "zlib"
-      required_config :compression do |attr, value, transport|
-        if !%W[zlib none].include?(value)
-          raise UserError, "#{transport} :#{attr} value may only " \
-            "be set to `none' or `zlib'."
-        end
-      end
+      default_config :compression, true
+      required_config :compression
 
       default_config :compression_level do |transport|
-        transport[:compression] == "none" ? 0 : 6
+        transport[:compression] == false ? 0 : 6
+      end
+
+      def finalize_config!(instance)
+        super
+
+        # zlib was never a valid value and breaks in net-ssh >= 2.10
+        # TODO: remove these backwards compatiable casts in 2.0
+        case config[:compression]
+        when "zlib"
+          config[:compression] = "zlib@openssh.com"
+        when "none"
+          config[:compression] = false
+        end
+
+        self
       end
 
       # (see Base#connection)
@@ -153,7 +163,7 @@ module Kitchen
         PING_COMMAND = "echo '[SSH] Established'".freeze
 
         RESCUE_EXCEPTIONS_ON_ESTABLISH = [
-          Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED,
+          Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
           Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
           Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Timeout::Error
         ].freeze

data/lib/kitchen/verifier/base.rb

@@ -181,11 +181,9 @@ module Kitchen
       #
       # @param version [Integer,String] a version number
       #
-      # rubocop:disable Style/TrivialAccessors
       def self.kitchen_verifier_api_version(version)
         @api_version = version
       end
-      # rubocop:enable Style/TrivialAccessors
 
       private
 

data/lib/kitchen/verifier/dummy.rb

@@ -58,7 +58,7 @@ module Kitchen
       #
       # @api private
       def failure_if_set
-        if config[:"fail"]
+        if config[:fail]
           debug("Failure for Verifier #{name}.")
           raise ActionFailed, "Action #verify failed for #{instance.to_str}."
         elsif config[:random_failure] && randomly_fail?

data/lib/kitchen/version.rb

@@ -18,5 +18,5 @@
 
 module Kitchen
 
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/spec/kitchen/configurable_spec.rb

@@ -311,25 +311,27 @@ describe Kitchen::Configurable do
       end
 
       it "expands a default value" do
-        subject[:success_path].must_equal "/tmp/yo/self/success"
+        subject[:success_path].must_equal os_safe_root_path("/tmp/yo/self/success")
       end
 
       it "uses provided config over default_config" do
         config[:success_path] = "mine"
 
-        subject[:success_path].must_equal "/tmp/yo/self/mine"
+        subject[:success_path].must_equal os_safe_root_path("/tmp/yo/self/mine")
       end
 
       it "leaves a full path expanded" do
         config[:success_path] = "/the/other/one"
 
-        subject[:success_path].must_equal "/the/other/one"
+        subject[:success_path].must_equal os_safe_root_path("/the/other/one")
       end
 
       it "expands all items if path is an array" do
-        subject[:bunch_of_paths].must_equal %W[
+        paths = %W[
           /tmp/yo/self/a /tmp/yo/self/b /tmp/yo/self/c
         ]
+        os_safe_paths = paths.collect { |path| os_safe_root_path(path) }
+        subject[:bunch_of_paths].must_equal os_safe_paths
       end
 
       it "doesn't expand path with a falsy expand_path_for value" do
@@ -342,7 +344,7 @@ describe Kitchen::Configurable do
         config[:something_else] = "is_set"
         config[:complex_path] = "./complex"
 
-        subject[:complex_path].must_equal "/tmp/yo/self/complex"
+        subject[:complex_path].must_equal os_safe_root_path("/tmp/yo/self/complex")
       end
 
       it "leaves a nil config value as nil" do
@@ -369,7 +371,7 @@ describe Kitchen::Configurable do
       end
 
       it "contains expand_path_for from superclass" do
-        subject[:success_path].must_equal "/rooty/success"
+        subject[:success_path].must_equal os_safe_root_path("/rooty/success")
       end
 
       it "uses its own expand_path_for over inherited expand_path_for" do

data/spec/kitchen/data_munger_spec.rb

@@ -20,7 +20,7 @@ require_relative "../spec_helper"
 
 require "kitchen/data_munger"
 
-module Kitchen
+module Kitchen # rubocop:disable Metrics/ModuleLength
 
   describe DataMunger do
 

data/spec/kitchen/loader/yaml_spec.rb

@@ -585,7 +585,7 @@ describe Kitchen::Loader::YAML do
 
       it "global config contains a filename" do
         loader.diagnose[:global_config][:filename].
-          must_equal File.join(ENV["HOME"], ".kitchen/config.yml")
+          must_equal File.join(ENV["HOME"].gsub('\\', "/"), ".kitchen/config.yml")
       end
 
       it "global config contains raw data" do

data/spec/kitchen/provisioner/chef_base_spec.rb

@@ -144,6 +144,14 @@ describe Kitchen::Provisioner::ChefBase do
             must_equal "#{base_url}?p=windows&m=x86_64&pv=2008r2&v=11.6.0.rc.1"
         end
 
+        it "defaults to a nightly package from :require_chef_omnibus" do
+          config[:require_chef_omnibus] = "12.5.0-current.0+20150721082808.git.14.c91b337-1"
+
+          provisioner[:chef_metadata_url].
+            must_equal "#{base_url}?p=windows&m=x86_64&pv=2008r2&" \
+              "v=12.5.0-current.0%2B20150721082808.git.14.c91b337-1"
+        end
+
         it "defaults to a chefdk package from :chef_omnibus_install_options" do
           config[:require_chef_omnibus] = true
           config[:chef_omnibus_install_options] = "-P chefdk"
@@ -195,33 +203,38 @@ describe Kitchen::Provisioner::ChefBase do
     end
 
     it ":data_path uses calculate_path and is expanded" do
-      provisioner[:data_path].must_equal "/rooty/<calculated>/data"
+      provisioner[:data_path].
+        must_equal os_safe_root_path("/rooty/<calculated>/data")
     end
 
     it ":data_bags_path uses calculate_path and is expanded" do
-      provisioner[:data_bags_path].must_equal "/rooty/<calculated>/data_bags"
+      provisioner[:data_bags_path].
+        must_equal os_safe_root_path("/rooty/<calculated>/data_bags")
     end
 
     it ":environments_path uses calculate_path and is expanded" do
       provisioner[:environments_path].
-        must_equal "/rooty/<calculated>/environments"
+        must_equal os_safe_root_path("/rooty/<calculated>/environments")
     end
 
     it ":nodes_path uses calculate_path and is expanded" do
-      provisioner[:nodes_path].must_equal "/rooty/<calculated>/nodes"
+      provisioner[:nodes_path].
+        must_equal os_safe_root_path("/rooty/<calculated>/nodes")
     end
 
     it ":roles_path uses calculate_path and is expanded" do
-      provisioner[:roles_path].must_equal "/rooty/<calculated>/roles"
+      provisioner[:roles_path].
+        must_equal os_safe_root_path("/rooty/<calculated>/roles")
     end
 
     it ":clients_path uses calculate_path and is expanded" do
-      provisioner[:clients_path].must_equal "/rooty/<calculated>/clients"
+      provisioner[:clients_path].
+        must_equal os_safe_root_path("/rooty/<calculated>/clients")
     end
 
     it "...secret_key_path uses calculate_path and is expanded" do
       provisioner[:encrypted_data_bag_secret_key_path].
-        must_equal "/rooty/<calculated>/encrypted_data_bag_secret_key"
+        must_equal os_safe_root_path("/rooty/<calculated>/encrypted_data_bag_secret_key")
     end
   end
 
@@ -315,6 +328,17 @@ describe Kitchen::Provisioner::ChefBase do
         cmd.must_match regexify(%{version="10.1.0.rc.1"})
       end
 
+      it "will install a nightly, if necessary" do
+        config[:require_chef_omnibus] = "12.5.0-current.0+20150721082808.git.14.c91b337-1"
+
+        cmd.must_match(
+          regexify(%{install_flags="-v 12.5.0-current.0%2B20150721082808.git.14.c91b337-1"}))
+        cmd.must_match(
+          regexify(%{pretty_version="12.5.0-current.0+20150721082808.git.14.c91b337-1"}))
+        cmd.must_match(
+          regexify(%{version="12.5.0-current.0+20150721082808.git.14.c91b337-1"}))
+      end
+
       it "will install the latest of chef, if necessary" do
         config[:require_chef_omnibus] = "latest"
 

data/spec/kitchen/provisioner/chef_zero_spec.rb

@@ -810,7 +810,6 @@ describe Kitchen::Provisioner::ChefZero do
         config[:require_chef_omnibus] = "10.20"
       end
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def self.common_old_shell_specs
         it "does not set local mode flag" do
           cmd.wont_match regexify(" --local-mode", :partial_line)

data/spec/kitchen/provisioner/shell_spec.rb

@@ -66,7 +66,7 @@ describe Kitchen::Provisioner::Shell do
       before { platform.stubs(:shell_type).returns("bourne") }
 
       it ":script uses calculate_path and is expanded" do
-        provisioner[:script].must_equal "/rooty/<calculated>/bootstrap.sh"
+        provisioner[:script].must_equal os_safe_root_path("/rooty/<calculated>/bootstrap.sh")
       end
     end
 
@@ -75,12 +75,12 @@ describe Kitchen::Provisioner::Shell do
       before { platform.stubs(:shell_type).returns("powershell") }
 
       it ":script uses calculate_path and is expanded" do
-        provisioner[:script].must_equal "/rooty/<calculated>/bootstrap.ps1"
+        provisioner[:script].must_equal os_safe_root_path("/rooty/<calculated>/bootstrap.ps1")
       end
     end
 
     it ":data_path uses calculate_path and is expanded" do
-      provisioner[:data_path].must_equal "/rooty/<calculated>/data"
+      provisioner[:data_path].must_equal os_safe_root_path("/rooty/<calculated>/data")
     end
   end
 
@@ -398,7 +398,10 @@ describe Kitchen::Provisioner::Shell do
           provisioner.create_sandbox
 
           sandbox_path("my_script").file?.must_equal true
-          sandbox_path("my_script").executable?.must_equal true
+          unless running_tests_on_windows?
+            # Windows doesn't have the concept of executable
+            sandbox_path("my_script").executable?.must_equal true
+          end
           IO.read(sandbox_path("my_script")).must_equal "gonuts"
         end
 
@@ -442,7 +445,10 @@ describe Kitchen::Provisioner::Shell do
             provisioner.create_sandbox
 
             sandbox_path("bootstrap.sh").file?.must_equal true
-            sandbox_path("bootstrap.sh").executable?.must_equal true
+            unless running_tests_on_windows?
+              # Windows doesn't have the concept of executable
+              sandbox_path("bootstrap.sh").executable?.must_equal true
+            end
             IO.read(sandbox_path("bootstrap.sh")).
               must_match(/NO BOOTSTRAP SCRIPT PRESENT/)
           end
@@ -470,7 +476,10 @@ describe Kitchen::Provisioner::Shell do
             provisioner.create_sandbox
 
             sandbox_path("bootstrap.ps1").file?.must_equal true
-            sandbox_path("bootstrap.ps1").executable?.must_equal true
+            unless running_tests_on_windows?
+              # Windows doesn't have the concept of executable
+              sandbox_path("bootstrap.ps1").executable?.must_equal true
+            end
             IO.read(sandbox_path("bootstrap.ps1")).
               must_match(/Write-Host "NO BOOTSTRAP SCRIPT PRESENT`n"/)
           end

data/spec/kitchen/ssh_spec.rb

@@ -36,7 +36,7 @@ def with_sorted_dir_entries
     class << self
       alias_method :__entries__, :entries unless method_defined?(:__entries__)
 
-      def entries(*args)
+      def entries(*args) # rubocop:disable Lint/NestedMethodDefinition
         send(:__entries__, *args).sort
       end
     end
@@ -95,7 +95,7 @@ module Net
           pty_data = ["xterm", 80, 24, 640, 480, "\0"]
 
           script.events << Class.new(Net::SSH::Test::LocalPacket) do
-            def types
+            def types # rubocop:disable Lint/NestedMethodDefinition
               if @type == 98 && @data[1] == "pty-req"
                 @types ||= [
                   :long, :string, :bool, :string,
@@ -158,9 +158,9 @@ describe Kitchen::SSH do
           rescue # rubocop:disable Lint/HandleExceptions
           end
 
-          logged_output.string.lines.select { |l|
+          logged_output.string.lines.count { |l|
             l =~ debug_line("[SSH] opening connection to me@foo:22<{:ssh_retries=>3}>")
-          }.size.must_equal opts[:ssh_retries]
+          }.must_equal opts[:ssh_retries]
         end
 
         it "sleeps for 1 second between retries" do
@@ -179,9 +179,9 @@ describe Kitchen::SSH do
           rescue # rubocop:disable Lint/HandleExceptions
           end
 
-          logged_output.string.lines.select { |l|
+          logged_output.string.lines.count { |l|
             l =~ info_line_with("[SSH] connection failed, retrying ")
-          }.size.must_equal 2
+          }.must_equal 2
         end
 
         it "logs the last retry failures on warn" do
@@ -190,9 +190,9 @@ describe Kitchen::SSH do
           rescue # rubocop:disable Lint/HandleExceptions
           end
 
-          logged_output.string.lines.select { |l|
+          logged_output.string.lines.count { |l|
             l =~ warn_line_with("[SSH] connection failed, terminating ")
-          }.size.must_equal 1
+          }.must_equal 1
         end
       end
     end
@@ -320,8 +320,9 @@ describe Kitchen::SSH do
 
     before do
       expect_scp_session("-t /tmp/remote") do |channel|
+        file_mode = running_tests_on_windows? ? 0644 : 0755
         channel.gets_data("\0")
-        channel.sends_data("C0755 1234 #{File.basename(src.path)}\n")
+        channel.sends_data("C#{padded_octal_string(file_mode)} 1234 #{File.basename(src.path)}\n")
         channel.gets_data("\0")
         channel.sends_data("a" * 1234)
         channel.sends_data("\0")
@@ -357,6 +358,12 @@ describe Kitchen::SSH do
 
     before do
       @dir = Dir.mktmpdir("local")
+
+      # Since File.chmod is a NOOP on Windows
+      @tmp_dir_mode = running_tests_on_windows? ? 0755 : 0700
+      @alpha_file_mode = running_tests_on_windows? ? 0644 : 0644
+      @beta_file_mode = running_tests_on_windows? ? 0444 : 0555
+
       FileUtils.chmod(0700, @dir)
       File.open("#{@dir}/alpha", "wb") { |f| f.write("alpha-contents\n") }
       FileUtils.chmod(0644, "#{@dir}/alpha")
@@ -369,16 +376,16 @@ describe Kitchen::SSH do
 
       expect_scp_session("-t -r /tmp/remote") do |channel|
         channel.gets_data("\0")
-        channel.sends_data("D0700 0 #{File.basename(@dir)}\n")
+        channel.sends_data("D#{padded_octal_string(@tmp_dir_mode)} 0 #{File.basename(@dir)}\n")
         channel.gets_data("\0")
-        channel.sends_data("C0644 15 alpha\n")
+        channel.sends_data("C#{padded_octal_string(@alpha_file_mode)} 15 alpha\n")
         channel.gets_data("\0")
         channel.sends_data("alpha-contents\n")
         channel.sends_data("\0")
         channel.gets_data("\0")
         channel.sends_data("D0755 0 subdir\n")
         channel.gets_data("\0")
-        channel.sends_data("C0555 14 beta\n")
+        channel.sends_data("C#{padded_octal_string(@beta_file_mode)} 14 beta\n")
         channel.gets_data("\0")
         channel.sends_data("beta-contents\n")
         channel.sends_data("\0")
@@ -642,9 +649,9 @@ describe Kitchen::SSH do
       TCPSocket.stubs(:new).returns(not_ready, not_ready, ready)
       ssh.wait
 
-      logged_output.string.lines.select { |l|
+      logged_output.string.lines.count { |l|
         l =~ info_line_with("Waiting for foo:22...")
-      }.size.must_equal 2
+      }.must_equal 2
     end
   end
 

data/spec/kitchen/transport/ssh_spec.rb

@@ -36,7 +36,7 @@ def with_sorted_dir_entries
     class << self
       alias_method :__entries__, :entries unless method_defined?(:__entries__)
 
-      def entries(*args)
+      def entries(*args) # rubocop:disable Lint/NestedMethodDefinition
         send(:__entries__, *args).sort
       end
     end
@@ -95,7 +95,7 @@ module Net
           pty_data = ["xterm", 80, 24, 640, 480, "\0"]
 
           script.events << Class.new(Net::SSH::Test::LocalPacket) do
-            def types
+            def types # rubocop:disable Lint/NestedMethodDefinition
               if @type == 98 && @data[1] == "pty-req"
                 @types ||= [
                   :long, :string, :bool, :string,
@@ -145,21 +145,20 @@ describe Kitchen::Transport::Ssh do
       transport[:username].must_equal "root"
     end
 
-    it "sets :compression to zlib by default" do
-      transport[:compression].must_equal "zlib"
+    it "sets :compression to true by default" do
+      transport[:compression].must_equal true
     end
 
-    it "sets :compression to none if set to none" do
+    it "sets :compression to false if set to none" do
       config[:compression] = "none"
 
-      transport[:compression].must_equal "none"
+      transport[:compression].must_equal false
     end
 
-    it "raises a UserError if :compression is set to a bogus value" do
-      config[:compression] = "boom"
+    it "sets :compression to zlib@openssh.com if set to zlib" do
+      config[:compression] = "zlib"
 
-      err = proc { transport }.must_raise Kitchen::UserError
-      err.message.must_match(%r{value may only be set to `none' or `zlib'})
+      transport[:compression].must_equal "zlib@openssh.com"
     end
 
     it "sets :compression_level to 6 by default" do
@@ -204,7 +203,7 @@ describe Kitchen::Transport::Ssh do
       config[:kitchen_root] = "/rooty"
       config[:ssh_key] = "my_key"
 
-      transport[:ssh_key].must_equal "/rooty/my_key"
+      transport[:ssh_key].must_equal os_safe_root_path("/rooty/my_key")
     end
   end
 
@@ -309,7 +308,7 @@ describe Kitchen::Transport::Ssh do
         config[:compression] = "none"
 
         klass.expects(:new).with do |hash|
-          hash[:compression] == "none"
+          hash[:compression] == false
         end
 
         make_connection
@@ -509,7 +508,7 @@ describe Kitchen::Transport::Ssh do
         config[:ssh_key] = "ssh_key_from_config"
 
         klass.expects(:new).with do |hash|
-          hash[:keys] == ["/r/ssh_key_from_config"]
+          hash[:keys] == [os_safe_root_path("/r/ssh_key_from_config")]
         end
 
         make_connection
@@ -579,9 +578,9 @@ describe Kitchen::Transport::Ssh do
         make_connection(state)
         make_connection(state)
 
-        logged_output.string.lines.select { |l|
+        logged_output.string.lines.count { |l|
           l =~ debug_line_with("[SSH] reusing existing connection ")
-        }.size.must_equal 1
+        }.must_equal 1
       end
 
       it "returns a new connection when called again if state differs" do
@@ -602,9 +601,9 @@ describe Kitchen::Transport::Ssh do
         make_connection(state)
         make_connection(state.merge(:port => 9000))
 
-        logged_output.string.lines.select { |l|
+        logged_output.string.lines.count { |l|
           l =~ debug_line_with("[SSH] shutting previous connection ")
-        }.size.must_equal 1
+        }.must_equal 1
       end
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
@@ -667,7 +666,7 @@ describe Kitchen::Transport::Ssh::Connection do
   describe "establishing a connection" do
 
     [
-      Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED,
+      Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
       Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
       Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Timeout::Error
     ].each do |klass|
@@ -694,9 +693,9 @@ describe Kitchen::Transport::Ssh::Connection do
             # the raise is not what is being tested here, rather its side-effect
           end
 
-          logged_output.string.lines.select { |l|
+          logged_output.string.lines.count { |l|
             l =~ debug_line("[SSH] opening connection to me@foo<{:port=>22}>")
-          }.size.must_equal 3
+          }.must_equal 3
         end
 
         it "sleeps for :connection_retry_sleep seconds between retries" do
@@ -717,10 +716,10 @@ describe Kitchen::Transport::Ssh::Connection do
             # the raise is not what is being tested here, rather its side-effect
           end
 
-          logged_output.string.lines.select { |l|
+          logged_output.string.lines.count { |l|
             l =~ info_line_with(
               "[SSH] connection failed, retrying in 7 seconds")
-          }.size.must_equal 2
+          }.must_equal 2
         end
 
         it "logs the last retry failures on warn" do
@@ -730,9 +729,9 @@ describe Kitchen::Transport::Ssh::Connection do
             # the raise is not what is being tested here, rather its side-effect
           end
 
-          logged_output.string.lines.select { |l|
+          logged_output.string.lines.count { |l|
             l =~ warn_line_with("[SSH] connection failed, terminating ")
-          }.size.must_equal 1
+          }.must_equal 1
         end
       end
     end
@@ -1018,8 +1017,9 @@ describe Kitchen::Transport::Ssh::Connection do
 
       before do
         expect_scp_session("-t /tmp/remote") do |channel|
+          file_mode = running_tests_on_windows? ? 0644 : 0755
           channel.gets_data("\0")
-          channel.sends_data("C0755 1234 #{File.basename(src.path)}\n")
+          channel.sends_data("C#{padded_octal_string(file_mode)} 1234 #{File.basename(src.path)}\n")
           channel.gets_data("\0")
           channel.sends_data("a" * 1234)
           channel.sends_data("\0")
@@ -1054,6 +1054,12 @@ describe Kitchen::Transport::Ssh::Connection do
     describe "for a path" do
       before do
         @dir = Dir.mktmpdir("local")
+
+        # Since File.chmod is a NOOP on Windows
+        @tmp_dir_mode = running_tests_on_windows? ? 0755 : 0700
+        @alpha_file_mode = running_tests_on_windows? ? 0644 : 0644
+        @beta_file_mode = running_tests_on_windows? ? 0444 : 0555
+
         FileUtils.chmod(0700, @dir)
         File.open("#{@dir}/alpha", "wb") { |f| f.write("alpha-contents\n") }
         FileUtils.chmod(0644, "#{@dir}/alpha")
@@ -1066,16 +1072,16 @@ describe Kitchen::Transport::Ssh::Connection do
 
         expect_scp_session("-t -r /tmp/remote") do |channel|
           channel.gets_data("\0")
-          channel.sends_data("D0700 0 #{File.basename(@dir)}\n")
+          channel.sends_data("D#{padded_octal_string(@tmp_dir_mode)} 0 #{File.basename(@dir)}\n")
           channel.gets_data("\0")
-          channel.sends_data("C0644 15 alpha\n")
+          channel.sends_data("C#{padded_octal_string(@alpha_file_mode)} 15 alpha\n")
           channel.gets_data("\0")
           channel.sends_data("alpha-contents\n")
           channel.sends_data("\0")
           channel.gets_data("\0")
           channel.sends_data("D0755 0 subdir\n")
           channel.gets_data("\0")
-          channel.sends_data("C0555 14 beta\n")
+          channel.sends_data("C#{padded_octal_string(@beta_file_mode)} 14 beta\n")
           channel.gets_data("\0")
           channel.sends_data("beta-contents\n")
           channel.sends_data("\0")
@@ -1161,16 +1167,16 @@ describe Kitchen::Transport::Ssh::Connection do
           # the raise is not what is being tested here, rather its side-effect
         end
 
-        logged_output.string.lines.select { |l|
+        logged_output.string.lines.count { |l|
           l =~ info_line_with(
             "Waiting for SSH service on foo:22, retrying in 3 seconds")
-        }.size.must_equal((300 / 3) - 1)
-        logged_output.string.lines.select { |l|
+        }.must_equal((300 / 3) - 1)
+        logged_output.string.lines.count { |l|
           l =~ debug_line_with("[SSH] connection failed ")
-        }.size.must_equal((300 / 3) - 1)
-        logged_output.string.lines.select { |l|
+        }.must_equal((300 / 3) - 1)
+        logged_output.string.lines.count { |l|
           l =~ warn_line_with("[SSH] connection failed, terminating ")
-        }.size.must_equal 1
+        }.must_equal 1
       end
 
       it "sleeps for 3 seconds between retries" do

data/spec/kitchen/transport/winrm_spec.rb

@@ -306,9 +306,9 @@ describe Kitchen::Transport::Winrm do
         make_connection(state)
         make_connection(state)
 
-        logged_output.string.lines.select { |l|
+        logged_output.string.lines.count { |l|
           l =~ debug_line_with("[WinRM] reusing existing connection ")
-        }.size.must_equal 1
+        }.must_equal 1
       end
 
       it "returns a new connection when called again if state differs" do
@@ -329,9 +329,9 @@ describe Kitchen::Transport::Winrm do
         make_connection(state)
         make_connection(state.merge(:port => 9000))
 
-        logged_output.string.lines.select { |l|
+        logged_output.string.lines.count { |l|
           l =~ debug_line_with("[WinRM] shutting previous connection ")
-        }.size.must_equal 1
+        }.must_equal 1
       end
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
@@ -732,12 +732,12 @@ MSG
             # the raise is not what is being tested here, rather its side-effect
           end
 
-          logged_output.string.lines.select { |l|
+          logged_output.string.lines.count { |l|
             l =~ debug_line("[WinRM] opening remote shell on #{info}")
-          }.size.must_equal 3
-          logged_output.string.lines.select { |l|
+          }.must_equal 3
+          logged_output.string.lines.count { |l|
             l =~ debug_line("[WinRM] remote shell shell-123 is open on #{info}")
-          }.size.must_equal 0
+          }.must_equal 0
         end
 
         it "sleeps for :connection_retry_sleep seconds between retries" do
@@ -758,10 +758,10 @@ MSG
             # the raise is not what is being tested here, rather its side-effect
           end
 
-          logged_output.string.lines.select { |l|
+          logged_output.string.lines.count { |l|
             l =~ info_line_with(
               "[WinRM] connection failed, retrying in 7 seconds")
-          }.size.must_equal 2
+          }.must_equal 2
         end
 
         it "logs the last retry failures on warn" do
@@ -771,9 +771,9 @@ MSG
             # the raise is not what is being tested here, rather its side-effect
           end
 
-          logged_output.string.lines.select { |l|
+          logged_output.string.lines.count { |l|
             l =~ warn_line_with("[WinRM] connection failed, terminating ")
-          }.size.must_equal 1
+          }.must_equal 1
         end
       end
     end
@@ -968,7 +968,6 @@ MSG
       transporter.stubs(:upload)
     end
 
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def self.common_specs_for_upload
       it "builds a Winrm::FileTransporter" do
         WinRM::Transport::FileTransporter.unstub(:new)
@@ -990,7 +989,6 @@ MSG
         upload
       end
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     describe "for a file" do
 
@@ -1035,16 +1033,16 @@ MSG
           # the raise is not what is being tested here, rather its side-effect
         end
 
-        logged_output.string.lines.select { |l|
+        logged_output.string.lines.count { |l|
           l =~ info_line_with(
             "Waiting for WinRM service on http://foo:5985/wsman, retrying in 3 seconds")
-        }.size.must_equal((300 / 3) - 1)
-        logged_output.string.lines.select { |l|
+        }.must_equal((300 / 3) - 1)
+        logged_output.string.lines.count { |l|
           l =~ debug_line_with("[WinRM] connection failed ")
-        }.size.must_equal((300 / 3) - 1)
-        logged_output.string.lines.select { |l|
+        }.must_equal((300 / 3) - 1)
+        logged_output.string.lines.count { |l|
           l =~ warn_line_with("[WinRM] connection failed, terminating ")
-        }.size.must_equal 1
+        }.must_equal 1
       end
 
       it "sleeps for 3 seconds between retries" do

data/spec/kitchen/verifier/busser_spec.rb

@@ -47,7 +47,7 @@ describe Kitchen::Verifier::Busser do
     {
       "mondospec/charlie" => {
         :content => "charlie",
-        :perms => "0764"
+        :perms => (running_tests_on_windows? ? "0644" : "0764")
       },
       "minispec/beta" => {
         :content => "beta",
@@ -55,7 +55,7 @@ describe Kitchen::Verifier::Busser do
       },
       "abba/alpha" => {
         :content => "alpha",
-        :perms => "0440"
+        :perms => (running_tests_on_windows? ? "0444" : "0440")
       }
     }
   end
@@ -68,7 +68,7 @@ describe Kitchen::Verifier::Busser do
       },
       "abba/common" => {
         :content => "yeppers",
-        :perms => "0664"
+        :perms => (running_tests_on_windows? ? "0644" : "0664")
       }
     }
   end
@@ -135,7 +135,6 @@ describe Kitchen::Verifier::Busser do
     end
   end
 
-  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def self.common_bourne_variable_specs
     it "uses bourne shell" do
       cmd.must_match(/\Ash -c '$/)
@@ -162,9 +161,7 @@ describe Kitchen::Verifier::Busser do
       cmd.must_match regexify(%{GEM_CACHE="/r/gems/cache"; export GEM_CACHE})
     end
   end
-  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
-  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def self.common_powershell_variable_specs
     it "sets the BUSSER_ROOT environment variable" do
       cmd.must_match regexify(%{$env:BUSSER_ROOT = "\\r"})
@@ -182,7 +179,6 @@ describe Kitchen::Verifier::Busser do
       cmd.must_match regexify(%{$env:GEM_CACHE = "\\r\\gems\\cache"})
     end
   end
-  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
   describe "#install_command" do
 

data/spec/spec_helper.rb

@@ -43,7 +43,20 @@ require "tempfile"
 # Nasty hack to redefine IO.read in terms of File#read for fakefs
 class IO
   def self.read(*args)
-    File.open(args[0], "rb") { |f| f.read(args[1]) }
+    length = args[1]
+    offset = args[2]
+    opt = args[3]
+    if length.is_a? Hash
+      opt = length
+      length = nil
+    elsif offset.is_a? Hash
+      opt = offset
+    end
+    if opt && opt.key?(:mode)
+      File.open(args[0], opt) { |f| f.read(length) }
+    else
+      File.open(args[0], "rb", opt) { |f| f.read(length) }
+    end
   end
 end
 
@@ -54,3 +67,19 @@ def with_fake_fs
   FakeFS.deactivate!
   FakeFS::FileSystem.clear
 end
+
+def running_tests_on_windows?
+  ENV["OS"] == "Windows_NT"
+end
+
+def os_safe_root_path(root_path)
+  if running_tests_on_windows?
+    "#{File.join(ENV["SystemDrive"], root_path)}"
+  else
+    root_path
+  end
+end
+
+def padded_octal_string(integer)
+  integer.to_s(8).rjust(4, "0")
+end

data/support/chef_base_install_command.ps1

@@ -2,9 +2,11 @@ Function Check-UpdateChef($root, $version) {
   if (-Not (Test-Path $root)) { return $true }
   elseif ("$version" -eq "true") { return $false }
   elseif ("$version" -eq "latest") { return $true }
-
-  Try { $chef_version = (& $root\bin\chef-solo.bat -v).split(" ", 2)[1] }
-  Catch { $chef_version = "" }
+  Try { $chef_version = Get-Content $root\version-manifest.txt | select-object -1}
+  Catch {
+    Try { $chef_version = (& $root\bin\chef-solo.bat -v).split(" ", 2)[1] }
+    Catch { $chef_version = "" }
+  }
 
   if ($chef_version.StartsWith($version)) { return $false }
   else { return $true }

data/support/chef_base_install_command.sh

@@ -172,13 +172,22 @@ should_update_chef() {
     return 0;
   fi
 
-  chef_version="`${1}/bin/chef-solo -v | cut -d \" \" -f 2`";
+  if test -f "${1}/version-manifest.txt"; then
+    chef_version="`head -n 1 ${1}/version-manifest.txt | cut -d \" \" -f 2`";
+  else
+    chef_version="`${1}/bin/chef-solo -v | cut -d \" \" -f 2`";
+  fi
 
   echo "$chef_version" | grep "^${2}" 2>&1 >/dev/null;
   if test $? -eq 0; then
     return 1;
   else
-    return 0;
+    echo "${2}" | grep "^$chef_version" 2>&1 >/dev/null;
+    if test $? -eq 0; then
+      return 1;
+    else
+      return 0;
+    fi
   fi
 }
 

data/test-kitchen.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "mixlib-shellout", ">= 1.2", "< 3.0"
   gem.add_dependency "net-scp",         "~> 1.1"
-  gem.add_dependency "net-ssh",         "~> 2.7"
+  gem.add_dependency "net-ssh",         "~> 2.7", "< 2.10"
   gem.add_dependency "safe_yaml",       "~> 1.0"
   gem.add_dependency "thor",            "~> 0.18"
 
@@ -35,7 +35,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler",   "~> 1.3"
   gem.add_development_dependency "rake"
 
-  gem.add_development_dependency "aruba",     "~> 0.5"
+  gem.add_development_dependency "aruba",     "~> 0.7.0"
   gem.add_development_dependency "fakefs",    "~> 0.4"
   gem.add_development_dependency "minitest",  "~> 5.3"
   gem.add_development_dependency "mocha",     "~> 1.1"
@@ -48,6 +48,6 @@ Gem::Specification.new do |gem|
   # style and complexity libraries are tightly version pinned as newer releases
   # may introduce new and undesireable style choices which would be immediately
   # enforced in CI
-  gem.add_development_dependency "finstyle",  "1.4.0"
+  gem.add_development_dependency "finstyle",  "1.5.0"
   gem.add_development_dependency "cane",      "2.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -51,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,6 +61,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +154,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -260,14 +266,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +308,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/kitchen
 - features/kitchen_action_commands.feature
 - features/kitchen_command.feature