cucumber-chef 2.1.0.rc.7 → 2.1.0.rc.8

data/lib/cucumber/chef/config.rb

@@ -165,7 +165,6 @@ module Cucumber
       mode              :user
       prerelease        (Cucumber::Chef.is_rc? ? true : false)
 
-      provider          :vagrant
       librarian_chef    false
 
       user              (ENV['OPSCODE_USER'] || ENV['USER'])
@@ -173,6 +172,18 @@ module Cucumber
       artifacts         ({"chef-client-log" => "/var/log/chef/client.log",
                           "chef-client-stacktrace" => "/var/chef/cache/chef-stacktrace.out"})
 
+      chef              ({:version => "10.18.2",
+                          :amqp_password => "p@ssw0rd1",
+                          :admin_password => "p@ssw0rd1",
+                          :render_client_rb => true})
+
+      test_lab          ({:hostname => "cucumber-chef",
+                          :tld => "test-lab"})
+
+      command_timeout   (60 * 30)
+
+      provider          :vagrant
+
       aws               ({:lab_user => "ubuntu",
                           :lxc_user => "root",
                           :ubuntu_release => "precise",
@@ -184,15 +195,6 @@ module Cucumber
       vagrant           ({:lab_user => "vagrant",
                           :lxc_user => "root"})
 
-      chef              ({:version => "10.18.2",
-                          :amqp_password => "p@ssw0rd1",
-                          :admin_password => "p@ssw0rd1"})
-
-      test_lab          ({:hostname => "cucumber-chef",
-                          :tld => "test-lab"})
-
-      command_timeout   (60 * 30)
-
 ################################################################################
 
     end

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

@@ -55,7 +55,7 @@ module Cucumber::Chef::Helpers::ChefClient
     chef_config_client(name)
 
     logger.info { "Removing artifacts #{Cucumber::Chef::Config[:artifacts].values.collect{|z| "'#{z}'" }.join(' ')}." }
-    (command_run_chroot(name, "/bin/rm -fv #{Cucumber::Chef::Config[:artifacts].values.join(' ')}") rescue nil)
+    (command_run_remote(name, "/bin/rm -fv #{Cucumber::Chef::Config[:artifacts].values.join(' ')}") rescue nil)
 
     logger.info { "Running chef client on container '#{name}'." }
 
@@ -70,7 +70,7 @@ module Cucumber::Chef::Helpers::ChefClient
 
     output = nil
     bm = ::Benchmark.realtime do
-      output = command_run_chroot(name, ["/usr/bin/chef-client", arguments, args, "--once"].flatten.join(" "))
+      output = command_run_remote(name, ["/usr/bin/chef-client", arguments, args, "--once"].flatten.join(" "))
     end
     logger.info { "Chef client run on container '#{name}' took %0.4f seconds." % bm }
 
@@ -84,23 +84,23 @@ module Cucumber::Chef::Helpers::ChefClient
     client_rb = File.join("/", container_root(name), "etc/chef/client.rb")
     FileUtils.mkdir_p(File.dirname(client_rb))
 
-    # Do not render out a chef-client config for now; we'll assume the user will
-    # use a cookbook/recipe to accomplish this to their liking.
-
-    # File.exists?(client_rb) && File.delete(client_rb)
-
-    # max_key_size = @chef_client_config.keys.collect{ |z| z.to_s.size }.max
-
-    # File.open(client_rb, 'w') do |f|
-    #   f.puts(Cucumber::Chef.generate_do_not_edit_warning("Chef Client Configuration"))
-    #   f.puts
-    #   @chef_client_config.merge(:node_name => name).each do |(key,value)|
-    #     next if value.nil?
-    #     f.puts("%-#{max_key_size}s  %s" % [key, value.inspect])
-    #   end
-    #   f.puts
-    #   f.puts("Mixlib::Log::Formatter.show_time = true")
-    # end
+    # render the chef-client client.rb if we are configured to
+    if Cucumber::Chef::Config.chef[:render_client_rb]
+      File.exists?(client_rb) && File.delete(client_rb)
+
+      max_key_size = @chef_client_config.keys.collect{ |z| z.to_s.size }.max
+
+      File.open(client_rb, 'w') do |f|
+        f.puts(Cucumber::Chef.generate_do_not_edit_warning("Chef Client Configuration"))
+        f.puts
+        @chef_client_config.merge(:node_name => name).each do |(key,value)|
+          next if value.nil?
+          f.puts("%-#{max_key_size}s  %s" % [key, value.inspect])
+        end
+        f.puts
+        f.puts("Mixlib::Log::Formatter.show_time = true")
+      end
+    end
 
     attributes_json = File.join("/", container_root(name), "etc", "chef", "attributes.json")
     FileUtils.mkdir_p(File.dirname(attributes_json))

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "2.1.0.rc.7" unless const_defined?(:VERSION)
+    VERSION = "2.1.0.rc.8" 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.7
+  version: 2.1.0.rc.8
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef