cucumber 0.8.7 → 0.9.0

data/features/cucumber_cli.feature

@@ -337,7 +337,7 @@ Feature: Cucumber command line
       """
 
   Scenario: Multiple formatters and outputs
-    When I run cucumber --format progress --out tmp/progress.txt --format pretty --out tmp/pretty.txt --no-source --dry-run features/lots_of_undefined.feature
+    When I run cucumber --format progress --out tmp/progress.txt --format pretty --out tmp/pretty.txt --no-source --dry-run --no-snippets features/lots_of_undefined.feature
     Then STDERR should be empty
     Then "fixtures/self_test/tmp/progress.txt" should contain
       """

data/features/json_formatter.feature

@@ -176,7 +176,7 @@ Feature: JSON output formatter
                       ],
                       "exception": {
                         "class": "RSpec::Expectations::ExpectationNotMetError",
-                        "message": "expected: 4,\n     got: 5 (using ==)\nDiff:\n@@ -1,2 +1,2 @@\n-4\n+5\n",
+                        "message": "expected: 4,\n     got: 5 (using ==)",
                         "backtrace": [
                           "./features/step_definitions/steps.rb:18:in `/^I the result should be (\\d+)$/'",
                           "features/tables.feature:8:in `Then I the result should be <c>'"

data/features/junit_formatter.feature

@@ -20,13 +20,15 @@ Feature: JUnit output formatter
       </testcase>
       <testcase classname="One passing scenario, one failing scenario.Failing" name="Failing" time="0.005">
         <failure message="failed Failing" type="failed">
-      Scenario: Failing
+          <![CDATA[Scenario: Failing
 
       Given a failing scenario
 
       Message:
-       (RuntimeError)
-      features/one_passing_one_failing.feature:7:in `Given a failing scenario'  </failure>
+	]]>
+          <![CDATA[ (RuntimeError)
+	features/one_passing_one_failing.feature:7:in `Given a failing scenario']]>
+        </failure>
       </testcase>
       </testsuite>
 
@@ -58,10 +60,12 @@ Feature: JUnit output formatter
       <testsuite errors="0" failures="1" name="Pending step" tests="1" time="0.000160">
       <testcase classname="Pending step.Pending" name="Pending" time="0.000160">
         <failure message="pending Pending" type="pending">
-      Scenario: Pending
+          <![CDATA[Scenario: Pending
 
-      TODO (Cucumber::Pending)
-      features/pending.feature:4:in `Given a pending step'  </failure>
+      ]]>
+          <![CDATA[TODO (Cucumber::Pending)
+      features/pending.feature:4:in `Given a pending step']]>
+        </failure>
       </testcase>
       </testsuite>
 

data/features/post_configuration_hook.feature

@@ -4,13 +4,26 @@ Feature: Post Configuration Hook [#423]
   As a developer
   I want to manipulate the Cucumber configuration after it has been created
 
-  Scenario: configuration modified to use HTML formatter
+  Scenario: Using options directly gets a deprecation warning
 
     Given a standard Cucumber project directory structure
     And a file named "features/support/env.rb" with:
       """
       AfterConfiguration do |config|
-        config.options[:formats] << ['html', config.out_stream]
+        config.options[:blah]
+      end
+      """
+    When I run cucumber features
+    Then STDERR should match
+      """
+      Deprecated
+      """
+
+    Given a standard Cucumber project directory structure
+    And a file named "features/support/env.rb" with:
+      """
+      AfterConfiguration do |config|
+        config.formats << ['html', config.out_stream]
       end
       """
     When I run cucumber features

data/features/step_definitions/cucumber_steps.rb

@@ -50,7 +50,11 @@ Given /^I have environment variable (\w+) set to "([^"]*)"$/ do |variable, value
 end
 
 When /^I run cucumber (.*)$/ do |cucumber_opts|
-  run "#{Cucumber::RUBY_BINARY} -r rubygems #{Cucumber::BINARY} --no-color #{cucumber_opts} CUCUMBER_OUTPUT_ENCODING=UTF-8"
+  # Don't use Cucumber::BINARY (which is the binary used to start the "outer" cucumber)
+  # Instead we force the use of this codebase's cucumber bin script.
+  # This allows us to run cucumber's cukes with an older, stable cucumber.
+  cucumber_bin = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
+  run "#{Cucumber::RUBY_BINARY} -I rubygems #{cucumber_bin} --no-color #{cucumber_opts} CUCUMBER_OUTPUT_ENCODING=UTF-8"
 end
 
 When /^I run rake (.*)$/ do |rake_opts|

data/features/step_definitions/wire_steps.rb

@@ -12,6 +12,7 @@ end
 module WireHelper
   def start_wire_server
     @wire_pid = fork do
+      at_exit { stop_wire_server }
       @server.run
     end
   end

data/features/support/env.rb

@@ -1,10 +1,7 @@
 require 'rubygems'
+
 require 'tempfile'
-begin
-  require 'rspec/expectations'
-rescue LoadError
-  require 'spec/expectations'
-end
+require 'rspec/expectations'
 require 'fileutils'
 require 'forwardable'
 require 'cucumber/formatter/unicode'

data/features/wire_protocol.feature

@@ -67,7 +67,7 @@ Feature: Wire Protocol
     Given there is a wire server running on port 54321 which understands the following protocol:
       | request                                              | response       |
       | ["step_matches",{"name_to_match":"we're all wired"}] | ["success",[]] |
-    When I run cucumber --dry-run -f progress
+    When I run cucumber --dry-run --no-snippets -f progress
     And it should pass with
       """
       U

data/lib/cucumber.rb

@@ -11,5 +11,13 @@ require 'cucumber/broadcaster'
 module Cucumber
   class << self
     attr_accessor :wants_to_quit
+    
+    def logger
+      @log ||= Logger.new(STDOUT)
+    end
+    
+    def logger=(logger)
+      @log = logger
+    end
   end
 end

data/lib/cucumber/ast/outline_table.rb

@@ -21,7 +21,7 @@ module Cucumber
         return if Cucumber.wants_to_quit
         init
         cells_rows.each_with_index do |row, n|
-          if(visitor.options[:expand])
+          if(visitor.configuration.expand?)
             row.accept(visitor)
           else
             visitor.visit_table_row(row)
@@ -96,7 +96,7 @@ module Cucumber
 
         def accept(visitor)
           return if Cucumber.wants_to_quit
-          visitor.options[:expand] ? accept_expand(visitor) : accept_plain(visitor)
+          visitor.configuration.expand? ? accept_expand(visitor) : accept_plain(visitor)
         end
 
         def accept_plain(visitor)
@@ -108,7 +108,7 @@ module Cucumber
           else
             visitor.step_mother.with_hooks(self) do
               @step_invocations.each do |step_invocation|
-                step_invocation.invoke(visitor.step_mother, visitor.options)
+                step_invocation.invoke(visitor.step_mother, visitor.configuration)
                 @exception ||= step_invocation.reported_exception
               end
 
@@ -127,7 +127,7 @@ module Cucumber
             visitor.step_mother.with_hooks(self) do
               @table.visit_scenario_name(visitor, self)
               @step_invocations.each do |step_invocation|
-                step_invocation.invoke(visitor.step_mother, visitor.options)
+                step_invocation.invoke(visitor.step_mother, visitor.configuration)
                 @exception ||= step_invocation.reported_exception
                 step_invocation.visit_step_result(visitor)
               end

data/lib/cucumber/ast/step_invocation.rb

@@ -1,3 +1,4 @@
+require 'cucumber/errors'
 require 'cucumber/step_match'
 require 'cucumber/ast/table'
 require 'gherkin/rubify'
@@ -38,7 +39,7 @@ module Cucumber
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
-        invoke(visitor.step_mother, visitor.options)
+        invoke(visitor.step_mother, visitor.configuration)
         visit_step_result(visitor)
       end
 
@@ -54,53 +55,53 @@ module Cucumber
         )
       end
 
-      def invoke(step_mother, options)
-        find_step_match!(step_mother)
-        unless @skip_invoke || options[:dry_run] || @exception || @step_collection.exception
+      def invoke(step_mother, configuration)
+        find_step_match!(step_mother, configuration)
+        unless @skip_invoke || configuration.dry_run? || @exception || @step_collection.exception
           @skip_invoke = true
           begin
             @step_match.invoke(@multiline_arg)
             step_mother.after_step
             status!(:passed)
           rescue Pending => e
-            failed(options, e, false)
+            failed(configuration, e, false)
             status!(:pending)
           rescue Undefined => e
-            failed(options, e, false)
+            failed(configuration, e, false)
             status!(:undefined)
           rescue Cucumber::Ast::Table::Different => e
             @different_table = e.table
-            failed(options, e, false)
+            failed(configuration, e, false)
             status!(:failed)
           rescue Exception => e
-            failed(options, e, false)
+            failed(configuration, e, false)
             status!(:failed)
           end
         end
       end
 
-      def find_step_match!(step_mother)
+      def find_step_match!(step_mother, configuration)
         return if @step_match
         begin
           @step_match = step_mother.step_match(@name)
         rescue Undefined => e
-          failed(step_mother.options, e, true)
+          failed(configuration, e, true)
           status!(:undefined)
           @step_match = NoStepMatch.new(@step, @name)
         rescue Ambiguous => e
-          failed(step_mother.options, e, false)
+          failed(configuration, e, false)
           status!(:failed)
           @step_match = NoStepMatch.new(@step, @name)
         end
         step_mother.step_visited(self)
       end
 
-      def failed(options, e, clear_backtrace)
+      def failed(configuration, e, clear_backtrace)
         e = filter_backtrace(e)
         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?)
+        if(configuration.strict? || !(Undefined === e) || e.nested?)
           @reported_exception = e
         else
           @reported_exception = nil

data/lib/cucumber/ast/table.rb

@@ -1,4 +1,5 @@
 require 'gherkin/rubify'
+require 'gherkin/lexer/i18n_lexer'
 require 'gherkin/formatter/escaping'
 
 module Cucumber
@@ -60,7 +61,7 @@ module Cucumber
 
       def self.parse(text, uri, offset)
         builder = Builder.new
-        lexer = Gherkin::I18nLexer.new(builder)
+        lexer = Gherkin::Lexer::I18nLexer.new(builder)
         lexer.scan(text)
         new(builder.rows)
       end

data/lib/cucumber/ast/tree_walker.rb

@@ -2,11 +2,11 @@ module Cucumber
   module Ast
     # Walks the AST, executing steps and notifying listeners
     class TreeWalker
-      attr_accessor :options #:nodoc:
+      attr_accessor :configuration #:nodoc:
       attr_reader   :step_mother #:nodoc:
 
-      def initialize(step_mother, listeners = [], options = {}, io = STDOUT)
-        @step_mother, @listeners, @options, @io = step_mother, listeners, options, io
+      def initialize(step_mother, listeners = [], configuration = Cucumber::Configuration.default)
+        @step_mother, @listeners, @configuration = step_mother, listeners, configuration
       end
 
       def visit_features(features)

data/lib/cucumber/cli/configuration.rb

@@ -12,7 +12,7 @@ module Cucumber
     class Configuration
       include Constantize
 
-      attr_reader :options, :out_stream
+      attr_reader :out_stream
 
       def initialize(out_stream = STDOUT, error_stream = STDERR)
         @out_stream   = out_stream
@@ -56,8 +56,16 @@ module Cucumber
         @options[:drb_port].to_i if @options[:drb_port]
       end
 
-      def build_runner(step_mother, io)
-        Ast::TreeWalker.new(step_mother, formatters(step_mother), @options, io)
+      def dry_run?
+        @options[:dry_run]
+      end
+
+      def expand?
+        @options[:expand]
+      end
+
+      def build_tree_walker(step_mother)
+        Ast::TreeWalker.new(step_mother, formatters(step_mother), self)
       end
 
       def formatter_class(format)
@@ -121,7 +129,27 @@ module Cucumber
         logger.level = Logger::DEBUG if self.verbose?
         logger
       end
-
+      
+      def tag_expression
+        Gherkin::TagExpression.new(@options[:tag_expressions])
+      end
+      
+      def filters
+        @options.filters
+      end
+      
+      def formats
+        @options[:formats]
+      end
+      
+      def options
+        warn("Deprecated: Configuration#options will be removed from the next release of Cucumber. Please use the configuration object directly instead.")
+        @options
+      end
+      
+      def paths
+        @options[:paths].empty? ? ['features'] : @options[:paths]
+      end
     private
 
       def formatters(step_mother)
@@ -151,9 +179,6 @@ module Cucumber
         end
       end
 
-      def paths
-        @options[:paths].empty? ? ['features'] : @options[:paths]
-      end
 
       def set_environment_variables
         @options[:env_vars].each do |var, value|

data/lib/cucumber/cli/main.rb

@@ -13,16 +13,20 @@ require 'cucumber/formatter/color_io'
 require 'cucumber/cli/configuration'
 require 'cucumber/cli/drb_client'
 
+if defined?(Spork::TestFramework::Cucumber)
+  class Spork::TestFramework::Cucumber < Spork::TestFramework
+    def run_tests(argv, stderr, stdout)
+      ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!
+    end
+  end
+end
+
 module Cucumber
   module Cli
     class Main
       class << self
-        def step_mother
-          @step_mother ||= StepMother.new
-        end
-
         def execute(args)
-          new(args).execute!(step_mother)
+          new(args).execute!
         end
       end
 
@@ -38,34 +42,17 @@ module Cucumber
         @configuration = nil
       end
 
-      def execute!(step_mother)
-        trap_interrupt
-        if configuration.drb?
-          begin
-            return DRbClient.run(@args, @error_stream, @out_stream, configuration.drb_port)
-          rescue DRbClientError => e
-            @error_stream.puts "WARNING: #{e.message} Running features locally:"
-          end
+      def execute!(legacy_step_mother = nil)
+        if legacy_step_mother
+          warn("Passing a step_mother to #execute! is deprecated, and has been ignored: #{caller[0]}")
         end
-        step_mother.options = configuration.options
-        step_mother.log = configuration.log
 
-        step_mother.load_code_files(configuration.support_to_load)
-        step_mother.after_configuration(configuration)
-        features = step_mother.load_plain_text_features(configuration.feature_files)
-        step_mother.load_code_files(configuration.step_defs_to_load)
-
-        runner = configuration.build_runner(step_mother, @out_stream)
-        step_mother.visitor = runner # Needed to support World#announce
+        trap_interrupt
+        return @drb_output if run_drb_client
         
-        runner.visit_features(features)
-
-        failure = if configuration.wip?
-          step_mother.scenarios(:passed).any?
-        else
-          step_mother.scenarios(:failed).any? ||
-          (configuration.strict? && (step_mother.steps(:undefined).any? || step_mother.steps(:pending).any?))
-        end
+        runtime = Runtime.new(configuration)
+        runtime.run!
+        runtime.results.failure?
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @error_stream.puts e.message
         true
@@ -76,10 +63,19 @@ module Cucumber
 
         @configuration = Configuration.new(@out_stream, @error_stream)
         @configuration.parse!(@args)
+        Cucumber.logger = @configuration.log
         @configuration
       end
 
       private
+      
+      def run_drb_client
+        return false unless configuration.drb?
+        @drb_output = DRbClient.run(@args, @error_stream, @out_stream, configuration.drb_port)
+        true
+      rescue DRbClientError => e
+        @error_stream.puts "WARNING: #{e.message} Running features locally:"
+      end
 
       def trap_interrupt
         trap('INT') do

data/lib/cucumber/cli/options.rb

@@ -199,10 +199,8 @@ module Cucumber
             Term::ANSIColor.coloring = v
           end
           opts.on("-d", "--dry-run", "Invokes formatters without executing the steps.",
-            "This also omits the loading of your support/env.rb file if it exists.",
-            "Implies --no-snippets.") do
+            "This also omits the loading of your support/env.rb file if it exists.") do
             @options[:dry_run] = true
-            @options[:snippets] = false
           end
           opts.on("-a", "--autoformat DIR",
             "Reformats (pretty prints) feature files and write them to DIRECTORY.",