cucumber 0.3.9 → 0.3.10

data/lib/cucumber/cli/main.rb

@@ -5,6 +5,7 @@ require 'cucumber/parser'
 require 'cucumber/formatter/color_io'
 require 'cucumber/cli/language_help_formatter'
 require 'cucumber/cli/configuration'
+require 'cucumber/cli/drb_client'
 
 module Cucumber
   module Cli
@@ -32,6 +33,14 @@ module Cucumber
       end
       
       def execute!(step_mother)
+        if configuration.drb?
+          if DRbClient.run(@args, @error_stream, @out_stream)
+            return false
+          else
+            @error_stream.puts "WARNING: No DRb server is running. Running features locally:"
+            configuration.parse!(@args)
+          end
+        end
         configuration.load_language
         step_mother.options = configuration.options
 

data/lib/cucumber/formatter/color_io.rb

@@ -6,7 +6,7 @@ module Cucumber
     class ColorIO
       extend Forwardable
       def_delegators :@kernel, :puts, :print # win32console colours only work when sent to Kernel
-      def_delegators :@stdout, :flush, :tty?
+      def_delegators :@stdout, :flush, :tty?, :write
 
       def initialize
         @kernel = Kernel
@@ -20,4 +20,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/formatter/console.rb

@@ -66,9 +66,7 @@ module Cucumber
       end
       
       def print_exception(e, status, indent)
-        if @options[:strict] || !(Undefined === e) || e.nested?
-          @io.puts(format_string("#{e.message} (#{e.class})\n#{e.backtrace.join("\n")}".indent(indent), status))
-        end
+        @io.puts(format_string("#{e.message} (#{e.class})\n#{e.backtrace.join("\n")}".indent(indent), status))
       end
 
       def print_snippets(options)

data/lib/cucumber/formatter/html.rb

@@ -15,7 +15,12 @@ module Cucumber
 
       def initialize(step_mother, io, options)
         super(step_mother)
-        @builder = Builder::XmlMarkup.new(:target => io, :indent => 2)
+        @options = options
+        @builder = create_builder(io)
+      end
+      
+      def create_builder(io)
+        Builder::XmlMarkup.new(:target => io, :indent => 2)
       end
       
       def visit_features(features)
@@ -42,7 +47,18 @@ module Cucumber
         end
       end
 
+      def visit_comment(comment)
+        @builder.pre(:class => 'comment') do
+          super
+        end
+      end
+
+      def visit_comment_line(comment_line)
+        @builder.text!(comment_line.strip + "\n")
+      end
+
       def visit_feature(feature)
+        @exceptions = []
         @builder.div(:class => 'feature') do
           super
         end
@@ -54,7 +70,9 @@ module Cucumber
 
       def visit_feature_name(name)
         lines = name.split(/\r?\n/)
-        @builder.h2(lines[0])
+        @builder.h2 do |h2|
+          @builder.span(lines[0], :class => 'val')
+        end
         @builder.p do
           lines[1..-1].each do |line|
             @builder.text!(line.strip)
@@ -65,17 +83,27 @@ module Cucumber
 
       def visit_background(background)
         @builder.div(:class => 'background') do
+          @in_background = true
           super
+          @in_background = nil
         end
       end
 
       def visit_background_name(keyword, name, file_colon_line, source_indent)
         @listing_background = true
-        @builder.h3("#{keyword} #{name}")
+        @builder.h3 do |h3|
+          @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
+          @builder.span(name, :class => 'val')
+        end
       end
 
       def visit_feature_element(feature_element)
-        @builder.div(:class => 'scenario') do
+        css_class = {
+          Ast::Scenario        => 'scenario',
+          Ast::ScenarioOutline => 'scenario outline'
+        }[feature_element.class]
+        @builder.div(:class => css_class) do
           super
         end
         @open_step_list = true
@@ -83,7 +111,11 @@ module Cucumber
       
       def visit_scenario_name(keyword, name, file_colon_line, source_indent)
         @listing_background = false
-        @builder.h3("#{keyword} #{name}")
+        @builder.h3 do
+          @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
+          @builder.span(name, :class => 'val')
+        end
       end
 
       def visit_outline_table(outline_table)
@@ -94,8 +126,18 @@ module Cucumber
         @outline_row = nil
       end
 
+      def visit_examples(examples)
+        @builder.div(:class => 'examples') do
+          super(examples)
+        end
+      end
+
       def visit_examples_name(keyword, name)
-        @builder.h4("#{keyword} #{name}")
+        @builder.h4 do
+          @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
+          @builder.span(name, :class => 'val')
+        end
       end
 
       def visit_steps(steps)
@@ -110,6 +152,11 @@ module Cucumber
       end
 
       def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        if exception
+          return if @exceptions.index(exception)
+          @exceptions << exception
+        end
+        return if status != :failed && @in_background ^ background
         @status = status
         @builder.li(:id => @step_id, :class => "step #{status}") do
           super(keyword, step_match, multiline_arg, status, exception, source_indent, background)
@@ -143,8 +190,8 @@ module Cucumber
       end
 
       def visit_py_string(string)
-        @builder.pre(:class => @status) do |pre|
-          pre << string
+        @builder.pre(:class => 'val') do |pre|
+          @builder.text!(string)
         end
       end
 
@@ -168,8 +215,8 @@ module Cucumber
 
       def visit_table_cell_value(value, width, status)
         cell_type = @outline_row == 0 ? :th : :td
-        attributes = {:id => "#{@row_id}_#{@col_index}"}
-        attributes[:class] = status if status
+        attributes = {:id => "#{@row_id}_#{@col_index}", :class => 'val'}
+        attributes[:class] += " #{status}" if status
         build_cell(cell_type, value, attributes)
         @col_index += 1
       end
@@ -181,9 +228,13 @@ module Cucumber
       protected
       
       def build_step(keyword, step_match, status)
-        step_name = step_match.format_args(lambda{|param| %{<span class="#{status}_param">#{param}</span>}})
+        step_name = step_match.format_args(lambda{|param| %{<span class="param">#{param}</span>}})
         @builder.div do |div|
-          div << h("#{keyword} #{step_name}").gsub(/&lt;span class=&quot;(.*?)&quot;&gt;/, '<span class="\1">').gsub(/&lt;\/span&gt;/, '</span>')
+          @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
+          @builder.span(:class => 'step val') do |name|
+            name << h(step_name).gsub(/&lt;span class=&quot;(.*?)&quot;&gt;/, '<span class="\1">').gsub(/&lt;\/span&gt;/, '</span>')
+          end
         end
       end
       

data/lib/cucumber/formatter/junit.rb

@@ -11,9 +11,9 @@ module Cucumber
 
       def initialize(step_mother, io, options)
         super(step_mother)
+        raise "You *must* specify --out DIR for the junit formatter" unless String === io && File.directory?(io)
         @reportdir = io
-        raise "You *must* specify --out DIR for the junit formatter" unless @reportdir
-        raise "Use --out DIR (not --out FILE) for the junit formatter" if File === @reportdir
+        @options = options
       end
 
       def visit_feature(feature)

data/lib/cucumber/formatter/pretty.rb

@@ -18,8 +18,8 @@ module Cucumber
         @io = io
         @options = options
         @delim = delim
-        @indent = 0
         @exceptions = []
+        @indent = 0
       end
 
       def visit_features(features)
@@ -28,6 +28,7 @@ module Cucumber
       end
 
       def visit_feature(feature)
+        @exceptions = []
         @indent = 0
         if @options[:autoformat]
           file = File.join(@options[:autoformat], feature.file)

data/lib/cucumber/formatter/rerun.rb

@@ -12,6 +12,7 @@ module Cucumber
       def initialize(step_mother, io, options)
         super(step_mother)
         @io = io
+        @options = options
         @file_names = []
         @file_colon_lines = Hash.new{|h,k| h[k] = []}
       end

data/lib/cucumber/formatter/tag_cloud.rb

@@ -5,6 +5,7 @@ module Cucumber
       def initialize(step_mother, io, options)
         super(step_mother)
         @io = io
+        @options = options
         @counts = Hash.new{|h,k| h[k] = 0}
       end
 

data/lib/cucumber/rails/rspec.rb

@@ -2,7 +2,9 @@ require 'cucumber/rails/world'
 require 'spec/expectations'
 require 'spec/rails/matchers'
 
-Cucumber::Rails::World.class_eval do
-  include Spec::Matchers
-  include Spec::Rails::Matchers
+[Cucumber::Rails::World, ActionController::Integration::Session].each do |klass|
+  klass.class_eval do
+    include Spec::Matchers
+    include Spec::Rails::Matchers
+  end
 end

data/lib/cucumber/rake/task.rb

@@ -90,7 +90,7 @@ module Cucumber
         class_eval <<-EOF, __FILE__, __LINE__ + 1
           def #{attribute}=(value)
             @#{attribute} = value
-            warn("Cucumber::Rake::Task##{attribute} is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles")
+            warn("\nWARNING: Cucumber::Rake::Task##{attribute} is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles\n")
           end
         EOF
       end

data/lib/cucumber/step_match.rb

@@ -1,11 +1,15 @@
 module Cucumber
   class StepMatch
-    attr_reader :step_definition, :args, :step_name
+    attr_reader :step_definition, :args
 
     def initialize(step_definition, step_name, formatted_step_name, args)
       @step_definition, @step_name, @formatted_step_name, @args = step_definition, step_name, formatted_step_name, args
     end
-    
+
+    def name
+      @formatted_step_name
+    end
+
     def invoke(world, multiline_arg)
       all_args = @args.dup
       all_args << multiline_arg if multiline_arg

data/lib/cucumber/step_mother.rb

@@ -100,6 +100,10 @@ module Cucumber
 
     attr_writer :snippet_generator, :options, :visitor
 
+    def options
+      @options ||= {}
+    end
+
     def step_visited(step)
       steps << step unless steps.index(step)
     end
@@ -235,6 +239,13 @@ module Cucumber
       end
     end
     
+    def clear!
+      step_definitions.clear
+      hooks.clear
+      steps.clear
+      scenarios.clear
+    end
+
     def step_definitions
       @step_definitions ||= []
     end
@@ -274,10 +285,6 @@ module Cucumber
       @max_step_definition_length ||= step_definitions.map{|step_definition| step_definition.text_length}.max
     end
 
-    def options
-      @options || {}
-    end
-
     # Creates a new world instance
     def new_world!
       return if options[:dry_run]
@@ -351,9 +358,5 @@ module Cucumber
     def scenario_visited(scenario)
       scenarios << scenario unless scenarios.index(scenario)
     end
-
-    def options
-      @options || {}
-    end
   end
 end

data/lib/cucumber/version.rb

@@ -2,7 +2,7 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 9
+    TINY  = 10
     PATCH = nil # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')

data/rails_generators/cucumber/cucumber_generator.rb

@@ -19,11 +19,17 @@ class CucumberGenerator < Rails::Generator::Base
       m.gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *TEST"
 
       m.directory 'features/support'
-      m.template  'env.rb',           'features/support/env.rb'
+
+      if options[:spork]
+        m.template  'spork_env.rb',     'features/support/env.rb'
+      else
+        m.template  'env.rb',           'features/support/env.rb'
+      end
+
       m.file      'paths.rb',         'features/support/paths.rb'
 
       m.directory 'lib/tasks'
-      m.file      'cucumber.rake',    'lib/tasks/cucumber.rake'
+      m.template  'cucumber.rake',    'lib/tasks/cucumber.rake'
 
       m.file      'cucumber',         'script/cucumber', {
         :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang]
@@ -51,6 +57,10 @@ protected
     opt.on('--testunit', 'Setup cucumber for use with test/unit') do |value|
       options[:framework] = :testunit
     end
+
+    opt.on('--spork', 'Setup cucumber for use with Spork') do |value|
+      options[:spork] = true
+    end
   end
 
 end

data/rails_generators/cucumber/templates/cucumber.rake

@@ -5,7 +5,7 @@ begin
 
   Cucumber::Rake::Task.new(:features) do |t|
     t.fork = true
-    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+    t.cucumber_opts = [<%= options[:spork] ? "'--drb', " : "" %>'--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
   end
   task :features => 'db:test:prepare'
 rescue LoadError

data/rails_generators/cucumber/templates/cucumber_environment.rb

@@ -15,7 +15,9 @@ config.action_controller.allow_forgery_protection    = false
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
 
-config.gem "cucumber",    :lib => false,        :version => ">=<%= cucumber_version %>"
-config.gem "webrat",      :lib => false,        :version => ">=0.4.4"
-config.gem "rspec",       :lib => false,        :version => ">=1.2.6"
-config.gem "rspec-rails", :lib => 'spec/rails', :version => ">=1.2.6"
+config.gem "cucumber",    :lib => false,        :version => ">=<%= cucumber_version %>" unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
+config.gem "webrat",      :lib => false,        :version => ">=0.4.4" unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
+<% if framework == :rspec -%>
+config.gem "rspec",       :lib => false,        :version => ">=1.2.6" unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
+config.gem "rspec-rails", :lib => 'spec/rails', :version => ">=1.2.6" unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
+<% end %>

data/rails_generators/cucumber/templates/env.rb

@@ -2,10 +2,17 @@
 ENV["RAILS_ENV"] ||= "cucumber"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails/world'
-require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
+
+# Comment out the next line if you don't want Cucumber Unicode support
+require 'cucumber/formatter/unicode'
+
+# Comment out the next line if you don't want transactions to
+# open/roll back around each scenario
 Cucumber::Rails.use_transactional_fixtures
-Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling 
-                              # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
+
+# Comment out the next line if you want Rails' own error handling
+# (e.g. rescue_action_in_public / rescue_responses / rescue_from)
+Cucumber::Rails.bypass_rescue
 
 require 'webrat'
 

data/rails_generators/cucumber/templates/spork_env.rb

@@ -0,0 +1,36 @@
+require 'rubygems'
+require 'spork'
+ 
+Spork.prefork do
+  # Sets up the Rails environment for Cucumber
+  ENV["RAILS_ENV"] ||= "cucumber"
+  require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+ 
+  require 'webrat'
+ 
+  Webrat.configure do |config|
+    config.mode = :rails
+  end
+ 
+  require 'webrat/core/matchers'
+  require 'cucumber'
+
+  # Comment out the next line if you don't want Cucumber Unicode support
+  require 'cucumber/formatter/unicode'
+
+  require 'spec/rails'
+  require 'cucumber/rails/rspec'
+end
+ 
+Spork.each_run do
+  # This code will be run each time you run your specs.
+  require 'cucumber/rails/world'
+
+  # Comment out the next line if you don't want transactions to
+  # open/roll back around each scenario
+  Cucumber::Rails.use_transactional_fixtures
+
+  # Comment out the next line if you want Rails' own error handling
+  # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
+  Cucumber::Rails.bypass_rescue
+end