test-kitchen 1.20.0 → 1.21.0

data/lib/kitchen/command.rb

@@ -165,7 +165,7 @@ module Kitchen
         @action_errors = []
         concurrency.times do
           threads << Thread.new do
-            while instance = queue.pop
+            while (instance = queue.pop)
               run_action_in_thread(action, instance, *args)
             end
           end

data/lib/kitchen/config.rb

@@ -39,7 +39,7 @@ module Kitchen
   #
   # @example fetching an instance by name
   #
-  #   Kitchen::Config.new.instances.get("default-ubuntu-12.04")
+  #   Kitchen::Config.new.instances.get("default-ubuntu-16.04")
   #
   # @example fetching all instances matching a regular expression
   #

data/lib/kitchen/data_munger.rb

@@ -151,7 +151,7 @@ module Kitchen
     #
     #     :platforms => [
     #       {
-    #         :name => "ubuntu-12.04",
+    #         :name => "ubuntu-16.04",
     #         :busser => "bar"
     #       }
     #     ],
@@ -174,7 +174,7 @@ module Kitchen
     #
     #     :platforms => [
     #       {
-    #         :name => "ubuntu-12.04",
+    #         :name => "ubuntu-16.04",
     #         :verifier => {
     #           :name => "busser",
     #           :version => "bar
@@ -295,7 +295,7 @@ module Kitchen
     #
     #     :platforms => [
     #       {
-    #         :name => "ubuntu-12.04",
+    #         :name => "ubuntu-16.04",
     #         :driver_plugin => "bar"
     #       }
     #     ],
@@ -319,7 +319,7 @@ module Kitchen
     #
     #     :platforms => [
     #       {
-    #         :name => "ubuntu-12.04",
+    #         :name => "ubuntu-16.04",
     #         :driver => {
     #           :name => "bar"
     #         }
@@ -391,7 +391,7 @@ module Kitchen
     #
     #     :platforms => [
     #       {
-    #         :name => "ubuntu-12.04",
+    #         :name => "ubuntu-16.04",
     #         :driver => {
     #           :http_proxy => "foo"
     #         }
@@ -428,7 +428,7 @@ module Kitchen
     #
     #     :platforms => [
     #       {
-    #         :name => "ubuntu-12.04",
+    #         :name => "ubuntu-16.04",
     #         :driver => {
     #           :http_proxy => "foo"
     #         },
@@ -512,7 +512,7 @@ module Kitchen
     #
     #     :platforms => [
     #       {
-    #         :name => "ubuntu-12.04",
+    #         :name => "ubuntu-16.04",
     #         :driver => {
     #           :require_chef_omnibus => "10.8.2"
     #         }
@@ -538,7 +538,7 @@ module Kitchen
     #
     #     :platforms => [
     #       {
-    #         :name => "ubuntu-12.04",
+    #         :name => "ubuntu-16.04",
     #         :provisioner => {
     #           :require_chef_omnibus => "10.8.2"
     #         }
@@ -635,7 +635,7 @@ module Kitchen
     #   {
     #     :platforms => [
     #       {
-    #         :name => "ubuntu-12.04",
+    #         :name => "ubuntu-16.04",
     #         :attributes => { :one => "two" },
     #         :run_list => ["alpha", "bravo"]
     #       }
@@ -655,7 +655,7 @@ module Kitchen
     #   {
     #     :platforms => [
     #       {
-    #         :name => "ubuntu-12.04",
+    #         :name => "ubuntu-16.04",
     #         :provisioner => {
     #           :attributes => { :one => "two" },
     #           :run_list => ["alpha", "bravo"]

data/lib/kitchen/driver/exec.rb

@@ -61,7 +61,7 @@ module Kitchen
       # @param state [Hash] the state hash
       # @api private
       def reset_instance(state)
-        if cmd = config[:reset_command]
+        if (cmd = config[:reset_command])
           info("Resetting instance state with command: #{cmd}")
           run_command(cmd)
         end

data/lib/kitchen/driver/proxy.rb

@@ -60,7 +60,7 @@ module Kitchen
       # @param state [Hash] the state hash
       # @api private
       def reset_instance(state)
-        if cmd = config[:reset_command]
+        if (cmd = config[:reset_command])
           info("Resetting instance state with command: #{cmd}")
           ssh(build_ssh_args(state), cmd)
         end

data/lib/kitchen/generator/init.rb

@@ -64,7 +64,6 @@ module Kitchen
         create_test_dir
         prepare_gitignore
         prepare_gemfile
-        add_drivers
         display_bundle_message
       end
 
@@ -80,7 +79,7 @@ module Kitchen
         run_list = cookbook_name ? "recipe[#{cookbook_name}::default]" : nil
         driver_plugin = Array(options[:driver]).first || "dummy"
 
-        template("kitchen.yml.erb", ".kitchen.yml",
+        template("kitchen.yml.erb", "kitchen.yml",
                  driver_plugin: driver_plugin.sub(/^kitchen-/, ""),
                  provisioner: options[:provisioner],
                  run_list: Array(run_list)
@@ -222,40 +221,6 @@ module Kitchen
         end
       end
 
-      # Appends driver gems to a Gemfile or installs them.
-      #
-      # @api private
-      def add_drivers
-        return if options[:driver].nil? || options[:driver].empty?
-
-        Array(options[:driver]).each do |driver_gem|
-          if File.exist?(File.join(destination_root, "Gemfile")) || options[:create_gemfile]
-            add_driver_to_gemfile(driver_gem)
-          else
-            install_gem(driver_gem)
-          end
-        end
-      end
-
-      # Appends a driver gem to a Gemfile.
-      #
-      # @api private
-      def add_driver_to_gemfile(driver_gem)
-        if not_in_file?("Gemfile", /gem ('|")#{driver_gem}('|")/)
-          append_to_file("Gemfile", %{gem "#{driver_gem}"\n})
-          @display_bundle_msg = true
-        end
-      end
-
-      # Installs a driver gem.
-      #
-      # @api private
-      def install_gem(driver_gem)
-        unbundlerize { Gem::GemRunner.new.run(["install", driver_gem]) }
-      rescue Gem::SystemExitException => e
-        raise unless e.exit_code == 0
-      end
-
       # Displays a bundle warning message to the user.
       #
       # @api private

data/lib/kitchen/lazy_hash.rb

@@ -101,7 +101,7 @@ module Kitchen
     # @return [Hash] a new hash
     def to_hash
       hash = {}
-      __getobj__.keys.each { |key| hash[key] = self[key] }
+      __getobj__.each_key { |key| hash[key] = self[key] }
       hash
     end
 

data/lib/kitchen/loader/yaml.rb

@@ -34,9 +34,9 @@ module Kitchen
       #
       # @param options [Hash] configuration for a new loader
       # @option options [String] :project_config path to the Kitchen
-      #   config YAML file (default: `./.kitchen.yml`)
+      #   config YAML file (default: `./kitchen.yml`)
       # @option options [String] :local_config path to the Kitchen local
-      #   config YAML file (default: `./.kitchen.local.yml`)
+      #   config YAML file (default: `./kitchen.local.yml`)
       # @option options [String] :global_config path to the Kitchen global
       #   config YAML file (default: `$HOME/.kitchen/config.yml`)
       # @option options [String] :process_erb whether or not to process YAML
@@ -186,21 +186,46 @@ module Kitchen
       end
 
       # Determines the default absolute path to the Kitchen config YAML file,
-      # based on current working directory.
+      # based on current working directory. We prefer `kitchen.yml` to the
+      # older `.kitchen.yml`.
       #
       # @return [String] an absolute path to a Kitchen config YAML file
       # @api private
       def default_config_file
+        if File.exist?(kitchen_yml) && File.exist?(dot_kitchen_yml)
+          raise UserError, "Both #{kitchen_yml} and #{dot_kitchen_yml} found. Please use the un-dotted variant: #{kitchen_yml}."
+        end
+
+        File.exist?(kitchen_yml) ? kitchen_yml : dot_kitchen_yml
+      end
+
+      # The absolute path to an un-hidden Kitchen config YAML file.
+      def kitchen_yml
+        File.join(Dir.pwd, "kitchen.yml")
+      end
+
+      # The absolute path to an hidden Kitchen config YAML file.
+      def dot_kitchen_yml
         File.join(Dir.pwd, ".kitchen.yml")
       end
 
       # Determines the default absolute path to the Kitchen local YAML file,
       # based on the base Kitchen config YAML file.
-      #
+
       # @return [String] an absolute path to a Kitchen local YAML file
+      # @raise [UserError] if both dotted and undotted versions of the default
+      #   local YAML file exist, e.g. both kitchen.local.yml and .kitchen.local.yml
       # @api private
       def default_local_config_file
-        config_file.sub(/(#{File.extname(config_file)})$/, '.local\1')
+        config_dir, default_local_config = File.split(config_file.sub(/(#{File.extname(config_file)})$/, '.local\1'))
+
+        undot_config = default_local_config.sub(/^\./, "")
+        dot_config = ".#{undot_config}"
+        if File.exist?(File.join(config_dir, undot_config)) && File.exist?(File.join(config_dir, dot_config))
+          raise UserError, "Both #{undot_config} and #{dot_config} found in #{config_dir}. Please use #{default_local_config} which matches your #{config_file}."
+        end
+
+        File.join(config_dir, default_local_config)
       end
 
       # Determines the default absolute path to the Kitchen global YAML file,
@@ -322,7 +347,7 @@ module Kitchen
       def parse_yaml_string(string, file_name)
         return {} if string.nil? || string.empty?
 
-        result = ::YAML.safe_load(string, [Symbol]) || {}
+        result = ::YAML.safe_load(string, [Symbol], [], true) || {}
         unless result.is_a?(Hash)
           raise UserError, "Error parsing #{file_name} as YAML " \
             "(Result of parse was not a Hash, but was a #{result.class}).\n" \

data/lib/kitchen/logger.rb

@@ -345,7 +345,7 @@ module Kitchen
       def <<(msg)
         @buffer ||= ""
         @buffer += msg
-        while i = @buffer.index("\n")
+        while (i = @buffer.index("\n"))
           format_line(@buffer[0, i].chomp)
           @buffer[0, i + 1] = ""
         end

data/lib/kitchen/provisioner/chef/berkshelf.rb

@@ -85,27 +85,31 @@ module Kitchen
         # @api private
         attr_reader :always_update
 
-        # Load the Berkshelf-specific libary code.
-        #
-        # @param logger [Kitchen::Logger] the logger to use
-        # @raise [UserError] if the library couldn't be loaded
-        # @api private
-        def self.load_berkshelf!(logger)
-          first_load = require "berkshelf"
+        class << self
+          private
 
-          version = ::Berkshelf::VERSION
-          if first_load
-            logger.debug("Berkshelf #{version} library loaded")
-          else
-            logger.debug("Berkshelf #{version} previously loaded")
+          # Load the Berkshelf-specific libary code.
+          #
+          # @param logger [Kitchen::Logger] the logger to use
+          # @raise [UserError] if the library couldn't be loaded
+          # @api private
+          def load_berkshelf!(logger)
+            first_load = require "berkshelf"
+
+            version = ::Berkshelf::VERSION
+            if first_load
+              logger.debug("Berkshelf #{version} library loaded")
+            else
+              logger.debug("Berkshelf #{version} previously loaded")
+            end
+          rescue LoadError => e
+            logger.fatal("The `berkshelf' gem is missing and must be installed" \
+              " or cannot be properly activated. Run" \
+              " `gem install berkshelf` or add the following to your" \
+              " Gemfile if you are using Bundler: `gem 'berkshelf'`.")
+            raise UserError,
+                  "Could not load or activate Berkshelf (#{e.message})"
           end
-        rescue LoadError => e
-          logger.fatal("The `berkshelf' gem is missing and must be installed" \
-            " or cannot be properly activated. Run" \
-            " `gem install berkshelf` or add the following to your" \
-            " Gemfile if you are using Bundler: `gem 'berkshelf'`.")
-          raise UserError,
-                "Could not load or activate Berkshelf (#{e.message})"
         end
       end
     end

data/lib/kitchen/provisioner/chef/librarian.rb

@@ -78,29 +78,33 @@ module Kitchen
         # @api private
         attr_reader :logger
 
-        # Load the Librarian-specific libary code.
-        #
-        # @param logger [Kitchen::Logger] the logger to use
-        # @raise [UserError] if the library couldn't be loaded
-        # @api private
-        def self.load_librarian!(logger)
-          first_load = require "librarian/chef/environment"
-          require "librarian/action/resolve"
-          require "librarian/action/install"
+        class << self
+          private
 
-          version = ::Librarian::Chef::VERSION
-          if first_load
-            logger.debug("Librarian-Chef #{version} library loaded")
-          else
-            logger.debug("Librarian-Chef #{version} previously loaded")
+          # Load the Librarian-specific libary code.
+          #
+          # @param logger [Kitchen::Logger] the logger to use
+          # @raise [UserError] if the library couldn't be loaded
+          # @api private
+          def load_librarian!(logger)
+            first_load = require "librarian/chef/environment"
+            require "librarian/action/resolve"
+            require "librarian/action/install"
+
+            version = ::Librarian::Chef::VERSION
+            if first_load
+              logger.debug("Librarian-Chef #{version} library loaded")
+            else
+              logger.debug("Librarian-Chef #{version} previously loaded")
+            end
+          rescue LoadError => e
+            logger.fatal("The `librarian-chef' gem is missing and must be installed" \
+              " or cannot be properly activated. Run" \
+              " `gem install librarian-chef` or add the following to your" \
+              " Gemfile if you are using Bundler: `gem 'librarian-chef'`.")
+            raise UserError,
+                  "Could not load or activate Librarian-Chef (#{e.message})"
           end
-        rescue LoadError => e
-          logger.fatal("The `librarian-chef' gem is missing and must be installed" \
-            " or cannot be properly activated. Run" \
-            " `gem install librarian-chef` or add the following to your" \
-            " Gemfile if you are using Bundler: `gem 'librarian-chef'`.")
-          raise UserError,
-                "Could not load or activate Librarian-Chef (#{e.message})"
         end
       end
     end