cucumber-chef 2.1.0.rc.4 → 2.1.0.rc.5

data/.travis.yml

@@ -4,16 +4,15 @@ rvm:
   - 1.9.2
   - 1.9.3
 
-branches:
-  only:
-    - master
-
-notifications:
-  irc:
-    - "irc.freenode.org#cucumber-chef"
+before_install:
+  - sudo apt-get -qq update
 
 before_script:
   - mkdir -p $HOME/.chef/
 
-# uncomment this line if your project needs to run something other than `rake`:
-#script: bundle exec rspec spec
+bundler_args: --binstubs
+
+script: "rake spec"
+
+notifications:
+  irc: "irc.freenode.net#jovelabs"

data/bin/cucumber-chef

@@ -514,6 +514,7 @@ class CucumberChef < Thor
       "root_dir" => Cucumber::Chef.root_dir,
       "home_dir" => Cucumber::Chef.home_dir,
       "log_file" => Cucumber::Chef.log_file,
+      "artifacts_dir" => Cucumber::Chef.artifacts_dir,
       "config_rb" => Cucumber::Chef.config_rb,
       "containers_bin" => Cucumber::Chef.containers_bin,
       "knife_rb" => Cucumber::Chef.knife_rb,

data/lib/cucumber/chef/helpers/chef_client.rb

@@ -62,12 +62,15 @@ module Cucumber::Chef::Helpers::ChefClient
     arguments = {
       "--node-name" => name,
       "--json-attributes" => File.join("/etc", "chef", "attributes.json").to_s,
-      "--log_level" => (ENV['LOG_LEVEL'] || "INFO").downcase
+      "--log_level" => @chef_client_config[:log_level],
+      "--logfile" => @chef_client_config[:log_location],
+      "--server" => @chef_client_config[:chef_server_url],
+      "--environment" => @chef_client_config[:environment]
     }.reject{ |k,v| v.nil? }.sort
 
     output = nil
     bm = ::Benchmark.realtime do
-      output = command_run_chroot(name, ["/usr/bin/chef-client", arguments, args].flatten.join(" "))
+      output = command_run_chroot(name, ["/usr/bin/chef-client", arguments, args, "--once"].flatten.join(" "))
     end
     logger.info { "Chef client run on container '#{name}' took %0.4f seconds." % bm }
 

data/lib/cucumber/chef/helpers/server.rb

@@ -25,6 +25,7 @@ module Cucumber::Chef::Helpers::Server
 
   def server_init(name)
     @containers[name] ||= Hash.new
+    @containers[name][:chef_client] = nil
   end
 
 ################################################################################

data/lib/cucumber/chef/steps/chef_steps.rb

@@ -23,11 +23,20 @@ And /^the following (databag|databags) (has|have) been (updated|uploaded):$/ do
   table.hashes.each do |entry|
     data_bag = entry['databag']
     data_bag_path = entry['databag_path']
+    $test_lab.knife_cli(%Q{data bag create "#{data_bag}"}, :silence => true)
+    $test_lab.knife_cli(%Q{data bag from file "#{data_bag}" "#{data_bag_path}"}, :silence => true)
+  end
+end
 
-    $test_lab.knife_cli(%Q{data bag from file #{data_bag} #{data_bag_path}}, :silence => true)
+And /^the following (databag|databags) (has|have) been (deleted|removed):$/ do |ignore0, ignore1, ignore2, table|
+  table.hashes.each do |entry|
+    data_bag = entry['databag']
+    $test_lab.knife_cli(%Q{data bag delete "#{data_bag}" --yes}, :silence => true)
   end
 end
 
+################################################################################
+
 And /^the following (role|roles) (has|have) been (updated|uploaded):$/ do |ignore0, ignore1, ignore2, table|
   table.hashes.each do |entry|
     role = entry['role']
@@ -43,6 +52,8 @@ And /^the following (role|roles) (has|have) been (updated|uploaded):$/ do |ignor
   end
 end
 
+################################################################################
+
 And /^the following (cookbook|cookbooks) (has|have) been (updated|uploaded):$/ do |ignore0, ignore1, ignore2, table|
   cookbooks = table.hashes.inject(Hash.new) do |memo, entry|
     cookbook = entry['cookbook']
@@ -56,6 +67,12 @@ And /^the following (cookbook|cookbooks) (has|have) been (updated|uploaded):$/ d
   end
 end
 
+And /^all of the cookbooks in "([^\"]*)" (has|have) been (updated|uploaded)$/ do |cookbook_path, ignore0, ignore1|
+  $test_lab.knife_cli(%Q{cookbook upload -a -o #{cookbook_path}}, :silence => true)
+end
+
+################################################################################
+
 And /^the following (environment|environments) (has|have) been (updated|uploaded):$/ do |ignore0, ignore1, ignore2, table|
   table.hashes.each do |entry|
     environment = entry['environment']
@@ -70,3 +87,5 @@ And /^the following (environment|environments) (has|have) been (updated|uploaded
     end
   end
 end
+
+################################################################################

data/lib/cucumber/chef/steps/provision_steps.rb

@@ -60,6 +60,7 @@ And /^"([^\"]*)" is in the "([^\"]*)" environment$/ do |name, environment|
 end
 
 And /^the chef-client has been run on "([^\"]*)"$/ do |name|
+  $test_lab.knife_cli(%Q{index rebuild --yes --verbose})
   $test_lab.drb.chef_run_client(name)
   chef_client_artifacts(name)
 end

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "2.1.0.rc.4" unless const_defined?(:VERSION)
+    VERSION = "2.1.0.rc.5" unless const_defined?(:VERSION)
 
 ################################################################################
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc.4
+  version: 2.1.0.rc.5
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef