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

data/spec/spec_helper.rb

@@ -31,6 +31,7 @@ SimpleCov.start 'gem'
 require 'fakefs/safe'
 require 'minitest/autorun'
 require 'mocha/setup'
+require 'tempfile'
 
 # enable yaml symbol parsing if code is executing under guard
 if ENV['GUARD_NOTIFY']

data/support/chef-client-zero.rb

@@ -18,42 +18,58 @@
 # limitations under the License.
 
 require 'rubygems'
-require 'chef'
-require 'chef/application/client'
+require 'chef/config'
 require 'chef_zero/server'
-require 'chef_fs/chef_fs_data_store'
-require 'chef_fs/config'
-require 'tmpdir'
-
-client = Chef::Application::Client.new
-client.reconfigure
-
-data_store = ChefFS::ChefFSDataStore.new(
-  ChefFS::Config.new(Chef::Config).local_fs
-)
-
-server_opts = {
-  :host => "127.0.0.1",
-  :port => 8889,
-  :generate_real_keys => false,
-  :data_store => data_store
-}
-
-Chef::Log.info("Starting Chef Zero server in background")
-server = ChefZero::Server.new(server_opts)
-server.start_background
-at_exit do
-  Chef::Log.info("Shutting down Chef Zero server")
-  server.stop
-end
+require 'chef/chef_fs/chef_fs_data_store'
+require 'chef/chef_fs/config'
+require 'fileutils'
+
+# Bust out of our self-imposed sandbox before running chef-client so
+# gems installed via gem_package land in Chef's GEM_HOME.
+#
+# https://github.com/opscode/test-kitchen/issues/240
+#
+ENV['GEM_HOME'] = ENV['GEM_PATH'] = ENV['GEM_CACHE'] = nil
+
+class ChefClientZero
+
+  def self.start
+    new.run
+  end
+
+  def run
+    create_chef_zero_server
+    run_chef_client
+  end
 
-Dir.mktmpdir do |tmpdir|
-  File.open(File.join(tmpdir, "validation.pem"), "wb") do |f|
-    f.write(server.gen_key_pair.first)
+  private
+
+  def create_chef_zero_server
+    Chef::Config.chef_repo_path = Chef::Config.find_chef_repo_path(repo_path)
+
+    chef_fs = Chef::ChefFS::Config.new.local_fs
+    chef_fs.write_pretty_json = true
+
+    @server = ChefZero::Server.new(
+      :generate_real_keys => false,
+      :data_store => Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+    )
+    puts "-----> Starting Chef Zero server in #{chef_fs.fs_description}"
+    @server.start_background
+
+    at_exit do
+      puts "-----> Shutting down Chef Zero server"
+      @server.stop
+    end
+  end
+
+  def repo_path
+    ENV.fetch('CHEF_REPO_PATH', Dir.pwd)
+  end
+
+  def run_chef_client
+    system("chef-client", *ARGV)
   end
-  Chef::Config[:validation_key] = File.join(tmpdir, "validation.pem")
-  Chef::Config[:client_key] = File.join(tmpdir, "client.pem")
-  Chef::Config[:chef_server_url] = server.url
-  client.setup_application
-  client.run_application
 end
+
+ChefClientZero.start

data/support/dummy-validation.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA0sOY9tHvVtLZ6xmVmH8d8LrRrNcWOXbrvvCrai+T3GtRvRSL
+hksLrpOpD0L9EHM6NdThNF/eGA9Oq+UKAe6yXR0hwsKuxKXqQ8SEmlhZZ9GiuggD
+B/zYD3ItB6SGpdkRe7kQqTChQyrIXqbRkJqxoTXLyeJDF0sCyTdp3L8IZCUWodM8
+oV9TlQBJHYtG1gLUwIi8kcMVEoCn2Q8ltCj0/ftnwhTtwO52RkWA0uYOLGVayHsL
+SCFfx+ACWPU/oWCwW5/KBqb3veTv0aEg/nh0QsFzRLoTx6SRFI5dT2Nf8iiJe4WC
+UG8WKEB2G8QPnxsxfOPYDBdTJ4CXEi2e+z41VQIDAQABAoIBAALhqbW2KQ+G0nPk
+ZacwFbi01SkHx8YBWjfCEpXhEKRy0ytCnKW5YO+CFU2gHNWcva7+uhV9OgwaKXkw
+KHLeUJH1VADVqI4Htqw2g5mYm6BPvWnNsjzpuAp+BR+VoEGkNhj67r9hatMAQr0I
+itTvSH5rvd2EumYXIHKfz1K1SegUk1u1EL1RcMzRmZe4gDb6eNBs9Sg4im4ybTG6
+pPIytA8vBQVWhjuAR2Tm+wZHiy0Az6Vu7c2mS07FSX6FO4E8SxWf8idaK9ijMGSq
+FvIS04mrY6XCPUPUC4qm1qNnhDPpOr7CpI2OO98SqGanStS5NFlSFXeXPpM280/u
+fZUA0AECgYEA+x7QUnffDrt7LK2cX6wbvn4mRnFxet7bJjrfWIHf+Rm0URikaNma
+h0/wNKpKBwIH+eHK/LslgzcplrqPytGGHLOG97Gyo5tGAzyLHUWBmsNkRksY2sPL
+uHq6pYWJNkqhnWGnIbmqCr0EWih82x/y4qxbJYpYqXMrit0wVf7yAgkCgYEA1twI
+gFaXqesetTPoEHSQSgC8S4D5/NkdriUXCYb06REcvo9IpFMuiOkVUYNN5d3MDNTP
+IdBicfmvfNELvBtXDomEUD8ls1UuoTIXRNGZ0VsZXu7OErXCK0JKNNyqRmOwcvYL
+JRqLfnlei5Ndo1lu286yL74c5rdTLs/nI2p4e+0CgYB079ZmcLeILrmfBoFI8+Y/
+gJLmPrFvXBOE6+lRV7kqUFPtZ6I3yQzyccETZTDvrnx0WjaiFavUPH27WMjY01S2
+TMtO0Iq1MPsbSrglO1as8MvjB9ldFcvp7gy4Q0Sv6XT0yqJ/S+vo8Df0m+H4UBpU
+f5o6EwBSd/UQxwtZIE0lsQKBgQCswfjX8Eg8KL/lJNpIOOE3j4XXE9ptksmJl2sB
+jxDnQYoiMqVO808saHVquC/vTrpd6tKtNpehWwjeTFuqITWLi8jmmQ+gNTKsC9Gn
+1Pxf2Gb67PqnEpwQGln+TRtgQ5HBrdHiQIi+5am+gnw89pDrjjO5rZwhanAo6KPJ
+1zcPNQKBgQDxFu8v4frDmRNCVaZS4f1B6wTrcMrnibIDlnzrK9GG6Hz1U7dDv8s8
+Nf4UmeMzDXjlPWZVOvS5+9HKJPdPj7/onv8B2m18+lcgTTDJBkza7R1mjL1Cje/Z
+KcVGsryKN6cjE7yCDasnA7R2rVBV/7NWeJV77bmzT5O//rW4yIfUIg==
+-----END RSA PRIVATE KEY-----

data/templates/init/kitchen.yml.erb

@@ -1,27 +1,15 @@
 ---
-driver_plugin: <%= config[:driver_plugin] %>
-driver_config:
-  require_chef_omnibus: true
+driver: <%= config[:driver_plugin] %>
+provisioner: <%= config[:provisioner] %>
 
 platforms:
-- name: ubuntu-12.04
-  driver_config:
-    box: opscode-ubuntu-12.04
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
-- name: ubuntu-10.04
-  driver_config:
-    box: opscode-ubuntu-10.04
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box
-- name: centos-6.4
-  driver_config:
-    box: opscode-centos-6.4
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box
-- name: centos-5.9
-  driver_config:
-    box: opscode-centos-5.9
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box
+  - name: ubuntu-12.04
+  - name: centos-6.4
 
 suites:
-- name: default
-  run_list: <%= config[:run_list].inspect %>
-  attributes: {}
+  - name: default
+    run_list:
+<% config[:run_list].each do |recipe| -%>
+      - <%= recipe %>
+<% end -%>
+    attributes:

data/test-kitchen.gemspec

@@ -25,14 +25,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'net-ssh',         '~> 2.7'
   gem.add_dependency 'safe_yaml',       '~> 0.9'
   gem.add_dependency 'thor',            '~> 0.18'
-  gem.add_dependency 'buff-ignore',     '~> 1.1'
 
   gem.add_development_dependency 'bundler',   '~> 1.3'
   gem.add_development_dependency 'rake'
 
   gem.add_development_dependency 'aruba',     '~> 0.5'
   gem.add_development_dependency 'fakefs',    '~> 0.4'
-  gem.add_development_dependency 'minitest',  '~> 4.7'
+  gem.add_development_dependency 'minitest',  '~> 5'
   gem.add_development_dependency 'mocha',     '~> 0.14'
 
   gem.add_development_dependency 'cane',      '~> 2.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.4
+  version: 1.0.0.rc.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -80,20 +80,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.18'
-- !ruby/object:Gem::Dependency
-  name: buff-ignore
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -286,6 +272,7 @@ files:
 - features/kitchen_init_command.feature
 - features/sink_command.feature
 - features/step_definitions/gem_steps.rb
+- features/step_definitions/git_steps.rb
 - features/support/env.rb
 - lib/kitchen.rb
 - lib/kitchen/busser.rb
@@ -293,6 +280,7 @@ files:
 - lib/kitchen/collection.rb
 - lib/kitchen/color.rb
 - lib/kitchen/config.rb
+- lib/kitchen/data_munger.rb
 - lib/kitchen/driver.rb
 - lib/kitchen/driver/base.rb
 - lib/kitchen/driver/dummy.rb
@@ -302,6 +290,7 @@ files:
 - lib/kitchen/generator/driver_create.rb
 - lib/kitchen/generator/init.rb
 - lib/kitchen/instance.rb
+- lib/kitchen/lazy_hash.rb
 - lib/kitchen/loader/yaml.rb
 - lib/kitchen/logger.rb
 - lib/kitchen/logging.rb
@@ -310,9 +299,12 @@ files:
 - lib/kitchen/platform.rb
 - lib/kitchen/provisioner.rb
 - lib/kitchen/provisioner/base.rb
+- lib/kitchen/provisioner/chef/berkshelf.rb
+- lib/kitchen/provisioner/chef/librarian.rb
 - lib/kitchen/provisioner/chef_base.rb
 - lib/kitchen/provisioner/chef_solo.rb
 - lib/kitchen/provisioner/chef_zero.rb
+- lib/kitchen/provisioner/dummy.rb
 - lib/kitchen/rake_tasks.rb
 - lib/kitchen/shell_out.rb
 - lib/kitchen/ssh.rb
@@ -325,17 +317,22 @@ files:
 - spec/kitchen/collection_spec.rb
 - spec/kitchen/color_spec.rb
 - spec/kitchen/config_spec.rb
+- spec/kitchen/data_munger_spec.rb
 - spec/kitchen/driver/base_spec.rb
 - spec/kitchen/driver/dummy_spec.rb
 - spec/kitchen/driver_spec.rb
 - spec/kitchen/instance_spec.rb
+- spec/kitchen/lazy_hash_spec.rb
 - spec/kitchen/loader/yaml_spec.rb
 - spec/kitchen/platform_spec.rb
+- spec/kitchen/provisioner/base_spec.rb
+- spec/kitchen/provisioner_spec.rb
 - spec/kitchen/state_file_spec.rb
 - spec/kitchen/suite_spec.rb
 - spec/kitchen/util_spec.rb
 - spec/spec_helper.rb
 - support/chef-client-zero.rb
+- support/dummy-validation.pem
 - templates/driver/CHANGELOG.md.erb
 - templates/driver/Gemfile.erb
 - templates/driver/README.md.erb
@@ -383,16 +380,21 @@ test_files:
 - features/kitchen_init_command.feature
 - features/sink_command.feature
 - features/step_definitions/gem_steps.rb
+- features/step_definitions/git_steps.rb
 - features/support/env.rb
 - spec/kitchen/collection_spec.rb
 - spec/kitchen/color_spec.rb
 - spec/kitchen/config_spec.rb
+- spec/kitchen/data_munger_spec.rb
 - spec/kitchen/driver/base_spec.rb
 - spec/kitchen/driver/dummy_spec.rb
 - spec/kitchen/driver_spec.rb
 - spec/kitchen/instance_spec.rb
+- spec/kitchen/lazy_hash_spec.rb
 - spec/kitchen/loader/yaml_spec.rb
 - spec/kitchen/platform_spec.rb
+- spec/kitchen/provisioner/base_spec.rb
+- spec/kitchen/provisioner_spec.rb
 - spec/kitchen/state_file_spec.rb
 - spec/kitchen/suite_spec.rb
 - spec/kitchen/util_spec.rb