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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e92b944518afe8ad9023cf97a51f14b427b28a0
-  data.tar.gz: e4f216d248e9e467eaa19b6c2049cb2d36cfc0f8
+  metadata.gz: c66b46e1a915624ed333e89ef6e7c829db84cfd1
+  data.tar.gz: 839dca4f7400f2dc66d4e5540684913cf586510e
 SHA512:
-  metadata.gz: 368dd8fbff5b816cc4622533809dd0992a3074818c93d0881312a1b988d2e3bb8786085ef3b82f6f8afd9cdd036279030c085e7cee2b8fd27dace7754e4b436b
-  data.tar.gz: 78bc12ab69f016079a311da68c6122144dcd8c94849a7b2f4c8cc22155bc5fd484403fbfef057536eccdf9450ae6d892b2ce2d061ce6c5625525b4087c5db3d8
+  metadata.gz: 87dfa48955478b2a69137244a9bef11763662af13ceae16218499ee95da0b6971cbeedd441486d1d88d74665562b09b81077e89113788b0e293c4ce09c9ece01
+  data.tar.gz: e60dbac3c1567c35eca1d819210d3298d564ce33cab87da49ff5a2a1a45d4bc0130c713a71cebdcf651db09b19a2b74088d20da9032c9864e809753a71c03464

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 .rvmrc
 .rbenv-version
 .ruby-version
+.project

data/.travis.yml

@@ -14,6 +14,8 @@ before_install:
   - gem update --system $RUBYGEMS_VERSION
   - gem --version
 
+bundler_args: --without guard
+
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 1.0.0.beta.4 / 2013-01-11
+
+### Bug fixes
+
+* Change permissions on the Chef sandbox to world readable and writable (0755) ([@fnichol][])
+* Minor typographical and documentation errors ([@gmiranda23][])
+* Improve error message when Berkshelf/Librarian is not present ([@fnichol][])
+* Ensure busser respects the `sudo` driver configuration ([@schisamo][])
+
+### Improvements
+
+* Pull request [#235][]: Add Chef Solo environment support ([@ekrupnik][])
+* Pull request [#231][]: Use chefignore to determine which files to copy ([@rteabeault][])
+* Pull request [#222][]: Remove dependency on Celluloid and use pure Ruby threads ([@sethvargo][])
+* Pull request [#218][]: Add support for `site-cookbooks` ([@hollow][])
+* Pull request [#217][]: Add support for specific driver configs ([@hollow][])
+* Pull request [#206][]: Add pessismestic locks on all gem requirements ([@sethvargo][])
+* Pull request [#193][]: Allow users to configure ssh forwarding ([@fnordfish][])
+* Pull request [#192][]: Add chef config has and proxy information ([@scotthain][])
+* Pull request [#94][]: Support passing multiple instance names ([@sethvargo][])
+* Drop hard dependency on `pry` gem for `kitchen console` ([@fnichol][])
+* Remove bash-specific code in favor of pure sh for non-standard Unix devices ([@schisamo][])
+* Make remote RUBY_BIN configurable ([@schisamo][])
+* Ensure busser and Chef Zero are executed in their own the sandboxes ([@schisamo][])
+
+
 ## 1.0.0.beta.3 / 2013-08-29
 
 ### Bug fixes
@@ -201,6 +227,7 @@ The initial release.
 [#84]: https://github.com/opscode/test-kitchen/issues/84
 [#90]: https://github.com/opscode/test-kitchen/issues/90
 [#92]: https://github.com/opscode/test-kitchen/issues/92
+[#94]: https://github.com/opscode/test-kitchen/issues/94
 [#97]: https://github.com/opscode/test-kitchen/issues/97
 [#98]: https://github.com/opscode/test-kitchen/issues/98
 [#99]: https://github.com/opscode/test-kitchen/issues/99
@@ -243,15 +270,27 @@ The initial release.
 [#179]: https://github.com/opscode/test-kitchen/issues/179
 [#187]: https://github.com/opscode/test-kitchen/issues/187
 [#188]: https://github.com/opscode/test-kitchen/issues/188
+[#192]: https://github.com/opscode/test-kitchen/issues/192
+[#193]: https://github.com/opscode/test-kitchen/issues/193
+[#206]: https://github.com/opscode/test-kitchen/issues/206
+[#217]: https://github.com/opscode/test-kitchen/issues/217
+[#218]: https://github.com/opscode/test-kitchen/issues/218
+[#222]: https://github.com/opscode/test-kitchen/issues/222
+[#231]: https://github.com/opscode/test-kitchen/issues/231
+[#235]: https://github.com/opscode/test-kitchen/issues/235
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@adamhjk]: https://github.com/adamhjk
 [@arangamani]: https://github.com/arangamani
 [@arunthampi]: https://github.com/arunthampi
 [@bryanwb]: https://github.com/bryanwb
 [@calavera]: https://github.com/calavera
+[@ekrupnik]: https://github.com/ekrupnik
 [@fnichol]: https://github.com/fnichol
+[@fnordfish]: https://github.com/fnordfish
+[@gmiranda23]: https://github.com/gmiranda23
 [@gondoi]: https://github.com/gondoi
 [@grahamc]: https://github.com/grahamc
+[@hollow]: https://github.com/hollow
 [@jasonroelofs]: https://github.com/jasonroelofs
 [@jonsmorrow]: https://github.com/jonsmorrow
 [@josephholsten]: https://github.com/josephholsten
@@ -267,6 +306,8 @@ The initial release.
 [@rteabeault]: https://github.com/rteabeault
 [@ryansouza]: https://github.com/ryansouza
 [@saketoba]: https://github.com/saketoba
+[@schisamo]: https://github.com/schisamo
+[@scotthain]: https://github.com/scotthain
 [@sethvargo]: https://github.com/sethvargo
 [@smith]: https://github.com/smith
 [@stevendanna]: https://github.com/stevendanna

data/Gemfile

@@ -1,9 +1,10 @@
 source 'https://rubygems.org'
-
 gemspec
 
-group :development do
+group :guard do
   gem 'rb-inotify', :require => false
   gem 'rb-fsevent', :require => false
   gem 'rb-fchange', :require => false
+  gem 'guard-minitest', '~> 1.3'
+  gem 'guard-cucumber', '~> 1.4'
 end

data/Rakefile

@@ -30,6 +30,7 @@ unless RUBY_ENGINE == 'jruby'
 
   desc "Run cane to check quality metrics"
   Cane::RakeTask.new do |cane|
+    cane.abc_max = 20
     cane.abc_exclude = %w(
       Kitchen::RakeTasks#define
       Kitchen::ThorTasks#define

data/lib/kitchen.rb

@@ -16,7 +16,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'celluloid'
 require 'pathname'
 require 'thread'
 
@@ -34,11 +33,10 @@ require 'kitchen/collection'
 require 'kitchen/config'
 require 'kitchen/driver'
 require 'kitchen/driver/base'
+require 'kitchen/driver/proxy'
 require 'kitchen/driver/ssh_base'
 require 'kitchen/instance'
-require 'kitchen/instance_actor'
 require 'kitchen/loader/yaml'
-require 'kitchen/manager'
 require 'kitchen/metadata_chopper'
 require 'kitchen/platform'
 require 'kitchen/state_file'
@@ -77,11 +75,6 @@ module Kitchen
       Logger.new(:stdout => STDOUT, :logdev => logfile, :level => env_log)
     end
 
-    def celluloid_file_logger
-      logfile = File.expand_path(File.join(".kitchen", "logs", "celluloid.log"))
-      Logger.new(:logdev => logfile, :level => env_log, :progname => "Celluloid")
-    end
-
     private
 
     def env_log
@@ -94,15 +87,8 @@ module Kitchen
   DEFAULT_LOG_LEVEL = :info
 end
 
-# Initialize the base logger and use that for Celluloid's logger
+# Initialize the base logger
 Kitchen.logger = Kitchen.default_logger
-Celluloid.logger = Kitchen.logger
 
 # Setup a collection of instance crash exceptions for error reporting
-Kitchen.crashes = []
-Celluloid.exception_handler do |exception|
-  Kitchen.logger.debug("An instance crashed because of #{exception.inspect}")
-  Kitchen.mutex.synchronize { Kitchen.crashes << exception }
-end
-
 Kitchen.mutex = Mutex.new

data/lib/kitchen/busser.rb

@@ -38,9 +38,11 @@ module Kitchen
     def initialize(suite_name, opts = {})
       validate_options(suite_name)
 
+      @ruby_binpath = opts.fetch(:ruby_binpath, DEFAULT_RUBY_BINPATH)
+      @busser_root = opts.fetch(:busser_root, DEFAULT_BUSSER_ROOT)
       @test_root = opts.fetch(:test_root, DEFAULT_TEST_ROOT)
       @suite_name = suite_name
-      @use_sudo = opts.fetch(:use_sudo, true)
+      @use_sudo = opts.fetch(:sudo, true)
     end
 
     # Returns a command string which installs Busser, and installs all
@@ -55,12 +57,14 @@ module Kitchen
       @setup_cmd ||= if local_suite_files.empty?
         nil
       else
+        # use Bourne (/bin/sh) as Bash does not exist on all Unix flavors
         <<-INSTALL_CMD.gsub(/^ {10}/, '')
-          bash -c '
-          if ! #{sudo}#{ruby_binpath}/gem list busser -i >/dev/null ; then
-            #{sudo}#{ruby_binpath}/gem install #{busser_gem} --no-rdoc --no-ri
+          sh -c '
+          #{sandbox_env(true)}
+          if ! #{sudo}#{gem_bin} list busser -i >/dev/null; then
+            echo "-----> Installing busser and plugins"
+            #{sudo}#{gem_bin} install busser --no-rdoc --no-ri
           fi
-          #{sudo}#{ruby_binpath}/busser setup
           #{sudo}#{busser_bin} plugin install #{plugins.join(' ')}'
         INSTALL_CMD
       end
@@ -78,8 +82,10 @@ module Kitchen
       @sync_cmd ||= if local_suite_files.empty?
         nil
       else
+        # use Bourne (/bin/sh) as Bash does not exist on all Unix flavors
         <<-INSTALL_CMD.gsub(/^ {10}/, '')
-          bash -c '
+          sh -c '
+          #{sandbox_env(true)}
           #{sudo}#{busser_bin} suite cleanup
           #{local_suite_files.map { |f| stream_file(f, remote_file(f, @suite_name)) }.join}
           #{helper_files.map { |f| stream_file(f, remote_file(f, "helpers")) }.join}'
@@ -95,15 +101,17 @@ module Kitchen
     # @return [String] a command string to run the test suites, or nil if no
     #   work needs to be performed
     def run_cmd
-      @run_cmd ||= local_suite_files.empty? ? nil : "#{sudo}#{busser_bin} test"
+      @run_cmd ||= local_suite_files.empty? ? nil : "#{sandbox_env} #{sudo}#{busser_bin} test"
     end
 
     private
 
     DEFAULT_RUBY_BINPATH = "/opt/chef/embedded/bin".freeze
-    DEFAULT_BUSSER_ROOT = "/opt/busser".freeze
+    DEFAULT_BUSSER_ROOT = "/tmp/kitchen-busser".freeze
     DEFAULT_TEST_ROOT = File.join(Dir.pwd, "test/integration").freeze
 
+    attr_reader :ruby_binpath
+    attr_reader :busser_root
     attr_reader :test_root
 
     def validate_options(suite_name)
@@ -135,7 +143,7 @@ module Kitchen
 
     def remote_file(file, dir)
       local_prefix = File.join(test_root, dir)
-      "$(#{sudo}#{busser_bin} suite path)/".concat(file.sub(%r{^#{local_prefix}/}, ''))
+      "$(#{sandbox_env} #{sudo}#{busser_bin} suite path)/".concat(file.sub(%r{^#{local_prefix}/}, ''))
     end
 
     def stream_file(local_path, remote_path)
@@ -162,16 +170,32 @@ module Kitchen
       @use_sudo ? "sudo -E " : ""
     end
 
-    def ruby_binpath
-      DEFAULT_RUBY_BINPATH
+    def ruby_bin
+      @ruby_bin ||= File.join(ruby_binpath, 'ruby')
+    end
+
+    def gem_bin
+      @gem_bin ||= File.join(ruby_binpath, 'gem')
     end
 
     def busser_bin
-      File.join(DEFAULT_BUSSER_ROOT, "bin/busser")
+      @busser_bin ||= "#{ruby_bin} #{File.join(busser_root, "gems", "bin", "busser")}"
     end
 
-    def busser_gem
-      "busser"
+    def sandbox_env(export=false)
+      env = [
+        "BUSSER_ROOT=#{busser_root}",
+        "GEM_HOME=#{busser_root}/gems",
+        "GEM_PATH=$GEM_HOME",
+        "GEM_CACHE=$GEM_HOME/cache",
+        "PATH=$PATH:$GEM_HOME/bin"
+      ]
+
+      if export
+        env << "; export BUSSER_ROOT GEM_HOME GEM_PATH GEM_CACHE PATH;"
+      end
+
+      env.join(" ")
     end
   end
 end

data/lib/kitchen/cli.rb

@@ -20,6 +20,7 @@ require 'benchmark'
 require 'erb'
 require 'ostruct'
 require 'thor'
+require 'thread'
 
 require 'kitchen'
 require 'kitchen/generator/driver_create'
@@ -40,11 +41,9 @@ module Kitchen
       super
       $stdout.sync = true
       Kitchen.logger = Kitchen.default_file_logger
-      Celluloid.logger = Kitchen.celluloid_file_logger
       @config = Kitchen::Config.new(
         :loader     => Kitchen::Loader::YAML.new(ENV['KITCHEN_YAML']),
-        :log_level  => ENV['KITCHEN_LOG'] && ENV['KITCHEN_LOG'].downcase.to_sym,
-        :supervised => false
+        :log_level  => ENV['KITCHEN_LOG'] && ENV['KITCHEN_LOG'].downcase.to_sym
       )
     end
 
@@ -106,7 +105,7 @@ module Kitchen
         ensure_initialized
         destroy_mode = options[:destroy].to_sym
         @task = :test
-        results = parse_subcommand(args.first)
+        results = parse_subcommand(args.join('|'))
 
         if options[:parallel]
           run_parallel(results, destroy_mode)
@@ -283,8 +282,12 @@ module Kitchen
     end
 
     def run_parallel(instances, *args)
-      futures = Array(instances).map { |i| i.future.public_send(task, *args) }
-      futures.map { |i| i.value }
+      threads = Array(instances).map do |i|
+        Thread.new do
+          i.public_send(task, *args)
+        end
+      end
+      threads.map { |i| i.join }
     end
 
     def parse_subcommand(arg = nil)
@@ -292,11 +295,7 @@ module Kitchen
     end
 
     def get_all_instances
-      result = if options[:parallel]
-        @config.instance_actors
-      else
-        @config.instances
-      end
+      result = @config.instances
 
       if result.empty?
         die task, "No instances defined"
@@ -306,11 +305,7 @@ module Kitchen
     end
 
     def get_filtered_instances(regexp)
-      result = if options[:parallel]
-        @config.instance_actors(/#{regexp}/)
-      else
-        @config.instances.get_all(/#{regexp}/)
-      end
+      result = @config.instances.get_all(/#{regexp}/)
 
       if result.empty?
         die task, "No instances for regex `#{regexp}', try running `kitchen list'"

data/lib/kitchen/config.rb

@@ -16,7 +16,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'celluloid'
 require 'vendor/hash_recursive_merge'
 
 module Kitchen
@@ -30,7 +29,6 @@ module Kitchen
     attr_accessor :kitchen_root
     attr_accessor :test_base_path
     attr_accessor :log_level
-    attr_writer :supervised
     attr_writer :platforms
     attr_writer :suites
 
@@ -47,13 +45,11 @@ module Kitchen
     # @option options [String] :kitchen_root
     # @option options [String] :test_base_path
     # @option options [Symbol] :log_level
-    # @option options [TrueClass,FalseClass] :supervised
     def initialize(options = {})
       @loader         = options[:loader] || Kitchen::Loader::YAML.new
       @kitchen_root   = options[:kitchen_root] || Dir.pwd
       @test_base_path = options[:test_base_path] || default_test_base_path
       @log_level      = options[:log_level] || Kitchen::DEFAULT_LOG_LEVEL
-      @supervised     = options[:supervised]
     end
 
     # @return [Array<Platform>] all defined platforms which will be used in
@@ -76,20 +72,6 @@ module Kitchen
       @instances ||= build_instances
     end
 
-    # Returns an InstanceActor for all instance names matched by the regexp,
-    # or all by default.
-    #
-    # @param [Regexp] a regular expression to match on instance names
-    # @return [Array<InstanceActor>] all instance actors matching the regexp
-    def instance_actors(regexp = nil)
-      result = regexp.nil? ? instances : instances.get_all(regexp)
-      Collection.new(result.map { |instance| actor_registry(instance) })
-    end
-
-    def supervised
-      @supervised.nil? ? @supervised = true : @supervised
-    end
-
     private
 
     def new_suite(hash)
@@ -127,6 +109,7 @@ module Kitchen
 
     def new_instance(suite, platform, index)
       platform_hash = platform_driver_hash(platform.name)
+      platform_hash[:driver_config].rmerge!(suite.driver_config)
       driver = new_driver(merge_driver_hash(platform_hash))
       provisioner = driver[:provisioner]
 
@@ -162,41 +145,13 @@ module Kitchen
       end
     end
 
-    def actor_registry(instance)
-      Celluloid::Actor[actor_key(instance)] || new_instance_actor(instance)
-    end
-
-    def actor_key(instance)
-      "#{object_id}__#{instance.name}"
-    end
-
-    def new_instance_actor(instance)
-      actor_name = actor_key(instance)
-
-      actor = if supervised
-        supervisor = InstanceActor.supervise_as(actor_name, instance)
-        actor = supervisor.actors.first
-        Kitchen.logger.debug("Supervising #{actor.to_str} with #{supervisor}")
-        actor
-      else
-        Celluloid::Actor[actor_name] = InstanceActor.new(instance)
-      end
-
-      manager.link(actor)
-
-      actor
-    end
-
-    def manager
-      @manager ||= Manager.new
-    end
-
     def log_root
       File.expand_path(File.join(kitchen_root, ".kitchen", "logs"))
     end
 
     def platform_driver_hash(platform_name)
       h = data[:platforms].find { |p| p[:name] == platform_name } || Hash.new
+      h[:driver_config] ||= {}
 
       h.select do |key, value|
         [:driver_plugin, :driver_config, :provisioner].include?(key)