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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2783a5d91e3ede1c1fbfbbd52d6b222e8ed1d627
-  data.tar.gz: 4fbe18231333671c28f4e3966180f6ce3a367421
+  metadata.gz: 1e92b944518afe8ad9023cf97a51f14b427b28a0
+  data.tar.gz: e4f216d248e9e467eaa19b6c2049cb2d36cfc0f8
 SHA512:
-  metadata.gz: 6730c6bd2bcf30b96606d58462d93223ad834a657fbec997f6df5200b139d119b56353999c1aa3a182734dff83a261bcba644893391e7a3160edb0a2eb8a8329
-  data.tar.gz: 988e5ff4c304e3de8f77bc77b092d4abd1c8896d22ffff2ffcae8a6666c12709f1def87fb995415bffc522b1699f25ed10cf319b003c67a7f5daad659a074f61
+  metadata.gz: 368dd8fbff5b816cc4622533809dd0992a3074818c93d0881312a1b988d2e3bb8786085ef3b82f6f8afd9cdd036279030c085e7cee2b8fd27dace7754e4b436b
+  data.tar.gz: 78bc12ab69f016079a311da68c6122144dcd8c94849a7b2f4c8cc22155bc5fd484403fbfef057536eccdf9450ae6d892b2ce2d061ce6c5625525b4087c5db3d8

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 1.0.0.beta.3 / 2013-08-29
+
+### Bug fixes
+
+* Pull request [#157][]: Include definitions directory when uploading the cookbooks. ([@jasonroelofs][])
+* Pull request [#178][]: Fix SSH#wait's logger call to #info. ([@ryansouza][])
+* Pull request [#188][]: Truthy default_configs can now be overridden. ([@thommay][])
+
+### Improvements
+
+* Allow Test Kitchen to be used as a library; CWD is not enough. ([@portertech][])
+* Add `kitchen list --debug` to display all merged & calculated config. ([@fnichol][])
+* Add retry logic to Kitchen:SSH when initiating a connection. ([@fnichol][])
+* Pull request [#147][]: Allow chef omnibus install.sh url to be configurable. ([@jrwesolo][])
+* Pull request [#187][]: Add support for log file in chef solo. ([@arangamani][])
+* Pull request [#179][]: Remove bundler references from README. ([@juliandunn][])
+* Compute default test_base_path in Config based on kitchen_root. ([@fnichol][])
+
+
 ## 1.0.0.beta.2 / 2013-07-24
 
 ### Bug fixes
@@ -208,35 +227,47 @@ The initial release.
 [#137]: https://github.com/opscode/test-kitchen/issues/137
 [#140]: https://github.com/opscode/test-kitchen/issues/140
 [#142]: https://github.com/opscode/test-kitchen/issues/142
+[#147]: https://github.com/opscode/test-kitchen/issues/147
 [#151]: https://github.com/opscode/test-kitchen/issues/151
 [#152]: https://github.com/opscode/test-kitchen/issues/152
 [#153]: https://github.com/opscode/test-kitchen/issues/153
 [#154]: https://github.com/opscode/test-kitchen/issues/154
 [#155]: https://github.com/opscode/test-kitchen/issues/155
+[#157]: https://github.com/opscode/test-kitchen/issues/157
 [#161]: https://github.com/opscode/test-kitchen/issues/161
 [#163]: https://github.com/opscode/test-kitchen/issues/163
 [#170]: https://github.com/opscode/test-kitchen/issues/170
 [#171]: https://github.com/opscode/test-kitchen/issues/171
 [#172]: https://github.com/opscode/test-kitchen/issues/172
+[#178]: https://github.com/opscode/test-kitchen/issues/178
+[#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
 [@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
 [@fnichol]: https://github.com/fnichol
 [@gondoi]: https://github.com/gondoi
 [@grahamc]: https://github.com/grahamc
+[@jasonroelofs]: https://github.com/jasonroelofs
 [@jonsmorrow]: https://github.com/jonsmorrow
 [@josephholsten]: https://github.com/josephholsten
+[@jrwesolo]: https://github.com/jrwesolo
 [@jtimberman]: https://github.com/jtimberman
+[@juliandunn]: https://github.com/juliandunn
 [@manul]: https://github.com/manul
 [@mattray]: https://github.com/mattray
 [@mconigliaro]: https://github.com/mconigliaro
 [@patcon]: https://github.com/patcon
+[@portertech]: https://github.com/portertech
 [@reset]: https://github.com/reset
 [@rteabeault]: https://github.com/rteabeault
+[@ryansouza]: https://github.com/ryansouza
 [@saketoba]: https://github.com/saketoba
 [@sethvargo]: https://github.com/sethvargo
 [@smith]: https://github.com/smith
 [@stevendanna]: https://github.com/stevendanna
-[@thommay]: https://github.com/thommay
+[@thommay]: https://github.com/thommay

data/README.md

@@ -7,54 +7,36 @@ A convergence integration test harness for configuration management systems.
 
 # Getting started
 
-
 Project Setup
 -------------
 
-In your `Gemfile`, add `test-kitchen` as a
-dependency:
+Install the `test-kitchen` gem. `--pre` is necessary because Test Kitchen 1.0.0 has not been released yet.
 
-```ruby
-gem 'test-kitchen', '~> 1.0.0.alpha'
+```text
+$ gem install test-kitchen --pre
 ```
 
-and run the `bundle` command to install:
-
-    $ bundle install
-
-This will expose the `test-kitchen` CLI. Run `bundle exec kitchen init` to get started:
-
-    $ kitchen init
-
-You will be prompted with a series of questions. In this guide, we
-will be using the [kitchen vagrant driver](https://github.com/opscode/kitchen-vagrant).
+This will expose the `test-kitchen` CLI. Run `kitchen init` to get started:
 
 ```text
-$ bundle exec kitchen init
+$ kitchen init
       create  .kitchen.yml
-      append  Rakefile
-      create  test/integration/default
-      append  .gitignore
-      append  .gitignore
-      Add a Driver plugin to your Gemfile?
-      (y/n)> y
-      Enter gem name, `list', or `skip'>
-      kitchen-vagrant
-      append  Gemfile
-      You must run `bundle install' to fetch any new gems.
 ```
+In this guide, we
+will be using the [kitchen vagrant driver](https://github.com/opscode/kitchen-vagrant),
+so install that:
 
-Run the `bundle` command again to install the new vagrant driver:
-
-    $ bundle install
+```text
+$ gem install kitchen-vagrant
+```
 
 Open up the `.kitchen.yml` file created in the root of your
-repository.
+repository and modify it if you wish.
 
 Now, it is time to get testing. Use the `--parallel` option to run
 your tests in parallel. Trust us, it's faster!
 
-    $ bundle exec kitchen test
+    $ kitchen test
 
 ### Helpful Switches
 

data/lib/kitchen/busser.rb

@@ -35,11 +35,12 @@ module Kitchen
     # @param [Hash] opts optional configuration
     # @option opts [TrueClass, FalseClass] :use_sudo whether or not to invoke
     #   sudo before commands requiring root access (default: `true`)
-    def initialize(suite_name, opts = { :use_sudo => true })
+    def initialize(suite_name, opts = {})
       validate_options(suite_name)
 
+      @test_root = opts.fetch(:test_root, DEFAULT_TEST_ROOT)
       @suite_name = suite_name
-      @use_sudo = opts[:use_sudo]
+      @use_sudo = opts.fetch(:use_sudo, true)
     end
 
     # Returns a command string which installs Busser, and installs all
@@ -103,6 +104,8 @@ module Kitchen
     DEFAULT_BUSSER_ROOT = "/opt/busser".freeze
     DEFAULT_TEST_ROOT = File.join(Dir.pwd, "test/integration").freeze
 
+    attr_reader :test_root
+
     def validate_options(suite_name)
       if suite_name.nil?
         raise ClientError, "Busser#new requires a suite_name"
@@ -170,9 +173,5 @@ module Kitchen
     def busser_gem
       "busser"
     end
-
-    def test_root
-      DEFAULT_TEST_ROOT
-    end
   end
 end

data/lib/kitchen/cli.rb

@@ -51,9 +51,13 @@ module Kitchen
     desc "list [(all|<REGEX>)]", "List all instances"
     method_option :bare, :aliases => "-b", :type => :boolean,
       :desc => "List the name of each instance only, one per line"
+    method_option :debug, :aliases => "-d", :type => :boolean,
+      :desc => "Show computed driver configuration for each instance"
     def list(*args)
       result = parse_subcommand(args.first)
-      if options[:bare]
+      if options[:debug]
+        Array(result).each { |i| debug_instance(i) }
+      elsif options[:bare]
         say Array(result).map { |i| i.name }.join("\n")
       else
         list_table(result)
@@ -333,6 +337,22 @@ module Kitchen
       ]
     end
 
+    def debug_instance(instance)
+      say "--------"
+      say "Instance: #{instance.name}"
+      say "Driver: #{instance.driver.name}"
+      say "Driver Config:"
+      instance.driver.config_keys.sort.each do |key|
+        say "    #{key}: #{instance.driver[key]}"
+      end
+      if instance.kind_of?(Instance::Cheflike)
+        say "Chef Config:"
+        say "    attributes: #{instance.attributes.inspect}"
+        say "    run_list: #{instance.run_list.inspect}"
+      end
+      say ""
+    end
+
     def color_pad(string)
       string + set_color("", :white)
     end

data/lib/kitchen/config.rb

@@ -40,9 +40,6 @@ module Kitchen
     # Default provisioner to use
     DEFAULT_PROVISIONER = "chef_solo".freeze
 
-    # Default base path which may contain `data_bags/` directories
-    DEFAULT_TEST_BASE_PATH = File.join(Dir.pwd, 'test/integration').freeze
-
     # Creates a new configuration.
     #
     # @param [Hash] options configuration
@@ -54,7 +51,7 @@ module Kitchen
     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
+      @test_base_path = options[:test_base_path] || default_test_base_path
       @log_level      = options[:log_level] || Kitchen::DEFAULT_LOG_LEVEL
       @supervised     = options[:supervised]
     end
@@ -258,5 +255,9 @@ module Kitchen
         [:driver_plugin, :driver_config, :provisioner].include?(key)
       end
     end
+
+    def default_test_base_path
+      File.join(kitchen_root, 'test/integration')
+    end
   end
 end

data/lib/kitchen/driver/base.rb

@@ -39,7 +39,7 @@ module Kitchen
       def initialize(config = {})
         @config = LazyDriverHash.new(config, self)
         self.class.defaults.each do |attr, value|
-          @config[attr] = value unless @config[attr]
+          @config[attr] = value unless @config.has_key?(attr)
         end
       end
 
@@ -64,6 +64,13 @@ module Kitchen
         config[attr]
       end
 
+      # Returns an array of configuration keys.
+      #
+      # @return [Array] array of configuration keys
+      def config_keys
+        config.keys
+      end
+
       # Creates an instance.
       #
       # @param state [Hash] mutable instance and driver state
@@ -153,10 +160,11 @@ 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)
+          Busser.new(instance.suite.name, :test_root => test_root)
         end
       end
 
@@ -227,6 +235,12 @@ module Kitchen
             proc_or_val
           end
         end
+
+        def to_hash
+          hash = Hash.new
+          __getobj__.keys.each { |key| hash[key] = self[key] }
+          hash
+        end
       end
     end
   end

data/lib/kitchen/driver/ssh_base.rb

@@ -85,7 +85,7 @@ module Kitchen
       end
 
       def build_ssh_args(state)
-        combined = config.merge(state)
+        combined = config.to_hash.merge(state)
 
         opts = Hash.new
         opts[:user_known_hosts_file] = "/dev/null"
@@ -123,7 +123,7 @@ module Kitchen
       end
 
       def wait_for_sshd(hostname, username = nil, options = {})
-        SSH.new(hostname, username, options).wait
+        SSH.new(hostname, username, { :logger => logger }.merge(options)).wait
       end
     end
   end

data/lib/kitchen/generator/init.rb

@@ -181,7 +181,7 @@ module Kitchen
       end
 
       def unbundlerize
-        keys = %w[BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE RUBYOPT]
+        keys = ENV.keys.select { |key| key =~ /^BUNDLER?_/ } + %w[RUBYOPT]
 
         keys.each { |key| ENV["__#{key}"] = ENV[key] ; ENV.delete(key) }
         yield

data/lib/kitchen/provisioner/chef_base.rb

@@ -31,7 +31,7 @@ module Kitchen
       def install_command
         return nil unless config[:require_chef_omnibus]
 
-        url = "https://www.opscode.com/chef/install.sh"
+        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}"
@@ -237,7 +237,7 @@ 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.*," +
+        glob = Dir.glob("#{kitchen_root}/{metadata.rb,README.*,definitions," +
           "attributes,files,libraries,providers,recipes,resources,templates}")
 
         FileUtils.mkdir_p(cb_path)
@@ -279,7 +279,7 @@ module Kitchen
         end
 
         Kitchen.mutex.synchronize do
-          env = Librarian::Chef::Environment.new
+          env = Librarian::Chef::Environment.new(:project_path => kitchen_root)
           env.config_db.local["path"] = tmpbooks_dir
           Librarian::Action::Resolve.new(env).run
           Librarian::Action::Install.new(env).run

data/lib/kitchen/provisioner/chef_solo.rb

@@ -36,6 +36,7 @@ module Kitchen
           sudo('chef-solo'),
           "--config #{home_path}/solo.rb",
           "--json-attributes #{home_path}/dna.json",
+          config[:log_file] ? "--logfile #{config[:log_file]}" : nil,
           "--log_level #{config[:log_level]}"
         ].join(" ")
       end

data/lib/kitchen/ssh.rb

@@ -86,7 +86,7 @@ module Kitchen
     end
 
     def wait
-      logger.log("Waiting for #{hostname}:#{port}...") until test_ssh
+      logger.info("Waiting for #{hostname}:#{port}...") until test_ssh
     end
 
     def login_command
@@ -105,9 +105,28 @@ module Kitchen
     attr_reader :hostname, :username, :options, :logger
 
     def session
-      @session ||= begin
+      @session ||= establish_connection
+    end
+
+    def establish_connection
+      rescue_exceptions = [
+        Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED,
+        Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
+        Net::SSH::Disconnect
+      ]
+      retries = 3
+
+      begin
         logger.debug("[SSH] opening connection to #{self}")
         Net::SSH.start(hostname, username, options)
+      rescue *rescue_exceptions => e
+        if (retries -= 1) > 0
+          logger.info("[SSH] connection failed, retrying (#{e.inspect})")
+          retry
+        else
+          logger.warn("[SSH] connection failed, terminating (#{e.inspect})")
+          raise
+        end
       end
     end
 

data/lib/kitchen/version.rb

@@ -18,5 +18,5 @@
 
 module Kitchen
 
-  VERSION = "1.0.0.beta.2"
+  VERSION = "1.0.0.beta.3"
 end

data/spec/kitchen/driver/base_spec.rb

@@ -30,6 +30,7 @@ module Kitchen
 
       default_config :beans, "kidney"
       default_config :tunables, { 'flimflam' => 'positate' }
+      default_config :edible, true
     end
 
     class ComputedDefaults < Base
@@ -88,12 +89,15 @@ describe Kitchen::Driver::Base do
     it "uses default config" do
       driver[:beans].must_equal "kidney"
       driver[:tunables]['flimflam'].must_equal 'positate'
+      driver[:edible].must_equal true
     end
 
     it "uses user config over default config" do
       config[:beans] = "pinto"
+      config[:edible] = false
 
       driver[:beans].must_equal "pinto"
+      driver[:edible].must_equal false
     end
   end
 

data/test-kitchen.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'net-ssh'
   gem.add_dependency 'net-scp'
   gem.add_dependency 'mixlib-shellout'
-  gem.add_dependency 'safe_yaml', '~> 0.9.3'
+  gem.add_dependency 'safe_yaml', '~> 0.9.5'
 
   gem.add_development_dependency 'bundler', '~> 1.3'
   gem.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.2
+  version: 1.0.0.beta.3
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement