bin/cucumber-chef in cucumber-chef-0.5.0 vs bin/cucumber-chef in cucumber-chef-0.5.1

@@ -21,23 +21,19 @@
 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|
         FileUtils.mkdir_p(project_dir + "features" + dir)
       end
     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',
         "example_step.erb" => 'features/step_definitions/example_step.rb',
         "env.rb" => "features/support/env.rb"
@@ -45,13 +41,15 @@
       templates.each do |filename, destination|
         template((template_dir + filename).realpath,
                  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)
       warn message
       exit 255
@@ -68,67 +66,74 @@
   
   desc "setup", "Set up a cucumber-chef test lab in Amazon EC2"
   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
       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
+      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
     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
+    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