cucumber-chef 2.0.4 → 2.0.5

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

@@ -27,7 +27,7 @@ module Cucumber::Chef::Helpers::TestLab
     dhcpd_config = File.join("/etc/dhcp/test-lab.conf")
     File.open(dhcpd_config, 'w') do |f|
       f.puts(Cucumber::Chef.generate_do_not_edit_warning("DHCPD Configuration"))
-      $servers.each do |key, value|
+      @servers.each do |key, value|
         f.puts
         f.puts("host #{key} {")
         f.puts("  hardware ethernet #{value[:mac]};")

data/lib/cucumber/chef/provisioner.rb

@@ -37,12 +37,12 @@ module Cucumber
         @stdout, @stderr, @stdin = stdout, stderr, stdin
         @stdout.sync = true if @stdout.respond_to?(:sync=)
 
-        @ssh = Cucumber::Chef::SSH.new(@stdout, @stderr, @stdin)
-        @ssh.config[:host] = @server.public_ip_address
-        @ssh.config[:ssh_user] = "ubuntu"
-        @ssh.config[:identity_file] = Cucumber::Chef::Config[:aws][:identity_file]
+        @ssh = ZTK::SSH.new(:stdout => @stdout, :stderr => @stderr, :stdin => @stdin)
+        @ssh.config.host_name = @server.public_ip_address
+        @ssh.config.user = "ubuntu"
+        @ssh.config.keys = Cucumber::Chef::Config[:aws][:identity_file]
 
-        @command = Cucumber::Chef::Command.new(@stdout, @stderr, @stdin)
+        # @command = Cucumber::Chef::Command.new(@stdout, @stderr, @stdin)
 
         @cookbooks_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "chef_repo", "cookbooks"))
         @roles_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "chef_repo", "roles"))
@@ -112,7 +112,7 @@ module Cucumber
         @stdout.print("Downloading chef-server credentials...")
         Cucumber::Chef.spinner do
           local_path = Cucumber::Chef.locate(:directory, ".cucumber-chef")
-          remote_path = File.join("/", "home", @ssh.config[:ssh_user], ".chef")
+          remote_path = File.join("/", "home", @ssh.config.user, ".chef")
 
           files = [ "#{Cucumber::Chef::Config[:user]}.pem", "validation.pem" ]
           files.each do |file|
@@ -128,7 +128,7 @@ module Cucumber
         @stdout.print("Downloading container SSH credentials...")
         Cucumber::Chef.spinner do
           local_path = Cucumber::Chef.locate(:directory, ".cucumber-chef")
-          remote_path = File.join("/", "home", @ssh.config[:ssh_user], ".ssh")
+          remote_path = File.join("/", "home", @ssh.config.user, ".ssh")
 
           files = { "id_rsa" => "id_rsa-ubuntu" }
           files.each do |remote_file, local_file|
@@ -155,7 +155,7 @@ module Cucumber
           }
 
           File.open(knife_rb, 'w') do |f|
-            f.puts(Cucumber::Chef::Template.render(template_file, context))
+            f.puts(ZTK::Template.render(template_file, context))
           end
         end
         @stdout.print("done.\n")
@@ -259,13 +259,13 @@ module Cucumber
       def wait_for_chef_server
         @stdout.print("Waiting for Chef-Server...")
         Cucumber::Chef.spinner do
-          Cucumber::Chef::TCPSocket.new(@server.public_ip_address, 4000, "GET").wait
+          ZTK::TCPSocketCheck.new(:host => @server.public_ip_address, :port => 4000, :data => "GET").wait
         end
         @stdout.puts("done.\n")
 
         @stdout.print("Waiting for Chef-WebUI...")
         Cucumber::Chef.spinner do
-          Cucumber::Chef::TCPSocket.new(@server.public_ip_address, 4040, "GET").wait
+          ZTK::TCPSocketCheck.new(:host => @server.public_ip_address, :port => 4040, :data => "GET").wait
         end
         @stdout.puts("done.\n")
       end
@@ -283,7 +283,7 @@ module Cucumber
 
         @stdout.print("Waiting for SSHD...")
         Cucumber::Chef.spinner do
-          Cucumber::Chef::TCPSocket.new(@server.public_ip_address, 22).wait
+          ZTK::TCPSocketCheck.new(:host => @server.public_ip_address, :port => 22).wait
         end
         @stdout.puts("done.\n")
 

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

@@ -20,10 +20,10 @@
 ################################################################################
 
 When /^I enable the running of MiniTest suites for "(.*?)"$/ do |name|
-  enable_minitest(name)
+  $drb_test_lab.enable_minitest(name)
 end
 
 Then /^the tests should run and pass on "(.*?)"$/ do |name|
-  results = run_minitests(name)
+  results = $drb_test_lab.run_minitests(name)
   results.last.scan(/assertions.*(\d).*failures.*(\d).*errors.*(\d).*skips/).flatten.map { |v| v.to_i }.should == [0,0,0]
 end

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

@@ -44,21 +44,21 @@ And /^"([^\"]*)" has a MAC address of "([^\"]*)"$/ do |name, mac|
 end
 
 And /^"([^\"]*)" has been provisioned$/ do |name|
-  server_create(name, @servers[name])
+  $drb_test_lab.server_create(name, @servers[name])
 end
 
 And /^the "([^\"]*)" role has been added to the "([^\"]*)" run list$/ do |role, name|
-  chef_set_client_attributes(@servers[name], :run_list => ["role[#{role}]"])
+  $drb_test_lab.chef_set_client_attributes(@servers[name], :run_list => ["role[#{role}]"])
 end
 
 And /^the "([^\"]*)" recipe has been added to the "([^\"]*)" run list$/ do |recipe, name|
-  chef_set_client_attributes(@servers[name], :run_list => ["recipe[#{recipe}]"])
+  $drb_test_lab.chef_set_client_attributes(@servers[name], :run_list => ["recipe[#{recipe}]"])
 end
 
 And /^"([^\"]*)" is in the "([^\"]*)" environment$/ do |name, environment|
-  chef_set_client_config(:environment => environment)
+  $drb_test_lab.chef_set_client_config(:environment => environment)
 end
 
 And /^the chef-client has been run on "([^\"]*)"$/ do |name|
-  chef_run_client(name)
+  $drb_test_lab.chef_run_client(name)
 end

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

@@ -1,81 +1,23 @@
-Given /^I have no public keys set$/ do
-  @auth_methods = %w(password)
-end
-
-Then /^I can ssh to "([^\"]*)" with the following credentials:$/ do |hostname, table|
-  @auth_methods ||= %w(publickey password)
-
-  credentials = table.hashes
-  credentials.each do |creds|
-    lambda {
-      Net::SSH.start(session["hostname"], creds["username"], :password => creds["password"], :auth_methods => @auth_methods)
-    }.should_not raise_error(Net::SSH::AuthenticationFailed)
-  end
-end
-
-Then /^I can ssh to the following hosts with these credentials:$/ do |table|
-  @keys ||= []
-  @auth_methods ||= %w(password)
-  session_details = table.hashes
-
-  session_details.each do |session|
-    # initialize a list of keys and auth methods for just this session, as
-    # session can have session-specific keys mixed with global keys
-    session_keys = Array.new(@keys)
-    session_auth_methods = Array.new(@auth_methods)
-
-    # you can pass in a keyfile in the session details, so we need to
-    if session["keyfile"]
-      session_keys << session["keyfile"]
-      session_auth_methods << "publickey"
-    end
-
-    lambda {
-      @connection = Net::SSH.start(session["hostname"],
-                                   session["username"],
-                                   :password => session["password"],
-                                   :auth_methods => session_auth_methods,
-                                   :keys => session_keys)
-    }.should_not raise_error
-  end
-end
-
-Given /^I have the following public keys:$/ do |table|
-  @keys = []
-  public_key_paths = table.hashes
+When /^I ssh to "([^\"]*)" with the following credentials:$/ do |hostname, table|
+  session = table.hashes.first
+  lambda {
 
-  public_key_paths.each do |key|
-    File.exist?(key["keyfile"]).should be_true
-    FileUtils.chmod(0600, key["keyfile"])
-    @keys << key["keyfile"]
-  end
+    @connection = ZTK::SSH.new
 
-  @auth_methods ||= %w(password)
-  @auth_methods << "publickey"
-end
+    @connection.config.proxy_host_name = $test_lab.labs_running.first.public_ip_address
+    @connection.config.proxy_user = "ubuntu"
+    @connection.config.proxy_keys = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{@connection.config.proxy_user}")
 
-When /^I ssh to "([^\"]*)" with the following credentials:$/ do |hostname, table|
-  @keys = []
-  @auth_methods ||= %w(password)
-  session = table.hashes.first
-  session_keys = Array.new(@keys)
-  session_auth_methods = Array.new(@auth_methods)
-  if session["keyfile"]
-    session_keys << session["keyfile"]
-    session_auth_methods << "publickey"
-  end
+    hostname and (@connection.config.host_name = hostname)
+    session["username"] and (@connection.config.user = session["username"])
+    session["password"] and (@connection.config.password = session["password"])
+    session["keyfile"] and (@connection.config.keys = session["keyfile"])
 
-  lambda {
-    @connection = Net::SSH.start(hostname,
-                                 session["username"],
-                                 :password => session["password"],
-                                 :auth_methods => session_auth_methods,
-                                 :keys => session_keys)
   }.should_not raise_error
 end
 
 And /^I run "([^\"]*)"$/ do |command|
-  @output = @connection.exec!(command)
+  @output = @connection.exec(command, :silence => true).output
 end
 
 Then /^I should( not)? see "([^\"]*)" in the output$/ do |boolean, string|
@@ -100,14 +42,14 @@ Then /^(path|directory|file|symlink) "([^\"]*)" should exist$/ do |type, path|
   command = "ls %s" % [
     parent
   ]
-  @output = @connection.exec!(command)
+  @output = @connection.exec(command).output
   @output.should =~ /#{child}/
 
 # if a specific type (directory|file) was specified, test for it
   command = "stat -c %%F %s" % [
     path
   ]
-  @output = @connection.exec!(command)
+  @output = @connection.exec(command).output
   types = {
     "file" => /regular file/,
     "directory" => /directory/,
@@ -132,7 +74,7 @@ Then /^(?:path|directory|file) "([^\"]*)" should be owned by "([^\"]*)"$/ do |pa
   command = "stat -c %%U:%%G %s" % [
     path
   ]
-  @output = @connection.exec!(command)
+  @output = @connection.exec(command).output
   @output.should =~ /#{owner}/
 end
 
@@ -144,7 +86,7 @@ Then /^file "([^\"]*)" should( not)? contain/ do |path, boolean, content|
 
 # turn the command-line output and the expectation string into Arrays and strip
 # leading and trailing cruft from members
-  @output = @connection.exec!(command).split("\n").map{ |i| i.strip }
+  @output = @connection.exec(command).output.split("\n").map{ |i| i.strip }
   content = content.split("\n").map{ |i| i.strip }
 
 # assume no match
@@ -179,14 +121,14 @@ end
 
 Then /^package "([^\"]*)" should be installed$/ do |package|
   command = ""
-  if (dpkg = @connection.exec!("which dpkg 2> /dev/null")).length > 0
+  if (dpkg = @connection.exec("which dpkg 2> /dev/null").output).length > 0
     command = "#{dpkg.chomp} --get-selections"
-  elsif (yum = @connection.exec!("which yum 2> /dev/null")).length > 0
+  elsif (yum = @connection.exec("which yum 2> /dev/null").output).length > 0
     command = "#{yum.chomp} -q list installed"
 # could easily add more cases here, if I knew what they were :)
   end
 
-  @output = @connection.exec!(command)
+  @output = @connection.exec(command)
   @output.should =~ /#{package}/
 end
 
@@ -196,7 +138,7 @@ end
 # * service "foo" is running
 # * application "foo" is running
 # * process "foo" is running
-# 
+#
 # basically because I couldn't decide what they should be called. Maybe there's
 # an Official Cucumber-chef Opinion on this. Still, Rubular is fun :)
 
@@ -204,7 +146,7 @@ end
 # works
 Then /^(?:(?:service|application|process)? )?"([^\"]*)" should( not)? be running$/ do |service, boolean|
   command = "ps ax"
-  @output = @connection.exec!(command)
+  @output = @connection.exec(command).output
   if (!boolean)
     @output.should =~ /#{service}/
   else

data/lib/cucumber/chef/templates/bootstrap/ubuntu-precise-test-lab.erb

@@ -4,9 +4,9 @@ CUCUMBER_CHEF_BOOTSTRAP_DONE="/.cucumber-chef-bootstrap-finished"
 
 export DEBIAN_FRONTEND=noninteractive
 
-sed -i "s/127.0.0.1 localhost/127.0.0.1 <%= @config[:hostname] %> <%= @config[:hostname].split(".")[0] %> localhost/" /etc/hosts
-echo "<%= @config[:hostname] %>" | tee /etc/hostname
-hostname <%= @config[:hostname] %>
+sed -i "s/127.0.0.1 localhost/127.0.0.1 <%= @hostname %> <%= @hostname.split(".")[0] %> localhost/" /etc/hosts
+echo "<%= @hostname %>" | tee /etc/hostname
+hostname <%= @hostname %>
 
 echo "deb http://apt.opscode.com/ `lsb_release -cs`-0.10 main" | tee /etc/apt/sources.list.d/opscode.list
 mkdir -p /etc/apt/trusted.gpg.d
@@ -19,9 +19,9 @@ chown -R ${SUDO_USER}:${SUDO_USER} ${HOME}/.gnupg
 apt-get -q -y upgrade
 
 cat <<EOF | debconf-set-selections
-chef chef/chef_server_url string http://<%= @config[:chef_server] %>:4000
-chef-solr chef-solr/amqp_password password <%= @config[:amqp_password] %>
-chef-server-webui chef-server-webui/admin_password password <%= @config[:admin_password] %>
+chef chef/chef_server_url string http://<%= @chef_server %>:4000
+chef-solr chef-solr/amqp_password password <%= @amqp_password %>
+chef-server-webui chef-server-webui/admin_password password <%= @admin_password %>
 EOF
 
 apt-get -q -y --force-yes install chef chef-server
@@ -56,7 +56,7 @@ EOF
 chmod +x ${KNIFE_CONFIG_EXP_FILE}
 ${KNIFE_CONFIG_EXP_FILE}
 
-knife client create <%= @config[:user] %> -d -a -f ${HOME}/.chef/<%= @config[:user] %>.pem
+knife client create <%= @user %> -d -a -f ${HOME}/.chef/<%= @user %>.pem
 
 chown -R ${SUDO_USER}:${SUDO_USER} ${HOME}
 
@@ -93,7 +93,7 @@ if [ ! -f /etc/chef/client.pem ]; then
 fi
 
 cat <<EOF > /etc/chef/first-boot.json
-<%= @config[:attributes].to_json %>
+<%= @attributes.to_json %>
 EOF
 
 touch ${CUCUMBER_CHEF_BOOTSTRAP_DONE}

data/lib/cucumber/chef/templates/cucumber-chef/knife-rb.erb

@@ -2,16 +2,16 @@ current_dir = File.dirname(__FILE__)
 
 log_level               :debug
 log_location            STDOUT
-node_name               "<%= @config[:user] %>"
-client_key              "#{current_dir}/<%= @config[:user] %>.pem"
+node_name               "<%= @user %>"
+client_key              "#{current_dir}/<%= @user %>.pem"
 validation_client_name  "chef-validator"
 validation_key          "#{current_dir}/validation.pem"
-chef_server_url         "http://<%= @config[:chef_server] %>:4000"
+chef_server_url         "http://<%= @chef_server %>:4000"
 cache_type              "BasicFile"
 cookbook_path           ['#{current_dir}/../cookbooks']
 
 cache_options(:path => "#{current_dir}/checksums")
-<% if @config[:librarian_chef] -%>
+<% if @librarian_chef -%>
 
 require 'librarian/chef/integration/knife'
 cookbook_path Librarian::Chef.install_path, "#{current_dir}/../site-cookbooks"

data/lib/cucumber/chef/templates/cucumber/env.rb

@@ -2,7 +2,6 @@ require 'rspec/expectations'
 require 'cucumber/chef'
 require 'cucumber/chef/helpers'
 require 'cucumber/chef/steps'
-require 'cucumber/chef/version'
 
 class CustomWorld
   include Cucumber::Chef
@@ -13,19 +12,54 @@ World do
   CustomWorld.new
 end
 
-$servers = Hash.new(nil)
+################################################################################
 
-Before do
-  knife_rb = Cucumber::Chef.locate(:file, ".chef", "knife.rb")
+$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}"
+print("  * #{message}")
+$logger.info { message }
+
+Cucumber::Chef::Config.load
+if ($test_lab = Cucumber::Chef::TestLab.new) && ($test_lab.labs_running.count > 0)
+
+  # fire up our drb server
+  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 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
+
+  # load our test lab knife config
+  knife_rb = Cucumber::Chef.locate(:file, ".cucumber-chef", "knife.rb")
   Chef::Config.from_file(knife_rb)
 
-  $servers_bin ||= (Cucumber::Chef.locate(:file, ENV['HOME'], "servers.bin") rescue File.expand_path(File.join(ENV['HOME'], "servers.bin")))
+  # initialize our drb object
+  $drb_test_lab ||= DRbObject.new_with_uri("druby://#{$test_lab.labs_running.first.public_ip_address}:8787")
+  $drb_test_lab and DRb.start_service
+  $drb_test_lab.servers = Hash.new(nil)
+
+else
+  puts("No running cucumber-chef test labs to connect to!")
+  exit(1)
+end
+
+puts(" - connected to test lab")
+
+################################################################################
+
+Before do
+  $servers_bin ||= (File.join(Cucumber::Chef.locate(:directory, ".cucumber-chef"), "servers.bin") rescue File.expand_path(File.join(ENV['HOME'], "servers.bin")))
 
   # cleanup previous lxc containers if asked
-  if (ENV['DESTROY'] == "1")
+  if ENV['DESTROY']
     log("servers", "are being destroyed")
-    servers.each do |name|
-      server_destroy(name)
+    $drb_test_lab.servers.each do |name|
+      $drb_test_lab.server_destroy(name)
     end
     File.exists?($servers_bin) && File.delete($servers_bin)
   else
@@ -33,24 +67,33 @@ Before do
   end
 
   if File.exists?($servers_bin)
-    $servers = Marshal.load(IO.read($servers_bin))
+    $drb_test_lab.servers = (Marshal.load(IO.read($servers_bin)) rescue Hash.new(nil))
   end
 
-  chef_set_client_config(:chef_server_url => "http://192.168.255.254:4000",
-                         :validation_client_name => "chef-validator")
+  $drb_test_lab.chef_set_client_config(:chef_server_url => "http://192.168.255.254:4000",
+                                   :validation_client_name => "chef-validator")
 end
 
-After do |scenario|
-  @connection.close if @connection
+################################################################################
 
+After do |scenario|
   File.open($servers_bin, 'w') do |f|
-    f.puts(Marshal.dump($servers))
+    f.puts(Marshal.dump($drb_test_lab.servers))
   end
 
   Kernel.exit if scenario.failed?
 
-  # cleanup non-persistent lxc containers on exit
-  $servers.select{ |name, attributes| !attributes[:persist] }.each do |name, attributes|
-    server_destroy(name)
+  # cleanup non-persistent lxc containers between tests
+  $drb_test_lab.servers.select{ |name, attributes| !attributes[:persist] }.each do |name, attributes|
+    $drb_test_lab.server_destroy(name)
   end
+
 end
+
+################################################################################
+
+Kernel.at_exit do
+  $drb_test_lab.shutdown
+end
+
+################################################################################