test-kitchen 1.4.2 → 1.5.0

data/spec/kitchen/verifier/shell_spec.rb

@@ -0,0 +1,157 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: SAWANOBORI Yukihiko (<sawanoboriyu@higanworks.com>)
+#
+# Copyright (C) 2015, HiganWorks LLC
+#
+# 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.
+
+require_relative "../../spec_helper"
+
+require "logger"
+require "stringio"
+
+require "kitchen/verifier/shell"
+
+describe Kitchen::Verifier::Shell do
+
+  let(:logged_output) { StringIO.new }
+  let(:logger)        { Logger.new(logged_output) }
+  let(:platform)      { stub(:os_type => nil, :shell_type => nil, :name => "coolbeans") }
+  let(:suite)         { stub(:name => "fries") }
+  let(:state)         { Hash.new }
+
+  let(:config) do
+    { :test_base_path => "/basist", :kitchen_root => "/rooty" }
+  end
+
+  let(:instance) do
+    stub(
+      :name => [platform.name, suite.name].join("-"),
+      :to_str => "instance",
+      :logger => logger,
+      :suite => suite,
+      :platform => platform
+    )
+  end
+
+  let(:verifier) do
+    Kitchen::Verifier::Shell.new(config).finalize_config!(instance)
+  end
+
+  it "verifier api_version is 1" do
+    verifier.diagnose_plugin[:api_version].must_equal 1
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    verifier.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
+  describe "configuration" do
+
+    it "sets :sleep to 0 by default" do
+      verifier[:sleep].must_equal 0
+    end
+
+    it "sets :command to 'true' by default" do
+      verifier[:command].must_equal "true"
+    end
+
+    it "sets :live_stream to stdout by default" do
+      verifier[:live_stream].must_equal $stdout
+    end
+  end
+
+  describe "#call" do
+
+    describe "#shell_out" do
+      it "calls sleep if :sleep value is greater than 0" do
+        config[:sleep] = 3
+        verifier.expects(:sleep).with(1).returns(true).at_least(3)
+
+        verifier.call(state)
+      end
+
+      it "states are set to environment" do
+        state[:hostname] = "testhost"
+        state[:server_id] = "i-xxxxxx"
+        verifier.call(state)
+        config[:shellout_opts][:environment]["KITCHEN_HOSTNAME"].must_equal "testhost"
+        config[:shellout_opts][:environment]["KITCHEN_SERVER_ID"].must_equal "i-xxxxxx"
+        config[:shellout_opts][:environment]["KITCHEN_INSTANCE"].must_equal "coolbeans-fries"
+        config[:shellout_opts][:environment]["KITCHEN_PLATFORM"].must_equal "coolbeans"
+        config[:shellout_opts][:environment]["KITCHEN_SUITE"].must_equal "fries"
+      end
+
+      it "raises ActionFailed if set false to :command" do
+        config[:command] = "false"
+
+        proc { verifier.call(state) }.must_raise Kitchen::ActionFailed
+      end
+
+      it "logs a converge event to INFO" do
+        verifier.call(state)
+
+        logged_output.string.must_match(/^.+ INFO .+ \[Shell\] Verify on .+$/)
+      end
+    end
+
+    describe "remote_exec" do
+      let(:transport) do
+        t = mock("transport")
+        t.responds_like_instance_of(Kitchen::Transport::Ssh)
+        t
+      end
+
+      let(:connection) do
+        c = mock("transport_connection")
+        c.responds_like_instance_of(Kitchen::Transport::Ssh::Connection)
+        c
+      end
+
+      let(:instance) do
+        stub(
+          :name => "coolbeans",
+          :to_str => "instance",
+          :logger => logger,
+          :platform => platform,
+          :suite => suite,
+          :transport => transport
+        )
+      end
+
+      before do
+        transport.stubs(:connection).yields(connection)
+        connection.stubs(:execute)
+      end
+
+      it "execute command onto instance." do
+        config[:remote_exec] = true
+
+        transport.expects(:connection).with(state).yields(connection)
+        verifier.call(state)
+      end
+    end
+  end
+
+  describe "#run_command" do
+    it "execute localy and returns nil" do
+      verifier.run_command
+    end
+
+    it "returns string when remote_exec" do
+      config[:remote_exec] = true
+      verifier.run_command.must_equal "true"
+    end
+  end
+end

data/support/busser_install_command.sh

@@ -7,8 +7,7 @@ else
 fi
 
 if test ! -f "$BUSSER_ROOT/bin/busser"; then
-  gem_bindir=`$ruby -rrubygems -e "puts Gem.bindir"`
-  $gem_bindir/busser setup
+  $busser setup
 fi
 
 echo "       Installing Busser plugins: $plugins"

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
 }

data/templates/driver/README.md.erb

@@ -61,4 +61,4 @@ Created and maintained by [<%= config[:author] %>][author] (<<%= config[:email]
 [license]:          https://github.com/enter-github-user/<%= config[:gem_name] %>/blob/master/LICENSE
 [repo]:             https://github.com/enter-github-user/<%= config[:gem_name] %>
 [driver_usage]:     http://docs.kitchen-ci.org/drivers/usage
-[chef_omnibus_dl]:  http://www.getchef.com/chef/install/
+[chef_omnibus_dl]:  http://www.chef.io/chef/install/

data/test-kitchen.gemspec

@@ -25,21 +25,30 @@ 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", "< 2.10"
+  gem.add_dependency "net-ssh",         ">= 2.9", "< 4.0"
   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 "winrm-transport", "~> 1.0"
+  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 "bundler",   "~> 1.3"
   gem.add_development_dependency "rake"
 
-  gem.add_development_dependency "aruba",     "~> 0.7.0"
+  gem.add_development_dependency "aruba",     "~> 0.11.1"
   gem.add_development_dependency "fakefs",    "~> 0.4"
   gem.add_development_dependency "minitest",  "~> 5.3"
   gem.add_development_dependency "mocha",     "~> 1.1"
 
+  # cucumber is getting explicit and aggresive version pin as the behavior of
+  # the aruba and cucumber apis are tightly coupled
+  gem.add_development_dependency "cucumber",  "~> 2.1.0"
+
   gem.add_development_dependency "countloc",  "~> 0.4"
   gem.add_development_dependency "maruku",    "~> 0.6"
   gem.add_development_dependency "simplecov", "~> 0.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -48,22 +48,22 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: mixlib-install
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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
@@ -106,6 +134,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: winrm-transport
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +169,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -120,6 +179,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: winrm-s
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -154,14 +230,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +280,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
@@ -303,9 +393,12 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
+- Gemfile.proxy_tests
 - Guardfile
 - LICENSE
+- MAINTAINERS.md
 - README.md
 - Rakefile
 - appveyor.yml
@@ -388,6 +481,7 @@ files:
 - lib/kitchen/verifier/base.rb
 - lib/kitchen/verifier/busser.rb
 - lib/kitchen/verifier/dummy.rb
+- lib/kitchen/verifier/shell.rb
 - lib/kitchen/version.rb
 - lib/vendor/hash_recursive_merge.rb
 - spec/kitchen/base64_stream_spec.rb
@@ -431,6 +525,7 @@ files:
 - spec/kitchen/verifier/base_spec.rb
 - spec/kitchen/verifier/busser_spec.rb
 - spec/kitchen/verifier/dummy_spec.rb
+- spec/kitchen/verifier/shell_spec.rb
 - spec/kitchen/verifier_spec.rb
 - spec/kitchen_spec.rb
 - spec/spec_helper.rb
@@ -547,6 +642,7 @@ test_files:
 - spec/kitchen/verifier/base_spec.rb
 - spec/kitchen/verifier/busser_spec.rb
 - spec/kitchen/verifier/dummy_spec.rb
+- spec/kitchen/verifier/shell_spec.rb
 - spec/kitchen/verifier_spec.rb
 - spec/kitchen_spec.rb
 - spec/spec_helper.rb