kosmas58-cucumber 0.2.2.1 → 0.2.3.3

data/lib/cucumber/ast/table.rb

@@ -12,6 +12,10 @@ module Cucumber
 
       attr_accessor :file
 
+      def self.default_arg_name
+        "table"
+      end
+
       def initialize(raw, conversions = NULL_CONVERSIONS.dup)
         # Verify that it's square
         raw.transpose
@@ -60,6 +64,23 @@ module Cucumber
           row.to_hash
         end
       end
+      
+      # Converts this table into a Hash where the first column is
+      # used as keys and the second column is used as values
+      #
+      #   | a | 2 |
+      #   | b | 3 |
+      #
+      # Gets converted into the following:
+      #
+      #   {'a' => '2', 'b' => '3'}
+      #
+      # The table must be exactly two columns wide 
+      #
+      def rows_hash
+        verify_table_width(2)
+        @rows_hash = self.transpose.hashes[0]
+      end
 
       # Gets the raw data of this table. For example, a Table built from
       # the following plain text:
@@ -84,10 +105,6 @@ module Cucumber
         cells_rows.each(&proc)
       end
 
-      def matches_lines?(lines)
-        cells_rows.detect{|row| row.matches_lines?(lines)}
-      end
-
       def accept(visitor)
         cells_rows.each do |row|
           visitor.visit_table_row(row)
@@ -95,12 +112,6 @@ module Cucumber
         nil
       end
 
-      def status=(status)
-        cells_rows.each do |row|
-          row.status = status
-        end
-      end
-
       # For testing only
       def to_sexp #:nodoc:
         [:table, *cells_rows.map{|row| row.to_sexp}]
@@ -160,6 +171,10 @@ module Cucumber
       def verify_column(column_name)
         raise %{The column named "#{column_name}" does not exist} unless @raw[0].include?(column_name)
       end
+      
+      def verify_table_width(width)
+        raise %{The table must have exactly #{width} columns} unless @raw[0].size == width
+      end
 
       def arguments_replaced(arguments) #:nodoc:
         raw_with_replaced_args = raw.map do |row|
@@ -232,10 +247,6 @@ module Cucumber
           @table, @cells = table, cells
         end
 
-        def matches_lines?(lines)
-          lines.index(line)
-        end
-
         def accept(visitor)
           each do |cell|
             visitor.visit_table_cell(cell)
@@ -245,7 +256,7 @@ module Cucumber
 
         # For testing only
         def to_sexp #:nodoc:
-          [:row, *@cells.map{|cell| cell.to_sexp}]
+          [:row, line, *@cells.map{|cell| cell.to_sexp}]
         end
 
         def to_hash #:nodoc:
@@ -268,12 +279,6 @@ module Cucumber
           "row_#{line}"
         end
 
-        def status=(status)
-          each do |cell|
-            cell.status = status
-          end
-        end
-
         private
 
         def index
@@ -295,7 +300,6 @@ module Cucumber
 
         def initialize(value, table, row, col, line)
           @value, @table, @row, @col, @line = value, table, row, col, line
-          @status = :passed
         end
 
         def accept(visitor)

data/lib/cucumber/ast/tags.rb

@@ -11,14 +11,6 @@ module Cucumber
         @line, @tag_names = line, tag_names
       end
 
-      def has_tags?(tags)
-        (@tag_names & tags).any?
-      end
-
-      def matches_lines?(lines)
-        lines.index(@line)
-      end
-
       def accept(visitor)
         @tag_names.each do |tag_name|
           visitor.visit_tag_name(tag_name)

data/lib/cucumber/ast/visitor.rb

@@ -8,25 +8,6 @@ module Cucumber
       def initialize(step_mother)
         @options = {}
         @step_mother = step_mother
-        @current_feature_lines = []
-      end
-
-      def current_feature_lines=(lines)
-        @current_feature_lines = lines
-      end
-
-      def matches_lines?(node)
-        @current_feature_lines.empty? || node.matches_lines?(@current_feature_lines)
-      end
-
-      def included_by_tags?(node)
-        tags = options[:include_tags] || []
-        tags.empty? || node.has_tags?(tags)
-      end
-
-      def excluded_by_tags?(node)
-        tags = options[:exclude_tags] || []
-        tags.any? && node.has_tags?(tags)
       end
 
       def matches_scenario_names?(node)
@@ -93,14 +74,23 @@ module Cucumber
         step.accept(self)
       end
 
-      def visit_step_name(keyword, step_match, status, source_indent, background)
+      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        visit_step_name(keyword, step_match, status, source_indent, background)
+        visit_multiline_arg(multiline_arg) if multiline_arg
+        visit_exception(exception, status) if exception
+      end
+
+      def visit_step_name(keyword, step_match, status, source_indent, background) #:nodoc:
       end
 
-      def visit_multiline_arg(multiline_arg)
+      def visit_multiline_arg(multiline_arg) #:nodoc:
         multiline_arg.accept(self)
       end
 
-      def visit_py_string(string, status)
+      def visit_exception(exception, status) #:nodoc:
+      end
+
+      def visit_py_string(string)
       end
 
       def visit_table_row(table_row)
@@ -114,9 +104,6 @@ module Cucumber
       def visit_table_cell_value(value, width, status)
       end
 
-      def visit_exception(exception, status)
-      end
-
       def announce(announcement)
       end
 

data/lib/cucumber/cli/configuration.rb

@@ -257,11 +257,11 @@ module Cucumber
 
         potential_feature_files
       end
-    
+
     protected
   
       def feature_dirs
-        feature_files.map { |f| File.directory?(f) ? f : File.dirname(f) }.uniq
+        @paths.map { |f| File.directory?(f) ? f : File.dirname(f) }.uniq
       end
     
       def constantize(camel_cased_word)

data/lib/cucumber/cli/main.rb

@@ -52,8 +52,11 @@ module Cucumber
 
         verbose_log("Features:")
         configuration.feature_files.each do |f|
-          features.add_feature(parser.parse_file(f))
-          verbose_log("  * #{f}")
+          feature = parser.parse_file(f, configuration.options)
+          if feature
+            features.add_feature(feature)
+            verbose_log("  * #{f}")
+          end
         end
         verbose_log("\n"*2)
         features

data/lib/cucumber/core_ext/instance_exec.rb

@@ -7,12 +7,14 @@ end
 
 class Object
   def cucumber_instance_exec(check_arity, pseudo_method, *args, &block)
-    arity = block.arity
-    arity = 0 if arity == -1
     cucumber_run_with_backtrace_filtering(pseudo_method) do
-      if check_arity && args.length != arity
+      if check_arity && !cucumber_compatible_arity?(args, block)
         instance_exec do
-          raise Cucumber::ArityMismatchError.new("expected #{arity} block argument(s), got #{args.length}")
+          s1 = cucumber_arity(block) == 1 ? "" : "s"
+          s2 = args.length == 1 ? "" : "s"
+          raise Cucumber::ArityMismatchError.new(
+            "Your block takes #{cucumber_arity(block)} argument#{s1}, but the Regexp matched #{args.length} argument#{s2}."
+          )
         end
       else
         instance_exec(*args, &block)
@@ -20,6 +22,17 @@ class Object
     end
   end
   
+  def cucumber_arity(block)
+    a = block.arity
+    Cucumber::RUBY_1_9 ? a : (a == -1 ? 0 : a)
+  end
+  
+  def cucumber_compatible_arity?(args, block)
+    a = cucumber_arity(block)
+    return true if (a == -1) && Cucumber::RUBY_1_9
+    a == args.length
+  end
+  
   def cucumber_run_with_backtrace_filtering(pseudo_method)
     begin
       yield

data/lib/cucumber/formatter/ansicolor.rb

@@ -6,12 +6,20 @@ if Cucumber::WINDOWS_MRI
     gem 'win32console', '>= 1.2.0'
     require 'Win32/Console/ANSI'
   rescue LoadError
-    STDERR.puts "*** WARNING: You must gem install win32console (1.2.0 or higher) to get coloured output on MRI/Windows"
+    STDERR.puts %{*** WARNING: You must "gem install win32console" (1.2.0 or higher) to get coloured output on MRI/Windows}
+    Term::ANSIColor.coloring = false
+  end
+elsif Cucumber::WINDOWS && Cucumber::JRUBY
+  begin
+    gem 'aslakhellesoy-ansicolor', '>= 1.0'
+    require 'ansicolor'
+  rescue LoadError
+    STDERR.puts %{*** WARNING: You must "gem install aslakhellesoy-ansicolor --source http://gems.github.com" (1.0 or higher) to get coloured output on JRuby/Windows}
     Term::ANSIColor.coloring = false
   end
 end
 
-Term::ANSIColor.coloring = false if !STDOUT.tty? || (Cucumber::WINDOWS && !Cucumber::WINDOWS_MRI)
+Term::ANSIColor.coloring = false if !STDOUT.tty?
 
 module Cucumber
   module Formatter

data/lib/cucumber/formatter/console.rb

@@ -74,7 +74,8 @@ module Cucumber
         return if undefined.empty?
         snippets = undefined.map do |step|
           step_name = Undefined === step.exception ? step.exception.step_name : step.name
-          snippet = @step_mother.snippet_text(step.actual_keyword, step_name)
+          step_multiline_class = step.multiline_arg ? step.multiline_arg.class : nil
+          snippet = @step_mother.snippet_text(step.actual_keyword, step_name, step_multiline_class)
           snippet
         end.compact.uniq
 

data/lib/cucumber/formatter/html.rb

@@ -1,3 +1,4 @@
+require 'erb'
 begin
   require 'builder'
 rescue LoadError
@@ -8,6 +9,8 @@ end
 module Cucumber
   module Formatter
     class Html < Ast::Visitor
+      include ERB::Util # for the #h method
+
       def initialize(step_mother, io, options)
         super(step_mother)
         @builder = Builder::XmlMarkup.new(:target => io, :indent => 2)
@@ -74,9 +77,11 @@ module Cucumber
       end
 
       def visit_outline_table(outline_table)
+        @outline_row = 0
         @builder.table do
           super(outline_table)
         end
+        @outline_row = nil
       end
 
       def visit_examples_name(keyword, name)
@@ -91,8 +96,13 @@ module Cucumber
 
       def visit_step(step)
         @step_id = step.dom_id
-        @builder.li(:id => @step_id) do
-          super
+        super
+      end
+
+      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        @status = status
+        @builder.li(:id => @step_id, :class => status) do
+          super(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         end
       end
 
@@ -103,8 +113,8 @@ module Cucumber
 
         unless @skip_step
           step_name = step_match.format_args(lambda{|param| "<span>#{param}</span>"})
-          @builder.div(:class => status) do |div|
-            div << "#{keyword} #{step_name}"
+          @builder.div do |div|
+            div << h("#{keyword} #{step_name}")
           end
         end
       end
@@ -124,8 +134,8 @@ module Cucumber
         end
       end
 
-      def visit_py_string(string, status)
-        @builder.pre(:class => status) do |pre|
+      def visit_py_string(string)
+        @builder.pre(:class => @status) do |pre|
           pre << string
         end
       end
@@ -145,10 +155,14 @@ module Cucumber
             end
           end
         end
+        @outline_row += 1 if @outline_row
       end
 
       def visit_table_cell_value(value, width, status)
-        @builder.td(value, :class => status, :id => "#{@row_id}_#{@col_index}")
+        cell_type = @outline_row == 0 ? :th : :td
+        attributes = {:id => "#{@row_id}_#{@col_index}"}
+        attributes[:class] = status if status
+        @builder.__send__(cell_type, value, attributes)
         @col_index += 1
       end
 

data/lib/cucumber/formatter/pretty.rb

@@ -19,6 +19,7 @@ module Cucumber
         @options = options
         @delim = delim
         @indent = 0
+        @exceptions = []
       end
 
       def visit_features(features)
@@ -119,26 +120,33 @@ module Cucumber
         super
       end
 
-      def visit_step_name(keyword, step_match, status, source_indent, background)
-        @step_matches ||= []
-        non_failed_background_step_outside_background = !@in_background && background && (status != :failed)
-        @skip_step = @step_matches.index(step_match) || non_failed_background_step_outside_background
-        @step_matches << step_match
-        
-        unless(@skip_step)
-          source_indent = nil unless @options[:source]
-          formatted_step_name = format_step(keyword, step_match, status, source_indent)
-          @io.puts("    " + formatted_step_name)
+      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
+
+        # @step_matches ||= []
+        # return if @step_matches.index(step_match)
+        # @step_matches << step_match
+
+        @status = status
+        super
+      end
+
+      def visit_step_name(keyword, step_match, status, source_indent, background)
+        source_indent = nil unless @options[:source]
+        formatted_step_name = format_step(keyword, step_match, status, source_indent)
+        @io.puts("    " + formatted_step_name)
       end
 
       def visit_multiline_arg(multiline_arg)
-        return if @options[:no_multiline] || @skip_step
+        return if @options[:no_multiline]
         super
       end
 
       def visit_exception(exception, status)
-        return if @skip_step
         print_exception(exception, status, @indent)
         @io.flush
       end
@@ -147,21 +155,20 @@ module Cucumber
         @io.print @delim.indent(@indent)
         super
         @io.puts
-        print_exception(table_row.exception, :failed, @indent) if table_row.exception
+        if table_row.exception && !@exceptions.index(table_row.exception)
+          print_exception(table_row.exception, :failed, @indent) 
+        end
       end
 
-      def visit_py_string(string, status)
-        s = "\"\"\"\n#{string}\n\"\"\"".indent(@indent)
+      def visit_py_string(string)
+        s = %{"""\n#{string}\n"""}.indent(@indent)
         s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}.join("\n")
-        @io.puts(format_string(s, status))
+        @io.puts(format_string(s, @status))
         @io.flush
       end
 
-      def visit_table_cell(table_cell)
-        super
-      end
-
       def visit_table_cell_value(value, width, status)
+        status ||= @status || :passed
         @io.print(' ' + format_string((value.to_s || '').ljust(width), status) + " #{@delim}")
         @io.flush
       end

data/lib/cucumber/formatter/usage.rb

@@ -10,6 +10,7 @@ module Cucumber
         @io = io
         @options = options
         @step_definitions = Hash.new { |h,step_definition| h[step_definition] = [] }
+        @all_step_definitions = step_mother.step_definitions.dup
         @locations = []
       end
 
@@ -32,6 +33,7 @@ module Cucumber
           description = format_step(keyword, step_match, status, nil)
           length = (keyword + step_match.format_args).jlength
           @step_definitions[step_match.step_definition] << [step_match, description, length, location]
+          @all_step_definitions.delete(step_match.step_definition)
         end
       end
 
@@ -63,6 +65,20 @@ module Cucumber
             @io.puts format_string(" # #{file_colon_line}".indent(max_length - length), :comment)
           end
         end
+
+        print_unused_step_definitions
+      end
+
+      def print_unused_step_definitions
+        if @all_step_definitions.any?
+          max_length = @all_step_definitions.map{|step_definition| step_definition.text_length}.max
+
+          @io.puts format_string("(::) UNUSED (::)", :failed)
+          @all_step_definitions.each do |step_definition|
+            @io.print format_string(step_definition.regexp.inspect, :failed)
+            @io.puts format_string("  # #{step_definition.file_colon_line}".indent(max_length - step_definition.text_length), :comment)
+          end
+        end
       end
     end
   end