test-kitchen 1.7.0 → 1.7.1.dev

data/features/step_definitions/gem_steps.rb

@@ -1,36 +1,36 @@
-# -*- encoding: utf-8 -*-
-
-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(
-      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
+# -*- encoding: utf-8 -*-
+
+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(
+      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

data/features/step_definitions/git_steps.rb

@@ -1,5 +1,5 @@
-# -*- encoding: utf-8 -*-
-
-Given(/I have a git repository/) do
-  create_directory(".git")
-end
+# -*- encoding: utf-8 -*-
+
+Given(/I have a git repository/) do
+  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|
-  expect(last_command_started).to have_output_on_stdout(Regexp.new(expected))
-end
+# -*- encoding: utf-8 -*-
+
+Then(/^the stdout should match \/([^\/]*)\/$/) do |expected|
+  expect(last_command_started).to have_output_on_stdout(Regexp.new(expected))
+end

data/features/support/env.rb

@@ -1,75 +1,75 @@
-# -*- encoding: utf-8 -*-
-
-# Set up the environment for testing
-require "aruba/cucumber"
-require "aruba/in_process"
-require "aruba/spawn_process"
-require "kitchen"
-require "kitchen/cli"
-
-class ArubaHelper
-
-  def initialize(argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)
-    @argv = argv
-    @stdin = stdin
-    @stdout = stdout
-    @stderr = stderr
-    @kernel = kernel
-  end
-
-  def execute!
-    $stdout = @stdout
-    $stdin = @stdin
-
-    kitchen_cli = Kitchen::CLI
-    kitchen_cli.start(@argv)
-    @kernel.exit(0)
-  end
-end
-
-Before do
-  @aruba_timeout_seconds = 15
-  @cleanup_dirs = []
-
-  aruba.config.command_launcher = :in_process
-  aruba.config.main_class = ArubaHelper
-end
-
-Before("@spawn") do
-  aruba.config.command_launcher = :spawn
-end
-
-After do |s|
-  # Tell Cucumber to quit after this scenario is done - if it failed.
-  # This is useful to inspect the 'tmp/aruba' directory before any other
-  # steps are executed and clear it out.
-  Cucumber.wants_to_quit = true if s.failed?
-
-  # Restore environment variables to their original settings, if they have
-  # been saved off
-  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)
-  aruba.environment["_CUKE_#{key}"] = aruba.environment[key]
-end
-
-def restore_envvar(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); aruba.environment.delete(key) }
-  yield
-  keys.each { |key| restore_envvar(key) }
-end
+# -*- encoding: utf-8 -*-
+
+# Set up the environment for testing
+require "aruba/cucumber"
+require "aruba/in_process"
+require "aruba/spawn_process"
+require "kitchen"
+require "kitchen/cli"
+
+class ArubaHelper
+
+  def initialize(argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)
+    @argv = argv
+    @stdin = stdin
+    @stdout = stdout
+    @stderr = stderr
+    @kernel = kernel
+  end
+
+  def execute!
+    $stdout = @stdout
+    $stdin = @stdin
+
+    kitchen_cli = Kitchen::CLI
+    kitchen_cli.start(@argv)
+    @kernel.exit(0)
+  end
+end
+
+Before do
+  @aruba_timeout_seconds = 15
+  @cleanup_dirs = []
+
+  aruba.config.command_launcher = :in_process
+  aruba.config.main_class = ArubaHelper
+end
+
+Before("@spawn") do
+  aruba.config.command_launcher = :spawn
+end
+
+After do |s|
+  # Tell Cucumber to quit after this scenario is done - if it failed.
+  # This is useful to inspect the 'tmp/aruba' directory before any other
+  # steps are executed and clear it out.
+  Cucumber.wants_to_quit = true if s.failed?
+
+  # Restore environment variables to their original settings, if they have
+  # been saved off
+  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)
+  aruba.environment["_CUKE_#{key}"] = aruba.environment[key]
+end
+
+def restore_envvar(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); aruba.environment.delete(key) }
+  yield
+  keys.each { |key| restore_envvar(key) }
+end

data/lib/kitchen.rb

@@ -1,150 +1,150 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2012, 2013, 2014 Fletcher Nichol
-#
-# 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 "pathname"
-require "thread"
-
-require "kitchen/errors"
-require "kitchen/logger"
-require "kitchen/logging"
-require "kitchen/shell_out"
-require "kitchen/configurable"
-require "kitchen/util"
-
-require "kitchen/provisioner"
-require "kitchen/provisioner/base"
-require "kitchen/color"
-require "kitchen/collection"
-require "kitchen/config"
-require "kitchen/data_munger"
-require "kitchen/driver"
-require "kitchen/driver/base"
-require "kitchen/driver/ssh_base"
-require "kitchen/driver/proxy"
-require "kitchen/instance"
-require "kitchen/transport"
-require "kitchen/transport/base"
-require "kitchen/loader/yaml"
-require "kitchen/metadata_chopper"
-require "kitchen/platform"
-require "kitchen/state_file"
-require "kitchen/ssh"
-require "kitchen/suite"
-require "kitchen/verifier"
-require "kitchen/verifier/base"
-require "kitchen/version"
-
-# Test Kitchen base module.
-#
-# @author Fletcher Nichol <fnichol@nichol.ca>
-module Kitchen
-
-  class << self
-
-    # @return [Logger] the common Kitchen logger
-    attr_accessor :logger
-
-    # @return [Mutex] a common mutex for global coordination
-    attr_accessor :mutex
-
-    # Returns the root path of the Kitchen gem source code.
-    #
-    # @return [Pathname] root path of gem
-    def source_root
-      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
-    end
-
-    # Returns a default logger which emits on standard output.
-    #
-    # @return [Logger] a logger
-    def default_logger
-      Logger.new(:stdout => $stdout, :level => Util.to_logger_level(env_log))
-    end
-
-    # Returns a default file logger which emits on standard output and to a
-    # log file.
-    #
-    # @param [Symbol] level logging level
-    # @param [Boolean] log_overwrite logging level
-    # @return [Logger] a logger
-    def default_file_logger(level = nil, log_overwrite = nil)
-      level ||= env_log
-      log_overwrite = log_overwrite.nil? ? env_log_overwrite : log_overwrite
-      log_location = File.expand_path(File.join(DEFAULT_LOG_DIR, "kitchen.log"))
-      log_location = log_location.to_s
-
-      Logger.new(
-        :stdout => $stdout,
-        :logdev => log_location,
-        :level => Util.to_logger_level(level),
-        :log_overwrite => log_overwrite
-      )
-    end
-
-    # Returns whether or not standard output is associated with a terminal
-    # device (tty).
-    #
-    # @return [true,false] is there a tty?
-    def tty?
-      $stdout.tty?
-    end
-
-    # Determine the default log level from an environment variable, if it is
-    # set.
-    #
-    # @return [Symbol,nil] a log level or nil if not set
-    # @api private
-    def env_log
-      ENV["KITCHEN_LOG"] && ENV["KITCHEN_LOG"].downcase.to_sym
-    end
-
-    # Determine the log overwriting logic from an environment variable,
-    # if it is set.
-    #
-    # @return [Boolean,nil]
-    # @api private
-    def env_log_overwrite
-      case ENV["KITCHEN_LOG_OVERWRITE"] && ENV["KITCHEN_LOG_OVERWRITE"].downcase
-      when nil, ""
-        nil
-      when "false", "f", "no"
-        false
-      else
-        true
-      end
-    end
-  end
-
-  # Default log level verbosity
-  DEFAULT_LOG_LEVEL = :info
-
-  # Overwrite the log file when Test Kitchen runs
-  DEFAULT_LOG_OVERWRITE = true
-
-  # Default base directory for integration tests, fixtures, etc.
-  DEFAULT_TEST_DIR = "test/integration".freeze
-
-  # Default base directory for instance and common log files
-  DEFAULT_LOG_DIR = ".kitchen/logs".freeze
-end
-
-# Initialize the base logger
-Kitchen.logger = Kitchen.default_logger
-
-# Setup a collection of instance crash exceptions for error reporting
-Kitchen.mutex = Mutex.new
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+#
+# Copyright (C) 2012, 2013, 2014 Fletcher Nichol
+#
+# 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 "pathname"
+require "thread"
+
+require "kitchen/errors"
+require "kitchen/logger"
+require "kitchen/logging"
+require "kitchen/shell_out"
+require "kitchen/configurable"
+require "kitchen/util"
+
+require "kitchen/provisioner"
+require "kitchen/provisioner/base"
+require "kitchen/color"
+require "kitchen/collection"
+require "kitchen/config"
+require "kitchen/data_munger"
+require "kitchen/driver"
+require "kitchen/driver/base"
+require "kitchen/driver/ssh_base"
+require "kitchen/driver/proxy"
+require "kitchen/instance"
+require "kitchen/transport"
+require "kitchen/transport/base"
+require "kitchen/loader/yaml"
+require "kitchen/metadata_chopper"
+require "kitchen/platform"
+require "kitchen/state_file"
+require "kitchen/ssh"
+require "kitchen/suite"
+require "kitchen/verifier"
+require "kitchen/verifier/base"
+require "kitchen/version"
+
+# Test Kitchen base module.
+#
+# @author Fletcher Nichol <fnichol@nichol.ca>
+module Kitchen
+
+  class << self
+
+    # @return [Logger] the common Kitchen logger
+    attr_accessor :logger
+
+    # @return [Mutex] a common mutex for global coordination
+    attr_accessor :mutex
+
+    # Returns the root path of the Kitchen gem source code.
+    #
+    # @return [Pathname] root path of gem
+    def source_root
+      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
+    end
+
+    # Returns a default logger which emits on standard output.
+    #
+    # @return [Logger] a logger
+    def default_logger
+      Logger.new(:stdout => $stdout, :level => Util.to_logger_level(env_log))
+    end
+
+    # Returns a default file logger which emits on standard output and to a
+    # log file.
+    #
+    # @param [Symbol] level logging level
+    # @param [Boolean] log_overwrite logging level
+    # @return [Logger] a logger
+    def default_file_logger(level = nil, log_overwrite = nil)
+      level ||= env_log
+      log_overwrite = log_overwrite.nil? ? env_log_overwrite : log_overwrite
+      log_location = File.expand_path(File.join(DEFAULT_LOG_DIR, "kitchen.log"))
+      log_location = log_location.to_s
+
+      Logger.new(
+        :stdout => $stdout,
+        :logdev => log_location,
+        :level => Util.to_logger_level(level),
+        :log_overwrite => log_overwrite
+      )
+    end
+
+    # Returns whether or not standard output is associated with a terminal
+    # device (tty).
+    #
+    # @return [true,false] is there a tty?
+    def tty?
+      $stdout.tty?
+    end
+
+    # Determine the default log level from an environment variable, if it is
+    # set.
+    #
+    # @return [Symbol,nil] a log level or nil if not set
+    # @api private
+    def env_log
+      ENV["KITCHEN_LOG"] && ENV["KITCHEN_LOG"].downcase.to_sym
+    end
+
+    # Determine the log overwriting logic from an environment variable,
+    # if it is set.
+    #
+    # @return [Boolean,nil]
+    # @api private
+    def env_log_overwrite
+      case ENV["KITCHEN_LOG_OVERWRITE"] && ENV["KITCHEN_LOG_OVERWRITE"].downcase
+      when nil, ""
+        nil
+      when "false", "f", "no"
+        false
+      else
+        true
+      end
+    end
+  end
+
+  # Default log level verbosity
+  DEFAULT_LOG_LEVEL = :info
+
+  # Overwrite the log file when Test Kitchen runs
+  DEFAULT_LOG_OVERWRITE = true
+
+  # Default base directory for integration tests, fixtures, etc.
+  DEFAULT_TEST_DIR = "test/integration".freeze
+
+  # Default base directory for instance and common log files
+  DEFAULT_LOG_DIR = ".kitchen/logs".freeze
+end
+
+# Initialize the base logger
+Kitchen.logger = Kitchen.default_logger
+
+# Setup a collection of instance crash exceptions for error reporting
+Kitchen.mutex = Mutex.new