test-kitchen 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81b8adb0709ab4a153dcc6a0eba1c51e871d7dde
-  data.tar.gz: 97fbf58b65c2696f67dfae8c70ba089f14ef0ba9
+  metadata.gz: 616a0d59e9500a9ae80507ef5efdf7175bb4adba
+  data.tar.gz: 3108f9221ad1ef480d3282e107e581a65f1c5873
 SHA512:
-  metadata.gz: 1d21fba7803bdf1592b7d1554cf4897f98817470d7559422f72f6fb8fbba38257484acf12dc89ee4f20cf7a0146053016a5f7c7b517ef7d8bf2591366e268a31
-  data.tar.gz: 32d72aac0d92f2c8dc12e0d1a4e66589d126c90f3c6f937230d28ef591a33e4e722a91613c6b316183360634457858f9f4e0c7bdc76f1afc88e024b49514600d
+  metadata.gz: 6b2851f54a37c72e95a6ae3e1842cbb54165508cc3ff1129ee2456fef1c06558c6647a19c361e21aaefdc9a13717d337bad07b122658b7ffb3e92e2e9c1f69b6
+  data.tar.gz: a0b3a27e700d82e0295004f9bf4a38e86148a3922d9ef7ac108de22b95341c718be87db1589b8970284ae608c0a8eb19a038544a50f81423b19c5c7ed1b5ccdf

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## [v1.13.0](https://github.com/test-kitchen/test-kitchen/tree/v1.13.0) (2016-09-16)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.12.0...v1.13.0)
+
+**Implemented enhancements:**
+
+- Add `kitchen status` command [\#87](https://github.com/test-kitchen/test-kitchen/issues/87)
+- Add support for Windows Nano installs via chef provisioners [\#1119](https://github.com/test-kitchen/test-kitchen/pull/1119) ([mwrock](https://github.com/mwrock))
+- Add package driver command [\#1074](https://github.com/test-kitchen/test-kitchen/pull/1074) ([neillturner](https://github.com/neillturner))
+
+**Fixed bugs:**
+
+- SSH Transport: Bastion proxy results in broken pipe error [\#1079](https://github.com/test-kitchen/test-kitchen/issues/1079)
+
 ## [v1.12.0](https://github.com/test-kitchen/test-kitchen/tree/v1.12.0) (2016-09-02)
 [Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.11.1...v1.12.0)
 

data/Gemfile

@@ -3,11 +3,11 @@ source "https://rubygems.org"
 gemspec
 gem "rack", "< 2.0"
 
-gem "train", :github => "chef/train", :branch => "winrm-v2"
+gem "train", "~> 0.19.0"
 
 group :integration do
   gem "berkshelf", "~> 4.3"
-  gem "kitchen-inspec", :git => "https://github.com/mwrock/kitchen-inspec", :branch => "winrm-v2"
+  gem "kitchen-inspec", "~> 0.15.1"
 end
 
 group :test do

data/features/step_definitions/gem_steps.rb

@@ -3,34 +3,34 @@
 require "tmpdir"
 require "pathname"
 
-# Given(/^a sandboxed GEM_HOME directory named "(.*?)"$/) do |name|
-#   backup_envvar("GEM_HOME")
-#   backup_envvar("GEM_PATH")
+Given(/^a sandboxed GEM_HOME directory named "(.*?)"$/) do |name|
+  backup_envvar("GEM_HOME")
+  backup_envvar("GEM_PATH")
 
-#   @aruba_timeout_seconds = 30
+  @aruba_timeout_seconds = 30
 
-#   gem_home = Pathname.new(Dir.mktmpdir(name))
-#   aruba.environment["GEM_HOME"] = gem_home.to_s
-#   aruba.environment["GEM_PATH"] = [gem_home.to_s, ENV["GEM_PATH"]].join(":")
-#   @cleanup_dirs << gem_home
-# end
+  gem_home = Pathname.new(Dir.mktmpdir(name))
+  aruba.environment["GEM_HOME"] = gem_home.to_s
+  aruba.environment["GEM_PATH"] = [gem_home.to_s, ENV["GEM_PATH"]].join(":")
+  @cleanup_dirs << gem_home
+end
 
-# Then(/^a gem named "(.*?)" is installed with version "(.*?)"$/) do |name, version|
-#   unbundlerize do
-#     run_simple(
-#       sanitize_text("gem list #{name} --version #{version} -i"),
-#       :fail_on_error => true,
-#       :exit_timeout => nil
-#      )
-#   end
-# end
+Then(/^a gem named "(.*?)" is installed with version "(.*?)"$/) do |name, version|
+  unbundlerize do
+    run_simple(
+      sanitize_text("gem list #{name} --version #{version} -i"),
+      :fail_on_error => true,
+      :exit_timeout => nil
+     )
+  end
+end
 
-# Then(/^a gem named "(.*?)" is installed$/) do |name|
-#   unbundlerize do
-#     run_simple(
-#       sanitize_text("gem list #{name} -i"),
-#       :fail_on_error => true,
-#       :exit_timeout => nil
-#      )
-#   end
-# end
+Then(/^a gem named "(.*?)" is installed$/) do |name|
+  unbundlerize do
+    run_simple(
+      sanitize_text("gem list #{name} -i"),
+      :fail_on_error => true,
+      :exit_timeout => nil
+     )
+  end
+end

data/lib/kitchen/cli.rb

@@ -119,6 +119,7 @@ module Kitchen
       update_config!
       perform("list", "list", args)
     end
+    map :status => :list
 
     desc "diagnose [INSTANCE|REGEXP|all]", "Show computed diagnostic configuration"
     method_option :loader,
@@ -239,6 +240,13 @@ module Kitchen
       perform("login", "login", args)
     end
 
+    desc "package INSTANCE|REGEXP", "package an instance"
+    log_options
+    def package(*args)
+      update_config!
+      perform("package", "package", args)
+    end
+
     desc "exec INSTANCE|REGEXP -c REMOTE_COMMAND",
       "Execute command on one or more instance"
     method_option :command,

data/lib/kitchen/command/package.rb

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+#
+#
+# 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 "kitchen/command"
+
+module Kitchen
+
+  module Command
+
+    # Execute command on remote instance.
+    #
+    class Package < Kitchen::Command::Base
+
+      # Invoke the command.
+      def call
+        results = parse_subcommand(args.first)
+        results.each do |instance|
+          banner "Package on #{instance.name}."
+          instance.package_action
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/configurable.rb

@@ -255,7 +255,7 @@ module Kitchen
     def reload_ps1_path
       [
         %{$env:PATH},
-        %{[System.Environment]::GetEnvironmentVariable("PATH","Machine")\n\n}
+        %(try { [System.Environment]::GetEnvironmentVariable("PATH","Machine") } catch {}\n\n)
       ].join(" = ")
     end
 

data/lib/kitchen/driver/base.rb

@@ -52,6 +52,13 @@ module Kitchen
       def destroy(state) # rubocop:disable Lint/UnusedMethodArgument
       end
 
+      # Package an instance.
+      #
+      # @param state [Hash] mutable instance and driver state
+      # @raise [ActionFailed] if the action could not be completed
+      def package(state) # rubocop:disable Lint/UnusedMethodArgument
+      end
+
       class << self
         # @return [Array<Symbol>] an array of action method names that cannot
         #   be run concurrently and must be run in serial via a shared mutex

data/lib/kitchen/driver/ssh_base.rb

@@ -130,6 +130,12 @@ module Kitchen
         backcompat_merged_state(state)
       end
 
+      # Package an instance.
+      #
+      # (see Base#package)
+      def package(state) # rubocop:disable Lint/UnusedMethodArgument
+      end
+
       # (see Base#login_command)
       def login_command(state)
         instance.transport.connection(backcompat_merged_state(state)).

data/lib/kitchen/instance.rb

@@ -229,6 +229,13 @@ module Kitchen
       end
     end
 
+    # Perform package.
+    #
+    def package_action
+      banner "Packaging remote instance"
+      driver.package(state_file.read)
+    end
+
     # Returns a Hash of configuration and other useful diagnostic information.
     #
     # @return [Hash] a diagnostic hash

data/lib/kitchen/transport/ssh.rb

@@ -197,7 +197,7 @@ module Kitchen
 
         RESCUE_EXCEPTIONS_ON_ESTABLISH = [
           Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED, Errno::ETIMEDOUT,
-          Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
+          Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH, Errno::EPIPE,
           Net::SSH::Disconnect, Net::SSH::AuthenticationFailed, Net::SSH::ConnectionTimeout,
           Timeout::Error
         ].freeze

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/spec/kitchen/provisioner/chef_solo_spec.rb

@@ -500,7 +500,7 @@ describe Kitchen::Provisioner::ChefSolo do
 
       it "reloads PATH for older chef omnibus packages" do
         cmd.must_match regexify("$env:PATH = " +
-          %{[System.Environment]::GetEnvironmentVariable("PATH","Machine")})
+          %(try { [System.Environment]::GetEnvironmentVariable("PATH","Machine") } catch {}))
       end
 
       it "calls the chef-solo command from :chef_solo_path" do

data/spec/kitchen/provisioner/chef_zero_spec.rb

@@ -818,7 +818,7 @@ describe Kitchen::Provisioner::ChefZero do
 
         it "reloads PATH for older chef omnibus packages" do
           cmd.must_match regexify("$env:PATH = " +
-            %{[System.Environment]::GetEnvironmentVariable("PATH","Machine")})
+            %(try { [System.Environment]::GetEnvironmentVariable("PATH","Machine") } catch {}))
         end
 
         it "calls the chef-client command from :chef_client_path" do
@@ -979,7 +979,7 @@ describe Kitchen::Provisioner::ChefZero do
 
         it "reloads PATH for older chef omnibus packages" do
           cmd.must_match regexify("$env:PATH = " +
-            %{[System.Environment]::GetEnvironmentVariable("PATH","Machine")})
+            %(try { [System.Environment]::GetEnvironmentVariable("PATH","Machine") } catch {}))
         end
       end
     end

data/test-kitchen.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "net-ssh-gateway", "~> 1.2.0"
   gem.add_dependency "safe_yaml",       "~> 1.0"
   gem.add_dependency "thor",            "~> 0.18"
-  gem.add_dependency "mixlib-install",  "~> 1.0", ">= 1.0.4"
+  gem.add_dependency "mixlib-install",  "~> 1.2"
 
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -112,20 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -480,6 +474,7 @@ files:
 - lib/kitchen/command/exec.rb
 - lib/kitchen/command/list.rb
 - lib/kitchen/command/login.rb
+- lib/kitchen/command/package.rb
 - lib/kitchen/command/sink.rb
 - lib/kitchen/command/test.rb
 - lib/kitchen/config.rb