test-kitchen 1.0.0.alpha.6 → 1.0.0.alpha.7

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 1.0.0.alpha.7 / 2013-05-23
+
+### New features
+
+* Pull request [#90][], issue [#31][]: Add a global user-level config file, located at `~/.kitchen/config.yml`. ([@thommay][])
+* Pull request [#102][]: Allow a way to override remote sudo. ([@calavera][])
+* Propagate default\_config from base driver classes into subclasses. ([@fnichol][])
+* Pull request [#120][]: Add http and https_proxy support. ([@adamhjk][])
+* Pull request [#111][]: Sink. Yeah, that one. ([@sethvargo][])
+
+### Bug fixes
+
+* Pull request [#99][], issue [#98][]: Ensure that destroy option is respected when --parallel is used. ([@stevendanna][])
+* Pull request [#116][]: Require the 'name' attribute is present in `metadata.rb`. ([@sethvargo][])
+* Pull request [#113][]: Handle case where YAML parses as nil. ([@smith][])
+* Pass original exception's backtrace to InstanceFailure and ActionFailed. ([@fnichol][])
+* Fix bug where action failures are swallowed with a nil inside an ensure. ([@fnichol][])
+
+### Improvements
+
+* Pull request [#104][]: Set the default ssh port in Driver::SSHBase. ([@calavera][])
+* Pull request [#114][]: Update kitchen.yml template with provisionerless baseboxes. ([@jtimberman][])
+* Pull request [#119][]: Test Kitchen works on Windows with Vagrant. ([@adamhjk][])
+* Pull request [#108][]: Add version string to "Starting Kitchen" logging output. ([@fnichol][])
+* Pull request [#105][]: Expand documentation around run-time switches in README. ([@grahamc][])
+
+
 ## 1.0.0.alpha.6 / 2013-05-08
 
 ### New features
@@ -97,6 +124,7 @@
 The initial release.
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
+[#31]: https://github.com/opscode/test-kitchen/issues/31
 [#61]: https://github.com/opscode/test-kitchen/issues/61
 [#64]: https://github.com/opscode/test-kitchen/issues/64
 [#65]: https://github.com/opscode/test-kitchen/issues/65
@@ -109,10 +137,31 @@ The initial release.
 [#81]: https://github.com/opscode/test-kitchen/issues/81
 [#82]: https://github.com/opscode/test-kitchen/issues/82
 [#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
+[#98]: https://github.com/opscode/test-kitchen/issues/98
+[#99]: https://github.com/opscode/test-kitchen/issues/99
+[#102]: https://github.com/opscode/test-kitchen/issues/102
+[#104]: https://github.com/opscode/test-kitchen/issues/104
+[#105]: https://github.com/opscode/test-kitchen/issues/105
+[#108]: https://github.com/opscode/test-kitchen/issues/108
+[#111]: https://github.com/opscode/test-kitchen/issues/111
+[#113]: https://github.com/opscode/test-kitchen/issues/113
+[#114]: https://github.com/opscode/test-kitchen/issues/114
+[#116]: https://github.com/opscode/test-kitchen/issues/116
+[#119]: https://github.com/opscode/test-kitchen/issues/119
+[#120]: https://github.com/opscode/test-kitchen/issues/120
 [@ChrisLundquist]: https://github.com/ChrisLundquist
+[@adamhjk]: https://github.com/adamhjk
 [@arunthampi]: https://github.com/arunthampi
 [@bryanwb]: https://github.com/bryanwb
+[@calavera]: https://github.com/calavera
 [@fnichol]: https://github.com/fnichol
+[@grahamc]: https://github.com/grahamc
+[@jtimberman]: https://github.com/jtimberman
 [@mattray]: https://github.com/mattray
 [@reset]: https://github.com/reset
+[@sethvargo]: https://github.com/sethvargo
+[@smith]: https://github.com/smith
+[@stevendanna]: https://github.com/stevendanna
+[@thommay]: https://github.com/thommay

data/Gemfile

@@ -7,7 +7,3 @@ group :development do
   gem 'rb-fsevent', :require => false
   gem 'rb-fchange', :require => false
 end
-
-group :test do
-  gem 'rake', '~> 0.9'
-end

data/README.md

@@ -56,6 +56,17 @@ your tests in parallel. Trust us, it's faster!
 
     $ bundle exec kitchen test
 
+### Helpful Switches
+
+ - `--destroy=always|passed|never`
+   - `passed` (default): destroy the machine after a successful test
+     run (which implies passing tests.)
+   - `never`: Never clean up builds, even if they pass or fail.
+   - `always`: Regardless of the success or failure of the build,
+     destroy the machine.
+ - `--log-level=debug|info|warn|error|fatal` - Set the log-level of
+     the entire stack, including the chef-solo run. 
+
 ## The Kitchen YAML format
 
 Test-Kitchen reads its configuration from the .kitchen.yml
@@ -112,7 +123,7 @@ suites:
         default_ruby: 1.8.7
 ```
 
-## Overriding .kitchen.yaml with .kitchen.<driver>.local.yml
+## Overriding .kitchen.yaml with .kitchen.&lt;driver&gt;.local.yml
 
 TODO
 

data/features/sink_command.feature

@@ -0,0 +1,30 @@
+Feature: The `kitchen sink` command
+  In order to have fun and provide an Easter Egg for users
+  As a Test Kitchen user
+  I want a `sink` command that displays ASCII art
+
+  Scenario: Displaying help
+    When I run `kitchen help`
+    Then the exit status should be 0
+    And the output should not contain "kitchen sink"
+
+  Scenario: Displaying the sink
+    When I run `kitchen sink`
+    Then the exit status should be 0
+    And the output should contain:
+      """
+                          ___
+                         ' _ '.
+                       / /` `\ \
+                       | |   [__]
+                       | |    {{
+                       | |    }}
+                    _  | |  _ {{
+        ___________<_>_| |_<_>}}________
+            .=======^=(___)=^={{====.
+           / .----------------}}---. \
+          / /                 {{    \ \
+         / /                  }}     \ \
+        (  '========================='  )
+         '-----------------------------'
+      """

data/lib/kitchen/busser.rb

@@ -55,11 +55,12 @@ module Kitchen
         nil
       else
         <<-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
           fi
           #{sudo}#{ruby_binpath}/busser setup
-          #{sudo}#{busser_bin} plugin install #{plugins.join(' ')}
+          #{sudo}#{busser_bin} plugin install #{plugins.join(' ')}'
         INSTALL_CMD
       end
     end
@@ -77,8 +78,9 @@ module Kitchen
         nil
       else
         <<-INSTALL_CMD.gsub(/^ {10}/, '')
+          bash -c '
           #{sudo}#{busser_bin} suite cleanup
-          #{local_suite_files.map { |f| stream_file(f, remote_file(f)) }.join}
+          #{local_suite_files.map { |f| stream_file(f, remote_file(f)) }.join}'
         INSTALL_CMD
       end
     end
@@ -142,7 +144,7 @@ module Kitchen
     end
 
     def sudo
-      @use_sudo ? "sudo " : ""
+      @use_sudo ? "sudo -E " : ""
     end
 
     def ruby_binpath

data/lib/kitchen/chef_data_uploader.rb

@@ -72,7 +72,7 @@ module Kitchen
       cookbooks_dir = local_cookbooks
       upload_path(scp, cookbooks_dir, "cookbooks")
     ensure
-      FileUtils.rmtree(cookbooks_dir)
+      FileUtils.rmtree(cookbooks_dir) unless cookbooks_dir.nil?
     end
 
     def upload_data_bags(scp)
@@ -138,11 +138,16 @@ module Kitchen
     end
 
     def run_resolver(name, bin, tmpdir)
-      begin
-        run_command "if ! command -v #{bin} >/dev/null; then exit 1; fi"
-      rescue Kitchen::ShellOut::ShellCommandFailed
-        fatal("#{name} must be installed, add it to your Gemfile.")
-        raise UserError, "#{bin} command not found"
+      # Just going to have to take your chances on Windows - no way to
+      # check for a command without running it, and looking for an
+      # exit code. Good times.
+      if RUBY_PLATFORM !~ /mswin|mingw/
+        begin
+          run_command "if ! command -v #{bin} >/dev/null; then exit 1; fi"
+        rescue Kitchen::ShellOut::ShellCommandFailed
+          fatal("#{name} must be installed, add it to your Gemfile.")
+          raise UserError, "#{bin} command not found"
+        end
       end
 
       Kitchen.mutex.synchronize do
@@ -157,7 +162,10 @@ module Kitchen
 
     def cp_this_cookbook(tmpdir)
       metadata_rb = File.join(kitchen_root, "metadata.rb")
-      cb_name = MetadataChopper.extract(metadata_rb).first
+      cb_name = MetadataChopper.extract(metadata_rb).first or raise(UserError,
+        "The metadata.rb does not define the 'name' key." +
+          " Please add: `name '<cookbook_name>'` to metadata.rb and try again")
+
       cb_path = File.join(tmpdir, cb_name)
       glob = Dir.glob("#{kitchen_root}/{metadata.rb,README.*," +
         "attributes,files,libraries,providers,recipes,resources,templates}")

data/lib/kitchen/cli.rb

@@ -100,7 +100,7 @@ module Kitchen
       end
 
       update_config!
-      banner "Starting Kitchen"
+      banner "Starting Kitchen (v#{Kitchen::VERSION})"
       elapsed = Benchmark.measure do
         ensure_initialized
         destroy_mode = options[:destroy].to_sym
@@ -137,6 +137,29 @@ module Kitchen
     end
     map %w(-v --version) => :version
 
+    desc "sink", "Show the Kitchen sink!", :hide => true
+    def sink
+      say [
+        "",
+        "                    ___              ",
+        "                   ' _ '.            ",
+        "                 / /` `\\ \\         ",
+        "                 | |   [__]          ",
+        "                 | |    {{           ",
+        "                 | |    }}           ",
+        "              _  | |  _ {{           ",
+        "  ___________<_>_| |_<_>}}________   ",
+        "      .=======^=(___)=^={{====.      ",
+        "     / .----------------}}---. \\    ",
+        "    / /                 {{    \\ \\  ",
+        "   / /                  }}     \\ \\ ",
+        "  (  '========================='  )  ",
+        "   '-----------------------------'   ",
+        "                                     ",  # necessary newline
+        ""
+      ].map(&:rstrip).join("\n")
+    end
+
     desc "console", "Kitchen Console!"
     def console
       require 'pry'
@@ -245,7 +268,7 @@ module Kitchen
 
     def exec_action(action)
       update_config!
-      banner "Starting Kitchen"
+      banner "Starting Kitchen (v#{Kitchen::VERSION})"
       elapsed = Benchmark.measure do
         @task = action
         results = parse_subcommand(args.first)
@@ -259,7 +282,7 @@ module Kitchen
     end
 
     def run_parallel(instances, *args)
-      futures = Array(instances).map { |i| i.future.public_send(task) }
+      futures = Array(instances).map { |i| i.future.public_send(task, *args) }
       futures.map { |i| i.value }
     end
 

data/lib/kitchen/driver/base.rb

@@ -167,7 +167,17 @@ module Kitchen
       end
 
       def self.defaults
-        @defaults ||= Hash.new
+        @defaults ||= Hash.new.merge(super_defaults)
+      end
+
+      def self.super_defaults
+        klass = self.superclass
+
+        if klass.respond_to?(:defaults)
+          klass.defaults
+        else
+          Hash.new
+        end
       end
 
       def self.default_config(attr, value)

data/lib/kitchen/driver/ssh_base.rb

@@ -31,6 +31,9 @@ module Kitchen
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class SSHBase < Base
 
+      default_config :sudo, true
+      default_config :port, 22
+
       def create(state)
         raise ClientError, "#{self.class}#create must be implemented"
       end
@@ -117,9 +120,9 @@ module Kitchen
           if [ ! -d "/opt/chef" ] || should_update_chef ; then
             echo "-----> Installing Chef Omnibus (#{flag})"
             if command -v wget >/dev/null ; then
-              wget #{url} -O - | sudo bash #{version}
+              wget #{url} -O - | #{cmd('bash')} #{version}
             elif command -v curl >/dev/null ; then
-              curl -sSL #{url} | sudo bash #{version}
+              curl -sSL #{url} | #{cmd('bash')} #{version}
             else
               echo ">>>>>> Neither wget nor curl found on this instance."
               exit 1
@@ -129,7 +132,7 @@ module Kitchen
       end
 
       def prepare_chef_home(ssh_args)
-        ssh(ssh_args, "sudo rm -rf #{chef_home} && mkdir -p #{chef_home}/cache")
+        ssh(ssh_args, "#{cmd('rm')} -rf #{chef_home} && mkdir -p #{chef_home}/cache")
       end
 
       def upload_chef_data(ssh_args)
@@ -140,12 +143,23 @@ module Kitchen
 
       def run_chef_solo(ssh_args)
         ssh(ssh_args, <<-RUN_SOLO)
-          sudo chef-solo -c #{chef_home}/solo.rb -j #{chef_home}/dna.json \
+          #{cmd('chef-solo')} -c #{chef_home}/solo.rb -j #{chef_home}/dna.json \
             --log_level #{Util.from_logger_level(logger.level)}
         RUN_SOLO
       end
 
       def ssh(ssh_args, cmd)
+        env = "env"
+        if config[:http_proxy]
+          env << " http_proxy=#{config[:http_proxy]}"
+        end
+        if config[:https_proxy]
+          env << " https_proxy=#{config[:https_proxy]}"
+        end
+        if env != "env"
+          cmd = "#{env} #{cmd}"
+        end
+
         debug("[SSH] #{ssh_args[1]}@#{ssh_args[0]} (#{cmd})")
         Net::SSH.start(*ssh_args) do |ssh|
           exit_code = ssh_exec_with_exit!(ssh, cmd)
@@ -201,6 +215,10 @@ module Kitchen
       ensure
         socket && socket.close
       end
+
+      def cmd(script)
+        config[:sudo] ? "sudo -E #{script}" : script
+      end
     end
   end
 end

data/lib/kitchen/instance.rb

@@ -262,12 +262,13 @@ module Kitchen
       elapsed
     rescue ActionFailed => e
       log_failure(what, e)
-      raise InstanceFailure, failure_message(what) +
-        "  Please see .kitchen/logs/#{self.name}.log for more details", caller
+      raise(InstanceFailure, failure_message(what) +
+        "  Please see .kitchen/logs/#{self.name}.log for more details",
+        e.backtrace)
     rescue Exception => e
       log_failure(what, e)
       raise ActionFailed,
-        "Failed to complete ##{what} action: [#{e.message}]", caller
+        "Failed to complete ##{what} action: [#{e.message}]", e.backtrace
     ensure
       state_file.write(state)
     end

data/lib/kitchen/loader/yaml.rb

@@ -47,6 +47,7 @@ module Kitchen
         @config_file = File.expand_path(config_file || default_config_file)
         @process_erb = options.fetch(:process_erb, true)
         @process_local = options.fetch(:process_local, true)
+        @process_global = options.fetch(:process_global, true)
       end
 
       # Reads, parses, and merges YAML configuration files and returns a Hash
@@ -68,7 +69,8 @@ module Kitchen
       end
 
       def combined_hash
-        @process_local ? yaml.rmerge(local_yaml) : yaml
+        y = @process_local ? yaml.rmerge(local_yaml) : yaml
+        @process_global ? y.rmerge(global_yaml) : y
       rescue NoMethodError
         raise UserError, "Error merging #{File.basename(config_file)} and" +
           "#{File.basename(local_config_file)}"
@@ -82,6 +84,10 @@ module Kitchen
         parse_yaml_string(yaml_string(local_config_file), local_config_file)
       end
 
+      def global_yaml
+        parse_yaml_string(yaml_string(global_config_file), global_config_file)
+      end
+
       def yaml_string(file)
         string = read_file(file)
 
@@ -96,10 +102,14 @@ module Kitchen
         config_file.sub(/(#{File.extname(config_file)})$/, '.local\1')
       end
 
+      def global_config_file
+        File.join(File.expand_path(ENV["HOME"]), ".kitchen", "config.yml")
+      end
+
       def parse_yaml_string(string, file_name)
         return Hash.new if string.nil? || string.empty?
 
-        ::YAML.safe_load(string)
+        ::YAML.safe_load(string) || Hash.new
       rescue SyntaxError, Psych::SyntaxError
         raise UserError, "Error parsing #{file_name}"
       end

data/lib/kitchen/shell_out.rb

@@ -60,7 +60,7 @@ module Kitchen
     def run_command(cmd, options = {})
       use_sudo = options[:use_sudo].nil? ? false : options[:use_sudo]
       quiet = options[:quiet]
-      cmd = "sudo #{cmd}" if use_sudo
+      cmd = "sudo -E #{cmd}" if use_sudo
       subject = "[#{options[:log_subject] || "local"} command]"
 
       info("#{subject} BEGIN (#{display_cmd(cmd)})") unless quiet

data/lib/kitchen/util.rb

@@ -93,6 +93,7 @@ module Kitchen
     # @param total [Integer] the total number of seconds
     # @return [String] a formatted string of the form (XmYY.00s)
     def self.duration(total)
+      total = 0 if total.nil?
       minutes = (total / 60).to_i
       seconds = (total - (minutes * 60))
       "(%dm%.2fs)" % [minutes, seconds]

data/lib/kitchen/version.rb

@@ -18,5 +18,5 @@
 
 module Kitchen
 
-  VERSION = "1.0.0.alpha.6"
+  VERSION = "1.0.0.alpha.7"
 end

data/spec/kitchen/loader/yaml_spec.rb

@@ -83,6 +83,28 @@ describe Kitchen::Loader::YAML do
       })
     end
 
+    it "deep merges in a global config file with all other configs" do
+      stub_yaml!(".kitchen.yml", {
+        'common' => { 'xx' => 1 },
+        'a' => 'b'
+      })
+      stub_yaml!(".kitchen.local.yml", {
+        'common' => { 'yy' => 2 },
+        'c' => 'd'
+      })
+      stub_global!({
+        'common' => { 'zz' => 3 },
+        'e' => 'f'
+      })
+
+      loader.read.must_equal({
+        :a => 'b',
+        :c => 'd',
+        :e => 'f',
+        :common => { :xx => 1, :yy => 2, :zz => 3 }
+      })
+    end
+
     it "merges kitchen.local.yml over configuration in kitchen.yml" do
       stub_yaml!(".kitchen.yml", {
         'common' => { 'thekey' => 'nope' }
@@ -94,6 +116,20 @@ describe Kitchen::Loader::YAML do
       loader.read.must_equal({ :common => { :thekey => 'yep' } })
     end
 
+    it "merges global config over both kitchen.local.yml and kitchen.yml" do
+      stub_yaml!(".kitchen.yml", {
+        'common' => { 'thekey' => 'nope' }
+      })
+      stub_yaml!(".kitchen.local.yml", {
+        'common' => { 'thekey' => 'yep' }
+      })
+      stub_global!({
+        'common' => { 'thekey' => 'kinda' }
+      })
+
+      loader.read.must_equal({ :common => { :thekey => 'kinda' } })
+    end
+
     it "handles a kitchen.local.yml with no yaml elements" do
       stub_yaml!(".kitchen.yml", {
         'a' => 'b'
@@ -112,6 +148,15 @@ describe Kitchen::Loader::YAML do
       loader.read.must_equal({ :a => 'b' })
     end
 
+    it "handles a kitchen.yml with yaml elements that parse as nil" do
+      stub_yaml!(".kitchen.yml", nil)
+      stub_yaml!(".kitchen.local.yml", {
+        'a' => 'b'
+      })
+
+      loader.read.must_equal({ :a => 'b' })
+    end
+
     it "raises an UserError if the config_file does not exist" do
       proc { loader.read }.must_raise Kitchen::UserError
     end
@@ -239,12 +284,34 @@ describe Kitchen::Loader::YAML do
 
       loader.read.must_equal({ :a => 'b' })
     end
+
+    it "skips the global config if disabled" do
+      loader = Kitchen::Loader::YAML.new(
+        '/tmp/.kitchen.yml', :process_global => false)
+      stub_yaml!(".kitchen.yml", {
+        'a' => 'b'
+      })
+      stub_global!({
+        'superawesomesauceadditions' => 'enabled, yo'
+      })
+
+      loader.read.must_equal({ :a => 'b' })
+    end
   end
 
   private
 
+  def stub_file(path, hash)
+    FileUtils.mkdir_p(File.dirname(path))
+    File.open(path, "wb") { |f| f.write(hash.to_yaml) }
+  end
+
   def stub_yaml!(name = ".kitchen.yml", hash)
-    FileUtils.mkdir_p "/tmp"
-    File.open("/tmp/#{name}", "wb") { |f| f.write(hash.to_yaml) }
+    stub_file(File.join("/tmp", name), hash)
+  end
+
+  def stub_global!(hash)
+    stub_file(File.join(File.expand_path(ENV["HOME"]),
+      ".kitchen", "config.yml"), hash)
   end
 end

data/spec/kitchen/util_spec.rb

@@ -92,6 +92,10 @@ describe Kitchen::Util do
 
   describe ".duration" do
 
+    it "turns nil into a zero" do
+      Kitchen::Util.duration(nil).must_equal "(0m0.00s)"
+    end
+
     it "formats seconds to 2 digits" do
       Kitchen::Util.duration(60).must_equal "(1m0.00s)"
     end

data/templates/init/kitchen.yml.erb

@@ -1,24 +1,25 @@
 ---
 driver_plugin: <%= config[:driver_plugin] %>
+driver_config:
+  require_chef_omnibus: true
 
 platforms:
 - name: ubuntu-12.04
   driver_config:
-    box: canonical-ubuntu-12.04
-    box_url: http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box
-    require_chef_omnibus: true
+    box: opscode-ubuntu-12.04
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
 - name: ubuntu-10.04
   driver_config:
     box: opscode-ubuntu-10.04
-    box_url: http://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box
-- name: centos-6.3
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box
+- name: centos-6.4
   driver_config:
-    box: opscode-centos-6.3
-    box_url: http://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.3_chef-11.2.0.box
-- name: centos-5.8
+    box: opscode-centos-6.4
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box
+- name: centos-5.9
   driver_config:
-    box: opscode-centos-5.8
-    box_url: http://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.8_chef-11.2.0.box
+    box: opscode-centos-5.9
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box
 
 suites:
 - name: default

data/test-kitchen.gemspec

@@ -28,7 +28,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'mixlib-shellout'
   gem.add_dependency 'safe_yaml'
 
-  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'bundler', '~> 1.3'
+  gem.add_development_dependency 'rake'
+
+  gem.add_development_dependency 'minitest', '~> 4.7'
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'fakefs'
   gem.add_development_dependency 'guard-minitest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.6
+  version: 1.0.0.alpha.7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -124,7 +124,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -139,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -337,6 +369,7 @@ files:
 - features/kitchen_driver_create_command.feature
 - features/kitchen_driver_discover_command.feature
 - features/kitchen_init_command.feature
+- features/sink_command.feature
 - features/step_definitions/gem_steps.rb
 - features/support/env.rb
 - lib/kitchen.rb
@@ -427,6 +460,7 @@ test_files:
 - features/kitchen_driver_create_command.feature
 - features/kitchen_driver_discover_command.feature
 - features/kitchen_init_command.feature
+- features/sink_command.feature
 - features/step_definitions/gem_steps.rb
 - features/support/env.rb
 - spec/kitchen/collection_spec.rb