test-kitchen 1.5.0.rc.1 → 1.5.0

data/lib/kitchen/version.rb

@@ -17,6 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-
-  VERSION = "1.5.0.rc.1"
+  VERSION = "1.5.0"
 end

data/spec/kitchen/collection_spec.rb

@@ -58,7 +58,7 @@ describe Kitchen::Collection do
       result.get_all(/one/).size.must_equal 1
     end
 
-    it "returns an empty Collection if on matches are found" do
+    it "returns an empty Collection if no matches are found" do
       result = collection.get_all(/noppa/)
       result.must_equal []
       result.get("nahuh").must_be_nil

data/spec/kitchen/logger_spec.rb

@@ -282,6 +282,16 @@ describe Kitchen::Logger do
         )
       end
 
+      it "logger that receives mixed first chunk will flush next message with newline" do
+        logger << "partially\no"
+        logger << "kay\n"
+
+        stdout.string.must_equal(
+          colorize("       partially", opts[:color]) + "\n" +
+          colorize("       okay", opts[:color]) + "\n"
+        )
+      end
+
       it "logger chomps carriage return characters" do
         logger << [
           "-----> banner\r",

data/spec/kitchen/provisioner/chef_base_spec.rb

@@ -27,7 +27,7 @@ describe Kitchen::Provisioner::ChefBase do
   let(:logger)          { Logger.new(logged_output) }
   let(:platform)        { stub(:os_type => nil) }
   let(:suite)           { stub(:name => "fries") }
-  let(:default_version) { "" }
+  let(:default_version) { "true" }
 
   let(:config) do
     { :test_base_path => "/basist", :kitchen_root => "/rooty" }
@@ -348,7 +348,7 @@ describe Kitchen::Provisioner::ChefBase do
 
       it "sets the powershell flag for Mixlib::Install" do
         Mixlib::Install.expects(:new).
-          with(default_version, true, install_opts).returns(installer)
+          with("", true, install_opts).returns(installer)
         cmd
       end
     end

data/spec/kitchen/provisioner/chef_solo_spec.rb

@@ -424,6 +424,19 @@ describe Kitchen::Provisioner::ChefSolo do
 
         cmd.must_match regexify(" --logfile /a/out.log", :partial_line)
       end
+
+      it "sets profile-ruby flag when config element is set" do
+        config[:profile_ruby] = true
+
+        cmd.must_match regexify(
+          " --profile-ruby", :partial_line)
+      end
+
+      it "does not set profile-ruby flag when config element is falsey" do
+        config[:profile_ruby] = false
+
+        cmd.wont_match regexify(" --profile-ruby", :partial_line)
+      end
     end
 
     describe "for powershell shells on windows os types" do

data/spec/kitchen/provisioner/chef_zero_spec.rb

@@ -686,6 +686,19 @@ describe Kitchen::Provisioner::ChefZero do
 
           cmd.wont_match regexify(" --chef-zero-port ", :partial_line)
         end
+
+        it "sets profile-ruby flag when config element is set" do
+          config[:profile_ruby] = true
+
+          cmd.must_match regexify(
+            " --profile-ruby", :partial_line)
+        end
+
+        it "does not set profile-ruby flag when config element is falsey" do
+          config[:profile_ruby] = false
+
+          cmd.wont_match regexify(" --profile-ruby", :partial_line)
+        end
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 

data/spec/kitchen/ssh_spec.rb

@@ -138,7 +138,7 @@ describe Kitchen::SSH do
     [
       Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED,
       Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
-      Net::SSH::Disconnect, Net::SSH::AuthenticationFailed
+      Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Net::SSH::ConnectionTimeout
     ].each do |klass|
       describe "raising #{klass}" do
 

data/spec/kitchen/transport/ssh_spec.rb

@@ -668,7 +668,8 @@ describe Kitchen::Transport::Ssh::Connection do
     [
       Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
       Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
-      Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Timeout::Error
+      Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Net::SSH::ConnectionTimeout,
+      Timeout::Error
     ].each do |klass|
       describe "raising #{klass}" do
 

data/spec/kitchen/transport/winrm_spec.rb

@@ -43,6 +43,10 @@ end
 
 describe Kitchen::Transport::Winrm do
 
+  before do
+    RbConfig::CONFIG.stubs(:[]).with("host_os").returns("blah")
+  end
+
   let(:logged_output) { StringIO.new }
   let(:logger)        { Logger.new(logged_output) }
   let(:config)        { Hash.new }
@@ -53,7 +57,11 @@ describe Kitchen::Transport::Winrm do
   end
 
   let(:transport) do
-    Kitchen::Transport::Winrm.new(config).finalize_config!(instance)
+    t = Kitchen::Transport::Winrm.new(config)
+    # :load_winrm_s! is not cross-platform safe
+    # and gets initialized too early in the pipeline
+    t.stubs(:load_winrm_s!)
+    t.finalize_config!(instance)
   end
 
   it "provisioner api_version is 1" do
@@ -98,6 +106,10 @@ describe Kitchen::Transport::Winrm do
     it "sets :max_wait_until_ready to 600 by default" do
       transport[:max_wait_until_ready].must_equal 600
     end
+
+    it "sets :winrm_transport to :plaintext" do
+      transport[:winrm_transport].must_equal :plaintext
+    end
   end
 
   describe "#connection" do
@@ -165,9 +177,10 @@ describe Kitchen::Transport::Winrm do
       it "sets :endpoint from data in config" do
         config[:hostname] = "host_from_config"
         config[:port] = "port_from_config"
+        config[:winrm_transport] = "ssl"
 
         klass.expects(:new).with do |hash|
-          hash[:endpoint] == "http://host_from_config:port_from_config/wsman"
+          hash[:endpoint] == "https://host_from_config:port_from_config/wsman"
         end
 
         make_connection
@@ -178,9 +191,10 @@ describe Kitchen::Transport::Winrm do
         config[:hostname] = "host_from_config"
         state[:port] = "port_from_state"
         config[:port] = "port_from_config"
+        config[:winrm_transport] = "ssl"
 
         klass.expects(:new).with do |hash|
-          hash[:endpoint] == "http://host_from_state:port_from_state/wsman"
+          hash[:endpoint] == "https://host_from_state:port_from_state/wsman"
         end
 
         make_connection
@@ -312,6 +326,55 @@ describe Kitchen::Transport::Winrm do
         make_connection
       end
 
+      it "sets :winrm_transport from config data" do
+        config[:winrm_transport] = "ssl"
+
+        klass.expects(:new).with do |hash|
+          hash[:winrm_transport] == :ssl
+        end
+
+        make_connection
+      end
+
+      describe "when sspinegotiate is set in config" do
+        before do
+          config[:winrm_transport] = "sspinegotiate"
+        end
+
+        describe "for Windows workstations" do
+          before do
+            RbConfig::CONFIG.stubs(:[]).with("host_os").returns("mingw32")
+          end
+
+          it "sets :winrm_transport to sspinegotiate on Windows" do
+
+            klass.expects(:new).with do |hash|
+              hash[:winrm_transport] == :sspinegotiate &&
+                hash[:disable_sspi] == false &&
+                hash[:basic_auth_only] == false
+            end
+
+            make_connection
+          end
+        end
+
+        describe "for non-Windows workstations" do
+          before do
+            RbConfig::CONFIG.stubs(:[]).with("host_os").returns("darwin14")
+          end
+
+          it "sets :winrm_transport to plaintext" do
+            klass.expects(:new).with do |hash|
+              hash[:winrm_transport] == :plaintext &&
+                hash[:disable_sspi] == true &&
+                hash[:basic_auth_only] == true
+            end
+
+            make_connection
+          end
+        end
+      end
+
       it "returns the same connection when called again with same state" do
         first_connection  = make_connection(state)
         second_connection = make_connection(state)
@@ -375,66 +438,133 @@ describe Kitchen::Transport::Winrm do
   end
 
   describe "#load_needed_dependencies" do
+    describe "winrm-transport" do
+      before do
+        # force loading of winrm-transport to get the version constant
+        require "winrm/transport/version"
+      end
 
-    before do
-      # force loading of winrm-transport to get the version constant
-      require "winrm/transport/version"
-    end
+      it "logs a message to debug that code will be loaded" do
+        transport.stubs(:require)
+        transport
 
-    it "logs a message to debug that code will be loaded" do
-      transport
+        logged_output.string.must_match debug_line_with(
+          "Winrm Transport requested, loading WinRM::Transport gem")
+      end
 
-      logged_output.string.must_match debug_line_with(
-        "Winrm Transport requested, loading WinRM::Transport gem")
-    end
+      it "logs a message to debug when library is initially loaded" do
+        transport = Kitchen::Transport::Winrm.new(config)
+        transport.stubs(:require)
+        transport.stubs(:execute_block).returns(true)
 
-    it "logs a message to debug when library is initially loaded" do
-      transport = Kitchen::Transport::Winrm.new(config)
-      transport.stubs(:require)
-      transport.stubs(:require).with("winrm/transport/version").returns(true)
-      transport.finalize_config!(instance)
+        transport.finalize_config!(instance)
 
-      logged_output.string.must_match(
-        %r{^D, .* : WinRM::Transport [^\s]+ library loaded$}
-      )
-    end
+        logged_output.string.must_match(
+          /WinRM::Transport library loaded/
+        )
+      end
 
-    it "logs a message to debug when library is previously loaded" do
-      transport = Kitchen::Transport::Winrm.new(config)
-      transport.stubs(:require)
-      transport.stubs(:require).with("winrm/transport/version").returns(false)
-      transport.finalize_config!(instance)
+      it "logs a message to debug when library is previously loaded" do
+        transport = Kitchen::Transport::Winrm.new(config)
+        transport.stubs(:require)
+        transport.stubs(:execute_block).returns(false)
 
-      logged_output.string.must_match(
-        %r{^D, .* : WinRM::Transport [^\s]+ previously loaded$}
-      )
+        transport.finalize_config!(instance)
+
+        logged_output.string.must_match(
+          /WinRM::Transport previously loaded/
+        )
+      end
+
+      it "logs a message to fatal when libraries cannot be loaded" do
+        transport = Kitchen::Transport::Winrm.new(config)
+        transport.stubs(:require)
+        transport.stubs(:execute_block).raises(LoadError, "uh oh")
+        begin
+          transport.finalize_config!(instance)
+        rescue # rubocop:disable Lint/HandleExceptions
+          # we are interested in the log output, not this exception
+        end
+
+        logged_output.string.must_match fatal_line_with(
+          "The `winrm-transport` gem is missing and must be installed")
+      end
+
+      it "raises a UserError when libraries cannot be loaded" do
+        transport = Kitchen::Transport::Winrm.new(config)
+        transport.stubs(:require)
+        transport.stubs(:execute_block).raises(LoadError, "uh oh")
+
+        err = proc {
+          transport.finalize_config!(instance)
+        }.must_raise Kitchen::UserError
+        err.message.must_match(/^Could not load or activate winrm-transport\. /)
+      end
     end
 
-    it "logs a message to fatal when libraries cannot be loaded" do
-      transport = Kitchen::Transport::Winrm.new(config)
-      transport.stubs(:require)
-      transport.stubs(:require).with("winrm/transport/version").
-        raises(LoadError, "uh oh")
-      begin
+    describe "winrm-s" do
+      before do
+        RbConfig::CONFIG.stubs(:[]).with("host_os").returns("mingw32")
+      end
+
+      it "logs a message to debug that code will be loaded" do
+        transport = Kitchen::Transport::Winrm.new(config)
+        transport.stubs(:load_winrm_transport!)
+        transport.stubs(:require)
         transport.finalize_config!(instance)
-      rescue # rubocop:disable Lint/HandleExceptions
-        # we are interested in the log output, not this exception
+
+        logged_output.string.must_match debug_line_with(
+          "The winrm-s gem is being loaded")
       end
 
-      logged_output.string.must_match fatal_line_with(
-        "The `winrm-transport' gem is missing and must be installed")
-    end
+      it "logs a message to debug when library is initially loaded" do
+        transport = Kitchen::Transport::Winrm.new(config)
+        transport.stubs(:load_winrm_transport!)
+        transport.stubs(:execute_block).returns(true)
+
+        transport.finalize_config!(instance)
+
+        logged_output.string.must_match(
+          /winrm-s is loaded/
+        )
+      end
 
-    it "raises a UserError when libraries cannot be loaded" do
-      transport = Kitchen::Transport::Winrm.new(config)
-      transport.stubs(:require)
-      transport.stubs(:require).with("winrm/transport/version").
-        raises(LoadError, "uh oh")
+      it "logs a message to debug when library is previously loaded" do
+        transport = Kitchen::Transport::Winrm.new(config)
+        transport.stubs(:load_winrm_transport!)
+        transport.stubs(:execute_block).returns(false)
 
-      err = proc {
         transport.finalize_config!(instance)
-      }.must_raise Kitchen::UserError
-      err.message.must_match(/^Could not load or activate WinRM::Transport /)
+
+        logged_output.string.must_match(
+          /winrm-s was already loaded/
+        )
+      end
+
+      it "logs a message to fatal when libraries cannot be loaded" do
+        transport = Kitchen::Transport::Winrm.new(config)
+        transport.stubs(:load_winrm_transport!)
+        transport.stubs(:execute_block).raises(LoadError, "uh oh")
+        begin
+          transport.finalize_config!(instance)
+        rescue # rubocop:disable Lint/HandleExceptions
+          # we are interested in the log output, not this exception
+        end
+
+        logged_output.string.must_match fatal_line_with(
+          "The `winrm-s` gem is missing and must be installed")
+      end
+
+      it "raises a UserError when libraries cannot be loaded" do
+        transport = Kitchen::Transport::Winrm.new(config)
+        transport.stubs(:load_winrm_transport!)
+        transport.stubs(:execute_block).raises(LoadError, "uh oh")
+
+        err = proc {
+          transport.finalize_config!(instance)
+        }.must_raise Kitchen::UserError
+        err.message.must_match(/^Could not load or activate winrm-s\. /)
+      end
     end
   end
 

data/support/chef_base_install_command.ps1

@@ -1,14 +1,16 @@
+$ErrorActionPreference = "stop"
+
 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 = Get-Content $root\version-manifest.txt | select-object -1}
+  Try { $chef_version = (Get-Content $root\version-manifest.txt | select-object -first 1) }
   Catch {
-    Try { $chef_version = (& $root\bin\chef-solo.bat -v).split(" ", 2)[1] }
-    Catch { $chef_version = "" }
+    Try { $chef_version = (& $root\bin\chef-solo.bat -v) }
+    Catch { $chef_version = " " }
   }
 
-  if ($chef_version.StartsWith($version)) { return $false }
+  if ($chef_version.split(" ", 2)[1].StartsWith($version)) { return $false }
   else { return $true }
 }
 
@@ -66,13 +68,18 @@ Function Unresolve-Path($p) {
   else { return $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($p) }
 }
 
-$chef_omnibus_root = Unresolve-Path $chef_omnibus_root
-$msi = Unresolve-Path $msi
+Try {
+  $chef_omnibus_root = Unresolve-Path $chef_omnibus_root
+  $msi = Unresolve-Path $msi
 
-if (Check-UpdateChef $chef_omnibus_root $version) {
-  Write-Host "-----> Installing Chef Omnibus ($pretty_version)`n"
-  Download-Chef "$chef_metadata_url" $msi
-  Install-Chef $msi
-} else {
-  Write-Host "-----> Chef Omnibus installation detected ($pretty_version)`n"
+  if (Check-UpdateChef $chef_omnibus_root $version) {
+    Write-Host "-----> Installing Chef Omnibus ($pretty_version)`n"
+    Download-Chef "$chef_metadata_url" $msi
+    Install-Chef $msi
+  } else {
+    Write-Host "-----> Chef Omnibus installation detected ($pretty_version)`n"
+}
+Catch {
+  Write-Error ($_ | ft -Property * | out-string) -ErrorAction Continue
+  exit 1
 }