specjour 0.3.0.rc8 → 0.3.0

data/History.markdown

@@ -1,16 +1,26 @@
 History
 =======
 
-## 0.3.0.rc8 / 2010-08-13
+## 0.3.0 / 2010-10-14
+
+* [fixed] Cucumber output for scenario outlines (delitescere & supaspoida)
+* [fixed] Undefined shared examples in Rspec2
+* [fixed] INT signal sent to managers and workers, sets wants\_to\_quit where
+  appropriate for Rspec2 and Cucumber
+* [fixed] Error reporting for failed steps within a Background
+* [added] Cucumber 0.9.x compatibility
+* [added] RSpec 2.0.0 compatibility
+
+
+## 0.3.0.rc8 / 2010-09-13
 
 * [fixed] Custom hooks now load in Ruby 1.9.2
 * [fixed] Specjour prepare correctly recreates the db
-
 * [added] Support for loading test DB from SQL file
-  (config.active_record.schema_format = :sql)
+  (config.active\_record.schema\_format = :sql)
 * [added] Rsync failures raise Specjour::Error
 
-## 0.3.0.rc7 / 2010-08-09
+## 0.3.0.rc7 / 2010-09-09
 
 * [fixed] Distributing absolute paths to remote machines.
 
@@ -20,11 +30,11 @@ History
 
 * [changed] Decreased timeout to 2 seconds when searching for remote managers
 
-## 0.3.0.rc6 / 2010-08-07
+## 0.3.0.rc6 / 2010-09-07
 
 * [fixed] Ruby 1.9.2 support through minor changes and DNSSD upgrade
 * [fixed] DbScrub.drop actually invokes the db:drop rake task
-* [fixed] Prepare task ignores rspec's at_exit callback, disabling the test
+* [fixed] Prepare task ignores rspec's at\_exit callback, disabling the test
   suite from running after the prepare task completes.
 
 ## 0.3.0.rc5 / 2010-07-30
@@ -94,9 +104,6 @@ History
 
         $ specjour listen --projects foo bar
 
-
-## 0.2.6 / master
-
 * [fixed] Rsync copies symbolic links. gh-6
 * [fixed] DbScrub explicitly requires its dependencies and no longer loads the
   Rakefile. gh-10

data/README.markdown

@@ -102,6 +102,15 @@ By default, the dispatcher looks for managers matching the project's directory n
     ~/bizconf $ specjour listen -p bizconf_09
     ~/bizconf $ specjour -a bizconf_09
 
+## Compatibility
+
+* RSpec 1.3.x
+* RSpec 2.0.0
+* Cucumber 0.8.5
+* Cucumber 0.9.2
+* Rails 2
+* Rails 3
+
 ## Thanks
 
 * shayarnett - Cucumber support, pairing and other various patches

data/Rakefile

@@ -14,6 +14,7 @@ begin
     gem.add_dependency "thor", ">=0.14.0"
     gem.add_development_dependency "rspec", "1.3.0"
     gem.add_development_dependency "rr", ">=0.10.11"
+    gem.add_development_dependency "cucumber", ">=0.9.0"
     gem.add_development_dependency "yard", ">=0.5.3"
     gem.add_development_dependency "jeweler", ">=1.4.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.3.0.rc8
+0.3.0

data/lib/specjour.rb

@@ -8,6 +8,7 @@ autoload :Benchmark, 'benchmark'
 autoload :Logger, 'logger'
 autoload :Socket, 'socket'
 autoload :StringIO, 'stringio'
+autoload :OpenStruct, 'ostruct'
 
 module Specjour
   autoload :CLI, 'specjour/cli'
@@ -17,7 +18,6 @@ module Specjour
   autoload :DbScrub, 'specjour/db_scrub'
   autoload :Dispatcher, 'specjour/dispatcher'
   autoload :Manager, 'specjour/manager'
-  autoload :OpenStruct, 'ostruct'
   autoload :Printer, 'specjour/printer'
   autoload :Protocol, 'specjour/protocol'
   autoload :QuietFork, 'specjour/quiet_fork'
@@ -28,12 +28,17 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :Rspec, 'specjour/rspec'
 
-  VERSION = "0.3.0.rc8".freeze
+  VERSION = "0.3.0".freeze
   HOOKS_PATH = "./.specjour/hooks.rb"
 
-  class << self
-    attr_accessor :interrupted
-    alias interrupted? interrupted
+  def self.interrupted?
+    @interrupted
+  end
+
+  def self.interrupted=(bool)
+    Cucumber.wants_to_quit
+    Rspec.wants_to_quit
+    @interrupted = bool
   end
 
   def self.logger
@@ -54,10 +59,18 @@ module Specjour
     require HOOKS_PATH if File.exists?(HOOKS_PATH)
   end
 
+  def self.trap_interrupt
+    Signal.trap('INT') do
+      self.interrupted = true
+      exit 1
+    end
+  end
+
   Error = Class.new(StandardError)
   PROGRAM_NAME = $PROGRAM_NAME # keep a reference of the original program name
 
   GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
 
-  Signal.trap('INT') { Specjour.interrupted = true; exit 1 }
+  trap_interrupt
+
 end

data/lib/specjour/cli.rb

@@ -34,6 +34,7 @@ module Specjour
       handle_logging
       handle_workers
       args[:registered_projects] = args.delete(:projects) || [File.basename(Dir.pwd)]
+      append_to_program_name "listen"
       Specjour::Manager.new(args).start
     end
 
@@ -44,6 +45,7 @@ module Specjour
       handle_logging
       handle_workers
       handle_dispatcher(path)
+      append_to_program_name "dispatch"
       Specjour::Dispatcher.new(args).start
     end
 
@@ -59,6 +61,7 @@ module Specjour
       handle_workers
       handle_dispatcher(path)
       args[:worker_task] = 'prepare'
+      append_to_program_name "prepare"
       Specjour::Dispatcher.new(args).start
     end
 
@@ -77,11 +80,16 @@ module Specjour
     method_option :quiet, :type => :boolean
     def work
       handle_logging
+      append_to_program_name "work"
       Specjour::Worker.new(args).start
     end
 
     protected
 
+    def append_to_program_name(command)
+      $PROGRAM_NAME = "#{$PROGRAM_NAME} #{command}"
+    end
+
     def args
       @args ||= options.dup
     end

data/lib/specjour/connection.rb

@@ -67,6 +67,7 @@ module Specjour
       @socket = TCPSocket.open(uri.host, uri.port)
     rescue Errno::ECONNREFUSED => error
       Specjour.logger.debug "Could not connect to #{uri.to_s}\n#{error.inspect}"
+      sleep 0.1
       retry
     end
 

data/lib/specjour/cucumber.rb

@@ -7,9 +7,20 @@ module Specjour
       require 'specjour/cucumber/distributed_formatter'
       require 'specjour/cucumber/final_report'
       require 'specjour/cucumber/preloader'
+      require 'specjour/cucumber/main_ext'
+      require 'specjour/cucumber/runner'
 
+      CUCUMBER_09x = ::Cucumber::VERSION =~ /0\.9\.\d/
       ::Cucumber::Cli::Options.class_eval { def print_profile_information; end }
     rescue LoadError
     end
+
+    class << self; attr_accessor :runtime; end
+
+    def self.wants_to_quit
+      if defined?(::Cucumber) && ::Cucumber.respond_to?(:wants_to_quit=)
+        ::Cucumber.wants_to_quit = true
+      end
+    end
   end
 end

data/lib/specjour/cucumber/distributed_formatter.rb

@@ -17,15 +17,17 @@ module Specjour::Cucumber
     end
 
     def prepare_failures
-      @failures = step_mother.scenarios(:failed).select { |s| s.is_a?(Cucumber::Ast::Scenario) }
-
-      if !@failures.empty?
-        @failures.each do |failure|
-          failure_message = ''
-          failure_message += format_string("cucumber " + failure.file_colon_line, :failed) +
-          failure_message += format_string(" # Scenario: " + failure.name, :comment)
-          @failing_scenarios << failure_message
+      step_mother.scenarios(:failed).select do |s|
+        s.is_a?(Cucumber::Ast::Scenario) || s.is_a?(Cucumber::Ast::OutlineTable::ExampleRow)
+      end.map do |failure|
+        if failure.is_a?(Cucumber::Ast::Scenario)
+          failure
+        elsif failure.is_a?(Cucumber::Ast::OutlineTable::ExampleRow)
+          failure.scenario_outline
         end
+      end.each do |failure|
+        @failing_scenarios << format_string("cucumber " + failure.file_colon_line[2..-1], :failed) +
+                              format_string(" # Scenario: " + failure.name, :comment)
       end
     end
 
@@ -43,12 +45,12 @@ module Specjour::Cucumber
           output += format_string(element.backtrace_line, status)
           output += "\n"
         end
-        @step_summary << output unless output.blank?
+        @step_summary << output unless output.nil? || output.empty?
       end
     end
 
     def prepare_steps(type)
-      prepare_elements(step_mother.scenarios(type), type, 'steps')
+      prepare_elements(step_mother.steps(type), type, 'steps')
     end
 
     def print_exception(e, status, indent)

data/lib/specjour/cucumber/final_report.rb

@@ -60,9 +60,12 @@ module Specjour
       end
 
       def summarize
-        if @summarizer.failing_scenarios.any?
+        if @summarizer.steps(:failed).any?
           puts "\n\n"
           @summarizer.step_summary.each {|f| puts f }
+        end
+
+        if @summarizer.failing_scenarios.any?
           puts "\n\n"
           puts format_string("Failing Scenarios:", :failed)
           @summarizer.failing_scenarios.each {|f| puts f }

data/lib/specjour/cucumber/main_ext.rb

@@ -0,0 +1,3 @@
+Cucumber::Cli::Main.class_eval do
+  def trap_interrupt; end
+end

data/lib/specjour/cucumber/preloader.rb

@@ -1,14 +1,35 @@
-class Specjour::Cucumber::Preloader
-  def self.load(feature_file)
-    # preload all features
-    cli = ::Cucumber::Cli::Main.new []
-    step_mother = cli.class.step_mother
-
-    step_mother.log = cli.configuration.log
-    step_mother.options = cli.configuration.options
-    step_mother.load_code_files(cli.configuration.support_to_load)
-    step_mother.after_configuration(cli.configuration)
-    features = step_mother.load_plain_text_features(cli.configuration.feature_files)
-    step_mother.load_code_files(cli.configuration.step_defs_to_load)
+module Specjour
+  module Cucumber
+    module Preloader
+      def self.load(feature_file)
+        if CUCUMBER_09x
+          load_09x
+        else
+          load_08x
+        end
+      end
+
+      protected
+
+      def self.load_08x
+        cli = ::Cucumber::Cli::Main.new []
+        step_mother = cli.class.step_mother
+
+        step_mother.log = cli.configuration.log
+        step_mother.options = cli.configuration.options
+        step_mother.load_code_files(cli.configuration.support_to_load)
+        step_mother.after_configuration(cli.configuration)
+        features = step_mother.load_plain_text_features(cli.configuration.feature_files)
+        step_mother.load_code_files(cli.configuration.step_defs_to_load)
+      end
+
+      def self.load_09x
+        configuration = ::Cucumber::Cli::Configuration.new
+        configuration.parse! []
+        runtime = ::Cucumber::Runtime.new(configuration)
+        runtime.send :load_step_definitions
+        Cucumber.runtime = runtime
+      end
+    end
   end
 end

data/lib/specjour/cucumber/runner.rb

@@ -0,0 +1,20 @@
+module Specjour
+  module Cucumber
+    module Runner
+      def self.run(feature, output)
+        cli = ::Cucumber::Cli::Main.new(['--format', 'Specjour::Cucumber::DistributedFormatter', feature], output)
+
+        if CUCUMBER_09x
+          Cucumber.runtime.instance_variable_set(:@configuration, cli.configuration)
+          Cucumber.runtime.instance_eval do
+            tree_walker = @configuration.build_tree_walker(self)
+            self.visitor = tree_walker
+            tree_walker.visit_features(features)
+          end
+        else
+          cli.execute!(::Cucumber::Cli::Main.step_mother)
+        end
+      end
+    end
+  end
+end

data/lib/specjour/db_scrub.rb

@@ -9,6 +9,7 @@ module Specjour
       load 'tasks/misc.rake'
       load 'tasks/databases.rake'
       Rake::Task["db:structure:dump"].clear
+      Rake::Task["environment"].clear
     end
 
     extend self
@@ -31,6 +32,7 @@ module Specjour
 
     def connect_to_database
       ActiveRecord::Base.remove_connection
+      ActiveRecord::Base.establish_connection
       connection
     rescue # assume the database doesn't exist
       Rake::Task['db:create'].invoke

data/lib/specjour/dispatcher.rb

@@ -18,7 +18,7 @@ module Specjour
     end
 
     def start
-      abort("#{project_path} doesn't exist") unless File.exists?(project_path)
+      abort("#{project_path} doesn't exist") unless File.directory?(project_path)
       gather_managers
       rsync_daemon.start
       dispatch_work
@@ -69,7 +69,7 @@ module Specjour
         puts "#{manager.hostname} (#{manager.worker_size})"
       end
       printer.worker_size = worker_size
-      command_managers(true) { |m| m.dispatch }
+      command_managers(true) { |m| m.dispatch rescue DRb::DRbConnError }
     end
 
     def dispatching_tests?
@@ -77,7 +77,7 @@ module Specjour
     end
 
     def fetch_manager(uri)
-      Timeout.timeout(1) do
+      Timeout.timeout(0.5) do
         manager = DRbObject.new_with_uri(uri.to_s)
         if !managers.include?(manager) && manager.available_for?(project_alias)
           add_manager(manager)
@@ -95,7 +95,11 @@ module Specjour
       manager_options = {:worker_size => options[:worker_size], :registered_projects => [project_alias]}
       manager = Manager.start_quietly manager_options
       fetch_manager(manager.drb_uri)
-      at_exit { Process.kill('TERM', manager.pid) rescue Errno::ESRCH }
+      at_exit do
+        unless Specjour.interrupted?
+          Process.kill('TERM', manager.pid) rescue Errno::ESRCH
+        end
+      end
     end
 
     def gather_managers
@@ -107,7 +111,7 @@ module Specjour
 
     def gather_remote_managers
       browser = DNSSD::Service.new
-      Timeout.timeout(1) do
+      Timeout.timeout(3) do
         browser.browse '_druby._tcp' do |reply|
           if reply.flags.add?
             resolve_reply(reply)
@@ -162,7 +166,13 @@ module Specjour
       manager.preload_spec = all_tests.detect {|f| f =~ /_spec\.rb$/}
       manager.preload_feature = all_tests.detect {|f| f =~ /\.feature$/}
       manager.worker_task = worker_task
-      at_exit { manager.kill_worker_processes rescue DRb::DRbConnError }
+      at_exit do
+        begin
+          manager.interrupted = Specjour.interrupted?
+          manager.kill_worker_processes
+        rescue DRb::DRbConnError
+        end
+      end
     end
 
     def wait_on_managers

data/lib/specjour/manager.rb

@@ -8,12 +8,13 @@ module Specjour
     include SocketHelper
 
     attr_accessor :project_name, :preload_spec, :preload_feature, :worker_task, :pid
-    attr_reader :worker_size, :dispatcher_uri, :registered_projects, :bonjour_service, :worker_pids, :options
+    attr_reader :worker_size, :dispatcher_uri, :registered_projects, :worker_pids, :options
 
     def self.start_quietly(options)
       manager = new options.merge(:quiet => true)
       manager.drb_uri
       manager.pid = QuietFork.fork { manager.start }
+      sleep 0.2
       manager
     end
 
@@ -69,8 +70,16 @@ module Specjour
       Dir.chdir(project_path, &block)
     end
 
+    def interrupted=(bool)
+      Specjour.interrupted = bool
+    end
+
     def kill_worker_processes
-      Process.kill('TERM', *worker_pids) rescue Errno::ESRCH
+      if Specjour.interrupted?
+        Process.kill('INT', *worker_pids) rescue Errno::ESRCH
+      else
+        Process.kill('TERM', *worker_pids) rescue Errno::ESRCH
+      end
     end
 
     def pid
@@ -86,7 +95,6 @@ module Specjour
       puts "Workers ready: #{worker_size}."
       puts "Listening for #{registered_projects.join(', ')}"
       bonjour_announce
-      Signal.trap('INT') { puts; puts "Shutting down manager..."; exit 1 }
       DRb.thread.join
     end
 
@@ -103,7 +111,13 @@ module Specjour
     protected
 
     def bonjour_announce
-      @bonjour_service = DNSSD.register! "specjour_manager_#{object_id}", "_#{drb_uri.scheme}._tcp", nil, drb_uri.port
+      unless quiet?
+        bonjour_service.register "specjour_manager_#{object_id}", "_#{drb_uri.scheme}._tcp", nil, drb_uri.port
+      end
+    end
+
+    def bonjour_service
+      @bonjour_service = DNSSD::Service.new
     end
 
     def cmd(command)

data/lib/specjour/printer.rb

@@ -10,7 +10,7 @@ module Specjour
       new(specs_to_run).start
     end
 
-    attr_accessor :worker_size, :specs_to_run, :completed_workers, :disconnections
+    attr_accessor :worker_size, :specs_to_run, :completed_workers, :disconnections, :profiler
 
     def initialize(specs_to_run)
       super(
@@ -23,7 +23,8 @@ module Specjour
       )
       @completed_workers = 0
       @disconnections = 0
-      self.specs_to_run = specs_to_run
+      @profiler = {}
+      self.specs_to_run = run_order(specs_to_run)
     end
 
     def serve(client)
@@ -56,13 +57,18 @@ module Specjour
       cucumber_report.add(summary)
     end
 
+    def add_to_profiler(client, args)
+      test, time = *args
+      self.profiler[test] = time
+    end
+
     protected
 
     def disconnecting(client_port)
-      self.disconnections += 1
+      synchronize { self.disconnections += 1 }
       if disconnections == worker_size
         shutdown
-        stop unless stopped?
+        stop unless Specjour.interrupted?
       end
     end
 
@@ -83,6 +89,15 @@ module Specjour
       end
     end
 
+    def run_order(specs_to_run)
+      if File.exist?('.specjour/performance')
+        ordered_specs = File.readlines('.specjour/performance').map {|l| l.chop.split(':')[1]}
+        (specs_to_run - ordered_specs) | (ordered_specs & specs_to_run)
+      else
+        specs_to_run
+      end
+    end
+
     def rspec_report
       @rspec_report ||= Rspec::FinalReport.new
     end
@@ -91,6 +106,14 @@ module Specjour
       @cucumber_report ||= Cucumber::FinalReport.new
     end
 
+    def record_performance
+      File.open('.specjour/performance', 'w') do |file|
+        ordered_specs = profiler.to_a.sort_by {|a| -a[1].to_f}.map do |test, time|
+          file.puts "%6f:%s" % [time, test]
+        end
+      end
+    end
+
     def reporters
       [@rspec_report, @cucumber_report].compact
     end
@@ -98,6 +121,7 @@ module Specjour
     def stopping
       summarize_reports
       warn_if_workers_deserted
+      record_performance unless Specjour.interrupted?
     end
 
     def summarize_reports

data/lib/specjour/rspec.rb

@@ -13,13 +13,16 @@ module Specjour
 
     def self.load_rspec2
       require 'rspec/core'
-      ::Rspec::Core::Runner.disable_autorun!
+      require 'rspec/core/formatters/progress_formatter'
 
       require 'specjour/rspec/marshalable_exception'
       require 'specjour/rspec/preloader'
       require 'specjour/rspec2/distributed_formatter'
       require 'specjour/rspec2/final_report'
       require 'specjour/rspec2/runner'
+      require 'specjour/rspec2/shared_example_group_ext'
+
+      ::Rspec::Core::Runner.disable_autorun!
     end
 
     begin
@@ -28,5 +31,10 @@ module Specjour
       load_rspec1
     end
 
+    def self.wants_to_quit
+      if defined?(::RSpec) && ::RSpec.respond_to?(:wants_to_quit=)
+        ::RSpec.wants_to_quit = true
+      end
+    end
   end
 end

data/lib/specjour/rspec2/distributed_formatter.rb

@@ -15,16 +15,26 @@ module Specjour::Rspec
       end
     end
 
-    def noop
+    def noop(*args)
     end
     alias dump_pending noop
     alias dump_failures noop
     alias start_dump noop
+    alias message noop
+
+    def color_enabled?
+      true
+    end
 
     def dump_summary(*args)
       output.send_message :rspec_summary=, metadata_for_examples
     end
 
+    def close
+      @examples = []
+      super
+    end
+
     protected
 
     def marshalable_execution_result(execution_result)

data/lib/specjour/rspec2/final_report.rb

@@ -6,6 +6,8 @@ module Specjour::Rspec
     def initialize
       @examples = []
       @duration = 0.0
+      ::Rspec.configuration.color_enabled = true
+      ::Rspec.configuration.output_stream = $stdout
     end
 
     def add(data)
@@ -28,6 +30,9 @@ module Specjour::Rspec
       examples.concat(
         metadata_collection.map do |partial_metadata|
           example = ::Rspec::Core::Example.allocate
+          example.instance_variable_set(:@example_group_class,
+            OpenStruct.new(:metadata => {}, :ancestors => [])
+          )
           metadata = ::Rspec::Core::Metadata.new
           metadata.merge! partial_metadata
           example.instance_variable_set(:@metadata, metadata)
@@ -36,24 +41,32 @@ module Specjour::Rspec
       )
     end
 
+    def pending_examples
+      ::RSpec.world.find(examples, :execution_result => { :status => 'pending' })
+    end
+
+    def failed_examples
+      ::RSpec.world.find(examples, :execution_result => { :status => 'failed' })
+    end
+
     def formatter
       @formatter ||= new_progress_formatter
     end
 
     def summarize
       if examples.size > 0
-        formatter.dump_summary(duration, formatter.example_count, formatter.failure_count, formatter.pending_count)
+        formatter.start_dump
         formatter.dump_pending
         formatter.dump_failures
+        formatter.dump_summary(duration, examples.size, failed_examples.size, pending_examples.size)
       end
     end
 
     protected
     def new_progress_formatter
       new_formatter = ::Rspec::Core::Formatters::ProgressFormatter.new($stdout)
-      new_formatter.instance_variable_set(:@examples, examples)
-      new_formatter.instance_variable_set(:@example_count, examples.size)
-      Rspec.configuration.color_enabled = true
+      new_formatter.instance_variable_set(:@failed_examples, failed_examples)
+      new_formatter.instance_variable_set(:@pending_examples, pending_examples)
       new_formatter
     end
   end

data/lib/specjour/rspec2/runner.rb

@@ -1,8 +1,8 @@
 module Specjour::Rspec::Runner
   def self.run(spec, output)
     reset
-    options = ['--format=Specjour::Rspec::DistributedFormatter', spec]
-    ::Rspec::Core::Runner.run options, $stderr, output
+    args = ['--format=Specjour::Rspec::DistributedFormatter', spec]
+    ::Rspec::Core::Runner.run_in_process args, $stderr, output
   end
 
   def self.reset

data/lib/specjour/rspec2/shared_example_group_ext.rb

@@ -0,0 +1,9 @@
+Rspec::Core::SharedExampleGroup.class_eval do
+
+  def ensure_shared_example_group_name_not_taken(name)
+    if RSpec.world.shared_example_groups.has_key?(name)
+      Specjour.logger.debug "Shared example group '#{name}' already exists"
+    end
+  end
+
+end

data/lib/specjour/worker.rb

@@ -40,7 +40,7 @@ module Specjour
       while test = connection.next_test
         print_status(test)
         time = Benchmark.realtime { run_test test }
-        print_time_for(test, time)
+        profile(test, time)
         run_times[test_type(test)] += time
       end
 
@@ -63,11 +63,9 @@ module Specjour
       Rspec::Preloader.load(preload_spec) if preload_spec
       Cucumber::Preloader.load(preload_feature) if preload_feature
     rescue StandardError => exception
-      msg = [
-        "Caught exception: #{exception.class} #{exception.message}",
-        "Proceeding... you may need to re-run the dispatcher."
-      ]
-      $stderr.puts msg.join("\n")
+      $stderr.puts "Caught exception: #{exception.class} #{exception.message}"
+      Specjour.logger.debug exception.backtrace.join("\n")
+      $stderr.puts "Proceeding... you may need to re-run the dispatcher."
     end
 
     def printer_connection
@@ -84,6 +82,11 @@ module Specjour
       printf "[#{ENV['TEST_ENV_NUMBER']}] Finished #{test} in %.4f\n", time
     end
 
+    def profile(test, time)
+      connection.send_message(:add_to_profiler, [test, time])
+      print_time_for(test, time)
+    end
+
     def run_test(test)
       if test_type(test) == :cucumber
         run_feature test
@@ -93,8 +96,7 @@ module Specjour
     end
 
     def run_feature(feature)
-      cli = ::Cucumber::Cli::Main.new(['--format', 'Specjour::Cucumber::DistributedFormatter', feature], connection)
-      cli.execute!(::Cucumber::Cli::Main.step_mother)
+      Specjour::Cucumber::Runner.run(feature, connection)
     end
 
     def run_spec(spec)

data/sample/features/fail.feature

@@ -0,0 +1,31 @@
+Feature: Failing sample
+
+  Background:
+    Given anything
+
+  Scenario: Winning
+    When I do something good
+    Then fail
+
+  Scenario: Losing
+    When I do something bad
+    Then fail
+
+  Scenario Outline: Passing wins
+    When I do something good with <thing>
+    Then fail
+
+  Examples:
+    | thing |
+    | money |
+    | time  |
+
+  Scenario Outline: Passing flops
+    When I do something bad with <thing>
+    Then fail
+
+  Examples:
+    | thing |
+    | money |
+    | time  |
+

data/sample/features/pass.feature

@@ -0,0 +1,31 @@
+Feature: Passing sample
+
+  Background:
+    Given anything
+
+  Scenario: Winning
+    When I do something good
+    Then I should be successful
+
+  Scenario: Losing
+    When I do something bad
+    Then I should not be successful
+
+  Scenario Outline: Passing wins
+    When I do something good with <thing>
+    Then I should be successful
+
+  Examples:
+    | thing |
+    | money |
+    | time  |
+
+  Scenario Outline: Passing flops
+    When I do something bad with <thing>
+    Then I should not be successful
+
+  Examples:
+    | thing |
+    | money |
+    | time  |
+

data/sample/features/step_definitions/sample_steps.rb

@@ -0,0 +1,26 @@
+Given /^anything$/ do
+end
+
+When /^I do something good$/ do
+end
+
+When /^I do something bad$/ do
+end
+
+When /^I do something good with (.+)$/ do |thing|
+end
+
+When /^I do something bad with (.+)$/ do |thing|
+end
+
+Then /^I should not be successful$/ do
+  false.should_not == true
+end
+
+Then /^I should be successful$/ do
+  true.should == true
+end
+
+Then /^fail$/ do
+  false.should == true
+end

data/sample/features/undefined.feature

@@ -0,0 +1,17 @@
+Feature: Undefined step definitions sample
+
+  Background:
+    Given anything
+
+  Scenario:
+    When I have this undefined step definition
+    Then fail
+
+  Scenario Outline:
+    When I have this undefined step definition
+    Then fail
+
+  Examples:
+    | thing |
+    | money |
+    | time  |

data/specjour.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{specjour}
-  s.version = "0.3.0.rc8"
+  s.version = "0.3.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sandro Turriate"]
-  s.date = %q{2010-09-13}
+  s.date = %q{2010-10-14}
   s.default_executable = %q{specjour}
   s.description = %q{Distribute your spec suite amongst your LAN via Bonjour.}
   s.email = %q{sandro.turriate@gmail.com}
@@ -37,7 +37,9 @@ Gem::Specification.new do |s|
      "lib/specjour/cucumber.rb",
      "lib/specjour/cucumber/distributed_formatter.rb",
      "lib/specjour/cucumber/final_report.rb",
+     "lib/specjour/cucumber/main_ext.rb",
      "lib/specjour/cucumber/preloader.rb",
+     "lib/specjour/cucumber/runner.rb",
      "lib/specjour/db_scrub.rb",
      "lib/specjour/dispatcher.rb",
      "lib/specjour/manager.rb",
@@ -54,9 +56,14 @@ Gem::Specification.new do |s|
      "lib/specjour/rspec2/distributed_formatter.rb",
      "lib/specjour/rspec2/final_report.rb",
      "lib/specjour/rspec2/runner.rb",
+     "lib/specjour/rspec2/shared_example_group_ext.rb",
      "lib/specjour/rsync_daemon.rb",
      "lib/specjour/socket_helper.rb",
      "lib/specjour/worker.rb",
+     "sample/features/fail.feature",
+     "sample/features/pass.feature",
+     "sample/features/step_definitions/sample_steps.rb",
+     "sample/features/undefined.feature",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/specjour/cli_spec.rb",
@@ -93,6 +100,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thor>, [">= 0.14.0"])
       s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_development_dependency(%q<rr>, [">= 0.10.11"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.9.0"])
       s.add_development_dependency(%q<yard>, [">= 0.5.3"])
       s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
     else
@@ -100,6 +108,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thor>, [">= 0.14.0"])
       s.add_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_dependency(%q<rr>, [">= 0.10.11"])
+      s.add_dependency(%q<cucumber>, [">= 0.9.0"])
       s.add_dependency(%q<yard>, [">= 0.5.3"])
       s.add_dependency(%q<jeweler>, [">= 1.4.0"])
     end
@@ -108,6 +117,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<thor>, [">= 0.14.0"])
     s.add_dependency(%q<rspec>, ["= 1.3.0"])
     s.add_dependency(%q<rr>, [">= 0.10.11"])
+    s.add_dependency(%q<cucumber>, [">= 0.9.0"])
     s.add_dependency(%q<yard>, [">= 0.5.3"])
     s.add_dependency(%q<jeweler>, [">= 1.4.0"])
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: specjour
 version: !ruby/object:Gem::Version 
-  hash: 977940561
-  prerelease: true
+  hash: 19
+  prerelease: false
   segments: 
   - 0
   - 3
   - 0
-  - rc8
-  version: 0.3.0.rc8
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -04:00
+date: 2010-10-14 00:00:00 -04:00
 default_executable: specjour
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,9 +83,25 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: cucumber
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -98,11 +113,11 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -114,7 +129,7 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: Distribute your spec suite amongst your LAN via Bonjour.
 email: sandro.turriate@gmail.com
 executables: 
@@ -143,7 +158,9 @@ files:
 - lib/specjour/cucumber.rb
 - lib/specjour/cucumber/distributed_formatter.rb
 - lib/specjour/cucumber/final_report.rb
+- lib/specjour/cucumber/main_ext.rb
 - lib/specjour/cucumber/preloader.rb
+- lib/specjour/cucumber/runner.rb
 - lib/specjour/db_scrub.rb
 - lib/specjour/dispatcher.rb
 - lib/specjour/manager.rb
@@ -160,9 +177,14 @@ files:
 - lib/specjour/rspec2/distributed_formatter.rb
 - lib/specjour/rspec2/final_report.rb
 - lib/specjour/rspec2/runner.rb
+- lib/specjour/rspec2/shared_example_group_ext.rb
 - lib/specjour/rsync_daemon.rb
 - lib/specjour/socket_helper.rb
 - lib/specjour/worker.rb
+- sample/features/fail.feature
+- sample/features/pass.feature
+- sample/features/step_definitions/sample_steps.rb
+- sample/features/undefined.feature
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/specjour/cli_spec.rb
@@ -194,14 +216,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: