test-kitchen 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3347ab6b20b7e1ec694d6fa3d050694253dcc9b1
-  data.tar.gz: dc5c2281fb606f23c941ea86554d51d45a18deb9
+SHA256:
+  metadata.gz: 6a64cdfeef17eb4bf2664343fc237a76facb5f7178837ee1423a878288f1fac8
+  data.tar.gz: 89335cce9a50a5a4eb8f0231bf49dd31a565441015bd3c340a8f83687207f618
 SHA512:
-  metadata.gz: 8fc1efddb69de36cb94b465377edc773f0aa24c133b80133ead971090abb03d92eb747a1e9e739fdb802f5d170ffb18bc486bb2b07ad8d80ba73097548d8a120
-  data.tar.gz: ea3ce216891dcde776bef616fed38dce086552d1ea46bfd38278bfe85de2b0a37b58b2ad333a6bd7cf66044c1c8d3e84033ede36b64a6b69a97d0db4f1a0a983
+  metadata.gz: f74ae850e51a4d39d405df6765de9a1ad80bdd5bf4b80ae92e9c854dc466ab7c6d4b374f35b038cecf8a80c69093633462ff0fe583a7d97646af1b616b801538
+  data.tar.gz: 4a46163d28150ffae39ca473783bb82e9e415b5235ae70e988746bd4eb1956db43a151a958dc848c51b4dd219e48bfffd8a29a49ea6c957c8bec849e88dfef08

data/.kitchen.proxy.yml

@@ -11,7 +11,7 @@ provisioner:
   name: chef_zero
 
 platforms:
-  - name: ubuntu-14.04
+  - name: ubuntu-16.04
 
 verifier:
   name: busser

data/.rubocop.yml

@@ -1,4 +1,4 @@
-Style/FileName:
+Naming/FileName:
   Exclude:
     - 'support/**/*'
 Layout/EndOfLine:

data/.travis.yml

@@ -5,8 +5,8 @@ services: docker
 language: ruby
 
 rvm:
-  - 2.3
-  - 2.4.2
+  - 2.3.6
+  - 2.4.3
   - ruby-head
 
 
@@ -26,6 +26,10 @@ branches:
 
 matrix:
   include:
+    - rvm: 2.5.0
+      before_install:
+      # https://github.com/travis-ci/travis-ci/issues/8978
+      - gem update --system
     - rvm: 2.4
       # To run the proxy tests we need additional gems than what Test Kitchen normally uses
       # for testing

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Change Log
 
+## [v1.21.0](https://github.com/test-kitchen/test-kitchen/tree/v1.21.0) (2018-04-16)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.20.0...v1.21.0)
+
+**Release Notes:**
+
+### Configuration UX improvements
+
+Having the kitchen configuration file be hidden has always been a bit odd and so we're moving to using `kitchen.yml` over `.kitchen.yml`.
+This also applies to `kitchen.local.yml` and we've made the change backwards compatible so you're not forced to move over right away. Additionally, we've added support for the environment variables `KITCHEN_YML` and KITCHEN_LOCAL_YML` again preserving compatibility if you're using the `*_YAML` forms.
+
+**Merged pull requests:**
+
+- Support `\*\_YML` for env vars too, for better UX [\#1398](https://github.com/test-kitchen/test-kitchen/pull/1398) ([coderanger](https://github.com/coderanger))
+- allow winrm-fs 1.2.0 [\#1396](https://github.com/test-kitchen/test-kitchen/pull/1396) ([gtmanfred](https://github.com/gtmanfred))
+- added KITCHEN\_YML [\#1392](https://github.com/test-kitchen/test-kitchen/pull/1392) ([jjasghar](https://github.com/jjasghar))
+- Rubocop appeasement [\#1379](https://github.com/test-kitchen/test-kitchen/pull/1379) ([robbkidd](https://github.com/robbkidd))
+- don't add drivers to a project's Gemfile during init [\#1378](https://github.com/test-kitchen/test-kitchen/pull/1378) ([robbkidd](https://github.com/robbkidd))
+- halt if visible & hidden default configs are both present [\#1377](https://github.com/test-kitchen/test-kitchen/pull/1377) ([robbkidd](https://github.com/robbkidd))
+- Update and fix appveyor [\#1373](https://github.com/test-kitchen/test-kitchen/pull/1373) ([cheeseplus](https://github.com/cheeseplus))
+- Support IPv6 addresses for WinRM [\#1371](https://github.com/test-kitchen/test-kitchen/pull/1371) ([jzinn](https://github.com/jzinn))
+- honor root\_path for location of chef installer script [\#1369](https://github.com/test-kitchen/test-kitchen/pull/1369) ([robbkidd](https://github.com/robbkidd))
+- Prefer kitchen.yml to .kitchen.yml [\#1363](https://github.com/test-kitchen/test-kitchen/pull/1363) ([thommay](https://github.com/thommay))
+- Support yaml alias [\#1359](https://github.com/test-kitchen/test-kitchen/pull/1359) ([limitusus](https://github.com/limitusus))
+- Adding Ruby 2.5, updating other versions [\#1348](https://github.com/test-kitchen/test-kitchen/pull/1348) ([cheeseplus](https://github.com/cheeseplus))
+- Update CentOS 7 / Ubuntu to the latest versions [\#1289](https://github.com/test-kitchen/test-kitchen/pull/1289) ([tas50](https://github.com/tas50))
+
 ## [v1.20.0](https://github.com/test-kitchen/test-kitchen/tree/v1.20.0) (2018-01-19)
 [Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.19.2...v1.20.0)
 

data/Gemfile

@@ -31,6 +31,10 @@ end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 
-# If you want to load debugging tools into the bundle exec sandbox,
-# add these additional dependencies into chef/Gemfile.local
+# To avoid bringing in development or test dependencies that are not
+# absolutely needed, if you want to load tools not present in the gemspec
+# or this Gemfile, add those additional dependencies into a Gemfile.local
+# file which is ignored by this repository.
+# rubocop:disable Security/Eval
 eval(IO.read(__FILE__ + ".local"), binding) if File.exist?(__FILE__ + ".local")
+# rubocop:enable Security/Eval

data/appveyor.yml

@@ -1,6 +1,6 @@
 version: "master-{build}"
 
-os: Windows Server 2012 R2
+os: Visual Studio 2017
 platform:
   - x64
 
@@ -12,7 +12,7 @@ environment:
   SSL_CERT_FILE: c:\projects\test_kitchen\certs.pem
 
   matrix:
-    - ruby_version: "23"
+    - ruby_version: "24-x64"
 
 clone_folder: c:\projects\test_kitchen
 clone_depth: 1
@@ -31,9 +31,10 @@ install:
   - set SSL_CERT_FILE=c:\projects\test_kitchen\certs.pem
   - gem update --system || gem update --system || gem update --system
   - update_rubygems
+  - gem install bundler --force
   - ruby --version
   - gem --version
-  - bundler --version
+  - bundle --version
 
 build_script:
   - bundle install --without guard integration

data/features/kitchen_defaults.feature

@@ -29,10 +29,10 @@ Feature: Test Kitchen defaults
     verifier: dummy
 
     platforms:
-      - name: ubuntu-14.04
+      - name: ubuntu-16.04
 
     suites:
       - name: default
     """
     When I successfully run `kitchen list`
-    Then the output should match /^default-ubuntu-1404\s+Dummy\s+Dummy\s+Dummy\s+Ssh\s+\<Not Created\>\s+\<None\>$/
+    Then the output should match /^default-ubuntu-1604\s+Dummy\s+Dummy\s+Dummy\s+Ssh\s+\<Not Created\>\s+\<None\>$/

data/features/kitchen_init_command.feature

@@ -3,9 +3,6 @@ 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`
@@ -23,8 +20,10 @@ Feature: Add Test Kitchen support to an existing project
     Then the exit status should be 0
     And a directory named "test/integration/default" should exist
     And the file ".gitignore" should contain ".kitchen/"
+    And the file ".gitignore" should contain "kitchen.local.yml"
     And the file ".gitignore" should contain ".kitchen.local.yml"
-    And the file ".kitchen.yml" should contain:
+    And the file "kitchen.yml" should exist:
+    And the file "kitchen.yml" should contain:
     """
     driver:
       name: vagrant
@@ -43,10 +42,6 @@ Feature: Add Test Kitchen support to an existing project
     """
     gem "test-kitchen"
     """
-    And the file "Gemfile" should contain:
-    """
-    gem "kitchen-vagrant"
-    """
     And the output should contain "You must run `bundle install'"
 
   Scenario: Running init with an existing Gemfile appends to the Gemfile
@@ -62,7 +57,6 @@ Feature: Add Test Kitchen support to an existing project
     source "https://rubygems.org"
 
     gem "test-kitchen"
-    gem "kitchen-vagrant"
 
     """
     And the output should contain "You must run `bundle install'"
@@ -82,10 +76,8 @@ Feature: Add Test Kitchen support to an existing project
     source "https://rubygems.org"
 
     gem 'test-kitchen'
-    gem "kitchen-vagrant"
 
     """
-    And the output should contain "You must run `bundle install'"
 
   Scenario: Running init with a Gemfile containing the driver gem does not
     re-append
@@ -108,24 +100,12 @@ Feature: Add Test Kitchen support to an existing project
     """
     And the output should not contain "You must run `bundle install'"
 
-  Scenario: Running init with multiple drivers appends to the Gemfile
-    Given an empty file named "Gemfile"
-    When I successfully run `kitchen init --driver=kitchen-bluebox kitchen-wakka`
-    Then the file "Gemfile" should contain:
-    """
-    gem "kitchen-bluebox"
-    """
-    And the file "Gemfile" should contain:
-    """
-    gem "kitchen-wakka"
-    """
-    And the output should contain "You must run `bundle install'"
-
   Scenario: Running init with multiple driver sets the plugin_driver to the
     first driver given
     Given an empty file named "Gemfile"
     When I successfully run `kitchen init --driver=kitchen-bluebox kitchen-wakka`
-    Then the file ".kitchen.yml" should contain:
+    Then the file "kitchen.yml" should exist
+    Then the file "kitchen.yml" should contain:
     """
     driver:
       name: bluebox
@@ -135,26 +115,26 @@ Feature: Add Test Kitchen support to an existing project
     dummy driver
     Given an empty file named "Gemfile"
     When I successfully run `kitchen init --no-driver`
-    Then the file ".kitchen.yml" should contain:
+    Then the file "kitchen.yml" should contain:
     """
     driver:
       name: dummy
     """
 
   Scenario: Running init without a provisioner sets the default provisioner
-    to chef_solo in .kitchen.yml
+    to chef_solo in kitchen.yml
     Given an empty file named "Gemfile"
     When I successfully run `kitchen init --no-driver`
-    Then the file ".kitchen.yml" should contain:
+    Then the file "kitchen.yml" should contain:
     """
     provisioner:
       name: chef_solo
     """
 
-  Scenario: Running init with a provisioner sets the provisioner in .kitchen.yml
+  Scenario: Running init with a provisioner sets the provisioner in kitchen.yml
     Given an empty file named "Gemfile"
     When I successfully run `kitchen init --no-driver --provisioner=chef_zero`
-    Then the file ".kitchen.yml" should contain:
+    Then the file "kitchen.yml" should contain:
     """
     provisioner:
       name: chef_zero
@@ -206,7 +186,7 @@ Feature: Add Test Kitchen support to an existing project
     support "centos"
     """
     When I successfully run `kitchen init`
-    Then the file ".kitchen.yml" should contain exactly:
+    Then the file "kitchen.yml" should contain exactly:
     """
     ---
     driver:
@@ -216,8 +196,8 @@ Feature: Add Test Kitchen support to an existing project
       name: chef_solo
 
     platforms:
-      - name: ubuntu-14.04
-      - name: centos-7.2
+      - name: ubuntu-16.04
+      - name: centos-7
 
     suites:
       - name: default
@@ -230,7 +210,7 @@ Feature: Add Test Kitchen support to an existing project
   Scenario: Running init with an empty file metadata.rb sets an empty run list
     Given an empty file named "metadata.rb"
     When I successfully run `kitchen init`
-    Then the file ".kitchen.yml" should contain exactly:
+    Then the file "kitchen.yml" should contain exactly:
     """
     ---
     driver:
@@ -240,8 +220,8 @@ Feature: Add Test Kitchen support to an existing project
       name: chef_solo
 
     platforms:
-      - name: ubuntu-14.04
-      - name: centos-7.2
+      - name: ubuntu-16.04
+      - name: centos-7
 
     suites:
       - name: default
@@ -253,7 +233,7 @@ Feature: Add Test Kitchen support to an existing project
   Scenario: Running init with no metadata.rb file sets an empty run list
     Given a file named "metadata.rb" does not exist
     When I successfully run `kitchen init`
-    Then the file ".kitchen.yml" should contain exactly:
+    Then the file "kitchen.yml" should contain exactly:
     """
     ---
     driver:
@@ -263,8 +243,8 @@ Feature: Add Test Kitchen support to an existing project
       name: chef_solo
 
     platforms:
-      - name: ubuntu-14.04
-      - name: centos-7.2
+      - name: ubuntu-16.04
+      - name: centos-7
 
     suites:
       - name: default

data/features/kitchen_list_command.feature

@@ -117,16 +117,16 @@ Feature: Listing Test Kitchen instances
     provisioner: chef_solo
 
     platforms:
-      - name: ubuntu-12.04
+      - name: ubuntu-16.04
 
     suites:
       - name: gdb01-master
       - name: logdb01-master
     """
-    When I successfully run `kitchen list gdb01-master-ubuntu-1204 --bare`
+    When I successfully run `kitchen list gdb01-master-ubuntu-1604 --bare`
     Then the output should contain exactly:
     """
-    gdb01-master-ubuntu-1204
+    gdb01-master-ubuntu-1604
 
     """
 

data/features/step_definitions/gem_steps.rb

@@ -3,18 +3,6 @@
 require "tmpdir"
 require "pathname"
 
-Given(/^a sandboxed GEM_HOME directory named "(.*?)"$/) do |name|
-  backup_envvar("GEM_HOME")
-  backup_envvar("GEM_PATH")
-
-  @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
-
 Then(/^a gem named "(.*?)" is installed with version "(.*?)"$/) do |name, version|
   unbundlerize do
     run_simple(

data/lib/kitchen/cli.rb

@@ -67,9 +67,9 @@ module Kitchen
       super
       $stdout.sync = true
       @loader = Kitchen::Loader::YAML.new(
-        project_config: ENV["KITCHEN_YAML"],
-        local_config: ENV["KITCHEN_LOCAL_YAML"],
-        global_config: ENV["KITCHEN_GLOBAL_YAML"]
+        project_config: ENV["KITCHEN_YAML"] || ENV["KITCHEN_YML"],
+        local_config: ENV["KITCHEN_LOCAL_YAML"] || ENV["KITCHEN_LOCAL_YML"],
+        global_config: ENV["KITCHEN_GLOBAL_YAML"] || ENV["KITCHEN_GLOBAL_YML"]
       )
       @config = Kitchen::Config.new(
         loader: @loader
@@ -306,16 +306,20 @@ module Kitchen
     D
     tasks["init"].options = Kitchen::Generator::Init.class_options
 
-    private
+    class << self
+      private
 
-    # Ensure the any failing commands exit non-zero.
-    #
-    # @return [true] you die always on failure
-    # @api private
-    def self.exit_on_failure?
-      true
+      # Ensure the any failing commands exit non-zero.
+      #
+      # @return [true] you die always on failure
+      # @api private
+      def exit_on_failure?
+        true
+      end
     end
 
+    private
+
     # @return [Logger] the common logger
     # @api private
     def logger
@@ -393,7 +397,7 @@ module Kitchen
     #
     # @api private
     def ensure_initialized
-      yaml = ENV["KITCHEN_YAML"] || ".kitchen.yml"
+      yaml = ENV["KITCHEN_YAML"] || ENV["KITCHEN_YML"] || ".kitchen.yml"
 
       if options[:auto_init] && !File.exist?(yaml)
         banner "Invoking init as '#{yaml}' file is missing"