test-kitchen 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d22285218684802317ed183046f76c3cc2344292
-  data.tar.gz: ddebfec0f35d3e73146860e4f0c1965b5dcfa606
+  metadata.gz: 64d47d36ddf40c8ecc6d85d959e3a57156532e47
+  data.tar.gz: 2c60df4e026b0f2cad64dc5b4c3c3ba1341ac2a6
 SHA512:
-  metadata.gz: dcc1ca63e1da958c70604f2df12fd141004f41339be28d815c593f5e1fa02b97005613dcd720dccc78fc2994ca82ce345b6a9e936efd50264e3883e4a36f87d5
-  data.tar.gz: 530e3634dc4113aa662f95aec7f8e5f49028fdaef173db54b172ff4253c9c8d79973b8b499823d6012d5c8f6307266eb7f7b5582e4180d5b79937fce1953d221
+  metadata.gz: a3de01b4c239c767b824c4d29b8645950ab2704f20c821dd42877d9034ec7024f9b669d4b1c41141ebb213f02f1fe33832adbd2eef804b089abdff78e1aa3d2f
+  data.tar.gz: 3b6ad9625a57724367af1de37712d39b9e2bd6c2115a3f5a66bda655b180797f319888d5ac916a4425b013bf390178d21398aba2198c125779c487f92658f1ad

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.1.1 / 2013-12-08
+
+### Bug fixes
+
+* Normalize driver, provisioner, & busser blocks when merging raw YAML. ([@fnichol][])
+* Issue [#276][], issue [#278][]: Ensure `Busser#local_suite_files` only rejects chef data dirs. ([@fnichol][])
+* Pull request [#275][]: Fix SSH 'Too many authentication failures' error. ([@zts][])
+* When copying `./cookbooks`, conditionally check for `./site-cookbooks`. ([@fnichol][])
+
+### Improvements
+
+* Improve `kitchen diagnose` when loader data merging fails. ([@fnichol][])
+
+
 ## 1.1.0 / 2013-12-04
 
 ### Default updates
@@ -383,6 +397,9 @@ The initial release.
 [#265]: https://github.com/opscode/test-kitchen/issues/265
 [#266]: https://github.com/opscode/test-kitchen/issues/266
 [#272]: https://github.com/opscode/test-kitchen/issues/272
+[#275]: https://github.com/opscode/test-kitchen/issues/275
+[#276]: https://github.com/opscode/test-kitchen/issues/276
+[#278]: https://github.com/opscode/test-kitchen/issues/278
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@adamhjk]: https://github.com/adamhjk
 [@arangamani]: https://github.com/arangamani
@@ -419,4 +436,5 @@ The initial release.
 [@sethvargo]: https://github.com/sethvargo
 [@smith]: https://github.com/smith
 [@stevendanna]: https://github.com/stevendanna
-[@thommay]: https://github.com/thommay
+[@thommay]: https://github.com/thommay
+[@zts]: https://github.com/zts

data/lib/kitchen/busser.rb

@@ -181,12 +181,17 @@ module Kitchen
     end
 
     def local_suite_files
-      glob = File.join(config[:test_base_path], config[:suite_name], "*/**/*")
+      base = File.join(config[:test_base_path], config[:suite_name])
+      glob = File.join(base, "*/**/*")
       Dir.glob(glob).reject do |f|
-        f[/(data|data_bags|environments|nodes|roles)/] || File.directory?(f)
+         is_chef_data_dir?(base, f) || File.directory?(f)
       end
     end
 
+    def is_chef_data_dir?(base, file)
+      file =~ %r[^#{base}/(data|data_bags|environments|nodes|roles)/]
+    end
+
     def helper_files
       Dir.glob(File.join(config[:test_base_path], "helpers", "*/**/*"))
     end

data/lib/kitchen/driver/ssh_base.rb

@@ -85,6 +85,7 @@ module Kitchen
         opts = Hash.new
         opts[:user_known_hosts_file] = "/dev/null"
         opts[:paranoid] = false
+        opts[:keys_only] = true if combined[:ssh_key]
         opts[:password] = combined[:password] if combined[:password]
         opts[:forward_agent] = combined[:forward_agent] if combined.key? :forward_agent
         opts[:port] = combined[:port] if combined[:port]

data/lib/kitchen/loader/yaml.rb

@@ -80,7 +80,8 @@ module Kitchen
           result[:local_config] =
             { :filename => local_config_file, :raw_data => local_yaml }
         end
-        result[:combined_config] = { :raw_data => combined_hash }
+        combined = begin ; combined_hash ; rescue => e ; failure_hash(e) ; end
+        result[:combined_config] = { :raw_data => combined }
         result
       end
 
@@ -91,8 +92,12 @@ module Kitchen
       end
 
       def combined_hash
-        y = @process_local ? yaml.rmerge(local_yaml) : yaml
-        @process_global ? y.rmerge(global_yaml) : y
+        y = if @process_local
+          normalize(yaml).rmerge(normalize(local_yaml))
+        else
+          normalize(yaml)
+        end
+        @process_global ? y.rmerge(normalize(global_yaml)) : y
       rescue NoMethodError
         raise UserError, "Error merging #{File.basename(config_file)} and" +
           "#{File.basename(local_config_file)}"
@@ -128,6 +133,40 @@ module Kitchen
         File.join(File.expand_path(ENV["HOME"]), ".kitchen", "config.yml")
       end
 
+      def failure_hash(e)
+        {
+          :error => {
+            :exception => e.inspect,
+            :message => e.message,
+            :backtrace => e.backtrace
+          }
+        }
+      end
+
+      def normalize(obj)
+        if obj.is_a?(Hash)
+          obj.inject(Hash.new) { |h, (k, v)| normalize_hash(h, k, v) ; h }
+        else
+          obj
+        end
+      end
+
+      def normalize_hash(hash, key, value)
+        case key
+        when "driver", "provisioner", "busser"
+          hash[key] = if value.nil?
+            Hash.new
+          elsif value.is_a?(String)
+            default_key = key == "busser" ? "version" : "name"
+            { default_key => value }
+          else
+            normalize(value)
+          end
+        else
+          hash[key] = normalize(value)
+        end
+      end
+
       def parse_yaml_string(string, file_name)
         return Hash.new if string.nil? || string.empty?
 

data/lib/kitchen/provisioner/chef_base.rb

@@ -355,13 +355,16 @@ module Kitchen
         FileUtils.mkdir_p(tmpbooks_dir)
         FileUtils.cp_r(File.join(cookbooks_dir, "."), tmpbooks_dir)
 
+        cp_site_cookbooks if File.directory?(site_cookbooks_dir)
+        cp_this_cookbook if File.exists?(metadata_rb)
+      end
+
+      def cp_site_cookbooks
         info("Preparing site-cookbooks from project directory")
         debug("Using cookbooks from #{site_cookbooks_dir}")
 
         FileUtils.mkdir_p(tmpsitebooks_dir)
         FileUtils.cp_r(File.join(site_cookbooks_dir, "."), tmpsitebooks_dir)
-
-        cp_this_cookbook if File.exists?(metadata_rb)
       end
 
       def cp_this_cookbook

data/lib/kitchen/ssh.rb

@@ -92,6 +92,7 @@ module Kitchen
     def login_command
       args  = %W{ -o UserKnownHostsFile=/dev/null }
       args += %W{ -o StrictHostKeyChecking=no }
+      args += %W{ -o IdentitiesOnly=yes } if options[:keys]
       args += %W{ -o LogLevel=#{logger.debug? ? "VERBOSE" : "ERROR"} }
       args += %W{ -o ForwardAgent=#{options[:forward_agent] ? "yes" : "no"} } if options.key? :forward_agent
       Array(options[:keys]).each { |ssh_key| args += %W{ -i #{ssh_key}} }

data/lib/kitchen/version.rb

@@ -18,5 +18,5 @@
 
 module Kitchen
 
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/kitchen/loader/yaml_spec.rb

@@ -130,6 +130,138 @@ describe Kitchen::Loader::YAML do
       loader.read.must_equal({ :common => { :thekey => 'kinda' } })
     end
 
+    NORMALIZED_KEYS = {
+      "driver" => "name",
+      "provisioner" => "name",
+      "busser" => "version"
+    }
+
+    NORMALIZED_KEYS.each do |key, default_key|
+
+      describe "normalizing #{key} config hashes" do
+
+        it "merges local with #{key} string value over yaml with hash value" do
+          stub_yaml!(".kitchen.yml", {
+            key => { 'dakey' => 'ya' }
+          })
+          stub_yaml!(".kitchen.local.yml", {
+            key => 'namey'
+          })
+
+          loader.read.must_equal({
+            key.to_sym => { default_key.to_sym => "namey", :dakey => 'ya' }
+          })
+        end
+
+        it "merges local with #{key} hash value over yaml with string value" do
+          stub_yaml!(".kitchen.yml", {
+            key => 'namey'
+          })
+          stub_yaml!(".kitchen.local.yml", {
+            key => { 'dakey' => 'ya' }
+          })
+
+          loader.read.must_equal({
+            key.to_sym => { default_key.to_sym => "namey", :dakey => 'ya' }
+          })
+        end
+
+        it "merges local with #{key} nil value over yaml with hash value" do
+          stub_yaml!(".kitchen.yml", {
+            key => { 'dakey' => 'ya' }
+          })
+          stub_yaml!(".kitchen.local.yml", {
+            key => nil
+          })
+
+          loader.read.must_equal({
+            key.to_sym => { :dakey => 'ya' }
+          })
+        end
+
+        it "merges local with #{key} hash value over yaml with nil value" do
+          stub_yaml!(".kitchen.yml", {
+            key => 'namey'
+          })
+          stub_yaml!(".kitchen.local.yml", {
+            key => nil
+          })
+
+          loader.read.must_equal({
+            key.to_sym => { default_key.to_sym => "namey" }
+          })
+        end
+
+        it "merges global with #{key} string value over yaml with hash value" do
+          stub_yaml!(".kitchen.yml", {
+            key => { 'dakey' => 'ya' }
+          })
+          stub_global!({
+            key => 'namey'
+          })
+
+          loader.read.must_equal({
+            key.to_sym => { default_key.to_sym => "namey", :dakey => 'ya' }
+          })
+        end
+
+        it "merges global with #{key} hash value over yaml with string value" do
+          stub_yaml!(".kitchen.yml", {
+            key => 'namey'
+          })
+          stub_global!({
+            key => { 'dakey' => 'ya' }
+          })
+
+          loader.read.must_equal({
+            key.to_sym => { default_key.to_sym => "namey", :dakey => 'ya' }
+          })
+        end
+
+        it "merges global with #{key} nil value over yaml with hash value" do
+          stub_yaml!(".kitchen.yml", {
+            key => { 'dakey' => 'ya' }
+          })
+          stub_global!({
+            key => nil
+          })
+
+          loader.read.must_equal({
+            key.to_sym => { :dakey => 'ya' }
+          })
+        end
+
+        it "merges global with #{key} hash value over yaml with nil value" do
+          stub_yaml!(".kitchen.yml", {
+            key => nil
+          })
+          stub_global!({
+            key => { 'dakey' => 'ya' }
+          })
+
+          loader.read.must_equal({
+            key.to_sym => { :dakey => 'ya' }
+          })
+        end
+
+        it "merges global, local, over yaml with mixed hash, string, nil values" do
+          stub_yaml!(".kitchen.yml", {
+            key => nil
+          })
+          stub_yaml!(".kitchen.local.yml", {
+            key => "namey"
+          })
+          stub_global!({
+            key => { 'dakey' => 'ya' }
+          })
+
+          loader.read.must_equal({
+            key.to_sym => { default_key.to_sym => "namey", :dakey => 'ya' }
+          })
+        end
+      end
+    end
+
     it "handles a kitchen.local.yml with no yaml elements" do
       stub_yaml!(".kitchen.yml", {
         'a' => 'b'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout