cucumber-chef 0.5.0 → 0.5.1

data/Gemfile

@@ -12,7 +12,6 @@ gem "cucumber-nagios", ">= 0"
 gem "rspec", ">= 0"
 gem "fog", ">= 0"
 gem "thor", ">= 0"
-gem "awesome_print", ">= 0"
 
 group :development do
   gem "bundler", "~> 1.0.0"

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/bin/cucumber-chef

@@ -23,10 +23,6 @@ GEM_DIR = Gem.default_dir
 class CucumberChef < Thor
   include Thor::Actions
   
-  def self.source_root
-    File.dirname(__FILE__)
-  end
-
   no_tasks do
     def create_directory_structure(project_dir)
       %w{step_definitions support}.each do |dir|
@@ -35,7 +31,7 @@ class CucumberChef < Thor
     end
     
     def generate_project_skeleton(project_dir)
-      template_dir = self.gem_root + 'lib' + 'cucumber' + 'chef' + 'templates'
+      template_dir = Pathname.new(__FILE__).parent.parent + 'lib' + 'cucumber' + 'chef' + 'templates'
       templates = {
         "readme.erb" => 'README',
         "example_feature.erb" => 'features/example.feature',
@@ -47,9 +43,11 @@ class CucumberChef < Thor
                  project_dir + destination)
       end
     end
-    
-    def gem_root
-      Pathname.new(__FILE__).parent.parent
+
+    def config
+      @config ||= begin
+      options.test? ? Cucumber::Chef::Config.test_config : Cucumber::Chef::Config.new
+      end
     end
 
     def error(message)
@@ -70,11 +68,6 @@ class CucumberChef < Thor
   method_option :test, :type  => :boolean
   def setup
     begin
-      if options.test?
-        config = Cucumber::Chef::Config.test_config
-      else
-        config = Cucumber::Chef::Config.new
-      end
       config.verify
       $stdout.sync
       provisioner = ::Cucumber::Chef::Provisioner.new
@@ -82,20 +75,21 @@ class CucumberChef < Thor
       sleep(10)
       provisioner.upload_cookbook(config)
       provisioner.upload_role(config)
-      provisioner.bootstrap_node(server.dns_name, config).run
+      provisioner.bootstrap_node(server.dns_name, config)
     rescue ::Cucumber::Chef::Error => err
       error(err.message)
     end
+    
   end
 
+  desc "connect", "Connect to a container in your test lab"
+  def connect
+    puts "Not implemented.  For now, find the IP of your test lab using the info task, and connect manually."
+  end
+  
   desc "displayconfig", "Display the current config from knife.rb"
   method_option :test, :type  => :boolean
   def displayconfig
-    if options.test?
-      config = Cucumber::Chef::Config.test_config
-    else
-      config = Cucumber::Chef::Config.new
-    end
     puts config.list.join("\n")
     config.verify
   rescue ::Cucumber::Chef::Error => err
@@ -105,30 +99,41 @@ class CucumberChef < Thor
   desc "info", "Display information about the current test lab"
   method_option :test, :type  => :boolean
   def info
-    if options.test?
-      config = Cucumber::Chef::Config.test_config
-    else
-      config = Cucumber::Chef::Config.new
-    end
     config.verify
     lab = Cucumber::Chef::TestLab.new(config)
-    if lab.exists?
-      puts lab.info
-    else
-    end
+    puts lab.info
+  rescue ::Cucumber::Chef::Error => err
+    error(err.message)
   end
-  
-  desc "upload", "Upload a cucumber-chef test suite to the test lab platform"
-  def upload
-    puts "Project uploaded to the test-lab."
+
+  desc "destroy", "Destroy running test labs"
+  method_option :test, :type => :boolean
+  def destroy
+    config.verify
+    lab = Cucumber::Chef::TestLab.new(config)
+    lab.destroy
+  end
+
+  desc "upload <project name>", "Upload a cucumber-chef test suite to the test lab platform"
+  def upload(project_name)
+    project_dir = Pathname.new(".") + "cucumber-chef" + project_name
+    unless File.exists?(project_dir)
+      raise "Project dir '#{project_dir}' does not exist."
+    end
+    config.verify
+    runner = Cucumber::Chef::TestRunner.new(project_dir, config)
+    runner.upload_project
   end
 
   desc "test", "Run a cucumber-chef test suite from a workstation."
-  def test
-    puts "Running test..."
-    puts
-    puts "Test results will appear here."
+  def test(project_name)
+    project_dir = Pathname.new(".") + "cucumber-chef" + project_name
+    unless File.exists?(project_dir)
+      raise "Project dir '#{project_dir}' does not exist."
+    end
+    config.verify
+    runner = Cucumber::Chef::TestRunner.new(project_dir, config)
+    runner.run
   end
 end
-
 CucumberChef.start

data/cookbooks/cucumber-chef/files/default/lxc-lucid-chef

@@ -144,15 +144,16 @@ EOF
     rm $image/etc/resolv.conf
     cp /etc/resolv.conf $image/etc/resolv.conf
     cp /etc/lxc/install-chef.sh $image/tmp/install-chef.sh
-    chroot $image /bin/sh -c "/usr/bin/apt-get update && /usr/bin/apt-get --assume-yes --allow-unauthenticated install strace ruby1.9.1p180"
+    chroot $image /bin/sh -c "/usr/bin/apt-get update && /usr/bin/apt-get --assume-yes --allow-unauthenticated install ruby1.9.1p180"
     mkdir -p $image/$HOME
-    chroot $image /bin/sh -c "strace /usr/local/bin/gem install chef --no-ri --no-rdoc 2>&1" 2>&1 >> /tmp/data
+    chroot $image /bin/sh -c "/usr/local/bin/gem install ohai --no-ri --no-rdoc"
+    chroot $image /bin/sh -c "/usr/local/bin/gem install chef --no-ri --no-rdoc"
     return $?
 }
 
 download_ubuntu()
 {
-    packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,vim,dhcp3-client,ssh,lsb-release,wget,gpgv,gnupg
+    packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,dhcp3-client,ssh,lsb-release,wget,gpgv,gnupg
 
     cache=$1
     arch=$2

data/cookbooks/cucumber-chef/recipes/controller.rb

@@ -38,13 +38,14 @@ cookbook_file "/var/lib/lxc/controller/rootfs/etc/chef/first-boot.json" do
   source "controller-first-boot"
 end
 
+controllers = search(:node, 'name:cucumber-chef-controller')
 execute 'chroot /var/lib/lxc/controller/rootfs /bin/bash -c "chef-client -j /etc/chef/first-boot.json > /dev/null 2>&1"' do
   action :run
-  # TODO: Make idempotent perhaps with a node search
+  not_if { controllers.length > 0 }
 end
 
 execute 'lxc-start -d -n controller' do
-  status = %x[lxc-info -n #{name} 2>&1]
+  status = %x[lxc-info -n controller 2>&1]
   not_if {status.include?("RUNNING")}
 end
 

data/cucumber-chef.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber-chef}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Nelson-Smith"]
-  s.date = %q{2011-06-09}
+  s.date = %q{2011-06-14}
   s.default_executable = %q{cucumber-chef}
   s.description = %q{Framework for behaviour-drive infrastructure development.}
   s.email = %q{stephen@atalanta-systems.com}
@@ -61,6 +61,7 @@ Gem::Specification.new do |s|
     "lib/cucumber/chef.rb",
     "lib/cucumber/chef/config.rb",
     "lib/cucumber/chef/handy.rb",
+    "lib/cucumber/chef/provisioner.rb",
     "lib/cucumber/chef/templates/controller.erb",
     "lib/cucumber/chef/templates/env.rb",
     "lib/cucumber/chef/templates/example_feature.erb",
@@ -68,11 +69,14 @@ Gem::Specification.new do |s|
     "lib/cucumber/chef/templates/readme.erb",
     "lib/cucumber/chef/templates/ubuntu10.04-gems.erb",
     "lib/cucumber/chef/test_lab.rb",
+    "lib/cucumber/chef/test_runner.rb",
     "lib/cucumber/chef/version.rb",
     "lib/cucumber/ec2_server_create.rb",
     "spec/unit/config_spec.rb",
     "spec/unit/cucumber_chef_spec.rb",
-    "spec/unit/test_lab_spec.rb"
+    "spec/unit/provisioner_spec.rb",
+    "spec/unit/test_lab_spec.rb",
+    "spec/unit/test_runner_spec.rb"
   ]
   s.homepage = %q{http://github.com/atalanta/cucumber-chef}
   s.licenses = ["MIT"]
@@ -90,7 +94,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<fog>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
-      s.add_runtime_dependency(%q<awesome_print>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -101,7 +104,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<fog>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
-      s.add_dependency(%q<awesome_print>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -113,7 +115,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<fog>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])
-    s.add_dependency(%q<awesome_print>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/cucumber/chef.rb

@@ -6,6 +6,7 @@ require 'chef/knife/core/bootstrap_context'
 require 'chef/knife/ssh'
 require 'socket'
 require 'net/ssh/multi'
+require 'net/scp'
 require "fog"
 require 'readline'
 require 'stringio'
@@ -15,78 +16,9 @@ module Cucumber
     class Error < StandardError ; end
     
     autoload :Config, "cucumber/chef/config"
+    autoload :Provisioner, "cucumber/chef/provisioner"
     autoload :TestLab, "cucumber/chef/test_lab"
-
-    class ProvisionerError < Error ; end
-    class Provisioner
-      def initialize
-        @cookbook_path = File.join(File.dirname(__FILE__), "../../cookbooks/cucumber-chef")
-      end
-
-      def config
-        Config.new.config
-      end
-
-      def bootstrap_node(dns_name, config)
-        template_file = File.join(File.dirname(__FILE__),
-                                  "chef/templates/ubuntu10.04-gems.erb")
-        bootstrap = ::Chef::Knife::Bootstrap.new
-        @stdout, @stderr, @stdout = StringIO.new, StringIO.new, StringIO.new
-        ui = ::Chef::Knife::UI.new(@stdout, @stderr, @stdout, bootstrap.config)
-        bootstrap.ui = ui
-        bootstrap.name_args = [dns_name]
-        bootstrap.config[:run_list] = "role[test_lab_test]"
-        bootstrap.config[:ssh_user] = "ubuntu"
-        bootstrap.config[:identity_file] = config[:knife][:identity_file]
-        bootstrap.config[:chef_node_name] = "cucumber-chef-test-lab"
-        bootstrap.config[:use_sudo] = true
-        bootstrap.config[:template_file] = template_file
-        bootstrap.config[:validation_client_name] = config["validation_client_name"]
-        bootstrap.config[:validation_key] = config["validation_key"]
-        bootstrap.config[:chef_server_url] = config["chef_server_url"]
-        bootstrap
-      end
-
-      def build_controller(dns_name, config)
-        template_file = File.join(File.dirname(__FILE__),
-                                  "chef/templates/controller.erb")
-        bootstrap = ::Chef::Knife::Bootstrap.new
-        @stdout, @stderr, @stdout = StringIO.new, StringIO.new, StringIO.new
-        ui = ::Chef::Knife::UI.new(@stdout, @stderr, @stdout, bootstrap.config)
-        bootstrap.ui = ui
-        bootstrap.name_args = [dns_name]
-        bootstrap.config[:ssh_user] = "ubuntu"
-        bootstrap.config[:identity_file] = config[:knife][:identity_file]
-        bootstrap.config[:chef_node_name] = "cucumber-chef-controller"
-        bootstrap.config[:use_sudo] = true
-        bootstrap.config[:template_file] = template_file
-        bootstrap.config[:validation_client_name] = config["validation_client_name"]
-        bootstrap.config[:validation_key] = config["validation_key"]
-        bootstrap.config[:chef_server_url] = config["chef_server_url"]
-        bootstrap
-      end
-
-      def upload_cookbook(config)
-        version_loader = ::Chef::Cookbook::CookbookVersionLoader.new(@cookbook_path)
-        version_loader.load_cookbooks
-        uploader = ::Chef::CookbookUploader.new(version_loader.cookbook_version,
-                                                @cookbook_path)
-        uploader.upload_cookbook
-      end
-
-      def upload_role(config)
-        role_path = File.join(@cookbook_path, "roles")
-        ::Chef::Config[:role_path] = role_path
-        role = ::Chef::Role.from_disk("test_lab_test")
-        role.save
-        role = ::Chef::Role.from_disk("controller")
-        role.save
-      end
-      
-      def build_test_lab(config, output)
-        TestLab.new(config).build(output)
-      end
-    end
+    autoload :TestRunner, "cucumber/chef/test_runner"
   end
 end
 

data/lib/cucumber/chef/config.rb

@@ -10,10 +10,10 @@ module Cucumber
         config[:mode] = "user"
       end
 
-      def self.test_config
-        config = self.new
-        config[:mode] = "test"
-        config
+
+
+      def self.mode
+        config.test_mode? ? 'test' : 'user'
       end
 
       def [](key)
@@ -40,6 +40,16 @@ module Cucumber
         @config
       end
 
+      def test_config
+        config = self.new
+        config[:mode] = "test"
+        config
+      end
+
+      def test_mode?
+        config[:mode] == "test"
+      end
+
       def list
         values = []
         KEYS.each do |key|

data/lib/cucumber/chef/provisioner.rb

@@ -0,0 +1,92 @@
+require "digest"
+
+module Cucumber
+  module Chef
+    class ProvisionerError < Error ; end
+
+    class Provisioner
+      def initialize
+        @cookbook_path = File.join(File.dirname(__FILE__), "../../../cookbooks/cucumber-chef")
+      end
+
+      def bootstrap_node(dns_name, config)
+        template_file = File.join(File.dirname(__FILE__), "templates/ubuntu10.04-gems.erb")
+        bootstrap = ::Chef::Knife::Bootstrap.new
+        @stdout, @stderr, @stdout = StringIO.new, StringIO.new, StringIO.new
+        ui = ::Chef::Knife::UI.new(@stdout, @stderr, @stdout, bootstrap.config)
+        bootstrap.ui = ui
+        nodename = chef_node_name(config)
+        bootstrap.name_args = [dns_name]
+        bootstrap.config[:run_list] = "role[test_lab_test]"
+        bootstrap.config[:ssh_user] = "ubuntu"
+        bootstrap.config[:identity_file] = config[:knife][:identity_file]
+        bootstrap.config[:chef_node_name] = nodename
+        bootstrap.config[:use_sudo] = true
+        bootstrap.config[:template_file] = template_file
+        bootstrap.config[:validation_client_name] = config["validation_client_name"]
+        bootstrap.config[:validation_key] = config["validation_key"]
+        bootstrap.config[:chef_server_url] = config["chef_server_url"]
+        bootstrap
+        bootstrap.run
+        tag_node(config)
+      end
+
+      def build_controller(dns_name, config)
+        template_file = File.join(File.dirname(__FILE__), "templates/controller.erb")
+        bootstrap = ::Chef::Knife::Bootstrap.new
+        @stdout, @stderr, @stdout = StringIO.new, StringIO.new, StringIO.new
+        ui = ::Chef::Knife::UI.new(@stdout, @stderr, @stdout, bootstrap.config)
+        bootstrap.ui = ui
+        bootstrap.name_args = [dns_name]
+        bootstrap.config[:ssh_user] = "ubuntu"
+        bootstrap.config[:identity_file] = config[:knife][:identity_file]
+        bootstrap.config[:chef_node_name] = "cucumber-chef-controller"
+        bootstrap.config[:use_sudo] = true
+        bootstrap.config[:template_file] = template_file
+        bootstrap.config[:validation_client_name] = config["validation_client_name"]
+        bootstrap.config[:validation_key] = config["validation_key"]
+        bootstrap.config[:chef_server_url] = config["chef_server_url"]
+
+      end
+
+      def upload_cookbook(config)
+        version_loader = ::Chef::Cookbook::CookbookVersionLoader.new(@cookbook_path)
+        version_loader.load_cookbooks
+        uploader = ::Chef::CookbookUploader.new(version_loader.cookbook_version,
+                                                @cookbook_path)
+        uploader.upload_cookbook
+      end
+
+      def upload_role(config)
+        role_path = File.join(@cookbook_path, "roles")
+        ::Chef::Config[:role_path] = role_path
+        role = ::Chef::Role.from_disk("test_lab_test")
+        role.save
+        role = ::Chef::Role.from_disk("controller")
+        role.save
+      end
+      
+      def build_test_lab(config, output)
+        TestLab.new(config).build(output)
+      end
+
+      def tag_node(config)
+        node = ::Chef::Node.load(chef_node_name)
+        node.tags << (config.test_mode? ? 'test' : 'user')
+        node.save
+      end
+      
+    private
+      
+      def chef_node_name(config=nil)
+        @node_name ||= begin
+          if config.test_mode?
+            "cucumber-chef-#{Digest::SHA1.hexdigest(Time.now.to_s)[0..7]}"
+          else
+            "cucumber-chef-test-lab"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,8 @@
 Welcome to the <%= @project %> suite of cucumber-chef tests
 
-Your general workflow will be to write cucumber features that describe the intended behaviour of '<%= @project %>'.  You will then write failing tests by writing steps to test the b$
+Your general workflow will be to write cucumber features that describe the intended behaviour of '<%= @project %>'.  You will then write failing tests by writing steps to test the behaviour, expressing them as cucumer scenarios. 
 
-You will then want to create a '<%= @project %>' cookbook, and write recipes that make your tests pass.  Upload your cookbook to the Opscode Platform, and then push your cucumber-ch$
-
-cucumber-chef upload <%= @project %>
+You will then want to create a '<%= @project %>' cookbook, and write recipes that make your tests pass.  Upload your cookbook to the Opscode Platform, and then run the tests with: 
 
 Then run your tests with:
 
@@ -14,15 +12,3 @@ For an example feature, take a look at ./<%= @project %>/features/example.featur
 
 For an example step definition, look at ./<%= @project %>/features/example.feature
 
-To get started, you'll need to configure cucumber-chef to use your own Opscode Chef platform credentials, and AWS EC2 keys.  You can generate a sample config with:
-
-cucumber-chef genconfig
-
-This will drop a .cucumber-chef config file in the home directory of the user with which you ran the cucumber-chef command.  You'll need to edit the file in order to carry out setup, upload or test functionality.
-
-One you've got a configuration in place, run:
-
-cucumber-chef setup
-
-This will create what we call a 'test lab' in EC2 in which tests will be run.
-

data/lib/cucumber/chef/test_lab.rb

@@ -10,7 +10,6 @@ module Cucumber
                            :aws_access_key_id => @config[:knife][:aws_access_key_id],
                            :aws_secret_access_key => @config[:knife][:aws_secret_access_key],
                            :region => @config[:knife][:region])
-        @mode = @config[:mode]
       end
 
       def build(output)
@@ -38,20 +37,41 @@ module Cucumber
       end
 
       def destroy
-        @connection.servers.each do |s|
-          s.destroy if s.tags['cucumber-chef'] == @mode && s.state == 'running'
+        running_labs.each do |server|
+          #server.destroy
+          puts server.public_ip_address
+        end
+        nodes.each do |node|
+          # node.destroy
+          puts node[:ec2][:public_ipv4]
         end
       end
 
       def exists?
-        running_labs_count > 0
+        running_labs.size > 0
       end
 
       def info
-        if exists?
-          query = ::Chef::Search::Query.new
-          node, offset, total = query.search("node", URI.escape("roles:test_lab_test"))
-          node.first && node.first[:ec2][:public_ipv4]
+        "#{node.name}: #{node[:ec2][:public_ipv4]}"
+      end
+
+      def public_hostname
+        node.cloud.public_hostname
+      end
+
+      def node
+        @node ||= begin
+        search = ::Chef::Search::Query.new
+        mode = @config[:mode]
+        query = "roles:test_lab_test AND tags:#{mode}"
+        nodes, offset, total = search.search("node", URI.escape(query))
+        nodes.compact.first
+        end
+      end
+
+      def running_labs
+        @connection.servers.select do |s|
+          s.tags['cucumber-chef'] == @config[:mode] && s.state == 'running'
         end
       end
 
@@ -60,15 +80,9 @@ module Cucumber
         tag = @connection.tags.new
         tag.resource_id = @server.id
         tag.key = "cucumber-chef"
-        tag.value = @mode
+        tag.value = @config[:mode]
         tag.save
       end
-
-      def running_labs_count
-        @connection.servers.select do |s|
-          s.tags["cucumber-chef"] == @mode && s.state == "running"
-        end.size
-      end
     end
   end
 end

data/lib/cucumber/chef/test_runner.rb

@@ -0,0 +1,32 @@
+module Cucumber
+  module Chef
+    class TestRunnerError < Error ; end
+
+    class TestRunner
+
+      require 'cucumber/chef/test_lab'
+
+      def initialize(project_dir, config)
+        @project_dir = project_dir
+        @config = config
+      end
+
+      def run
+        upload_project
+        @project_path = File.join('/home/ubuntu', File.basename(@project_dir), 'features')
+        connection = Net::SSH.start(@hostname, 'ubuntu', :keys => @key) do |ssh|
+          @output = ssh.exec!("sudo cucumber #{@project_path}")
+        end
+        puts @output
+      end
+
+      def upload_project
+        lab = Cucumber::Chef::TestLab.new(@config)
+        @hostname = lab.public_hostname
+        @key = File.expand_path(@config[:knife][:identity_file])
+        %x[scp -r -i #{@key} #{@project_dir} ubuntu@#{@hostname}: 2>/dev/null]
+        puts "Cucumber-chef project: #{File.basename(@project_dir)} sucessfully uploaded to the test lab."
+      end
+    end
+  end
+end

data/spec/unit/config_spec.rb

@@ -103,6 +103,14 @@ describe Cucumber::Chef::Config do
       config = Cucumber::Chef::Config.test_config
       config[:mode].should == "test"
     end
+
+    it "should know it is in test mode" do
+      Cucumber::Chef::Config.test_config.test_mode?.should be
+    end
+
+    it "should know it is not in test_mode" do
+      Cucumber::Chef::Config.new.test_mode?.should_not be
+    end
   end
 end
 

data/spec/unit/cucumber_chef_spec.rb

@@ -2,126 +2,3 @@ require "rubygems"
 require "bundler/setup"
 require File.join(File.dirname(__FILE__), "../../lib/cucumber-chef")
 
-def tcp_test_ssh(hostname)
-  tcp_socket = TCPSocket.new(hostname, 22)
-  IO.select([tcp_socket], nil, nil, 5)
-rescue Errno::ETIMEDOUT
-  false
-rescue Errno::EPERM
-  false
-rescue Errno::ECONNREFUSED
-  sleep 2
-  false
-  # This happens on EC2 quite often
-rescue Errno::EHOSTUNREACH
-  sleep 2
-  false
-ensure
-  tcp_socket && tcp_socket.close
-end
-
-describe Cucumber::Chef::Provisioner do
-  before(:all) do
-    @config = subject.config
-    @config[:mode] = "test"
-  end
-
-  describe "upload_cookbook" do
-    before(:each) do
-      begin
-        cookbook_path = File.expand_path("cookbooks/cucumber-chef")
-        version_loader = ::Chef::Cookbook::CookbookVersionLoader.new(cookbook_path)
-        version_loader.load_cookbooks
-        version = version_loader.cookbook_version
-        version.destroy
-      rescue Net::HTTPServerException => err
-      end
-    end
-
-    it "should upload the cucumber-chef cookbook" do
-      subject.upload_cookbook(@config)
-      ::Chef::CookbookVersion.list["cucumber-chef"].should be
-    end
-  end
-
-  describe "upload_role" do
-    before(:each) do
-      begin
-        role_path = File.expand_path("cookbooks/cucumber-chef/roles")
-        ::Chef::Config[:role_path] = role_path
-        role = ::Chef::Role.from_disk("test_lab_test")
-        role.destroy
-      rescue Net::HTTPServerException => err
-      end
-    end
-
-    it "should upload the test_lab role" do
-      subject.upload_role(@config)
-      ::Chef::Role.list["test_lab_test"].should be
-    end
-  end
-
-  describe "bootstrap_node" do
-    before(:each) do
-      server = subject.build_test_lab(@config, StringIO.new)
-      @dns_name = server.dns_name
-      puts "Hanging around..." until tcp_test_ssh(server.public_ip_address)
-      puts "Got ssh..."
-      sleep(10)
-      subject.upload_cookbook(@config)
-      subject.upload_role(@config)
-    end
-    
-    after(:each) do
-      config = @config[:knife]
-      connection = Fog::Compute.new(:provider => 'AWS',
-                                    :aws_access_key_id => config[:aws_access_key_id],
-                                    :aws_secret_access_key => config[:aws_secret_access_key],
-                                    :region => config[:region])
-      connection.servers.each do |s|
-        s.destroy if s.tags['cucumber-chef'] == 'test' && s.state == 'running'
-      end
-    end
-
-    it "should set up platform as a chef client and apply test-lab role" do
-      bootstrapper = subject.bootstrap_node(@dns_name, @config)
-      bootstrapper.run
-      # DEBUG: puts bootstrapper.ui.stdout.string
-      node = ::Chef::Node.load("cucumber-chef-test-lab")
-      node.run_list.to_s.should match(/role\[test_lab_test\]/)
-    end
-  end
-
-  describe "build_controller" do
-
-    before(:each) do
-      server = subject.build_test_lab(@config, StringIO.new)
-      @dns_name = server.dns_name
-      puts "Hanging around..." until tcp_test_ssh(server.public_ip_address)
-      puts "Got ssh..."
-      sleep(10)
-      subject.upload_cookbook(@config)
-      subject.upload_role(@config)
-      subject.bootstrap_node(@dns_name, @config).run
-    end
-    
-    after(:each) do
-      config = @config[:knife]
-      connection = Fog::Compute.new(:provider => 'AWS',
-                                    :aws_access_key_id => config[:aws_access_key_id],
-                                    :aws_secret_access_key => config[:aws_secret_access_key],
-                                    :region => config[:region])
-      connection.servers.each do |s|
-        s.destroy if s.tags['cucumber-chef'] == 'test' && s.state == 'running'
-      end
-    end
-
-    it "should build a cucumber-chef controller" do
-      controller_builder = subject.build_controller(@dns_name, @config)
-      controller_builder.run
-      puts controller_builder.ui.stdout.string
-    end
-
-  end
-
-end

data/spec/unit/provisioner_spec.rb

@@ -0,0 +1,120 @@
+require "rubygems"
+require "bundler/setup"
+require File.join(File.dirname(__FILE__), "../../lib/cucumber-chef")
+
+def tcp_test_ssh(hostname)
+  tcp_socket = TCPSocket.new(hostname, 22)
+  IO.select([tcp_socket], nil, nil, 5)
+rescue Errno::ETIMEDOUT
+  false
+rescue Errno::EPERM
+  false
+rescue Errno::ECONNREFUSED
+  sleep 2
+  false
+  # This happens on EC2 quite often
+rescue Errno::EHOSTUNREACH
+  sleep 2
+  false
+ensure
+  tcp_socket && tcp_socket.close
+end
+
+describe Cucumber::Chef::Provisioner do
+  before(:all) do
+    @config = Cucumber::Chef::Config.test_config
+  end
+
+  describe "upload_cookbook" do
+    before(:each) do
+      begin
+        cookbook_path = File.expand_path("cookbooks/cucumber-chef")
+        version_loader = ::Chef::Cookbook::CookbookVersionLoader.new(cookbook_path)
+        version_loader.load_cookbooks
+        version = version_loader.cookbook_version
+        version.destroy
+      rescue Net::HTTPServerException => err
+      end
+    end
+
+    it "should upload the cucumber-chef cookbook" do
+      subject.upload_cookbook(@config)
+      ::Chef::CookbookVersion.list["cucumber-chef"].should be
+    end
+  end
+
+  describe "upload_role" do
+    before(:each) do
+      begin
+        role_path = File.expand_path("cookbooks/cucumber-chef/roles")
+        ::Chef::Config[:role_path] = role_path
+        role = ::Chef::Role.from_disk("test_lab_test")
+        role.destroy
+      rescue Net::HTTPServerException => err
+      end
+    end
+
+    it "should upload the test_lab role" do
+      subject.upload_role(@config)
+      ::Chef::Role.list["test_lab_test"].should be
+    end
+  end
+
+  describe "bootstrap_node" do
+    before(:each) do
+      @test_lab = Cucumber::Chef::TestLab.new(@config)
+      @test_lab.destroy
+      server = subject.build_test_lab(@config, StringIO.new)
+      @dns_name = server.dns_name
+      puts "Hanging around..." until tcp_test_ssh(server.public_ip_address)
+      puts "Got ssh..."
+      sleep(10)
+      subject.upload_cookbook(@config)
+      subject.upload_role(@config)
+    end
+    
+    after(:each) do
+      @test_lab.destroy
+    end
+
+    it "should assign a random name to the node" do
+      bootstrapper = subject.bootstrap_node(@dns_name, @config)
+      bootstrapper.run
+      @test_lab.nodes.detect do |node|
+        node.name.match /^cucumber-chef-[0-9a-f]{8}$/
+      end.should be
+    end
+  end
+
+  describe "build_controller" do
+
+    before(:each) do
+      server = subject.build_test_lab(@config, StringIO.new)
+      @dns_name = server.dns_name
+      puts "Hanging around..." until tcp_test_ssh(server.public_ip_address)
+      puts "Got ssh..."
+      sleep(10)
+      subject.upload_cookbook(@config)
+      subject.upload_role(@config)
+      subject.bootstrap_node(@dns_name, @config).run
+    end
+    
+    after(:each) do
+      config = @config[:knife]
+      connection = Fog::Compute.new(:provider => 'AWS',
+                                    :aws_access_key_id => config[:aws_access_key_id],
+                                    :aws_secret_access_key => config[:aws_secret_access_key],
+                                    :region => config[:region])
+      connection.servers.each do |s|
+        s.destroy if s.tags['cucumber-chef'] == 'test' && s.state == 'running'
+      end
+    end
+
+    it "should build a cucumber-chef controller" do
+      controller_builder = subject.build_controller(@dns_name, @config)
+      controller_builder.run
+      puts controller_builder.ui.stdout.string
+    end
+
+  end
+end

data/spec/unit/test_lab_spec.rb

@@ -4,8 +4,7 @@ require File.join(File.dirname(__FILE__), "../../lib/cucumber-chef")
 
 describe Cucumber::Chef::TestLab do
   before(:all) do
-    @config = Cucumber::Chef::Config.new.config
-    @config[:mode] = "test"
+    @config = Cucumber::Chef::Config.test_config
   end
 
   subject { Cucumber::Chef::TestLab.new(@config) }
@@ -54,7 +53,7 @@ describe Cucumber::Chef::TestLab do
     after(:each) { subject.destroy }
 
     it "should report its public ip address", :slow => true do
-      subject.info.should == @public_ip_address
+      subject.info.should match(/#{@public_ip_address}/)
     end
   end
 end

data/spec/unit/test_runner_spec.rb

@@ -0,0 +1,10 @@
+require "rubygems"
+require "bundler/setup"
+require File.join(File.dirname(__FILE__), "../../lib/cucumber-chef")
+
+describe Cucumber::Chef::TestRunner do
+  before(:all) do
+    @config = Cucumber::Chef::Config.test_config
+  end
+end
+

metadata

@@ -1,136 +1,127 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cucumber-chef
-version: !ruby/object:Gem::Version
-  version: 0.5.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.5.1
 platform: ruby
-authors:
+authors: 
 - Stephen Nelson-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-09 00:00:00.000000000 +00:00
+
+date: 2011-06-14 00:00:00 +01:00
 default_executable: cucumber-chef
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: chef
-  requirement: &24043900 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *24043900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &24043420 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *24043420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: cucumber-nagios
-  requirement: &24042940 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *24042940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &24042460 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *24042460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: fog
-  requirement: &24041980 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *24041980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: &24041500 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *24041500
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: &24041020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *24041020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &24061420 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *24061420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &24060940 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *24060940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &24060460 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *24060460
+  version_requirements: *id009
 description: Framework for behaviour-drive infrastructure development.
 email: stephen@atalanta-systems.com
-executables:
+executables: 
 - cucumber-chef
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.md
-files:
+files: 
 - .document
 - .gitignore
 - Gemfile
@@ -173,6 +164,7 @@ files:
 - lib/cucumber/chef.rb
 - lib/cucumber/chef/config.rb
 - lib/cucumber/chef/handy.rb
+- lib/cucumber/chef/provisioner.rb
 - lib/cucumber/chef/templates/controller.erb
 - lib/cucumber/chef/templates/env.rb
 - lib/cucumber/chef/templates/example_feature.erb
@@ -180,38 +172,44 @@ files:
 - lib/cucumber/chef/templates/readme.erb
 - lib/cucumber/chef/templates/ubuntu10.04-gems.erb
 - lib/cucumber/chef/test_lab.rb
+- lib/cucumber/chef/test_runner.rb
 - lib/cucumber/chef/version.rb
 - lib/cucumber/ec2_server_create.rb
 - spec/unit/config_spec.rb
 - spec/unit/cucumber_chef_spec.rb
+- spec/unit/provisioner_spec.rb
 - spec/unit/test_lab_spec.rb
+- spec/unit/test_runner_spec.rb
 has_rdoc: true
 homepage: http://github.com/atalanta/cucumber-chef
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 4460646559625670767
+      segments: 
       - 0
-      hash: -3689892462055237010
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Tests Chef-built infrastructure
 test_files: []
+