cucumber-chef 2.0.7 → 2.1.0.rc.0

data/README.md

@@ -26,7 +26,7 @@ Cucumber-Chef - A test driven infrastructure system
 
 * Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
 * Author: Zachary Patten <zachary@jovelabs.com>
-* Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+* Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 * License: Apache License, Version 2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");

data/Rakefile

@@ -2,7 +2,7 @@
 #
 #      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");

data/bin/cc-knife

@@ -1,21 +1,18 @@
 #!/usr/bin/env ruby
 require 'cucumber-chef'
 
-$logger = ZTK::Logger.new(Cucumber::Chef.log_file)
-Cucumber::Chef.is_rc? and ($logger.level = ZTK::Logger::DEBUG)
-
 # if we have bundler binstubs use that; otherwise attempt to detect
 knife = (Cucumber::Chef.locate(:file, "bin", "knife") rescue nil)
 knife = "/usr/bin/env knife" unless knife
 
 message = "cc-knife v#{Cucumber::Chef::VERSION}"
 puts(message)
-$logger.info { message }
+Cucumber::Chef.logger.info { message }
 
 Cucumber::Chef::Config.load
 if (test_lab = Cucumber::Chef::TestLab.new) && (test_lab.labs_running.count > 0)
 
-  knife_rb = Cucumber::Chef.locate(:file, ".cucumber-chef", "knife.rb")
+  knife_rb = Cucumber::Chef.knife_rb
   if File.exists?(knife_rb)
     command = [knife, ARGV, "--server-url http://#{test_lab.labs_running.first.public_ip_address}:4000", "--config #{knife_rb}", "2>&1"].flatten.compact.join(" ")
     puts(command)

data/bin/cc-push

@@ -1,38 +1,62 @@
 #!/usr/bin/env ruby
 require 'cucumber-chef'
 
-def run(command)
-  puts "Executing: '#{command}'"
-  @ssh.exec(command)
+def run_remote(command)
+  $logger.info { "cc-push(run_remote): '#{command}'" }
+  $test_lab.ssh.exec(command)
 end
 
-$logger = ZTK::Logger.new(Cucumber::Chef.log_file)
-Cucumber::Chef.is_rc? and ($logger.level = ZTK::Logger::DEBUG)
-
-message = "cc-push v#{Cucumber::Chef::VERSION}"
-puts(message)
-$logger.info { message }
+def run_local(command)
+  $logger.info { "cc-push(run_local): '#{command}'" }
+  %x(#{command})
+end
 
-Cucumber::Chef::Config.load
-if (test_lab = Cucumber::Chef::TestLab.new) && (test_lab.labs_running.count > 0)
-  @ssh = ZTK::SSH.new
-  @ssh.config.host_name = test_lab.labs_running.first.public_ip_address
-  @ssh.config.user = "ubuntu"
-  @ssh.config.keys = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{@ssh.config.user}")
+tag = Cucumber::Chef.tag("cc-push")
+puts(tag)
+Cucumber::Chef.load_config(tag)
+$logger = Cucumber::Chef.logger
 
+if ($test_lab = Cucumber::Chef::TestLab.new) && ($test_lab.labs_running.count > 0)
   gem_name = "cucumber-chef-#{Cucumber::Chef::VERSION}.gem"
-
-  puts %x(cd #{Cucumber::Chef.root} && gem build cucumber-chef.gemspec -V)
-
-  local_file = File.join(Cucumber::Chef.root, gem_name)
-  remote_file = File.join("/", "home", @ssh.config.user, gem_name)
-  puts("#{local_file} -> #{@ssh.config.user}@#{test_lab.labs_running.first.public_ip_address}:#{remote_file}")
-  @ssh.upload(local_file, remote_file)
-  FileUtils.rm_f(File.join(Cucumber::Chef.root, "*.gem"))
-
-  run("cd #{File.dirname(remote_file)}; ls -la | grep 'cucumber-chef-'; sudo gem uninstall cucumber-chef -a -I -x -V; rm -f /usr/lib/ruby/gems/1.8/cache/#{gem_name}; sudo gem install #{gem_name} -l -V; rm -f *.gem")
+  gem_path = File.join(Cucumber::Chef.root, gem_name)
+
+  $logger.info { "gem_name == '#{gem_name}'" }
+  $logger.info { "gem_path == '#{gem_path}'" }
+
+  if !File.exists?(gem_path)
+    puts
+    puts("To build cucumber-chef and install the gem in to the test lab, execute:")
+    puts
+    puts [ "cd #{Cucumber::Chef.root}", "gem build cucumber-chef.gemspec", "cd #{Dir.pwd}", "bundle exec cc-push" ].join(" ; ")
+    puts
+  else
+    local_file = File.join(Cucumber::Chef.root, gem_name)
+    remote_file = File.join("/", "home", $test_lab.ssh.config.user, gem_name)
+    $logger.info { "#{local_file} -> #{$test_lab.ssh.config.user}@#{$test_lab.labs_running.first.public_ip_address}:#{remote_file}" }
+
+    $test_lab.ssh.upload(local_file, remote_file)
+    FileUtils.rm_f(File.join(Cucumber::Chef.root, "*.gem"))
+
+    run_remote(<<-EOH
+sudo /bin/bash -c '
+cd #{File.dirname(remote_file)}
+
+gem uninstall ztk --all --ignore-dependencies --executables --verbose --backtrace
+gem cleanup ztk --verbose --backtrace
+gem install ztk --verbose --backtrace
+
+ls -la | grep 'cucumber-chef-'
+gem uninstall cucumber-chef --all --ignore-dependencies --executables --verbose --backtrace
+rm -fv /usr/lib/ruby/gems/1.8/cache/#{gem_name}
+gem cleanup cucumber-chef --verbose --backtrace
+gem install #{gem_name} --local --verbose --backtrace
+rm -fv /home/#{$test_lab.ssh.config.user}/*.gem'
+EOH
+    )
+    File.exists?(gem_path) && File.delete(gem_path)
+  end
 
 else
-  puts("No running cucumber-chef test labs to connect to!")
+  puts("No run_remotening cucumber-chef test labs to connect to!")
   exit(1)
 end

data/bin/cc-server

@@ -27,24 +27,23 @@ class FrontObject
   include Cucumber::Chef::Helpers
 
   def initialize
-    knife_rb = Cucumber::Chef.locate(:file, ".chef", "knife.rb")
-    Chef::Config.from_file(knife_rb)
-
-    $logger = ZTK::Logger.new(Cucumber::Chef.log_file)
-    Cucumber::Chef.is_rc? and ($logger.level = ZTK::Logger::DEBUG)
-
-    puts("cc-server v#{Cucumber::Chef::VERSION}")
+    tag = Cucumber::Chef.tag("cc-server")
+    puts("  * #{tag}")
+    Cucumber::Chef.load_config(tag)
+    $logger = Cucumber::Chef.logger
   end
 
   def shutdown
     DRb.stop_service
   end
 
-end
+  def logger
+    $logger
+  end
 
-hostname = %x( hostname -f ).chomp
+end
 
-list = %w( deny all allow 127.0.0.1 )
+list = %w( deny all )
 ARGV[0] and (list += [ 'allow', ARGV[0] ])
 acl = ACL.new(list)
 

data/bin/cucumber-chef

@@ -3,6 +3,8 @@
 require 'thor'
 require 'cucumber-chef'
 
+# $logger = Cucumber::Chef.logger
+
 class CucumberChef < Thor
   include Thor::Actions
 
@@ -39,9 +41,11 @@ class CucumberChef < Thor
         "example_feature.erb" => "features/#{project}/#{project}.feature",
         "example_steps.erb" => "features/#{project}/step_definitions/#{project}_steps.rb",
         "env.rb" => "features/support/env.rb",
+        "cc-hooks.rb" => "features/support/cc-hooks.rb",
         "readme-data_bags.erb" => "features/support/data_bags/README",
         "readme-roles.erb" => "features/support/roles/README",
-        "readme-keys.erb" => "features/support/keys/README"
+        "readme-keys.erb" => "features/support/keys/README",
+        "readme-environments.erb" => "features/support/environments/README"
       }
 
       templates.each do |source, destination|
@@ -50,29 +54,12 @@ class CucumberChef < Thor
     end
 
     def load_config
+      tag = Cucumber::Chef.tag("cucumber-chef")
+      puts(set_color(tag, :green, true))
+      Cucumber::Chef.load_config(tag)
+      $logger = Cucumber::Chef.logger
 
-      chef_repo = (Cucumber::Chef.locate_parent(".chef") rescue nil)
-      if ( !chef_repo || ( !File.exists?(chef_repo) || !File.directory?(chef_repo) ) )
-        fatal("It does not look like you are inside a chef-repo!  Please relocate to one and execute your command again!")
-        exit(255)
-      end
-
-      $logger = ZTK::Logger.new(Cucumber::Chef.log_file)
-      Cucumber::Chef.is_rc? and ($logger.level = ZTK::Logger::DEBUG)
-
-      message = "cucumber-chef v#{Cucumber::Chef::VERSION}"
-      puts(set_color(message, :green, true))
-
-      $logger.info { "================================================================================" }
-      $logger.info { message }
-      $logger.info { "UNAME: %s" % %x( uname -a ).chomp.strip }
-      $logger.info { "Ruby Version: #{RUBY_VERSION}" }
-      $logger.info { "Ruby Patch Level: #{RUBY_PATCHLEVEL}" }
-      $logger.info { "Ruby Platform: #{RUBY_PLATFORM}" }
-      $logger.info { "Ruby Engine: #{RUBY_ENGINE}" }
-      $logger.info { "================================================================================" }
-
-      @options.test? ? Cucumber::Chef::Config.test : Cucumber::Chef::Config.load
+      @options.test? and Cucumber::Chef::Config.test
     end
 
     def fatal(message)
@@ -218,21 +205,13 @@ class CucumberChef < Thor
           puts(set_color("...BOOM!", :red, true))
           puts
 
-          ssh = ZTK::SSH.new
-          ssh.config.host_name = test_lab.labs_running.first.public_ip_address
-          ssh.config.user = "ubuntu"
-          ssh.config.keys = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{ssh.config.user}")
-          ssh.exec("nohup sudo pkill -9 -f cc-server")
-          ssh.exec("nohup sudo BACKGROUND=yes cc-server #{Cucumber::Chef.external_ip}")
+          test_lab.ssh.exec("nohup sudo pkill -9 -f cc-server")
+          test_lab.ssh.exec("nohup sudo BACKGROUND=yes cc-server #{Cucumber::Chef.external_ip}")
           Cucumber::Chef.spinner do
             ZTK::TCPSocketCheck.new(:host => test_lab.labs_running.first.public_ip_address, :port => 8787, :data => "\n\n").wait
           end
-
-          # initialize our drb object
-          test_lab_drb ||= DRbObject.new_with_uri("druby://#{test_lab.labs_running.first.public_ip_address}:8787")
-          test_lab_drb and DRb.start_service
-          test_lab_drb.servers = Hash.new(nil)
-          test_lab_drb.server_destroy(container)
+          test_lab.drb.servers = Hash.new(nil)
+          test_lab.drb.server_destroy(container)
         else
           puts
           puts(set_color("Whew! That was close!", :green, true))
@@ -249,6 +228,19 @@ class CucumberChef < Thor
     fatal(e)
   end
 
+################################################################################
+
+  desc "test", "depreciated"
+  def test
+    puts
+    puts(set_color("The test task is depreciated!  You should execute cucumber directly.", :red, true))
+    puts
+
+  rescue Cucumber::Chef::Error => e
+    $logger.fatal { e.backtrace.join("\n") }
+    fatal(e)
+  end
+
 ################################################################################
 
   desc "up", "Startup the cucumber-chef test lab"
@@ -296,28 +288,13 @@ class CucumberChef < Thor
 
     puts
     if (test_lab = Cucumber::Chef::TestLab.new) && (test_lab.labs_running.count > 0)
-      ssh = ZTK::SSH.new
-
       if args.size == 0
-        ssh.config.host_name = test_lab.labs_running.first.public_ip_address
-        ssh.config.user = "ubuntu"
-        ssh.config.keys = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{ssh.config.user}")
-
         puts([set_color("Attempting SSH connection to cucumber-chef '", :blue, true), set_color("test lab", :cyan, true), set_color("'...", :blue, true)].join)
-        ssh.console
+        test_lab.ssh.console
       else
         container = args[0]
-
-        ssh.config.proxy_host_name = test_lab.labs_running.first.public_ip_address
-        ssh.config.proxy_user = "ubuntu"
-        ssh.config.proxy_keys = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{ssh.config.proxy_user}")
-
-        ssh.config.host_name = container
-        ssh.config.user = "root"
-        ssh.config.keys = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{ssh.config.proxy_user}")
-
         puts([set_color("Attempting SSH connection to cucumber-chef container '", :blue, true), set_color(container, :cyan, true), set_color("'...", :blue, true)].join)
-        ssh.console
+        test_lab.proxy_ssh(container).console
       end
 
     else
@@ -330,6 +307,39 @@ class CucumberChef < Thor
     fatal(e)
   end
 
+################################################################################
+
+  desc "log", "Streams the cucumber-chef local and test lab logs to the terminal."
+  def log
+    load_config
+
+    if ($test_lab = Cucumber::Chef::TestLab.new) && ($test_lab.labs_running.count > 0)
+      $tail_thread_remote = Thread.new do
+        $test_lab.ssh.exec("tail -n 0 -f /home/#{$test_lab.ssh.config.user}/.cucumber-chef/cucumber-chef.log")
+
+        Kernel.at_exit do
+          $test_lab.ssh.close
+        end
+      end
+
+      log_file = File.open(Cucumber::Chef.log_file, "r")
+      log_file.seek(0, ::IO::SEEK_END)
+      loop do
+        if !(data = (log_file.readline rescue nil)).nil?
+          print(data)
+        else
+          sleep(1)
+        end
+      end
+
+      $tail_thread_remote.join
+    end
+
+    Kernel.at_exit do
+      $tail_thread_remote.kill
+    end
+  end
+
 ################################################################################
 
   desc "diagnose <container>", "Provide diagnostics from the chef-client on the specified container."
@@ -341,29 +351,19 @@ class CucumberChef < Thor
 
     puts
     if (test_lab = Cucumber::Chef::TestLab.new) && (test_lab.labs_running.count > 0)
-      ssh = ZTK::SSH.new
-
-      ssh.config.proxy_host_name = test_lab.labs_running.first.public_ip_address
-      ssh.config.proxy_user = "ubuntu"
-      ssh.config.proxy_keys = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{ssh.config.proxy_user}")
-
-      ssh.config.host_name = container
-      ssh.config.user = "root"
-      ssh.config.keys = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{ssh.config.proxy_user}")
-
       puts([set_color("Attempting to collect diagnostic information on cucumber-chef container '", :blue, true), set_color(container, :cyan, true), set_color("'...", :blue, true)].join)
       if @options.strace?
         puts
         puts("chef-stacktrace.out:")
         puts(set_color("============================================================================", :bold))
-        ssh.exec("[[ -e /var/chef/cache/chef-stacktrace.out ]] && cat /var/chef/cache/chef-stacktrace.out")
+        test_lab.proxy_ssh(container).exec("[[ -e /var/chef/cache/chef-stacktrace.out ]] && cat /var/chef/cache/chef-stacktrace.out")
         print("\n")
       end
       if @options.log?
         puts
         puts("chef.log:")
         puts(set_color("============================================================================", :bold))
-        ssh.exec("[[ -e /var/log/chef/client.log ]] && tail -n #{@options.lines} /var/log/chef/client.log")
+        test_lab.proxy_ssh(container).exec("[[ -e /var/log/chef/client.log ]] && tail -n #{@options.lines} /var/log/chef/client.log")
       end
     end
     puts
@@ -397,16 +397,10 @@ class CucumberChef < Thor
 
     puts
     if (test_lab = Cucumber::Chef::TestLab.new) && (test_lab.labs_running.count > 0)
-      ssh = ZTK::SSH.new
-
-      ssh.config.host_name = test_lab.labs_running.first.public_ip_address
-      ssh.config.user = "ubuntu"
-      ssh.config.keys = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{ssh.config.user}")
-
       puts(set_color("Getting container processes from cucumber-chef test lab...", :blue, true))
       puts
       puts(set_color("============================================================================", :bold))
-      ssh.exec("lxc-ps --lxc -- #{args.join(" ")}")
+      test_lab.ssh.exec("lxc-ps --lxc -- #{args.join(" ")}")
       print("\n")
     end
     puts

data/chef_repo/cookbooks/cucumber-chef/attributes/default.rb

@@ -1,7 +1,7 @@
 ################################################################################
 #
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");

data/chef_repo/cookbooks/cucumber-chef/recipes/default.rb

@@ -1,7 +1,7 @@
 ################################################################################
 #
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");

data/chef_repo/cookbooks/cucumber-chef/recipes/lxc.rb

@@ -1,7 +1,7 @@
 ################################################################################
 #
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -267,49 +267,47 @@ directory "create lxc configuration directory" do
   not_if { File.exists?("/etc/lxc") && File.directory?("/etc/lxc") }
 end
 
-=begin
-# load the chef client into our distro lxc cache
-install_chef_sh = "/tmp/install-chef.sh"
-distros = { "ubuntu" => [ "lucid", "maverick", "natty", "oneiric", "precise" ] }
-arch = (%x( arch ).include?("i686") ? "i386" : "amd64")
+# # load the chef client into our distro lxc cache
+# install_chef_sh = "/tmp/install-chef.sh"
+# distros = { "ubuntu" => [ "lucid", "maverick", "natty", "oneiric", "precise" ] }
+# arch = (%x( arch ).include?("i686") ? "i386" : "amd64")
 
-template "create lxc initializer container configuration" do
-  path "/etc/lxc/initializer"
-  source "lxc-initializer-config.erb"
+# template "create lxc initializer container configuration" do
+#   path "/etc/lxc/initializer"
+#   source "lxc-initializer-config.erb"
 
-  not_if { File.exists?("/etc/lxc/initializer") }
-end
+#   not_if { File.exists?("/etc/lxc/initializer") }
+# end
 
-distros.each do |distro, releases|
-  releases.each do |release|
-    cache_rootfs = File.join("/", "var", "cache", "lxc", release, "rootfs-#{arch}")
-    initializer_rootfs = File.join("/", "var", "lib", "lxc", "initializer", "rootfs")
+# distros.each do |distro, releases|
+#   releases.each do |release|
+#     cache_rootfs = File.join("/", "var", "cache", "lxc", release, "rootfs-#{arch}")
+#     initializer_rootfs = File.join("/", "var", "lib", "lxc", "initializer", "rootfs")
 
-    execute "create the lxc initializer container for #{distro}/#{release}" do
-      command "lxc-create -n initializer -f /etc/lxc/initializer -t #{distro} -- -r #{release}"
+#     execute "create the lxc initializer container for #{distro}/#{release}" do
+#       command "lxc-create -n initializer -f /etc/lxc/initializer -t #{distro} -- -r #{release}"
 
-      not_if { File.exists?(cache_rootfs) && File.directory?(cache_rootfs) }
-    end
+#       not_if { File.exists?(cache_rootfs) && File.directory?(cache_rootfs) }
+#     end
 
-    execute "destroy the lxc initializer container for #{distro}/#{release}" do
-      command "lxc-destroy -n initializer"
+#     execute "destroy the lxc initializer container for #{distro}/#{release}" do
+#       command "lxc-destroy -n initializer"
 
-      only_if { File.exists?(initializer_rootfs) && File.directory?(initializer_rootfs) }
-    end
+#       only_if { File.exists?(initializer_rootfs) && File.directory?(initializer_rootfs) }
+#     end
 
-    template "create opscode omnibus installer in lxc container cache for #{distro}/#{release}" do
-      path "#{cache_rootfs}#{install_chef_sh}"
-      source "lxc-install-chef.erb"
-      mode "0755"
+#     template "create opscode omnibus installer in lxc container cache for #{distro}/#{release}" do
+#       path "#{cache_rootfs}#{install_chef_sh}"
+#       source "lxc-install-chef.erb"
+#       mode "0755"
 
-      not_if { File.exists?(File.join(cache_rootfs, install_chef_sh)) }
-    end
+#       not_if { File.exists?(File.join(cache_rootfs, install_chef_sh)) }
+#     end
 
-    execute "install chef-client using omnibus in lxc container cache for #{distro}/#{release}" do
-      command "chroot #{cache_rootfs} /bin/bash -c '#{install_chef_sh}'"
+#     execute "install chef-client using omnibus in lxc container cache for #{distro}/#{release}" do
+#       command "chroot #{cache_rootfs} /bin/bash -c '#{install_chef_sh}'"
 
-      not_if { File.exists?(File.join(cache_rootfs, "opt", "opscode", "bin", "chef-client")) }
-    end
-  end
-end
-=end
+#       not_if { File.exists?(File.join(cache_rootfs, "opt", "opscode", "bin", "chef-client")) }
+#     end
+#   end
+# end

data/chef_repo/cookbooks/cucumber-chef/recipes/test_lab.rb

@@ -1,7 +1,7 @@
 ################################################################################
 #
 #      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 Atalanta Systems Ltd
+#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
 #     License: Apache License, Version 2.0
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,57 +19,14 @@
 ################################################################################
 
 
-%w( build-essential wget chkconfig ruby-full ruby-dev libxml2-dev libxslt1-dev ).each do |p|
-  package p
-end
-
-bash "install rubygems" do
-  code <<-EOH
-cd /tmp
-wget http://production.cf.rubygems.org/rubygems/rubygems-1.8.19.tgz
-tar zxf rubygems-1.8.19.tgz
-cd rubygems-1.8.19
-ruby setup.rb --no-format-executable
-  EOH
-end
-
-gem_package "cucumber-chef" do
-  gem_binary("/usr/bin/gem")
-
-  version(node['cucumber_chef']['version'])
-
-  if node['cucumber_chef']['prerelease']
-    options("--prerelease")
-  end
-end
-
-%w( rspec ).each do |g|
-  gem_package g do
-    gem_binary("/usr/bin/gem")
-  end
-end
-
 ################################################################################
-# CHEF-CLIENT
+# SYSTEM TWEAKS
 ################################################################################
-service "chef-client"
 
-execute "set chef-client logging to debug" do
-  command "sed -i \"s/log_level          :info/log_level          :debug/\" /etc/chef/client.rb"
-
-  notifies :restart, "service[chef-client]"
-
-  only_if do
-    %x( cat /etc/chef/client.rb | grep "log_level          :info" )
-    ($? == 0)
-  end
+%w( build-essential wget chkconfig ruby-full ruby-dev libxml2-dev libxslt1-dev ).each do |p|
+  package p
 end
 
-
-################################################################################
-# SYSTEM TWEAKS
-################################################################################
-
 %w( root ubuntu ).each do |user|
   home_dir = (user == "root" ? "/#{user}" : "/home/#{user}")
 
@@ -146,3 +103,63 @@ template "install cucumber-chef motd" do
 
   not_if { File.exists?("/etc/motd") && !File.symlink?("/etc/motd") }
 end
+
+
+################################################################################
+# RUBY
+################################################################################
+bash "install rubygems" do
+  code <<-EOH
+cd /tmp
+wget http://production.cf.rubygems.org/rubygems/rubygems-1.8.19.tgz
+tar zxf rubygems-1.8.19.tgz
+cd rubygems-1.8.19
+ruby setup.rb --no-format-executable
+  EOH
+end
+
+gem_package "cucumber-chef" do
+  gem_binary("/usr/bin/gem")
+
+  version(node['cucumber_chef']['version'])
+
+  if node['cucumber_chef']['prerelease']
+    options("--prerelease")
+  end
+end
+
+%w( rspec ).each do |g|
+  gem_package g do
+    gem_binary("/usr/bin/gem")
+  end
+end
+
+
+################################################################################
+# CHEF-CLIENT
+################################################################################
+service "chef-client"
+
+execute "set chef-client logging to debug" do
+  command "sed -i \"s/log_level          :info/log_level          :debug/\" /etc/chef/client.rb"
+
+  notifies :restart, "service[chef-client]"
+
+  only_if do
+    %x( cat /etc/chef/client.rb | grep "log_level          :info" )
+    ($? == 0)
+  end
+end
+
+
+################################################################################
+# CHEF-SOLR / APACHE SOLR
+################################################################################
+
+template "install custom solr config" do
+  path "/var/lib/chef/solr/conf/solrconfig.xml"
+  source "solrconfig.erb"
+  owner "chef"
+  group "chef"
+  mode "0644"
+end