cucumber 0.8.6 → 0.8.7

data/lib/cucumber/ast/scenario_outline.rb

@@ -1,12 +1,10 @@
-require 'cucumber/ast/feature_element'
-require 'cucumber/ast/names'
-
 module Cucumber
   module Ast
     class ScenarioOutline #:nodoc:
       include FeatureElement
-      include Names
       
+      attr_reader :name
+
       module ExamplesArray #:nodoc:
         def accept(visitor)
           return if Cucumber.wants_to_quit
@@ -22,12 +20,12 @@ module Cucumber
       # * Examples keyword
       # * Examples section name
       # * Raw matrix
-      def initialize(background, comment, tags, line, keyword, title, description, raw_steps, example_sections)
-        @background, @comment, @tags, @line, @keyword, @title, @description, @raw_steps, @example_sections = background, comment, tags, line, keyword, title, description, raw_steps, example_sections
+      def initialize(background, comment, tags, line, keyword, name, raw_steps, example_sections)
+        @background, @comment, @tags, @line, @keyword, @name, @raw_steps, @example_sections = background, comment, tags, line, keyword, name, raw_steps, example_sections
       end
 
-      def add_examples(example_section, gherkin_examples)
-        @example_sections << [example_section, gherkin_examples]
+      def add_examples(example_section)
+        @example_sections << example_section
       end
 
       def init
@@ -35,21 +33,15 @@ module Cucumber
         attach_steps(@raw_steps)
         @steps = StepCollection.new(@raw_steps)
 
-        @examples_array = @example_sections.map do |example_section_and_gherkin_examples|
-          example_section = example_section_and_gherkin_examples[0]
-          gherkin_examples = example_section_and_gherkin_examples[1]
-          
-          examples_comment     = example_section[0]
-          examples_line        = example_section[1]
-          examples_keyword     = example_section[2]
-          examples_title       = example_section[3]
-          examples_description = example_section[4]
-          examples_matrix      = example_section[5]
+        @examples_array = @example_sections.map do |example_section|
+          examples_comment    = example_section[0]
+          examples_line       = example_section[1]
+          examples_keyword    = example_section[2]
+          examples_name       = example_section[3]
+          examples_matrix     = example_section[4]
 
           examples_table = OutlineTable.new(examples_matrix, self)
-          ex = Examples.new(examples_comment, examples_line, examples_keyword, examples_title, examples_description, examples_table)
-          ex.gherkin_statement(gherkin_examples)
-          ex
+          Examples.new(examples_comment, examples_line, examples_keyword, examples_name, examples_table)
         end
 
         @examples_array.extend(ExamplesArray)
@@ -61,7 +53,7 @@ module Cucumber
         return if Cucumber.wants_to_quit
         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_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
         visitor.visit_steps(@steps)
 
         skip_invoke! if @background && @background.failed?
@@ -110,7 +102,7 @@ module Cucumber
 
       def to_sexp
         init
-        sexp = [:scenario_outline, @keyword, name]
+        sexp = [:scenario_outline, @keyword, @name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         tags = @tags.to_sexp

data/lib/cucumber/ast/step.rb

@@ -14,11 +14,6 @@ module Cucumber
         @line, @keyword, @name, @multiline_arg = line, keyword, name, multiline_arg
       end
 
-      attr_reader :gherkin_statement
-      def gherkin_statement(statement=nil)
-        @gherkin_statement ||= statement
-      end
-
       def background?
         false
       end

data/lib/cucumber/ast/step_invocation.rb

@@ -1,4 +1,3 @@
-require 'cucumber/errors'
 require 'cucumber/step_match'
 require 'cucumber/ast/table'
 require 'gherkin/rubify'
@@ -39,7 +38,7 @@ module Cucumber
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
-        invoke(visitor.step_mother, visitor.configuration)
+        invoke(visitor.step_mother, visitor.options)
         visit_step_result(visitor)
       end
 
@@ -55,64 +54,63 @@ module Cucumber
         )
       end
 
-      def invoke(step_mother, configuration)
-        find_step_match!(step_mother, configuration)
-        unless @skip_invoke || configuration.dry_run? || @exception || @step_collection.exception
+      def invoke(step_mother, options)
+        find_step_match!(step_mother)
+        unless @skip_invoke || options[: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(configuration, e, false)
+            failed(options, e, false)
             status!(:pending)
           rescue Undefined => e
-            failed(configuration, e, false)
+            failed(options, e, false)
             status!(:undefined)
           rescue Cucumber::Ast::Table::Different => e
             @different_table = e.table
-            failed(configuration, e, false)
+            failed(options, e, false)
             status!(:failed)
           rescue Exception => e
-            failed(configuration, e, false)
+            failed(options, e, false)
             status!(:failed)
           end
         end
       end
 
-      def find_step_match!(step_mother, configuration)
+      def find_step_match!(step_mother)
         return if @step_match
         begin
           @step_match = step_mother.step_match(@name)
         rescue Undefined => e
-          failed(configuration, e, true)
+          failed(step_mother.options, e, true)
           status!(:undefined)
           @step_match = NoStepMatch.new(@step, @name)
         rescue Ambiguous => e
-          failed(configuration, 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(configuration, e, clear_backtrace)
+      def failed(options, 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(configuration.strict? || !(Undefined === e) || e.nested?)
+        if(options[:strict] || !(Undefined === e) || e.nested?)
           @reported_exception = e
         else
           @reported_exception = nil
         end
       end
 
-      PWD_PATTERN = /#{Regexp.escape(Dir.pwd)}\//m
-
       def filter_backtrace(e)
         return e if Cucumber.use_full_backtrace
-        (e.backtrace || []).each{|line| line.gsub!(PWD_PATTERN, "./")}
+        pwd = /#{Regexp.escape(Dir.pwd)}\//m
+        (e.backtrace || []).each{|line| line.gsub!(pwd, "./")}
         
         filtered = (e.backtrace || []).reject do |line|
           BACKTRACE_FILTER_PATTERNS.detect { |p| line =~ p }
@@ -187,10 +185,6 @@ module Cucumber
         @step.language
       end
 
-      def gherkin_statement
-        @step.gherkin_statement
-      end
-
       def to_sexp
         [:step_invocation, @step.line, @step.keyword, @name, (@multiline_arg.nil? ? nil : @multiline_arg.to_sexp)].compact
       end

data/lib/cucumber/ast/table.rb

@@ -1,5 +1,4 @@
 require 'gherkin/rubify'
-require 'gherkin/lexer/i18n_lexer'
 require 'gherkin/formatter/escaping'
 
 module Cucumber
@@ -61,7 +60,7 @@ module Cucumber
 
       def self.parse(text, uri, offset)
         builder = Builder.new
-        lexer = Gherkin::Lexer::I18nLexer.new(builder)
+        lexer = Gherkin::I18nLexer.new(builder)
         lexer.scan(text)
         new(builder.rows)
       end
@@ -74,6 +73,7 @@ module Cucumber
       def initialize(raw, conversion_procs = NULL_CONVERSIONS.dup)
         @cells_class = Cells
         @cell_class = Cell
+
         raw = ensure_array_of_array(rubify(raw))
         # Verify that it's square
         transposed = raw.transpose
@@ -153,7 +153,7 @@ module Cucumber
       #
       # gets converted into the following:
       #
-      #   [['a', 'b'], ['c', 'd']]
+      #   [['a', 'b], ['c', 'd']]
       #
       def raw
         cell_matrix.map do |row|
@@ -163,14 +163,9 @@ module Cucumber
         end
       end
 
-      def column_names	#:nodoc:
-        @col_names ||= cell_matrix[0].map { |cell| cell.value }
-      end
-
+      # Same as #raw, but skips the first (header) row
       def rows
-        hashes.map do |hash|
-          hash.values_at *headers
-        end
+        raw[1..-1]
       end
 
       def each_cells_row(&proc) #:nodoc:
@@ -276,9 +271,8 @@ module Cucumber
       #   end
       #
       def map_column!(column_name, strict=true, &conversion_proc)
-        verify_column(column_name.to_s) if strict
-        @conversion_procs[column_name.to_s] = conversion_proc
-        self
+        verify_column(column_name) if strict
+        @conversion_procs[column_name] = conversion_proc
       end
 
       # Compares +other_table+ to self. If +other_table+ contains columns
@@ -385,7 +379,7 @@ module Cucumber
         hash = Hash.new do |hash, key|
           hash[key.to_s] if key.is_a?(Symbol)
         end
-        column_names.each_with_index do |column_name, column_index|
+        raw[0].each_with_index do |column_name, column_index|
           value = @conversion_procs[column_name].call(cells.value(column_index))
           hash[column_name] = value
         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 :configuration #:nodoc:
+      attr_accessor :options #:nodoc:
       attr_reader   :step_mother #:nodoc:
 
-      def initialize(step_mother, listeners = [], configuration = Cucumber::Configuration.default)
-        @step_mother, @listeners, @configuration = step_mother, listeners, configuration
+      def initialize(step_mother, listeners = [], options = {}, io = STDOUT)
+        @step_mother, @listeners, @options, @io = step_mother, listeners, options, io
       end
 
       def visit_features(features)
@@ -122,7 +122,7 @@ module Cucumber
         broadcast(exception, status)
       end
 
-      def visit_doc_string(string)
+      def visit_py_string(string)
         broadcast(string)
       end
 
@@ -142,15 +142,15 @@ module Cucumber
         broadcast(value, status)
       end
 
-      # Print +messages+. This method can be called from within StepDefinitions.
-      def puts(*messages)
-        broadcast(*messages)
+      # Print +announcement+. This method can be called from within StepDefinitions.
+      def announce(announcement)
+        broadcast(announcement)
       end
 
       # Embed +file+ of +mime_type+ in the formatter. This method can be called from within StepDefinitions.
       # For most formatters this is a no-op.
-      def embed(file, mime_type, label)
-        broadcast(file, mime_type, label)
+      def embed(file, mime_type)
+        broadcast(file, mime_type)
       end
       
       private
@@ -171,10 +171,48 @@ module Cucumber
       def send_to_all(message, *args)
         @listeners.each do |listener|
           if listener.respond_to?(message)
-            listener.__send__(message, *args)
+            if legacy_listener?(listener)
+              warn_legacy(listener)
+              legacy_invoke(listener, message, *args)
+            else
+              listener.__send__(message, *args)
+            end
           end
         end
       end
+
+      def legacy_listener?(listener)
+        listener.respond_to?(:feature_name) && 
+        (listener.method(:feature_name) rescue false) && 
+        listener.method(:feature_name).arity == 1
+      end
+
+      def warn_legacy(listener)
+        @warned_listeners ||= []
+        unless @warned_listeners.index(listener)
+          warn("#{listener.class} is using a deprecated formatter API. Starting with Cucumber 0.7.0 the signatures\n" + 
+          "that have changed are:\n" +
+          "  feature_name(keyword, name)  # Two arguments. The keyword argument will not contain a colon.\n" +
+          "  scenario_name(keyword, name, file_colon_line, source_indent)  # The keyword argument will not contain a colon.\n" +
+          "  examples_name(keyword, name)  # The keyword argument will not contain a colon.\n"
+          )
+        end
+        @warned_listeners << listener
+      end
+
+      def legacy_invoke(listener, message, *args)
+        case message.to_sym
+        when :feature_name
+          listener.feature_name("#{args[0]}: #{args[1]}")
+        when :scenario_name, :examples_name
+          args_with_colon = args.dup
+          args_with_colon[0] += ':'
+          listener.__send__(message, *args_with_colon)
+        else
+          listener.__send__(message, *args)
+        end
+      end
+
       def extract_method_name_from(call_stack)
         call_stack[0].match(/in `(.*)'/).captures[0]
       end

data/lib/cucumber/cli/configuration.rb

@@ -12,7 +12,7 @@ module Cucumber
     class Configuration
       include Constantize
 
-      attr_reader :out_stream
+      attr_reader :options, :out_stream
 
       def initialize(out_stream = STDOUT, error_stream = STDERR)
         @out_stream   = out_stream
@@ -56,16 +56,8 @@ module Cucumber
         @options[:drb_port].to_i if @options[:drb_port]
       end
 
-      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)
+      def build_runner(step_mother, io)
+        Ast::TreeWalker.new(step_mother, formatters(step_mother), @options, io)
       end
 
       def formatter_class(format)
@@ -106,7 +98,7 @@ module Cucumber
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
           path = path.chomp('/')
           if File.directory?(path)
-            Dir["#{path}/**/*.feature"].sort
+            Dir["#{path}/**/*.feature"]
           elsif path[0..0] == '@' and # @listfile.txt
               File.file?(path[1..-1]) # listfile.txt is a file
             IO.read(path[1..-1]).split
@@ -129,27 +121,7 @@ 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)
@@ -179,6 +151,9 @@ 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

@@ -9,6 +9,7 @@ require 'cucumber'
 require 'logger'
 require 'cucumber/parser'
 require 'cucumber/feature_file'
+require 'cucumber/formatter/color_io'
 require 'cucumber/cli/configuration'
 require 'cucumber/cli/drb_client'
 
@@ -16,32 +17,55 @@ module Cucumber
   module Cli
     class Main
       class << self
+        def step_mother
+          @step_mother ||= StepMother.new
+        end
+
         def execute(args)
-          new(args).execute!
+          new(args).execute!(step_mother)
         end
       end
 
       def initialize(args, out_stream = STDOUT, error_stream = STDERR)
         @args         = args
-        @out_stream   = out_stream
+        if Cucumber::WINDOWS_MRI
+          @out_stream   = out_stream == STDOUT ? Formatter::ColorIO.new(Kernel, STDOUT) : out_stream
+        else
+          @out_stream   = out_stream
+        end
 
         @error_stream = error_stream
         @configuration = nil
       end
 
-      def execute!(existing_runtime = nil)
+      def execute!(step_mother)
         trap_interrupt
-        return @drb_output if run_drb_client
+        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
+        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
         
-        runtime = if existing_runtime
-          existing_runtime.configure(configuration)
-          existing_runtime
+        runner.visit_features(features)
+
+        failure = if configuration.wip?
+          step_mother.scenarios(:passed).any?
         else
-          Runtime.new(configuration)
+          step_mother.scenarios(:failed).any? ||
+          (configuration.strict? && (step_mother.steps(:undefined).any? || step_mother.steps(:pending).any?))
         end
-
-        runtime.run!
-        runtime.results.failure?
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @error_stream.puts e.message
         true
@@ -52,19 +76,10 @@ 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