cucumber-chef 0.4.4 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

data/bin/cucumber-chef

@@ -27,46 +27,7 @@ class CucumberChef < Thor
     File.dirname(__FILE__)
   end
 
-  def initialize(args = [], options = {}, config = {})
-    @provisioner = ::Cucumber::Chef::Provisioner.new
-    super(args, options, config)
-  end
-
   no_tasks do
-    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
-
-    def get_latest_version
-      installed_versions = []
-      Gem::source_index.find_name('cucumber-chef').map do |g|
-        version = g.version.version
-        if version == ""
-          version = "0"
-        end
-        installed_versions << version
-      end
-      version = installed_versions.sort { |a, b| a.to_i <=> b.to_i }.last
-      if version == "0"
-        version = ""
-      end
-      return "cucumber-chef-" + version
-    end
-
     def create_directory_structure(project_dir)
       %w{step_definitions support}.each do |dir|
         FileUtils.mkdir_p(project_dir + "features" + dir)
@@ -95,12 +56,6 @@ class CucumberChef < Thor
       warn message
       exit 255
     end
-
-    def find_knife_config
-      @provisioner.config
-    rescue ::Cucumber::Chef::ProvisionerError => err
-      error(err.message)
-    end
   end
   
   desc "project <project name>" , "Create a project template for testing an infrastructure"
@@ -115,35 +70,53 @@ class CucumberChef < Thor
   method_option :test, :type  => :boolean
   def setup
     begin
-      config = find_knife_config
       if options.test?
-        config[:mode] = "test"
+        config = Cucumber::Chef::Config.test_config
       else
-        config[:mode] = "user"
+        config = Cucumber::Chef::Config.new
       end
-      @provisioner.verify_opscode_platform_credentials(config)
-      @provisioner.verify_aws_credentials(config)
+      config.verify
       $stdout.sync
-      server = @provisioner.build_test_lab(config, $stdout)
+      provisioner = ::Cucumber::Chef::Provisioner.new
+      server = provisioner.build_test_lab(config, $stdout)
       sleep(10)
-      @provisioner.upload_cookbook(config)
-      @provisioner.upload_role(config)
-      @provisioner.bootstrap_node(server.dns_name, config).run
-    rescue ::Cucumber::Chef::ProvisionerError => err
+      provisioner.upload_cookbook(config)
+      provisioner.upload_role(config)
+      provisioner.bootstrap_node(server.dns_name, config).run
+    rescue ::Cucumber::Chef::Error => err
       error(err.message)
     end
   end
 
   desc "displayconfig", "Display the current config from knife.rb"
+  method_option :test, :type  => :boolean
   def displayconfig
-    values, missing_keys = Cucumber::Chef::Config.new.display
-    puts values.join("\n")
-    if missing_keys.size > 0
-      error("Incomplete config file, please specify: #{missing_keys.join(", ")}")
+    if options.test?
+      config = Cucumber::Chef::Config.test_config
+    else
+      config = Cucumber::Chef::Config.new
     end
-  rescue ::Cucumber::Chef::ProvisionerError => err
+    puts config.list.join("\n")
+    config.verify
+  rescue ::Cucumber::Chef::Error => err
     error(err.message)
   end
+
+  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
+  end
   
   desc "upload", "Upload a cucumber-chef test suite to the test lab platform"
   def upload
@@ -156,7 +129,6 @@ class CucumberChef < Thor
     puts
     puts "Test results will appear here."
   end
-  
-  
 end
+
 CucumberChef.start

data/cucumber-chef.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber-chef}
-  s.version = "0.4.4"
+  s.version = "0.5.0"
 
   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-06}
+  s.date = %q{2011-06-09}
   s.default_executable = %q{cucumber-chef}
   s.description = %q{Framework for behaviour-drive infrastructure development.}
   s.email = %q{stephen@atalanta-systems.com}
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
     "features/usage.feature",
     "lib/cucumber-chef.rb",
     "lib/cucumber/chef.rb",
+    "lib/cucumber/chef/config.rb",
     "lib/cucumber/chef/handy.rb",
     "lib/cucumber/chef/templates/controller.erb",
     "lib/cucumber/chef/templates/env.rb",
@@ -66,9 +67,12 @@ Gem::Specification.new do |s|
     "lib/cucumber/chef/templates/example_step.erb",
     "lib/cucumber/chef/templates/readme.erb",
     "lib/cucumber/chef/templates/ubuntu10.04-gems.erb",
+    "lib/cucumber/chef/test_lab.rb",
     "lib/cucumber/chef/version.rb",
     "lib/cucumber/ec2_server_create.rb",
-    "spec/unit/cucumber_chef_spec.rb"
+    "spec/unit/config_spec.rb",
+    "spec/unit/cucumber_chef_spec.rb",
+    "spec/unit/test_lab_spec.rb"
   ]
   s.homepage = %q{http://github.com/atalanta/cucumber-chef}
   s.licenses = ["MIT"]

data/features/steps/usage_steps.rb

@@ -22,7 +22,7 @@ When /^the config file contains invalid credentials$/ do
 end
 
 Then /^I should be alerted that my credentials are invalid$/ do
-  @output.should == "Invalid Opscode platform credentials. Please check.\n"
+  @output.should match(/Invalid Opscode platform credentials. Please check/m)
 end
 
 When /^I create a project called test_project$/ do

data/lib/cucumber/chef/config.rb

@@ -0,0 +1,121 @@
+module Cucumber
+  module Chef
+    class ConfigError < Error ; end
+
+    class Config
+      KEYS = %w[mode node_name chef_server_url client_key validation_key validation_client_name]
+      KNIFE_KEYS = %w[aws_access_key_id aws_secret_access_key region availability_zone aws_ssh_key_id identity_file]
+
+      def initialize
+        config[:mode] = "user"
+      end
+
+      def self.test_config
+        config = self.new
+        config[:mode] = "test"
+        config
+      end
+
+      def [](key)
+        config[key]
+      end
+
+      def []=(key, value)
+        config[key] = value
+      end
+
+      def config
+        unless @config
+          full_path = Dir.pwd.split(File::SEPARATOR)
+          (full_path.length - 1).downto(0) do |i|
+            knife_file = File.join(full_path[0..i] + [".chef", "knife.rb"])
+            if File.exist?(knife_file)
+              ::Chef::Config.from_file(knife_file)
+              @config = ::Chef::Config
+              return @config
+            end
+          end
+          raise ConfigError.new("Couldn't find knife.rb")
+        end
+        @config
+      end
+
+      def list
+        values = []
+        KEYS.each do |key|
+          value = config[key]
+          values << "#{key}: #{value}"
+        end
+        KNIFE_KEYS.each do |key|
+          value = config[:knife][key.to_sym]
+          values << "knife[:#{key}]: #{value}"
+        end
+        values
+      end
+
+      def verify
+        @errors = []
+        verify_orgname
+        verify_opscode_user
+        verify_keys
+        verify_opscode_platform_credentials
+        verify_aws_credentials
+        if @errors.size > 0
+          raise ConfigError.new(@errors.join("\n"))
+        end
+      end
+
+    private
+      
+      def verify_orgname
+        if !ENV["ORGNAME"] || ENV["ORGNAME"] == ""
+          @errors << "Your organisation must be set using the environment variable ORGNAME."
+        end
+      end
+
+      def verify_opscode_user
+        if !ENV["OPSCODE_USER"] || ENV["OPSCODE_USER"] == ""
+          @errors << "Your Opscode platform username must be set using the environment variable OPSCODE_USER."
+        end
+      end
+
+      def verify_keys
+        missing_keys = []
+        KEYS.each do |key|
+          value = config[key]
+          missing_keys << key unless value && value != ""
+        end
+        KNIFE_KEYS.each do |key|
+          missing_keys << "knife[:#{key}]" unless value = config[:knife][key.to_sym]
+        end
+        if missing_keys.size > 0
+          @errors << "Incomplete config file, please specify: #{missing_keys.join(", ")}."
+        end
+      end
+
+      def verify_opscode_platform_credentials
+        username = config['node_name']
+        if username
+          req = Net::HTTP.new('community.opscode.com', 80)
+          code = req.request_head("/users/#{username}").code
+        end
+        if username == "" || code != "200"
+          @errors << "Invalid Opscode platform credentials. Please check."
+        end
+      end
+      
+      def verify_aws_credentials
+        if config[:knife][:aws_access_key_id] && config[:knife][:aws_secret_access_key]
+          compute = Fog::Compute.new(:provider => 'AWS',
+                                     :aws_access_key_id => config[:knife][:aws_access_key_id],
+                                     :aws_secret_access_key => config[:knife][:aws_secret_access_key])
+          compute.describe_availability_zones
+        else
+          @errors << "Invalid AWS credentials. Please check."
+        end
+      rescue Fog::Service::Error => err
+        @errors << "Invalid AWS credentials. Please check."
+      end
+    end
+  end
+end

data/lib/cucumber/chef/handy.rb

@@ -43,7 +43,7 @@ module Cucumber
         %x[chroot #{container_path} /bin/bash -c 'chef-client > /dev/null 2>&1']
       end
       
-      def databag_from_file(file)
+      def databag_item_from_file(file)
         ::Chef::JSONCompat.from_json(File.read(file))
       end
 

data/lib/cucumber/chef/test_lab.rb

@@ -0,0 +1,74 @@
+module Cucumber
+  module Chef
+    class TestLabError < Error ; end
+
+    class TestLab
+      def initialize(config)
+        @config = config
+        @connection =
+          Fog::Compute.new(:provider => 'AWS',
+                           :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)
+        if exists?
+          raise TestLabError.new("A test lab already exists using the AWS credentials you supplied")
+        end
+        server_definition = {
+          :image_id => "ami-339ca947",
+          :groups => "default",
+          :flavor_id => "m1.small",
+          :key_name => @config[:knife][:aws_ssh_key_id],
+          :availability_zone => @config[:knife][:availability_zone],
+          :tags => {"purpose" => "cucumber-chef"},
+          :identity_file => @config[:knife][:identity_file]
+        }
+        @server = @connection.servers.create(server_definition)
+        output.puts "Provisioning cucumber-chef test lab platform."
+        output.print "Waiting for server"
+        @server.wait_for { output.print "."; ready? }
+        output.puts("\n")
+        tag_server
+        output.puts "Instance ID: #{@server.id} ; IP Address #{@server.public_ip_address}"
+        output.puts "Platform provisioned.  Run cucumber-chef project to get started."
+        @server
+      end
+
+      def destroy
+        @connection.servers.each do |s|
+          s.destroy if s.tags['cucumber-chef'] == @mode && s.state == 'running'
+        end
+      end
+
+      def exists?
+        running_labs_count > 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]
+        end
+      end
+
+    private
+      def tag_server
+        tag = @connection.tags.new
+        tag.resource_id = @server.id
+        tag.key = "cucumber-chef"
+        tag.value = @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.rb

@@ -14,44 +14,8 @@ module Cucumber
   module Chef
     class Error < StandardError ; end
     
-    class ConfigError < Error ; end
-    class Config
-      KEYS = %w[node_name chef_server_url client_key validation_key validation_client_name]
-      KNIFE_KEYS = %w[aws_access_key_id aws_secret_access_key region availability_zone aws_ssh_key_id identity_file]
-      
-      def config
-        full_path = Dir.pwd.split(File::SEPARATOR)
-        (full_path.length - 1).downto(0) do |i|
-          knife_file = File.join(full_path[0..i] + [".chef", "knife.rb"])
-          if File.exist?(knife_file)
-            ::Chef::Config.from_file(knife_file)
-            return ::Chef::Config
-          end
-        end
-        raise ConfigError.new("Couldn't find knife.rb")
-      end
-
-      def display
-        current_config = config
-        values, missing_keys = [], []
-        KEYS.each do |key|
-          value = current_config[key]
-          if value && value != ""
-            values << "#{key}: #{value}"
-          else
-            missing_keys << key
-          end
-        end
-        KNIFE_KEYS.each do |key|
-          if value = current_config[:knife][key.to_sym]
-            values << "knife[:#{key}]: #{value}"
-          else
-            missing_keys << "knife[:#{key}]"
-          end
-        end
-        [values, missing_keys]
-      end
-    end
+    autoload :Config, "cucumber/chef/config"
+    autoload :TestLab, "cucumber/chef/test_lab"
 
     class ProvisionerError < Error ; end
     class Provisioner
@@ -63,27 +27,6 @@ module Cucumber
         Config.new.config
       end
 
-      def running_labs(connection, mode)
-        connection.servers.select {|s| s.tags['cucumber-chef'] == mode && s.state == 'running'}
-      end
-
-      def lab_exists?(connection, mode)
-        number_of_labs = running_labs(connection, mode).size
-        if number_of_labs > 0
-          return true
-        else
-          return false
-        end
-      end
-      
-      def tag_server(connection, id, tag)
-        t = connection.tags.new
-        t.resource_id = id
-        t.key = "cucumber-chef"
-        t.value = tag
-        t.save
-      end
-
       def bootstrap_node(dns_name, config)
         template_file = File.join(File.dirname(__FILE__),
                                   "chef/templates/ubuntu10.04-gems.erb")
@@ -123,26 +66,6 @@ module Cucumber
         bootstrap
       end
 
-      def verify_opscode_platform_credentials(config)
-        username = config['node_name']
-        if username
-          req = Net::HTTP.new('community.opscode.com', 80)
-          code = req.request_head("/users/#{username}").code
-        end
-        if username == "" || code != "200"
-          raise ProvisionerError.new("Invalid Opscode platform credentials. Please check.")
-        end
-      end
-
-      def verify_aws_credentials(config)
-        compute = Fog::Compute.new(:provider => 'AWS',
-                                   :aws_access_key_id => config[:knife][:aws_access_key_id],
-                                   :aws_secret_access_key => config[:knife][:aws_secret_access_key])
-        compute.describe_availability_zones
-      rescue Fog::Service::Error => err
-        raise ProvisionerError.new("Invalid AWS credentials. Please check.")
-      end
-      
       def upload_cookbook(config)
         version_loader = ::Chef::Cookbook::CookbookVersionLoader.new(@cookbook_path)
         version_loader.load_cookbooks
@@ -161,25 +84,7 @@ module Cucumber
       end
       
       def build_test_lab(config, output)
-        connection = Fog::Compute.new(:provider => 'AWS',
-                                      :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"]
-        if lab_exists?(connection, mode)
-          raise ProvisionerError.new("A test lab already exists using the AWS credentials you supplied") 
-        end
-        ami = connection.images.get("ami-339ca947")
-        server_def = { :image_id => "ami-339ca947", :groups => "default", :flavor_id => "m1.small", :key_name => config[:knife][:aws_ssh_key_id], :availability_zone => config[:knife][:availability_zone], :tags => {"purpose" => "cucumber-chef"}, :identity_file => config[:knife][:identity_file] }
-        server = connection.servers.create(server_def)
-        output.puts "Provisioning cucumber-chef test lab platform."
-        output.print "Waiting for server"
-        server.wait_for { output.print "."; ready? }
-        output.puts("\n")
-        tag_server(connection, server.id, config["mode"])
-        output.puts "Instance ID: #{server.id} ; IP Address #{server.public_ip_address}"
-        output.puts "Platform provisioned.  Run cucumber-chef project to get started."
-        server
+        TestLab.new(config).build(output)
       end
     end
   end

data/spec/unit/config_spec.rb

@@ -0,0 +1,108 @@
+require "rubygems"
+require "bundler/setup"
+require File.join(File.dirname(__FILE__), "../../lib/cucumber-chef")
+
+describe Cucumber::Chef::Config do
+  before(:all) do
+    @orgname = ENV["ORGNAME"]
+    @opscode_user = ENV["OPSCODE_USER"]
+  end
+
+  after(:each) do
+    ENV["ORGNAME"] = @orgname
+    ENV["OPSCODE_USER"] = @opscode_user
+  end
+
+  describe "verification" do
+    describe "when ORGNAME is not set" do
+      it "should raise" do
+        ENV["ORGNAME"] = ""
+        expect {
+          subject.verify
+        }.to raise_error(Cucumber::Chef::ConfigError, /ORGNAME/)
+      end
+    end
+
+    describe "when OPSCODE_USER is not set" do
+      it "should raise" do
+        ENV["OPSCODE_USER"] = ""
+        expect {
+          subject.verify
+        }.to raise_error(Cucumber::Chef::ConfigError, /OPSCODE_USER/)
+      end
+    end
+
+    describe "when configuration is invalid" do
+      it "should complain about missing keys" do
+        subject.config[:chef_server_url] = nil
+        subject.config[:knife][:aws_access_key_id] = nil
+        expect {
+          subject.verify
+        }.to raise_error(Cucumber::Chef::ConfigError, /chef_server_url.*aws_access_key_id/)
+      end
+      
+      describe "when node name is invalid" do
+        it "should raise" do
+          ENV["OPSCODE_USER"] = "REALLYBOGUSORGNAME"
+          expect {
+            subject.verify
+          }.to raise_error(Cucumber::Chef::ConfigError, /Opscode platform credentials/)
+        end
+      end
+    
+      describe "when aws_access_key_id is empty" do
+        it "should raise" do
+          subject.config[:knife][:aws_access_key_id] = "bogus"
+          expect {
+            subject.verify
+          }.to raise_error(Cucumber::Chef::ConfigError, /AWS credentials/)
+        end
+      end
+    end
+
+    describe "when configuration is valid" do
+      it "should not raise" do
+        subject.verify
+      end
+    end
+  end
+
+  describe "when knife.rb is missing" do
+    it "should raise" do
+      begin
+        chef_dir = Pathname("~/.chef").expand_path
+        (chef_dir + "knife.rb").rename(chef_dir + "knife.rb.bak")
+        config_file = chef_dir + "knife.rb"
+        expect { subject.config }.to raise_error(Cucumber::Chef::ConfigError)
+      ensure
+        (chef_dir + "knife.rb.bak").rename(chef_dir + "knife.rb")
+      end
+    end
+  end
+
+  describe "when configuration is valid" do
+    it "should list the configuration values" do
+      output = subject.list.join("\n")
+      output.should match(/node_name:/)
+      output.should match(/knife\[:aws_secret_access_key\]:/)
+    end
+
+    it "should return the configuration values" do
+      subject[:node_name].should == @opscode_user
+      subject[:knife][:ssh_user].should == "ubuntu"
+    end
+
+    it "should allow setting configuration values" do
+      subject[:mode] = "blah"
+      subject[:knife][:aws_access_key_id] = "bogus"
+      subject[:mode].should == "blah"
+      subject[:knife][:aws_access_key_id].should == "bogus"
+    end
+
+    it "should provide a method for getting a test mode configuration" do
+      config = Cucumber::Chef::Config.test_config
+      config[:mode].should == "test"
+    end
+  end
+end
+

data/spec/unit/cucumber_chef_spec.rb

@@ -20,155 +20,12 @@ ensure
   tcp_socket && tcp_socket.close
 end
 
-describe Cucumber::Chef::Config do
-  describe "when configuration is missing" do
-    it "should raise if it cannot find a configuration" do
-      begin
-        chef_dir = File.expand_path("~/.chef")
-        config_file = File.join(chef_dir, "knife.rb")
-        FileUtils.mv(config_file, File.join(chef_dir, "knife.rb.bak"))
-        expect { subject.config }.to raise_error(Cucumber::Chef::ConfigError)
-      ensure
-        FileUtils.mv(File.join(chef_dir, "knife.rb.bak"), config_file)
-      end
-    end
-  end
-  
-  describe "when configuration is invalid" do
-    config_dir = File.join(File.dirname(__FILE__), "../../.chef")
-    
-    before(:all) { FileUtils.mkdir_p(config_dir) }
-    after(:all) { FileUtils.rm_rf(config_dir) }
-
-    it "should complain about missing keys" do
-      config = "node_name ''"
-      File.open(Pathname(config_dir) + "knife.rb", 'w') { |f| f.puts config }
-      values, missing_keys = subject.display
-      missing_keys.should include("node_name")
-      missing_keys.should include("knife[:aws_access_key_id]")
-    end
-  end
-
-  describe "when configuration is valid" do
-    it "should find the configuration" do
-      values, missing_keys = subject.display
-      missing_keys.should be_empty
-    end
-
-    it "should display the configuration values" do
-      values, missing_keys = subject.display
-      output = values.join("\n")
-      output.should match(/node_name:/)
-      output.should match(/knife\[:aws_secret_access_key\]:/)
-    end
-  end
-end
-
 describe Cucumber::Chef::Provisioner do
   before(:all) do
     @config = subject.config
     @config[:mode] = "test"
   end
 
-  describe "verify_opscode_platform_credentials" do
-    describe "when configuration is invalid" do
-      config_dir = File.join(File.dirname(__FILE__), "../../.chef")
-      knife_file = File.join(config_dir, "knife.rb")
-    
-      before(:all) do
-        FileUtils.mkdir_p(config_dir)
-      end
-
-      after(:all) do
-        FileUtils.rm_rf(config_dir)
-      end
-    
-      describe "when node name is missing" do
-        it "should raise" do
-          config = "node_name ''"
-          File.open(knife_file, 'w') { |f| f.puts config }
-          expect {
-            subject.verify_opscode_platform_credentials(subject.config)
-          }.to raise_error(Cucumber::Chef::ProvisionerError)
-        end
-      end
-      
-      describe "when node name is invalid" do
-        it "should raise" do
-          config = "node_name 'REALLYBOGUSORGNAME'"
-          File.open(knife_file, 'w') { |f| f.puts config }
-          expect {
-            subject.verify_opscode_platform_credentials(subject.config)
-          }.to raise_error(Cucumber::Chef::ProvisionerError)
-        end
-      end
-    end
-
-    describe "when configuration is valid" do
-      it "should not raise" do
-        subject.verify_opscode_platform_credentials(subject.config)
-      end
-    end
-  end
-
-  describe "verify_aws_credentials" do
-    describe "when configuration is invalid" do
-      config_dir = File.join(File.dirname(__FILE__), "../../.chef")
-      knife_file = File.join(config_dir, "knife.rb")
-    
-      before(:all) do
-        FileUtils.mkdir_p(config_dir)
-      end
-
-      after(:all) do
-        FileUtils.rm_rf(config_dir)
-      end
-    
-      describe "when configuration is invalid" do
-        it "should raise" do
-          config = "knife[:aws_access_key_id] = ''"
-          File.open(knife_file, 'w') { |f| f.puts config }
-          expect {
-            subject.verify_aws_credentials(subject.config)
-          }.to raise_error(Cucumber::Chef::ProvisionerError)
-        end
-      end
-    end
-
-    describe "when configuration is valid" do
-      it "should not raise" do
-        subject.verify_aws_credentials(subject.config)
-      end
-    end
-  end
-
-  describe "build_test_lab" do
-    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 spin up a ec2 instance", :slow => true do
-      output = StringIO.new
-      subject.build_test_lab(@config, output)
-      output.rewind
-      output.read.should match(/Platform provisioned/)
-    end
-
-    it "should only spin up one ec2 instance", :slow => true do
-      subject.build_test_lab(@config, StringIO.new)
-      expect {
-        subject.build_test_lab(@config, StringIO.new)
-      }.to raise_error(Cucumber::Chef::ProvisionerError)
-    end
-  end
-
   describe "upload_cookbook" do
     before(:each) do
       begin

data/spec/unit/test_lab_spec.rb

@@ -0,0 +1,61 @@
+require "rubygems"
+require "bundler/setup"
+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"
+  end
+
+  subject { Cucumber::Chef::TestLab.new(@config) }
+    
+  describe "build" do
+    after(:each) { subject.destroy }
+
+    it "should spin up an ec2 instance", :slow => true do
+      output = StringIO.new
+      subject.build(output)
+      output.rewind
+      output.read.should match(/Platform provisioned/)
+    end
+
+    it "should only spin up one ec2 instance", :slow => true do
+      subject.build(StringIO.new)
+      expect {
+        subject.build(StringIO.new)
+      }.to raise_error(Cucumber::Chef::TestLabError)
+    end
+
+  end
+
+  describe "destroy" do
+    it "should destroy the running ec2 instance", :slow => true do
+      subject.build(StringIO.new)
+      subject.destroy
+      subject.exists?.should_not be
+    end
+  end
+
+  describe "against a bootstrapped lab" do
+    before(:each) do
+      provisioner = Cucumber::Chef::Provisioner.new
+      server = provisioner.build_test_lab(@config, StringIO.new)
+      @dns_name = server.dns_name
+      @public_ip_address = server.public_ip_address
+      puts "Hanging around..." until tcp_test_ssh(server.public_ip_address)
+      puts "Got ssh..."
+      sleep(10)
+      provisioner.upload_cookbook(@config)
+      provisioner.upload_role(@config)
+      provisioner.bootstrap_node(@dns_name, @config).run
+    end
+
+    after(:each) { subject.destroy }
+
+    it "should report its public ip address", :slow => true do
+      subject.info.should == @public_ip_address
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-06 00:00:00.000000000 +00:00
+date: 2011-06-09 00:00:00.000000000 +00:00
 default_executable: cucumber-chef
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &15205680 !ruby/object:Gem::Requirement
+  requirement: &24043900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *15205680
+  version_requirements: *24043900
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &15205200 !ruby/object:Gem::Requirement
+  requirement: &24043420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15205200
+  version_requirements: *24043420
 - !ruby/object:Gem::Dependency
   name: cucumber-nagios
-  requirement: &15204720 !ruby/object:Gem::Requirement
+  requirement: &24042940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15204720
+  version_requirements: *24042940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15204240 !ruby/object:Gem::Requirement
+  requirement: &24042460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15204240
+  version_requirements: *24042460
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &15203760 !ruby/object:Gem::Requirement
+  requirement: &24041980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15203760
+  version_requirements: *24041980
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &15203280 !ruby/object:Gem::Requirement
+  requirement: &24041500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15203280
+  version_requirements: *24041500
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &15223480 !ruby/object:Gem::Requirement
+  requirement: &24041020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15223480
+  version_requirements: *24041020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15223000 !ruby/object:Gem::Requirement
+  requirement: &24061420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15223000
+  version_requirements: *24061420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15222520 !ruby/object:Gem::Requirement
+  requirement: &24060940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *15222520
+  version_requirements: *24060940
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &15222040 !ruby/object:Gem::Requirement
+  requirement: &24060460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15222040
+  version_requirements: *24060460
 description: Framework for behaviour-drive infrastructure development.
 email: stephen@atalanta-systems.com
 executables:
@@ -171,6 +171,7 @@ files:
 - features/usage.feature
 - lib/cucumber-chef.rb
 - lib/cucumber/chef.rb
+- lib/cucumber/chef/config.rb
 - lib/cucumber/chef/handy.rb
 - lib/cucumber/chef/templates/controller.erb
 - lib/cucumber/chef/templates/env.rb
@@ -178,9 +179,12 @@ files:
 - lib/cucumber/chef/templates/example_step.erb
 - lib/cucumber/chef/templates/readme.erb
 - lib/cucumber/chef/templates/ubuntu10.04-gems.erb
+- lib/cucumber/chef/test_lab.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
 has_rdoc: true
 homepage: http://github.com/atalanta/cucumber-chef
 licenses:
@@ -197,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2224216704413573753
+      hash: -3689892462055237010
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: