test-kitchen 1.0.0.beta.4 → 1.0.0.rc.1

data/lib/kitchen/driver/base.rb

@@ -18,6 +18,8 @@
 
 require 'thor/util'
 
+require 'kitchen/lazy_hash'
+
 module Kitchen
 
   module Driver
@@ -37,7 +39,7 @@ module Kitchen
       end
 
       def initialize(config = {})
-        @config = LazyDriverHash.new(config, self)
+        @config = LazyHash.new(config, self)
         self.class.defaults.each do |attr, value|
           @config[attr] = value unless @config.has_key?(attr)
         end
@@ -162,8 +164,7 @@ module Kitchen
       def busser
         @busser ||= begin
           raise ClientError, "Instance must be set for Driver" if instance.nil?
-
-          Busser.new(instance.suite.name, config)
+          instance.busser
         end
       end
 
@@ -213,34 +214,6 @@ module Kitchen
         @serial_actions ||= []
         @serial_actions += methods
       end
-
-      # A modifed Hash object that may contain procs as a value which must be
-      # executed in the context of a Driver object.
-      #
-      # @author Fletcher Nichol <fnichol@nichol.ca>
-      class LazyDriverHash < SimpleDelegator
-
-        def initialize(obj, driver)
-          @driver = driver
-          super(obj)
-        end
-
-        def [](key)
-          proc_or_val = __getobj__[key]
-
-          if proc_or_val.respond_to?(:call)
-            proc_or_val.call(@driver)
-          else
-            proc_or_val
-          end
-        end
-
-        def to_hash
-          hash = Hash.new
-          __getobj__.keys.each { |key| hash[key] = self[key] }
-          hash
-        end
-      end
     end
   end
 end

data/lib/kitchen/driver/ssh_base.rb

@@ -36,12 +36,13 @@ module Kitchen
       end
 
       def converge(state)
-        provisioner = new_provisioner
+        provisioner = instance.provisioner
+        sandbox_dirs = Dir.glob("#{provisioner.create_sandbox}/*")
 
         Kitchen::SSH.new(*build_ssh_args(state)) do |conn|
           run_remote(provisioner.install_command, conn)
           run_remote(provisioner.init_command, conn)
-          transfer_path(provisioner.create_sandbox, provisioner.home_path, conn)
+          transfer_path(sandbox_dirs, provisioner[:root_path], conn)
           run_remote(provisioner.prepare_command, conn)
           run_remote(provisioner.run_command, conn)
         end
@@ -78,12 +79,6 @@ module Kitchen
 
       protected
 
-      def new_provisioner
-        combined = config.dup
-        combined[:log_level] = Util.from_logger_level(logger.level)
-        Provisioner.for_plugin(combined[:provisioner], instance, combined)
-      end
-
       def build_ssh_args(state)
         combined = config.to_hash.merge(state)
 
@@ -104,11 +99,6 @@ 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
 
@@ -120,10 +110,10 @@ module Kitchen
         raise ActionFailed, ex.message
       end
 
-      def transfer_path(local, remote, connection)
-        return if local.nil?
+      def transfer_path(locals, remote, connection)
+        return if locals.nil? || Array(locals).empty?
 
-        connection.upload_path!(local, remote)
+        locals.each { |local| connection.upload_path!(local, remote) }
       rescue SSHFailed, Net::SSH::Exception => ex
         raise ActionFailed, ex.message
       end

data/lib/kitchen/driver.rb

@@ -26,9 +26,13 @@ module Kitchen
   # @author Fletcher Nichol <fnichol@nichol.ca>
   module Driver
 
+    # Default driver plugin to use
+    DEFAULT_PLUGIN = "dummy".freeze
+
     # Returns an instance of a driver given a plugin type string.
     #
     # @param plugin [String] a driver plugin type, which will be constantized
+    # @param config [Hash] a configuration hash to initialize the driver
     # @return [Driver::Base] a driver instance
     # @raise [ClientError] if a driver instance could not be created
     # @raise [UserError] if the driver's dependencies could not be met

data/lib/kitchen/generator/init.rb

@@ -37,6 +37,12 @@ module Kitchen
           Gemfile
         D
 
+      class_option :provisioner, :type => :string, :aliases => "-P",
+        :default => "chef_solo",
+        :desc => <<-D.gsub(/^\s+/, '').gsub(/\n/, ' ')
+          The default Kitchen Provisioner to use
+        D
+
       class_option :create_gemfile, :type => :boolean, :default => false,
         :desc => <<-D.gsub(/^\s+/, '').gsub(/\n/, ' ')
           Whether or not to create a Gemfile if one does not exist.
@@ -50,8 +56,10 @@ module Kitchen
         prepare_rakefile if init_rakefile?
         prepare_thorfile if init_thorfile?
         empty_directory "test/integration/default" if init_test_dir?
-        append_to_gitignore(".kitchen/")
-        append_to_gitignore(".kitchen.local.yml")
+        if init_git?
+          append_to_gitignore(".kitchen/")
+          append_to_gitignore(".kitchen.local.yml")
+        end
         prepare_gemfile if init_gemfile?
         add_drivers
 
@@ -68,11 +76,12 @@ module Kitchen
         else
           nil
         end
-        run_list = cookbook_name ? "recipe[#{cookbook_name}]" : nil
+        run_list = cookbook_name ? "recipe[#{cookbook_name}::default]" : nil
         driver_plugin = Array(options[:driver]).first || 'dummy'
 
         template("kitchen.yml.erb", ".kitchen.yml", {
           :driver_plugin => driver_plugin.sub(/^kitchen-/, ''),
+          :provisioner => options[:provisioner],
           :run_list => Array(run_list)
         })
       end
@@ -96,6 +105,10 @@ module Kitchen
         Dir.glob("test/integration/*").select { |d| File.directory?(d) }.empty?
       end
 
+      def init_git?
+        File.directory?(File.join(destination_root, '.git'))
+      end
+
       def prepare_rakefile
         rakedoc = <<-RAKE.gsub(/^ {10}/, '')
 
@@ -142,9 +155,8 @@ module Kitchen
       end
 
       def add_gem_to_gemfile
-        if not_in_file?("Gemfile", %r{gem 'test-kitchen'})
-          append_to_file("Gemfile",
-            %{gem 'test-kitchen', :group => :integration\n})
+        if not_in_file?("Gemfile", %r{gem ('|")test-kitchen('|")})
+          append_to_file("Gemfile", %{gem 'test-kitchen'\n})
           @display_bundle_msg = true
         end
       end
@@ -163,9 +175,8 @@ module Kitchen
       end
 
       def add_driver_to_gemfile(driver_gem)
-        if not_in_file?("Gemfile", %r{gem '#{driver_gem}'})
-          append_to_file("Gemfile",
-            %{gem '#{driver_gem}', :group => :integration\n})
+        if not_in_file?("Gemfile", %r{gem ('|")#{driver_gem}('|")})
+          append_to_file("Gemfile", %{gem '#{driver_gem}'\n})
           @display_bundle_msg = true
         end
       end

data/lib/kitchen/instance.rb

@@ -18,7 +18,6 @@
 
 require 'benchmark'
 require 'fileutils'
-require 'vendor/hash_recursive_merge'
 
 module Kitchen
 
@@ -33,6 +32,10 @@ module Kitchen
 
     class << self
       attr_accessor :mutexes
+
+      def name_for(suite, platform)
+        "#{suite.name}-#{platform.name}".gsub(/_/, '-').gsub(/\./, '')
+      end
     end
 
     # @return [Suite] the test suite configuration
@@ -41,38 +44,53 @@ module Kitchen
     # @return [Platform] the target platform configuration
     attr_reader :platform
 
+    # @return [String] name of this instance
+    attr_reader :name
+
     # @return [Driver::Base] driver object which will manage this instance's
     #   lifecycle actions
     attr_reader :driver
 
+    # @return [Provisioner::Base] provisioner object which will the setup
+    #   and invocation instructions for configuration management and other
+    #   automation tools
+    attr_reader :provisioner
+
+    # @return [Busser] busser object for instance to manage the busser
+    #   installation on this instance
+    attr_reader :busser
+
     # @return [Logger] the logger for this instance
     attr_reader :logger
 
     # Creates a new instance, given a suite and a platform.
     #
     # @param [Hash] options configuration for a new suite
-    # @option options [Suite] :suite the suite
-    # @option options [Platform] :platform the platform
-    # @option options [Driver::Base] :driver the driver
+    # @option options [Suite] :suite the suite (**Required)
+    # @option options [Platform] :platform the platform (**Required)
+    # @option options [Driver::Base] :driver the driver (**Required)
+    # @option options [Provisioner::Base] :provisioner the provisioner
+    #   (**Required)
+    # @option options [Busser] :busser the busser logger (**Required**)
     # @option options [Logger] :logger the instance logger
+    #   (default: Kitchen.logger)
+    # @option options [StateFile] :state_file the state file object to use
+    #   when tracking instance  state (**Required**)
+    # @raise [ClientError] if one or more required options are omitted
     def initialize(options = {})
-      options = { :logger => Kitchen.logger }.merge(options)
       validate_options(options)
-      logger = options[:logger]
-
-      @suite = options[:suite]
-      @platform = options[:platform]
-      @driver = options[:driver]
-      @logger = logger.is_a?(Proc) ? logger.call(name) : logger
 
-      @driver.instance = self
-      @driver.validate_config!
-      setup_driver_mutex
-    end
-
-    # @return [String] name of this instance
-    def name
-      "#{suite.name}-#{platform.name}".gsub(/_/, '-').gsub(/\./, '')
+      @suite        = options.fetch(:suite)
+      @platform     = options.fetch(:platform)
+      @name         = self.class.name_for(@suite, @platform)
+      @driver       = options.fetch(:driver)
+      @provisioner  = options.fetch(:provisioner)
+      @busser       = options.fetch(:busser)
+      @logger       = options.fetch(:logger) { Kitchen.logger }
+      @state_file   = options.fetch(:state_file)
+
+      setup_driver
+      setup_provisioner
     end
 
     def to_str
@@ -179,45 +197,22 @@ module Kitchen
       state_file.read[:last_action]
     end
 
-    # Extra instance methods used for accessing Puppet data such as a combined
-    # run list, node attributes, etc.
-    module Cheflike
-
-      # Returns a combined run_list starting with the platform's run_list
-      # followed by the suite's run_list.
-      #
-      # @return [Array] combined run_list from suite and platform
-      def run_list
-        Array(platform.run_list) + Array(suite.run_list)
-      end
-
-      # Returns a merged hash of Chef node attributes with values from the
-      # suite overriding values from the platform.
-      #
-      # @return [Hash] merged hash of Chef node attributes
-      def attributes
-        platform.attributes.rmerge(suite.attributes)
-      end
-
-      def dna
-        attributes.rmerge({ :run_list => run_list })
-      end
-    end
+    private
 
-    # Extra instances methods used for accessing Puppet data such as a run,
-    # node attributes, etc.
-    module Puppetlike
+    attr_reader :state_file
 
-      def manifest
+    def validate_options(options)
+      [:suite, :platform, :driver, :provisioner, :busser, :state_file].each do |k|
+        if !options.has_key?(k)
+          raise ClientError, "Instance#new requires option :#{k}"
+        end
       end
     end
 
-    private
-
-    def validate_options(opts)
-      [:suite, :platform, :driver, :logger].each do |k|
-        raise ClientError, "Instance#new requires option :#{k}" if opts[k].nil?
-      end
+    def setup_driver
+      @driver.instance = self
+      @driver.validate_config!
+      setup_driver_mutex
     end
 
     def setup_driver_mutex
@@ -229,6 +224,10 @@ module Kitchen
       end
     end
 
+    def setup_provisioner
+      @provisioner.instance = self
+    end
+
     def transition_to(desired)
       result = nil
       FSM.actions(last_action, desired).each do |transition|
@@ -258,7 +257,7 @@ module Kitchen
     end
 
     def perform_action(verb, output_verb)
-      banner "#{output_verb} #{to_str}"
+      banner "#{output_verb} #{to_str}..."
       elapsed = action(verb) { |state| driver.public_send(verb, state) }
       info("Finished #{output_verb.downcase} #{to_str}" +
         " #{Util.duration(elapsed.real)}.")
@@ -298,10 +297,6 @@ module Kitchen
       end
     end
 
-    def state_file
-      @state_file ||= StateFile.new(driver[:kitchen_root], name)
-    end
-
     def banner(*args)
       Kitchen.logger.logdev && Kitchen.logger.logdev.banner(*args)
       super

data/lib/kitchen/lazy_hash.rb

@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+#
+# Copyright (C) 2013, 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 'delegate'
+
+module Kitchen
+
+  # A modifed Hash object that may contain procs as a value which must be
+  # executed in the context of another object.
+  #
+  # @author Fletcher Nichol <fnichol@nichol.ca>
+  class LazyHash < SimpleDelegator
+
+    def initialize(obj, context)
+      @context = context
+      super(obj)
+    end
+
+    def [](key)
+      proc_or_val = __getobj__[key]
+
+      if proc_or_val.respond_to?(:call)
+        proc_or_val.call(@context)
+      else
+        proc_or_val
+      end
+    end
+
+    def to_hash
+      hash = Hash.new
+      __getobj__.keys.each { |key| hash[key] = self[key] }
+      hash
+    end
+  end
+end

data/lib/kitchen/platform.rb

@@ -34,37 +34,8 @@ module Kitchen
     # @option options [String] :name logical name of this platform
     #   (**Required**)
     def initialize(options = {})
-      options = options.dup
-      validate_options(options)
-
-      @name = options.delete(:name)
-      @data = options.reject do |key, value|
-        [:driver_config, :driver_plugin, :provisioner].include?(key)
-      end
-    end
-
-    # Extra platform methods used for accessing Chef data such as a run list,
-    # node attributes, etc.
-    module Cheflike
-
-      # @return [Array] Array of Chef run_list items
-      def run_list
-        Array(data[:run_list])
-      end
-
-      # @return [Hash] Hash of Chef node attributes
-      def attributes
-        data[:attributes] || Hash.new
-      end
-    end
-
-    private
-
-    attr_reader :data
-
-    def validate_options(opts)
-      [:name].each do |k|
-        raise ClientError, "Platform#new requires option :#{k}" if opts[k].nil?
+      @name = options.fetch(:name) do
+        raise ClientError, "Platform#new requires option :name"
       end
     end
   end