test-kitchen 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cbd1f0c3efa5fa341dded1be775532c1b8d07bb
-  data.tar.gz: eb29a06f2db36bafe5a522be2e2aae107e3802e9
+  metadata.gz: ac352970d9bb62f576ca7a3c8a1390382fa2fb5d
+  data.tar.gz: cd340da33b93b212a7c21de7ccaa212f05be52e8
 SHA512:
-  metadata.gz: 3c568cbdba88464d8372f06fd2b6275def230d8efec447cb281114d2a3809a3df3f8671a0b1158ac57ea58ae98bfe0b68b1a3deb8e7226de740e6328ecfeb0f5
-  data.tar.gz: 1045da5458e2644e1f98af2fd39d796f1070d1f18af18906b9a81a5dba9217585b49a838bf953f920106eb5f631b1859529f33b196ed1b31b3ee26ebb07e101e
+  metadata.gz: dd350ae343edb32bac0914df75405d166546274cc7056104859926641fa930c080084686847b5699d01a250e690c4d40aba8444033094aa7fe06f69ea7175daa
+  data.tar.gz: c801ac18f1c2019301e6ab80f2b99a73e381064e8df489aa205bd68f3c94d40eb8bf3265f11fc5868eac720b047cdbfa345e8f4e6c2cf0720621c9ba8211ba99

data/CHANGELOG.md

@@ -1,4 +1,22 @@
-## 1.4.0.rc.1 / 2015-04-23
+## 1.4.1 / 2015-06-18
+
+### Potentially breaking changes
+
+### Bug fixes
+
+* Issue [#663][], PR [#665][]: Centos 6.4 no longer supported, upgrade in templates for `kitchen init` ([@lloydde][])
+* PR [#711][]: Update to Ubuntu 14.04 and Centos 7.1 for `kitchen init` ([@fnichol][])
+* PR [#734][]: Fix failing `kitchen driver discover` test ([@fnichol][])
+* Issue [#732][], PR [#737][]: Generate a `chefignore` file during `kitchen init` ([@metadave][])
+* Issue [#688][], PR [#728][] and [#736][]: Default WinRM username updated to `administrator` and additional errors caught for retry logic when trying to login with WinRM ([@zl4bv][], [@tyler-ball][])
+
+### New features
+
+### Improvements
+
+* PR [#704][]: Don't prompt for passwords when using public key auth ([@caboteria][])
+
+## 1.4.0 / 2015-04-28
 
 (*A selected roll-up of 1.4.0 pre-release changelogs*)
 
@@ -717,6 +735,8 @@ The initial release.
 [#654]: https://github.com/test-kitchen/test-kitchen/issues/654
 [#656]: https://github.com/test-kitchen/test-kitchen/issues/656
 [#658]: https://github.com/test-kitchen/test-kitchen/issues/658
+[#663]: https://github.com/test-kitchen/test-kitchen/issues/663
+[#665]: https://github.com/test-kitchen/test-kitchen/issues/665
 [#666]: https://github.com/test-kitchen/test-kitchen/issues/666
 [#667]: https://github.com/test-kitchen/test-kitchen/issues/667
 [#668]: https://github.com/test-kitchen/test-kitchen/issues/668
@@ -724,6 +744,14 @@ The initial release.
 [#673]: https://github.com/test-kitchen/test-kitchen/issues/673
 [#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
+[#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
+[#732]: https://github.com/test-kitchen/test-kitchen/issues/732
+[#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
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@MarkGibbons]: https://github.com/MarkGibbons
 [@adamhjk]: https://github.com/adamhjk
@@ -733,6 +761,7 @@ The initial release.
 [@benlangfeld]: https://github.com/benlangfeld
 [@bkw]: https://github.com/bkw
 [@bryanwb]: https://github.com/bryanwb
+[@caboteria]: https://github.com/caboteria
 [@calavera]: https://github.com/calavera
 [@chrishenry]: https://github.com/chrishenry
 [@coderanger]: https://github.com/coderanger
@@ -763,11 +792,13 @@ The initial release.
 [@kamalim]: https://github.com/kamalim
 [@kisoku]: https://github.com/kisoku
 [@lamont-granquist]: https://github.com/lamont-granquist
+[@lloydde]: https://github.com/lloydde
 [@manul]: https://github.com/manul
 [@martinb3]: https://github.com/martinb3
 [@mattray]: https://github.com/mattray
 [@mconigliaro]: https://github.com/mconigliaro
 [@mcquin]: https://github.com/mcquin
+[@metadave]: https://github.com/metadave
 [@michaelkirk]: https://github.com/michaelkirk
 [@miketheman]: https://github.com/miketheman
 [@mthssdrbrg]: https://github.com/mthssdrbrg
@@ -797,4 +828,5 @@ The initial release.
 [@tknerr]: https://github.com/tknerr
 [@tyler-ball]: https://github.com/tyler-ball
 [@whiteley]: https://github.com/whiteley
-[@zts]: https://github.com/zts
+[@zl4bv]: https://github.com/zl4bv
+[@zts]: https://github.com/zts

data/features/kitchen_driver_discover_command.feature

@@ -16,5 +16,4 @@ Feature: Search RubyGems to discover new Test Kitchen Driver gems
   Scenario: Running driver discover returns live results
     When I run `kitchen driver discover`
     Then the exit status should be 0
-    And the output should contain "kitchen-vagrant"
     And the output should contain "kitchen-bluebox"

data/features/kitchen_init_command.feature

@@ -31,6 +31,8 @@ Feature: Add Test Kitchen support to an existing project
     And a file named "Rakefile" should not exist
     And a file named "Thorfile" should not exist
     And a gem named "kitchen-vagrant" is installed
+    And a file named "chefignore" should exist
+    And the file "chefignore" should contain ".kitchen"
 
   Scenario: Running init that creates a Gemfile
     When I successfully run `kitchen init --create-gemfile`
@@ -212,8 +214,8 @@ Feature: Add Test Kitchen support to an existing project
       name: chef_solo
 
     platforms:
-      - name: ubuntu-12.04
-      - name: centos-6.4
+      - name: ubuntu-14.04
+      - name: centos-7.1
 
     suites:
       - name: default

data/lib/kitchen/generator/init.rb

@@ -61,6 +61,7 @@ module Kitchen
         self.class.source_root(Kitchen.source_root.join("templates", "init"))
 
         create_kitchen_yaml
+        create_chefignore
         prepare_rakefile
         prepare_thorfile
         create_test_dir
@@ -91,6 +92,13 @@ module Kitchen
         )
       end
 
+      # Creates the `chefignore` file.
+      #
+      # @api private
+      def create_chefignore
+        template("chefignore.erb", "chefignore")
+      end
+
       # @return [true,false] whether or not a Gemfile needs to be initialized
       # @api private
       def init_gemfile?

data/lib/kitchen/transport/ssh.rb

@@ -310,6 +310,7 @@ module Kitchen
 
         opts[:keys_only] = true                     if data[:ssh_key]
         opts[:keys] = Array(data[:ssh_key])         if data[:ssh_key]
+        opts[:auth_methods] = ["publickey"]         if data[:ssh_key]
         opts[:password] = data[:password]           if data.key?(:password)
         opts[:forward_agent] = data[:forward_agent] if data.key?(:forward_agent)
 

data/lib/kitchen/transport/winrm.rb

@@ -44,7 +44,7 @@ module Kitchen
       plugin_version Kitchen::VERSION
 
       default_config :port, 5985
-      default_config :username, ".\\administrator"
+      default_config :username, "administrator"
       default_config :password, nil
       default_config :endpoint_template, "http://%{hostname}:%{port}/wsman"
       default_config :rdp_port, 3389
@@ -139,7 +139,8 @@ module Kitchen
             Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED,
             Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
             ::WinRM::WinRMHTTPTransportError, ::WinRM::WinRMAuthorizationError,
-            HTTPClient::KeepAliveDisconnected
+            HTTPClient::KeepAliveDisconnected,
+            HTTPClient::ConnectTimeoutError
           ].freeze
         end
 

data/lib/kitchen/version.rb

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

data/spec/kitchen/transport/ssh_spec.rb

@@ -483,6 +483,16 @@ describe Kitchen::Transport::Ssh do
         make_connection
       end
 
+      it "sets :auth_methods to only publickey if :ssh_key is set in config" do
+        config[:ssh_key] = "ssh_key_from_config"
+
+        klass.expects(:new).with do |hash|
+          hash[:auth_methods] == ["publickey"]
+        end
+
+        make_connection
+      end
+
       it "sets :keys_only to true if :ssh_key is set in state" do
         state[:ssh_key] = "ssh_key_from_config"
         config[:ssh_key] = false

data/spec/kitchen/transport/winrm_spec.rb

@@ -53,8 +53,8 @@ describe Kitchen::Transport::Winrm do
       transport[:port].must_equal 5985
     end
 
-    it "sets :username to .\\administrator by default" do
-      transport[:username].must_equal ".\\administrator"
+    it "sets :username to administrator by default" do
+      transport[:username].must_equal "administrator"
     end
 
     it "sets :password to nil by default" do
@@ -703,7 +703,7 @@ MSG
       Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED,
       Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
       ::WinRM::WinRMHTTPTransportError, ::WinRM::WinRMAuthorizationError,
-      HTTPClient::KeepAliveDisconnected
+      HTTPClient::KeepAliveDisconnected, HTTPClient::ConnectTimeoutError
     ].each do |klass|
       describe "raising #{klass}" do
 

data/templates/init/chefignore.erb

@@ -0,0 +1 @@
+.kitchen

data/templates/init/kitchen.yml.erb

@@ -6,8 +6,8 @@ provisioner:
   name: <%= config[:provisioner] %>
 
 platforms:
-  - name: ubuntu-12.04
-  - name: centos-6.4
+  - name: ubuntu-14.04
+  - name: centos-7.1
 
 suites:
   - name: default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -453,6 +453,7 @@ files:
 - templates/driver/tailor.erb
 - templates/driver/travis.yml.erb
 - templates/driver/version.rb.erb
+- templates/init/chefignore.erb
 - templates/init/kitchen.yml.erb
 - test-kitchen.gemspec
 homepage: http://kitchen.ci
@@ -475,7 +476,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure