cucumber 0.3.9 → 0.3.10

data/features/junit_formatter.feature

@@ -58,5 +58,14 @@ Feature: JUnit output formatter
       """
     And "examples/junit/tmp/TEST-One_passing_scenario__one_failing_scenario.xml" should exist
     And "examples/junit/tmp/TEST-Pending_step.xml" should exist
-    
-    
+  
+  Scenario: show correct error message if no --out is passed
+    When I run cucumber --format junit features
+	  Then STDERR should not match 
+		  """
+can't convert .* into String \(TypeError\)
+		  """
+    And STDERR should match
+		  """
+You \*must\* specify \-\-out DIR for the junit formatter
+	    """

data/features/step_definitions/cucumber_steps.rb

@@ -31,6 +31,15 @@ Given /^the following profiles? (?:are|is) defined:$/ do |profiles|
   create_file('cucumber.yml', profiles)
 end
 
+Given /^I am running "([^\"]*)" in the background$/ do |command|
+  run_in_background command
+end
+
+Given /^I am not running (?:.*) in the background$/ do
+  # no-op
+end
+
+
 When /^I run cucumber (.*)$/ do |cucumber_opts|
   run "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} --no-color #{cucumber_opts}"
 end
@@ -88,9 +97,9 @@ end
 
 Then /^"([^\"]*)" should have the same contents as "([^\"]*)"$/ do |actual_file, expected_file|
   actual = IO.read(actual_file)
-  # Comment out to replace expected file. Use with care! Remember to update duration afterwards.
-  # File.open(expected_file, "w"){|io| io.write(actual)}
   actual = replace_duration(actual, '0m30.005s')
+  # Comment out to replace expected file. Use with care! Remember to update duration afterwards.
+  # File.open(expected_file, "w") {|io| io.write(actual)}
   actual.should == IO.read(expected_file)
 end
 
@@ -98,6 +107,10 @@ Then /^STDERR should match$/ do |text|
   last_stderr.should =~ /#{text}/
 end
 
+Then /^STDERR should not match$/ do |text|
+  last_stderr.should_not =~ /#{text}/
+end
+
 Then /^STDERR should be empty$/ do
   last_stderr.should == ""
 end

data/features/support/env.rb

@@ -3,6 +3,11 @@ require 'tempfile'
 require 'spec/expectations'
 require 'fileutils'
 require 'forwardable'
+begin
+  require 'spork'
+rescue Gem::LoadError => ex
+  warn "WARNING: #{ex.message} You need to have the spork gem installed to run the DRb feature properly!"
+end
 
 class CucumberWorld
   extend Forwardable
@@ -52,6 +57,10 @@ class CucumberWorld
     end
   end
 
+  def background_jobs
+    @background_jobs ||= []
+  end
+
   def in_current_dir(&block)
     Dir.chdir(@current_dir, &block)
   end
@@ -66,6 +75,27 @@ class CucumberWorld
     @last_stderr = IO.read(stderr_file.path)
   end
 
+  def run_in_background(command)
+    pid = fork
+    in_current_dir do
+      if pid
+        background_jobs << pid
+      else
+        #STDOUT.close
+        #STDERR.close
+        exec command
+      end
+    end
+  end
+
+  def terminate_background_jobs
+    if @background_jobs
+      @background_jobs.each do |pid|
+        Process.kill(Signal.list['TERM'], pid)
+      end
+    end
+  end
+
 end
 
 World do
@@ -77,7 +107,11 @@ Before do
   FileUtils.mkdir CucumberWorld.working_dir
 end
 
+After do
+  terminate_background_jobs
+end
+
 Before('@diffxml') do
   `diffxml --version`
   raise "Please install diffxml from http://diffxml.sourceforge.net/" if $? != 0
-end
+end

data/features/usage.feature

@@ -113,11 +113,11 @@ Feature: Cucumber command line
        Then the multiline string should be # features/background/multiline_args_background.feature:17
        Then the multiline string should be # features/background/multiline_args_background.feature:27
       /^passing$/    # features/step_definitions/sample_steps.rb:5
-       Given passing # features/sample.feature:10
+       Given passing # features/sample.feature:12
       /^failing expectation$/    # features/step_definitions/sample_steps.rb:62
        Given failing expectation # features/failing_expectation.feature:4
       /^failing$/    # features/step_definitions/sample_steps.rb:8
-       Given failing # features/sample.feature:16
+       Given failing # features/sample.feature:18
       (::) UNUSED (::)
       /^unused$/          # features/step_definitions/sample_steps.rb:66
       /^another unused$/  # features/step_definitions/sample_steps.rb:69

data/lib/cucumber/ast/background.rb

@@ -23,7 +23,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        visitor.visit_comment(@comment)
+        visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_background_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
         visitor.step_mother.before(hook_context)
         visitor.visit_steps(@step_invocations)

data/lib/cucumber/ast/comment.rb

@@ -12,6 +12,10 @@ module Cucumber
         @value = value
       end
 
+      def empty?
+        @value.nil? || @value == ""
+      end
+
       def accept(visitor)
         @value.split("\n").each do |line|
           visitor.visit_comment_line(line.strip)

data/lib/cucumber/ast/feature.rb

@@ -4,6 +4,7 @@ module Cucumber
     class Feature
       attr_accessor :file
       attr_writer :features
+      attr_reader :name
 
       def initialize(background, comment, tags, name, feature_elements)
         @background, @comment, @tags, @name, @feature_elements = background, comment, tags, name, feature_elements
@@ -15,7 +16,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        visitor.visit_comment(@comment)
+        visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_tags(@tags)
         visitor.visit_feature_name(@name)
         visitor.visit_background(@background) if @background

data/lib/cucumber/ast/outline_table.rb

@@ -70,7 +70,7 @@ module Cucumber
             visitor.step_mother.before_and_after(self) do
               @step_invocations.each do |step_invocation|
                 step_invocation.invoke(visitor.step_mother, visitor.options)
-                @exception ||= step_invocation.exception
+                @exception ||= step_invocation.reported_exception
               end
 
               @cells.each do |cell|
@@ -89,7 +89,7 @@ module Cucumber
               @table.visit_scenario_name(visitor, self)
               @step_invocations.each do |step_invocation|
                 step_invocation.invoke(visitor.step_mother, visitor.options)
-                @exception ||= step_invocation.exception
+                @exception ||= step_invocation.reported_exception
                 step_invocation.visit_step_result(visitor)
               end
             end

data/lib/cucumber/ast/scenario.rb

@@ -21,7 +21,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        visitor.visit_comment(@comment)
+        visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_tags(@tags)
         visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
 

data/lib/cucumber/ast/scenario_outline.rb

@@ -3,6 +3,14 @@ module Cucumber
     class ScenarioOutline
       include FeatureElement
 
+      module ExamplesArray
+        def accept(visitor)
+          each do |examples|
+            visitor.visit_examples(examples)
+          end
+        end
+      end
+
       # The +example_sections+ argument must be an Array where each element is another array representing
       # an Examples section. This array has 3 elements:
       #
@@ -23,20 +31,19 @@ module Cucumber
           examples_table = OutlineTable.new(examples_matrix, self)
           Examples.new(examples_line, examples_keyword, examples_name, examples_table)
         end
+        @examples_array.extend(ExamplesArray)
 
         @background.feature_elements << self if @background
       end
 
       def accept(visitor)
-        visitor.visit_comment(@comment)
+        visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_tags(@tags)
         visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
         visitor.visit_steps(@steps)
 
         skip_invoke! if @background && @background.failed?
-        @examples_array.each do |examples|
-          visitor.visit_examples(examples)
-        end
+        visitor.visit_examples_array(@examples_array) unless @examples_array.empty?
       end
 
       def skip_invoke!

data/lib/cucumber/ast/step_invocation.rb

@@ -2,7 +2,7 @@ module Cucumber
   module Ast
     class StepInvocation
       attr_writer :step_collection, :background
-      attr_reader :name, :matched_cells, :status
+      attr_reader :name, :matched_cells, :status, :reported_exception
       attr_accessor :exception
 
       def initialize(step, name, multiline_arg, matched_cells)
@@ -24,12 +24,12 @@ module Cucumber
       end
 
       def visit_step_result(visitor)
-        visitor.visit_step_result(keyword, @step_match, @multiline_arg, @status, @exception, source_indent, @background)
+        visitor.visit_step_result(keyword, @step_match, @multiline_arg, @status, @reported_exception, source_indent, @background)
       end
 
       def invoke(step_mother, options)
         find_step_match!(step_mother)
-        unless @skip_invoke || options[:dry_run] || exception || @step_collection.exception
+        unless @skip_invoke || options[:dry_run] || @exception || @step_collection.exception
           @skip_invoke = true
           begin
             step_mother.current_world.__cucumber_current_step = self if step_mother.current_world # Nil in Pure Java
@@ -37,13 +37,13 @@ module Cucumber
             step_mother.after_step
             status!(:passed)
           rescue Pending => e
-            failed(e, false)
+            failed(options, e, false)
             status!(:pending)
           rescue Undefined => e
-            failed(e, false)
+            failed(options, e, false)
             status!(:undefined)
           rescue Exception => e
-            failed(e, false)
+            failed(options, e, false)
             status!(:failed)
           end
         end
@@ -54,21 +54,26 @@ module Cucumber
         begin
           @step_match = step_mother.step_match(@name)
         rescue Undefined => e
-          failed(e, true)
+          failed(step_mother.options, e, true)
           status!(:undefined)
           @step_match = NoStepMatch.new(@step, @name)
         rescue Ambiguous => e
-          failed(e, false)
+          failed(step_mother.options, e, false)
           status!(:failed)
           @step_match = NoStepMatch.new(@step, @name)
         end
         step_mother.step_visited(self)
       end
 
-      def failed(exception, clear_backtrace)
-        @exception = exception
-        @exception.set_backtrace([]) if clear_backtrace
-        @exception.backtrace << @step.backtrace_line unless @step.backtrace_line.nil?
+      def failed(options, e, clear_backtrace)
+        e.set_backtrace([]) if clear_backtrace
+        e.backtrace << @step.backtrace_line unless @step.backtrace_line.nil?
+        @exception = e
+        if(options[:strict] || !(Undefined === e) || e.nested?)
+          @reported_exception = e
+        else
+          @reported_exception = nil
+        end
       end
 
       def status!(status)

data/lib/cucumber/ast/visitor.rb

@@ -52,6 +52,10 @@ module Cucumber
       def visit_background_name(keyword, name, file_colon_line, source_indent)
       end
 
+      def visit_examples_array(examples_array)
+        examples_array.accept(self)
+      end
+
       def visit_examples(examples)
         examples.accept(self)
       end

data/lib/cucumber/cli/configuration.rb

@@ -13,6 +13,9 @@ module Cucumber
         'junit'    => 'Cucumber::Formatter::Junit'
       }
       DEFAULT_FORMAT = 'pretty'
+      DRB_FLAG = '--drb'
+      PROFILE_SHORT_FLAG = '-p'
+      PROFILE_LONG_FLAG = '--profile'
 
       attr_reader :paths
       attr_reader :options
@@ -28,8 +31,10 @@ module Cucumber
       end
 
       def parse!(args)
-        @args = args
-        return parse_args_from_profile('default') if @args.empty?
+        @args = args.empty? ? args_from_profile('default') : args
+        expand_profiles_into_args
+        return if parse_drb
+
         @args.extend(::OptionParser::Arguable)
 
         @args.options do |opts|
@@ -100,8 +105,8 @@ module Cucumber
           opts.on("-e", "--exclude PATTERN", "Don't run feature files or require ruby files matching PATTERN") do |v|
             @options[:excludes] << Regexp.new(v)
           end
-          opts.on("-p", "--profile PROFILE", "Pull commandline arguments from cucumber.yml.") do |v|
-            parse_args_from_profile(v)
+          opts.on(PROFILE_SHORT_FLAG, "#{PROFILE_LONG_FLAG} PROFILE", "Pull commandline arguments from cucumber.yml.") do |v|
+            # Processing of this is done previsouly so that the DRb flag can be detected within profiles.
           end
           opts.on("-c", "--[no-]color",
             "Whether or not to use ANSI color in the output. Cucumber decides",
@@ -158,6 +163,9 @@ module Cucumber
           opts.on("--no-diff", "Disable diff output on failing expectations.") do
             @options[:diff_enabled] = false
           end
+          opts.on(DRB_FLAG, "Run features against a DRb server. (i.e. with the spork gem)") do
+            # Processing of this is done previsouly in order to short circuit args from being lost.
+          end
           opts.on_tail("--version", "Show version.") do
             @out_stream.puts VERSION::STRING
             Kernel.exit
@@ -176,7 +184,7 @@ module Cucumber
         raise("You can't use both --strict and --wip") if @options[:strict] && @options[:wip]
 
         # Whatever is left after option parsing is the FILE arguments
-        @paths += args
+        @paths += @args
       end
 
       def verbose?
@@ -199,6 +207,10 @@ module Cucumber
         @options[:diff_enabled]
       end
 
+      def drb?
+        @drb
+      end
+
       def load_language
         if Cucumber.language_incomplete?(@options[:lang])
           list_keywords_and_exit(@options[:lang])
@@ -313,7 +325,15 @@ module Cucumber
           downcase
       end
 
-      def parse_args_from_profile(profile)
+      def expand_profiles_into_args
+        while (profile_index = @args.index(PROFILE_SHORT_FLAG) || @args.index(PROFILE_LONG_FLAG)) do
+          @args.delete_at(profile_index)
+          @args[profile_index] = args_from_profile(@args[profile_index])
+          @args.flatten!
+        end
+      end
+
+      def args_from_profile(profile)
         unless cucumber_yml.has_key?(profile)
           raise(<<-END_OF_ERROR)
 Could not find profile: '#{profile}'
@@ -334,7 +354,7 @@ Defined profiles in cucumber.yml:
           else
             raise "The '#{profile}' profile in cucumber.yml was a #{args_from_yml.class}. It must be a String or Array"
         end
-        parse!(args_from_yml)
+        args_from_yml
       end
 
       def cucumber_yml
@@ -346,7 +366,7 @@ Defined profiles in cucumber.yml:
         require 'yaml'
         begin
           @cucumber_yml = YAML::load(IO.read('cucumber.yml'))
-        rescue Exception => e
+        rescue StandardError => e
           raise(YmlLoadError,"cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentation on correct profile usage.\n")
         end
 
@@ -370,6 +390,10 @@ Defined profiles in cucumber.yml:
         Kernel.exit
       end
 
+      def parse_drb
+        @drb = @args.delete(DRB_FLAG) ? true : false
+      end
+
       def default_options
         {
           :strict       => false,

data/lib/cucumber/cli/drb_client.rb

@@ -0,0 +1,21 @@
+require "drb/drb"
+# This code was taken from the RSpec project and slightly modified.
+
+module Cucumber
+  module Cli
+    # Runs features on a DRB server, originally created with Spork compatibility in mind.
+    class DRbClient
+      def self.run(args, error_stream, out_stream)
+        begin
+          # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
+          DRb.start_service("druby://localhost:0")
+          feature_server = DRbObject.new_with_uri("druby://127.0.0.1:8990")
+          feature_server.run(args, error_stream, out_stream)
+          true
+        rescue DRb::DRbConnError
+          false
+        end
+      end
+    end
+  end
+end