cucumber-chef 2.0.6 → 2.0.7

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/zpatten/cucumber-chef.png)](http://travis-ci.org/zpatten/cucumber-chef)
+[![Build Status](https://secure.travis-ci.org/zpatten/cucumber-chef.png)](http://travis-ci.org/zpatten/cucumber-chef) [![Dependency Status](https://gemnasium.com/jovelabs/cucumber-chef.png)](https://gemnasium.com/jovelabs/cucumber-chef)
 
 Cucumber-chef is a library of tools to enable the emerging discipline of infrastructure as code to practice test driven development.  It provides a testing platform within which Cucumber tests can be run which provision virtual machines, configure them by applying the appropriate Chef roles to them, and then run acceptance and integration tests against the environment.
 

data/bin/cucumber-chef

@@ -178,30 +178,67 @@ class CucumberChef < Thor
 
 ################################################################################
 
-  desc "teardown", "Teardown cucumber-chef test lab in Amazon EC2"
+  desc "teardown [container]", "Teardown the cucumber-chef test lab in Amazon EC2 or a test lab [container] if specified."
   method_option :test, :type => :boolean, :desc => "INTERNAL USE ONLY"
-  def teardown
+  def teardown(*args)
     load_config
 
     puts
     if (test_lab = Cucumber::Chef::TestLab.new)
-      if yes?(set_color("Are you sure you want to teardown your cucumber-chef test lab?", :red, true))
-        count_down_colors = { 5 => :green, 4 => :yellow, 3 => :yellow, 2 => :red, 1 => :red }
-        puts
-        puts(set_color("You have 5 seconds to abort!", :green, true))
-        puts
-        print(set_color("Self-destructing in", :green, true))
-        5.downto(1) do |x|
-          print(set_color("...#{x}", count_down_colors[x], true))
-          sleep(1)
+      if args.count == 0
+        if yes?(set_color("Are you sure you want to teardown your cucumber-chef test lab?", :red, true))
+          count_down_colors = { 5 => :green, 4 => :yellow, 3 => :yellow, 2 => :red, 1 => :red }
+          puts
+          puts(set_color("You have 5 seconds to abort!", :green, true))
+          puts
+          print(set_color("Self-destructing in", :green, true))
+          5.downto(1) do |x|
+            print(set_color("...#{x}", count_down_colors[x], true))
+            sleep(1)
+          end
+          puts(set_color("...BOOM!", :red, true))
+          puts
+          test_lab.destroy
+        else
+          puts
+          puts(set_color("Whew! That was close!", :green, true))
         end
-        puts(set_color("...BOOM!", :red, true))
-        puts
-        test_lab.destroy
       else
-        puts
-        puts(set_color("Whew! That was close!", :green, true))
+        container = args[0]
+        if yes?(set_color("Are you sure you want to teardown the test lab containter '#{container}'?", :red, true))
+          count_down_colors = { 5 => :green, 4 => :yellow, 3 => :yellow, 2 => :red, 1 => :red }
+          puts
+          puts(set_color("You have 5 seconds to abort!", :green, true))
+          puts
+          print(set_color("Self-destructing in", :green, true))
+          5.downto(1) do |x|
+            print(set_color("...#{x}", count_down_colors[x], true))
+            sleep(1)
+          end
+          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}")
+          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)
+        else
+          puts
+          puts(set_color("Whew! That was close!", :green, true))
+        end
       end
+
     else
       puts(set_color("Could not find a cucumber-chef test lab to teardown!", :red, true))
     end

data/lib/cucumber/chef.rb

@@ -19,6 +19,7 @@
 #
 ################################################################################
 
+require 'drb/drb'
 require 'readline'
 require 'socket'
 require 'stringio'

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

@@ -26,7 +26,6 @@ module Cucumber::Chef::Helpers::ChefClient
   # call this in a Before hook
   def chef_set_client_config(config={})
     @chef_client_config = (@chef_client_config || {
-      :environment => "_default",
       :log_level => :debug,
       :log_location => "/var/log/chef/client.log",
       :chef_server_url => "https://api.opscode.com/organizations/#{config[:orgname]}",
@@ -66,7 +65,7 @@ module Cucumber::Chef::Helpers::ChefClient
       f.puts("ssl_verify_mode         :verify_none")
       f.puts("validation_client_name  \"#{@chef_client_config[:validation_client_name]}\"")
       f.puts("node_name               \"#{name}\"")
-      f.puts("environment             \"#{@chef_client_config[:environment]}\"")
+      f.puts("environment             \"#{@chef_client_config[:environment]}\"") if @chef_client_config[:environment]
       f.puts
       f.puts("Mixlib::Log::Formatter.show_time = true")
     end

data/lib/cucumber/chef/templates/cucumber/example_feature.erb

@@ -8,6 +8,9 @@ Feature: Perform test driven infrastructure with Cucumber-Chef
     * I have a server called "<%= @project %>"
     * "<%= @project %>" is running "ubuntu" "precise"
     * "<%= @project %>" has been provisioned
+    * the following cookbooks have been uploaded:
+      | cookbook | cookbook_path |
+      | chef-client | ./cookbooks |
     * the "chef-client::service" recipe has been added to the "<%= @project %>" run list
     * the chef-client has been run on "<%= @project %>"
     * I ssh to "<%= @project %>" with the following credentials:

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "2.0.6" unless const_defined?(:VERSION)
+    VERSION = "2.0.7" unless const_defined?(:VERSION)
 
 ################################################################################
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors: