test-kitchen 1.0.0.beta.3 → 1.0.0.beta.4

data/lib/kitchen/driver/base.rb

@@ -160,11 +160,10 @@ module Kitchen
       end
 
       def busser
-        test_root = File.join(config[:kitchen_root], 'test/integration')
         @busser ||= begin
           raise ClientError, "Instance must be set for Driver" if instance.nil?
 
-          Busser.new(instance.suite.name, :test_root => test_root)
+          Busser.new(instance.suite.name, config)
         end
       end
 

data/lib/kitchen/driver/proxy.rb

@@ -0,0 +1,58 @@
+#
+# Author:: Seth Chisamore <schisamo@opscode.com>
+#
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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/driver/ssh_base'
+
+module Kitchen
+
+  module Driver
+
+    # Proxy driver for Test Kitchen.
+    #
+    # @author Seth Chisamore <schisamo@opscode.com>
+    class Proxy < Kitchen::Driver::SSHBase
+
+      required_config :host
+      required_config :reset_command
+
+      no_parallel_for :create, :destroy
+
+      def create(state)
+        state[:hostname] = config[:host]
+        reset_instance(state)
+      end
+
+      def destroy(state)
+        return if state[:hostname].nil?
+        reset_instance(state)
+        state.delete(:hostname)
+      end
+
+      private
+
+      def reset_instance(state)
+        if cmd = config[:reset_command]
+          info("Resetting instance state with command: #{cmd}")
+          ssh(build_ssh_args(state), cmd)
+        end
+      end
+
+    end
+  end
+end

data/lib/kitchen/driver/ssh_base.rb

@@ -91,6 +91,7 @@ module Kitchen
         opts[:user_known_hosts_file] = "/dev/null"
         opts[:paranoid] = false
         opts[:password] = combined[:password] if combined[:password]
+        opts[:forward_agent] = combined[:forward_agent] if combined.key? :forward_agent
         opts[:port] = combined[:port] if combined[:port]
         opts[:keys] = Array(combined[:ssh_key]) if combined[:ssh_key]
         opts[:logger] = logger
@@ -103,6 +104,11 @@ module Kitchen
         env << " http_proxy=#{config[:http_proxy]}"   if config[:http_proxy]
         env << " https_proxy=#{config[:https_proxy]}" if config[:https_proxy]
 
+        additional_paths = []
+        additional_paths << config[:ruby_binpath] if config[:ruby_binpath]
+        additional_paths << config[:path] if config[:path]
+        env << " PATH=$PATH:#{additional_paths.join(':')}" if additional_paths.any?
+
         env == "env" ? cmd : "#{env} #{cmd}"
       end
 

data/lib/kitchen/instance.rb

@@ -18,7 +18,6 @@
 
 require 'benchmark'
 require 'fileutils'
-require 'thread'
 require 'vendor/hash_recursive_merge'
 
 module Kitchen

data/lib/kitchen/provisioner/chef_base.rb

@@ -16,8 +16,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'buff/ignore'
 require 'fileutils'
+require 'pathname'
 require 'json'
+require 'kitchen/util'
 
 module Kitchen
 
@@ -34,32 +37,27 @@ module Kitchen
         url = config[:chef_omnibus_url] || "https://www.opscode.com/chef/install.sh"
         flag = config[:require_chef_omnibus]
         version = if flag.is_a?(String) && flag != "latest"
-          "-s -- -v #{flag.downcase}"
+          "-v #{flag.downcase}"
         else
           ""
         end
 
+        # use Bourne (/bin/sh) as Bash does not exist on all Unix flavors
         <<-INSTALL.gsub(/^ {10}/, '')
-          bash -c '
+          sh -c '
+          #{Util.shell_helpers}
+
           should_update_chef() {
             case "#{flag}" in
-              true|$(chef-solo -v | cut -d " " -f 2)) return 1 ;;
+              true|`chef-solo -v | cut -d " " -f 2`) return 1 ;;
               latest|*) return 0 ;;
             esac
           }
 
           if [ ! -d "/opt/chef" ] || should_update_chef ; then
-            PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-            export PATH
             echo "-----> Installing Chef Omnibus (#{flag})"
-            if command -v wget >/dev/null ; then
-              wget #{url} -O - | #{sudo('bash')} #{version}
-            elif command -v curl >/dev/null ; then
-              curl -sSL #{url} | #{sudo('bash')} #{version}
-            else
-              echo ">>>>>> Neither wget nor curl found on this instance."
-              exit 16
-            fi
+            do_download #{url} /tmp/install.sh
+            #{sudo('sh')} /tmp/install.sh #{version}
           fi'
         INSTALL
       end
@@ -79,6 +77,7 @@ module Kitchen
 
       def create_chef_sandbox
         @tmpdir = Dir.mktmpdir("#{instance.name}-sandbox-")
+        File.chmod(0755, @tmpdir)
         debug("Creating local sandbox in #{tmpdir}")
 
         yield if block_given?
@@ -86,6 +85,7 @@ module Kitchen
         prepare_data_bags
         prepare_roles
         prepare_nodes
+        prepare_environments
         prepare_secret
         prepare_cache
         prepare_cookbooks
@@ -131,6 +131,17 @@ module Kitchen
         FileUtils.cp_r(Dir.glob("#{nodes}/*"), tmpnodes_dir)
       end
 
+      def prepare_environments
+        return unless environments
+
+        info("Preparing environments")
+        debug("Using environments from #{environments}")
+
+        tmpenvs_dir = File.join(tmpdir, "environments")
+        FileUtils.mkdir_p(tmpenvs_dir)
+        FileUtils.cp_r(Dir.glob("#{environments}/*"), tmpenvs_dir)
+      end
+
       def prepare_secret
         return unless secret
 
@@ -160,27 +171,19 @@ module Kitchen
           raise UserError, "Cookbooks could not be found"
         end
 
-        filter_only_cookbook_files
+        remove_ignored_files
       end
 
-      def filter_only_cookbook_files
-        info("Removing non-cookbook files in sandbox")
-
-        all_files = Dir.glob(File.join(tmpbooks_dir, "**/*")).
-          select { |fn| File.file?(fn) }
-        cookbook_files = Dir.glob(File.join(tmpbooks_dir, cookbook_files_glob)).
-          select { |fn| File.file?(fn) }
-
-        FileUtils.rm(all_files - cookbook_files)
-      end
-
-      def cookbook_files_glob
-        files = %w{README.* metadata.{json,rb}
-          attributes/**/* definitions/**/* files/**/* libraries/**/*
-          providers/**/* recipes/**/* resources/**/* templates/**/*
-        }
-
-        "*/{#{files.join(',')}}"
+      def remove_ignored_files
+        cookbooks_in_tmpdir do |cookbook_path|
+          chefignore = File.join(cookbook_path, "chefignore")
+          if File.exist? chefignore
+            ignores = Buff::Ignore::IgnoreFile.new(chefignore)
+            cookbook_files = Dir.glob(File.join(cookbook_path, "**/*"), File::FNM_DOTMATCH).
+              select { |fn| File.file?(fn) && fn != '.' && fn != '..' }
+            cookbook_files.each { |file| FileUtils.rm(file) if ignores.ignored?(file) }
+          end
+        end
       end
 
       def berksfile
@@ -199,6 +202,10 @@ module Kitchen
         File.join(kitchen_root, "cookbooks")
       end
 
+      def site_cookbooks_dir
+        File.join(kitchen_root, "site-cookbooks")
+      end
+
       def data_bags
         instance.suite.data_bags_path
       end
@@ -211,6 +218,10 @@ module Kitchen
         instance.suite.nodes_path
       end
 
+      def environments
+        instance.suite.environments_path
+      end
+
       def secret
         instance.suite.encrypted_data_bag_secret_key_path
       end
@@ -219,12 +230,23 @@ module Kitchen
         File.join(tmpdir, "cookbooks")
       end
 
+      def tmpsitebooks_dir
+        File.join(tmpdir, "cookbooks")
+      end
+
       def cp_cookbooks
         info("Preparing cookbooks from project directory")
         debug("Using cookbooks from #{cookbooks_dir}")
 
         FileUtils.mkdir_p(tmpbooks_dir)
         FileUtils.cp_r(File.join(cookbooks_dir, "."), tmpbooks_dir)
+
+        info("Preparing site-cookbooks from project directory")
+        debug("Using cookbooks from #{site_cookbooks_dir}")
+
+        FileUtils.mkdir_p(tmpsitebooks_dir)
+        FileUtils.cp_r(File.join(site_cookbooks_dir, "."), tmpsitebooks_dir)
+
         cp_this_cookbook if File.exists?(metadata_rb)
       end
 
@@ -237,8 +259,8 @@ module Kitchen
             " Please add: `name '<cookbook_name>'` to metadata.rb and retry")
 
         cb_path = File.join(tmpbooks_dir, cb_name)
-        glob = Dir.glob("#{kitchen_root}/{metadata.rb,README.*,definitions," +
-          "attributes,files,libraries,providers,recipes,resources,templates}")
+
+        glob = Dir.glob("#{kitchen_root}/**")
 
         FileUtils.mkdir_p(cb_path)
         FileUtils.cp_r(glob, cb_path)
@@ -250,11 +272,13 @@ module Kitchen
 
         begin
           require 'berkshelf'
-        rescue LoadError
-          fatal("The `berkself' gem is missing and must be installed." +
-            " Run `gem install berkshelf` or add the following " +
-            "to your Gemfile if you are using Bundler: `gem 'berkshelf'`.")
-          raise UserError, "Could not load Berkshelf"
+        rescue LoadError => e
+          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
 
         Kitchen.mutex.synchronize do
@@ -271,11 +295,13 @@ module Kitchen
           require 'librarian/chef/environment'
           require 'librarian/action/resolve'
           require 'librarian/action/install'
-        rescue LoadError
-          fatal("The `librarian-chef' gem is missing and must be installed." +
-            " 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 Librarian-Chef"
+        rescue LoadError => e
+          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
 
         Kitchen.mutex.synchronize do
@@ -285,6 +311,14 @@ module Kitchen
           Librarian::Action::Install.new(env).run
         end
       end
+
+      private
+
+      def cookbooks_in_tmpdir
+        Dir.glob(File.join(tmpbooks_dir, "*/")).each do |cookbook_path|
+          yield cookbook_path if block_given?
+        end
+      end
     end
   end
 end

data/lib/kitchen/provisioner/chef_solo.rb

@@ -51,11 +51,28 @@ module Kitchen
         solo = []
         solo << %{node_name "#{instance.name}"}
         solo << %{file_cache_path "#{home_path}/cache"}
-        solo << %{cookbook_path "#{home_path}/cookbooks"}
+        solo << %{cookbook_path ["#{home_path}/cookbooks","#{home_path}/site-cookbooks"]}
         solo << %{role_path "#{home_path}/roles"}
+        if config[:chef]
+          if config[:chef][:http_proxy]
+            solo << %{http_proxy "#{config[:chef][:http_proxy]}"}
+          end
+          if config[:chef][:https_proxy]
+            solo << %{https_proxy "#{config[:chef][:https_proxy]}"}
+          end
+          if config[:chef][:no_proxy]
+            solo << %{no_proxy "#{config[:chef][:no_proxy]}"}
+          end
+        end
         if instance.suite.data_bags_path
           solo << %{data_bag_path "#{home_path}/data_bags"}
         end
+        if instance.suite.environments_path
+          solo << %{environment_path "#{home_path}/environments"}
+        end
+        if instance.suite.environment
+          solo << %{environment "#{instance.suite.environment}"}
+        end
         if instance.suite.encrypted_data_bag_secret_key_path
           secret = "#{home_path}/encrypted_data_bag_secret"
           solo << %{encrypted_data_bag_secret "#{secret}"}

data/lib/kitchen/provisioner/chef_zero.rb

@@ -27,6 +27,11 @@ module Kitchen
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class ChefZero < ChefBase
 
+      def initialize(instance, config)
+        super
+        @ruby_binpath = config.fetch(:ruby_binpath, DEFAULT_RUBY_BINPATH)
+      end
+
       def create_sandbox
         create_chef_sandbox do
           prepare_chef_client_zero_rb
@@ -35,13 +40,13 @@ module Kitchen
       end
 
       def prepare_command
-        ruby_bin = "/opt/chef/embedded/bin"
-
+        # use Bourne (/bin/sh) as Bash does not exist on all Unix flavors
         <<-PREPARE.gsub(/^ {10}/, '')
-          bash -c '
-          if [ ! -f "#{ruby_bin}/chef-zero" ] ; then
+          sh -c '
+          #{sandbox_env(true)}
+          if ! #{sudo(gem_bin)} list chef-zero -i >/dev/null; then
             echo "-----> Installing chef-zero and knife-essentials gems"
-            #{sudo("#{ruby_bin}/gem")} install \
+            #{sudo(gem_bin)} install \
               chef-zero knife-essentials --no-ri --no-rdoc
           fi'
         PREPARE
@@ -49,7 +54,8 @@ module Kitchen
 
       def run_command
         [
-          sudo('/opt/chef/embedded/bin/ruby'),
+          sandbox_env,
+          sudo(ruby_bin),
           "#{home_path}/chef-client-zero.rb",
           "--config #{home_path}/client.rb",
           "--json-attributes #{home_path}/dna.json",
@@ -61,8 +67,35 @@ module Kitchen
         "/tmp/kitchen-chef-zero".freeze
       end
 
+      def gem_bin
+        @gem_bin ||= File.join(ruby_binpath, 'gem')
+      end
+
+      def ruby_bin
+        @ruby_bin ||= File.join(ruby_binpath, 'ruby')
+      end
+
       private
 
+      DEFAULT_RUBY_BINPATH = "/opt/chef/embedded/bin".freeze
+
+      attr_reader :ruby_binpath
+
+      def sandbox_env(export=false)
+        env = [
+          "GEM_HOME=#{home_path}/gems",
+          "GEM_PATH=$GEM_HOME",
+          "GEM_CACHE=$GEM_HOME/cache",
+          "PATH=$PATH:$GEM_HOME/bin"
+        ]
+
+        if export
+          env << "; export GEM_HOME GEM_PATH GEM_CACHE PATH;"
+        end
+
+        env.join(" ")
+      end
+
       def prepare_chef_client_zero_rb
         source = File.join(File.dirname(__FILE__),
           %w{.. .. .. support chef-client-zero.rb})

data/lib/kitchen/rake_tasks.rb

@@ -32,7 +32,6 @@ module Kitchen
     # @yield [self] gives itself to the block
     def initialize
       @config = Kitchen::Config.new
-      @config.supervised = false
       Kitchen.logger = Kitchen.default_file_logger
       yield self if block_given?
       define