test-kitchen 1.4.2 → 1.5.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed6240c00a8d6ca35986ab16735134c1fe4368b1
-  data.tar.gz: 3b4324d554794093cc15ebd2f82e9bca3c426074
+  metadata.gz: adede1e7727afe32740d4f4b60452b704f4326ee
+  data.tar.gz: cfd3c1e7ea3517a9d9bbdc8b3b1e135dd546f26b
 SHA512:
-  metadata.gz: d1949f7688de24d288aa21d15f4d1bc80dc049937b60ab56e3ac445211e7c68c57fcb7c2b1f3fc93fa25e341f2dd9907494ecdcfcda4518dd2939cbed22fec3f
-  data.tar.gz: a8713a783d3ff9b2dff382e790a1496ec75b1f305bab75b02d0a5a36f505995c4b998f2a0a057d6d7443371757b50d69aa732b1d16a467211378500b021836d3
+  metadata.gz: 3d3dfad8e69eb236fd38ca05e233245342140823b94cf9d7cea0b56f5ec6bbae1aba59494c728fe768dc29e51fd3ee817e764836751e1187f996f6566385b758
+  data.tar.gz: 4cb4852bb1977639bbb5068420ba26c170f5594d1e21b12be1dec4c6cd6a464ab7426640324066e7545b768c8865d401d1a5d6969f97fc2cdb200fd064ad6020

data/.gitignore

@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+Gemfile*.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.2
+  - 2.2.3
   - 2.1
   - 2.0.0
-  - 1.9.3
   - ruby-head
 
 env:
@@ -24,6 +23,32 @@ bundler_args: --without guard
 sudo: false
 
 matrix:
+  include:
+    - rvm: 2.2
+      sudo: required
+      dist: trusty
+      # To run the proxy tests we need additional gems than what Test Kitchen normally uses
+      # for testing
+      gemfile: Gemfile.proxy_tests
+      before_install:
+        - sudo apt-get update
+        - sudo apt-get -y install squid3 git curl
+      env:
+        # ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY']
+        - secure: "E7h427Y8z6Nx5sdrA4Ye9gO9pDGpe4jxfhJdM4HPJIM/FSkEJM0ZDPdvhQ6QAQ1S1AHja/JhQUFaNP5NzKhRkVqGCzunBBC6RVb7pp1Qo16EMhJkg7LEsExiSsjQykAzt2w6K/71V+mIlMKxCPYdpu6PT/8w/jZFgBqLEHXuogU="
+        - global:
+          - PROXY_TESTS_DIR=proxy_tests/files/default/scripts
+          - PROXY_TESTS_REPO=$PROXY_TESTS_DIR/repo
+
+      script:
+        - bundle exec kitchen --version
+        # TODO switch to master when https://github.com/chef/proxy_tests/pull/12 is merged
+        - git clone https://github.com/chef/proxy_tests.git
+        - rvmsudo -E bundle exec bash $PROXY_TESTS_DIR/run_tests.sh kitchen \* \* /tmp/out.txt
+      after_script:
+        - cat /tmp/out.txt
+        - sudo cat /var/log/squid3/cache.log
+        - sudo cat /var/log/squid3/access.log
   allow_failures:
     - rvm: ruby-head
   exclude:

data/CHANGELOG.md

@@ -1,4 +1,29 @@
-## 1.4.2
+## 1.5.0
+
+### Potentially breaking changes
+
+### Bug fixes
+
+* PR [#816][]: Fix SuSe OS Busser install ([@Peuserik][])
+* PR [#833][]: Updates the gem path to install everything in /tmp/verifier ([@scotthain][])
+* PR [#878][]: write install_command to file and invoke on the instance to avoid command too long on windows ([@mwrock][])
+
+### New features
+
+* PR [#741][]: Add shell verifier ([@sawanoboly][])
+* PR [#752][]: Make lazyhash enumerable ([@caboteria][])
+* PR [#892][]: Adding proxy tests to the Travis.yml ([@tyler-ball][])
+* PR [#895][]: Adding in ChefConfig support to enable loading proxy config from chef config files ([@tyler-ball][])
+
+### Improvements
+
+* PR [#782][]: Use [`mixlib-install`](https://github.com/chef/mixlib-install) to generate chef install command. ([@thommay][])
+* PR [#804][]: Drop Ruby 1.9 from TravisCI build matrix ([@thommay][])
+* PR [#813][]: Honor proxy ENV variables ([@mcquin][])
+* PR [#885][]: Running the chef_base provisioner install_command via sudo, and command_prefix support ([@adamleff][])
+* PR [#896][]: Fixing garbled output for chef_zero provisioner ([@someara][])
+
+## 1.4.2 / 2015-08-03
 
 ### Potentially breaking changes
 
@@ -769,12 +794,26 @@ The initial release.
 [#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
+[#741]: https://github.com/test-kitchen/test-kitchen/issues/741
+[#752]: https://github.com/test-kitchen/test-kitchen/issues/752
+[#782]: https://github.com/test-kitchen/test-kitchen/issues/782
 [#801]: https://github.com/test-kitchen/test-kitchen/issues/801
 [#802]: https://github.com/test-kitchen/test-kitchen/issues/802
+[#804]: https://github.com/test-kitchen/test-kitchen/issues/804
+[#813]: https://github.com/test-kitchen/test-kitchen/issues/813
+[#816]: https://github.com/test-kitchen/test-kitchen/issues/816
+[#833]: https://github.com/test-kitchen/test-kitchen/issues/833
+[#878]: https://github.com/test-kitchen/test-kitchen/issues/878
+[#885]: https://github.com/test-kitchen/test-kitchen/issues/885
+[#892]: https://github.com/test-kitchen/test-kitchen/issues/892
+[#895]: https://github.com/test-kitchen/test-kitchen/issues/895
+[#896]: https://github.com/test-kitchen/test-kitchen/issues/896
 [@Annih]: https://github.com/Annih
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@MarkGibbons]: https://github.com/MarkGibbons
+[@Peuserik]: https://github.com/Peuserik
 [@adamhjk]: https://github.com/adamhjk
+[@adamleff]: https://github.com/adamleff
 [@afiune]: https://github.com/afiune
 [@arangamani]: https://github.com/arangamani
 [@arunthampi]: https://github.com/arunthampi

data/Gemfile.proxy_tests

@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+eval_gemfile File.join(File.dirname(__FILE__), "Gemfile")
+
+gem "kitchen-ec2"
+# TODO when this is released in Chef 12.6.0 we need to depend on that
+gem "chef-config", github: "chef/chef", submodules: true

data/features/kitchen_driver_discover_command.feature

@@ -17,3 +17,9 @@ Feature: Search RubyGems to discover new Test Kitchen Driver gems
     When I run `kitchen driver discover`
     Then the exit status should be 0
     And the output should contain "kitchen-bluebox"
+
+  Scenario: Running driver discover with the --chef-config-path parameter loads the chef config
+    Given an empty file named "kitchen_client.rb"
+    When I run `kitchen driver discover --chef-config-path=kitchen_client.rb`
+    Then the exit status should be 0
+    And the output should contain "kitchen-bluebox"

data/features/kitchen_init_command.feature

@@ -3,6 +3,9 @@ Feature: Add Test Kitchen support to an existing project
   As an operator
   I want to run a command to initialize my project
 
+  Background:
+    Given a sandboxed GEM_HOME directory named "kitchen-init"
+
   @spawn
   Scenario: Displaying help
     When I run `kitchen help init`
@@ -15,8 +18,7 @@ Feature: Add Test Kitchen support to an existing project
 
   @spawn
   Scenario: Running init with default values
-    Given a sandboxed GEM_HOME directory named "kitchen-init"
-    And I have a git repository
+    Given I have a git repository
     When I run `kitchen init`
     Then the exit status should be 0
     And a directory named "test/integration/default" should exist
@@ -173,7 +175,7 @@ Feature: Add Test Kitchen support to an existing project
     """
 
   Scenario: Running without git doesn't make a .gitignore
-    When I successfully run `kitchen init`
+    When I successfully run `kitchen init --no-driver`
     Then the exit status should be 0
     And a file named ".gitignore" should not exist
 

data/features/step_definitions/gem_steps.rb

@@ -10,19 +10,27 @@ Given(/^a sandboxed GEM_HOME directory named "(.*?)"$/) do |name|
   @aruba_timeout_seconds = 30
 
   gem_home = Pathname.new(Dir.mktmpdir(name))
-  ENV["GEM_HOME"] = gem_home.to_s
-  ENV["GEM_PATH"] = [gem_home.to_s, ENV["GEM_PATH"]].join(":")
+  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(unescape("gem list #{name} --version #{version} -i"), true, nil)
+    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(unescape("gem list #{name} -i"), true, nil)
+    run_simple(
+      sanitize_text("gem list #{name} -i"),
+      :fail_on_error => true,
+      :exit_timeout => nil
+     )
   end
 end

data/features/step_definitions/git_steps.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 Given(/I have a git repository/) do
-  create_dir(".git")
+  create_directory(".git")
 end

data/features/step_definitions/output_steps.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 Then(/^the stdout should match \/([^\/]*)\/$/) do |expected|
-  assert_matching_output(expected, all_stdout)
+  expect(last_command_started).to have_output_on_stdout(Regexp.new(expected))
 end

data/features/support/env.rb

@@ -31,12 +31,12 @@ Before do
   @aruba_timeout_seconds = 15
   @cleanup_dirs = []
 
-  Aruba::Processes::InProcess.main_class = ArubaHelper
-  Aruba.process = Aruba::Processes::InProcess
+  aruba.config.command_launcher = :in_process
+  aruba.config.main_class = ArubaHelper
 end
 
 Before("@spawn") do
-  Aruba.process = Aruba::Processes::SpawnProcess
+  aruba.config.command_launcher = :spawn
 end
 
 After do |s|
@@ -47,25 +47,29 @@ After do |s|
 
   # Restore environment variables to their original settings, if they have
   # been saved off
-  ENV.keys.select { |key| key =~ /^_CUKE_/ }.each do |backup_key|
-    ENV[backup_key.sub(/^_CUKE_/, "")] = ENV.delete(backup_key)
-  end
+  env = aruba.environment
+  env.to_h.keys.select { |key| key =~ /^_CUKE_/ }.
+    each do |backup_key|
+      env[backup_key.sub(/^_CUKE_/, "")] = env[backup_key]
+      env.delete(backup_key)
+    end
 
   @cleanup_dirs.each { |dir| FileUtils.rm_rf(dir) }
 end
 
 def backup_envvar(key)
-  ENV["_CUKE_#{key}"] = ENV[key]
+  aruba.environment["_CUKE_#{key}"] = aruba.environment[key]
 end
 
 def restore_envvar(key)
-  ENV[key] = ENV.delete("_CUKE_#{key}")
+  aruba.environment[key] = aruba.environment["_CUKE_#{key}"]
+  aruba.environment.delete("_CUKE_#{key}")
 end
 
 def unbundlerize
   keys = %w[BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE RUBYOPT]
 
-  keys.each { |key| backup_envvar(key); ENV.delete(key) }
+  keys.each { |key| backup_envvar(key); aruba.environment.delete(key) }
   yield
   keys.each { |key| restore_envvar(key) }
 end

data/lib/kitchen/cli.rb

@@ -287,6 +287,9 @@ module Kitchen
         guarenteed that every result is a driver, but chances are good most
         relevant drivers will be returned.
       D
+      method_option :chef_config_path,
+        :default => nil,
+        :desc => "Path to chef config file containing proxy configuration to use"
       def discover
         perform("discover", "driver_discover", args)
       end

data/lib/kitchen/command/driver_discover.rb

@@ -19,6 +19,8 @@
 require "kitchen/command"
 
 require "rubygems/spec_fetcher"
+require "chef-config/config"
+require "chef-config/workstation_config_loader"
 
 module Kitchen
 
@@ -31,6 +33,12 @@ module Kitchen
 
       # Invoke the command.
       def call
+        # We are introducing the idea of using the Chef configuration as a
+        # unified config for all the ChefDK tools.  The first practical
+        # implementation of this is 1 location to setup proxy configurations.
+        ChefConfig::WorkstationConfigLoader.new(options[:chef_config_path]).load
+        ChefConfig::Config.export_proxies
+
         specs = fetch_gem_specs.sort { |x, y| x[0] <=> y[0] }
         specs = specs[0, 49].push(["...", "..."]) if specs.size > 49
         specs = specs.unshift(["Gem Name", "Latest Stable Release"])

data/lib/kitchen/configurable.rb

@@ -295,15 +295,36 @@ module Kitchen
     # @param code [String] the shell code to be wrapped
     # @return [String] wrapped shell code
     # @api private
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
     def wrap_shell_code(code)
       env = []
       if config[:http_proxy]
         env << shell_env_var("http_proxy", config[:http_proxy])
         env << shell_env_var("HTTP_PROXY", config[:http_proxy])
+      else
+        export_proxy(env, "http")
       end
       if config[:https_proxy]
         env << shell_env_var("https_proxy", config[:https_proxy])
         env << shell_env_var("HTTPS_PROXY", config[:https_proxy])
+      else
+        export_proxy(env, "https")
+      end
+      if config[:ftp_proxy]
+        env << shell_env_var("ftp_proxy", config[:ftp_proxy])
+        env << shell_env_var("FTP_PROXY", config[:ftp_proxy])
+      else
+        export_proxy(env, "ftp")
+      end
+      # if http_proxy was set from environment variable or https_proxy was set
+      # from environment variable, or ftp_proxy was set from environment
+      # variable, include no_proxy environment variable, if set.
+      if (!config[:http_proxy] && (ENV["http_proxy"] || ENV["HTTP_PROXY"])) ||
+          (!config[:https_proxy] && (ENV["https_proxy"] || ENV["HTTPS_PROXY"])) ||
+          (!config[:ftp_proxy] && (ENV["ftp_proxy"] || ENV["FTP_PROXY"]))
+        env << shell_env_var("no_proxy", ENV["no_proxy"]) if ENV["no_proxy"]
+        env << shell_env_var("NO_PROXY", ENV["NO_PROXY"]) if ENV["NO_PROXY"]
       end
       if powershell_shell?
         env.join("\n").concat("\n").concat(code)
@@ -312,6 +333,17 @@ module Kitchen
       end
     end
 
+    # Helper method to export
+    #
+    # @param env [Array] the environment to modify
+    # @param code [String] the type of proxy to export, one of 'http', 'https' or 'ftp'
+    # @api private
+    def export_proxy(env, type)
+      env << shell_env_var("#{type}_proxy", ENV["#{type}_proxy"]) if ENV["#{type}_proxy"]
+      env << shell_env_var("#{type.upcase}_PROXY", ENV["#{type.upcase}_PROXY"]) if
+        ENV["#{type.upcase}_PROXY"]
+    end
+
     # Class methods which will be mixed in on inclusion of Configurable module.
     module ClassMethods
 

data/lib/kitchen/driver/ssh_base.rb

@@ -233,17 +233,31 @@ module Kitchen
         [combined[:hostname], combined[:username], opts]
       end
 
-      # Adds http and https proxy environment variables to a command, if set
-      # in configuration data.
+      # Adds http, https and ftp proxy environment variables to a command, if
+      # set in configuration data or on local workstation.
       #
       # @param cmd [String] command string
       # @return [String] command string
       # @api private
+      # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/AbcSize
       def env_cmd(cmd)
         return if cmd.nil?
         env = "env"
-        env << " http_proxy=#{config[:http_proxy]}"   if config[:http_proxy]
-        env << " https_proxy=#{config[:https_proxy]}" if config[:https_proxy]
+        http_proxy = config[:http_proxy] || ENV["http_proxy"] ||
+          ENV["HTTP_PROXY"]
+        https_proxy = config[:https_proxy] || ENV["https_proxy"] ||
+          ENV["HTTPS_PROXY"]
+        ftp_proxy = config[:ftp_proxy] || ENV["ftp_proxy"] ||
+          ENV["FTP_PROXY"]
+        no_proxy = if (!config[:http_proxy] && http_proxy) ||
+            (!config[:https_proxy] && https_proxy) ||
+            (!config[:ftp_proxy] && ftp_proxy)
+          ENV["no_proxy"] || ENV["NO_PROXY"]
+        end
+        env << " http_proxy=#{http_proxy}"   if http_proxy
+        env << " https_proxy=#{https_proxy}" if https_proxy
+        env << " ftp_proxy=#{ftp_proxy}"     if ftp_proxy
+        env << " no_proxy=#{no_proxy}"       if no_proxy
 
         env == "env" ? cmd : "#{env} #{cmd}"
       end

data/lib/kitchen/generator/driver_create.rb

@@ -87,8 +87,8 @@ module Kitchen
       # @api private
       def initialize_git
         inside(target_dir) do
-          run("git init")
-          run("git add .")
+          run("git init", :capture => true)
+          run("git add .", :capture => true)
         end
       end
 

data/lib/kitchen/lazy_hash.rb

@@ -53,6 +53,7 @@ module Kitchen
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class LazyHash < SimpleDelegator
+    include Enumerable
 
     # Creates a new LazyHash using a Hash-like object to populate itself and
     # an object that can be used as context in value-callable blocks. The
@@ -105,6 +106,25 @@ module Kitchen
       hash
     end
 
+    # Yields each key/value pair to the provided block.  Returns a new
+    # Hash with only the keys and rendered values for which the block
+    # returns true.
+    #
+    # @return [Hash] a new hash
+    def select(&block)
+      to_hash.select(&block)
+    end
+
+    # If no block provided, returns an enumerator over the keys and
+    # rendered values in the underlying object.  If a block is
+    # provided, calls the block once for each [key, rendered_value]
+    # pair in the underlying object.
+    #
+    # @return [Enumerator, Array]
+    def each(&block)
+      to_hash.each(&block)
+    end
+
     private
 
     # Returns an object or invokes call with context if object is callable.