square-cucumber 0.3.12.2 → 0.3.93.1

data/lib/cucumber/core_ext/instance_exec.rb

@@ -10,10 +10,12 @@ class Object
     cucumber_run_with_backtrace_filtering(pseudo_method) do
       if check_arity && !cucumber_compatible_arity?(args, block)
         instance_exec do
-          s1 = cucumber_arity(block) == 1 ? "" : "s"
+          ari = cucumber_arity(block)
+          ari = ari < 0 ? (ari.abs-1).to_s+"+" : ari
+          s1 = ari == 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}."
+            "Your block takes #{ari} argument#{s1}, but the Regexp matched #{args.length} argument#{s2}."
           )
         end
       else
@@ -28,9 +30,10 @@ class Object
   end
   
   def cucumber_compatible_arity?(args, block)
-    a = cucumber_arity(block)
-    return true if (a == -1) && Cucumber::RUBY_1_9
-    a == args.length
+    ari = cucumber_arity(block)
+    len = args.length
+    return true if ari == len or ari < 0 && len >= ari.abs-1
+    false
   end
   
   def cucumber_run_with_backtrace_filtering(pseudo_method)

data/lib/cucumber/feature_file.rb

@@ -31,7 +31,13 @@ module Cucumber
         require 'open-uri'
         open(@path).read
       else
-        File.open(@path, Cucumber.file_mode('r')).read 
+        begin
+          File.open(@path, Cucumber.file_mode('r')).read 
+        rescue Errno::EACCES => e
+          p = File.expand_path(@path)
+          e.message << "\nCouldn't open #{p}"
+          raise e
+        end
       end
     end
     

data/lib/cucumber/filter.rb

@@ -32,7 +32,7 @@ module Cucumber
     end
 
     def included_by_tags?(syntax_node)
-      @include_tags.empty? || syntax_node.has_tags?(@include_tags)
+      @include_tags.empty? || syntax_node.has_all_tags?(@include_tags)
     end
 
     def excluded_by_tags?(syntax_node)
@@ -47,4 +47,4 @@ module Cucumber
       @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.matches_name?(name_regexp)}
     end
   end
-end
+end

data/lib/cucumber/formatter/ansicolor.rb

@@ -60,15 +60,6 @@ module Cucumber
     module ANSIColor
       include Term::ANSIColor
 
-      # Not supported in Term::ANSIColor
-      def grey(m)
-        if ::Term::ANSIColor.coloring?
-          "\e[90m#{m}\e[0m"
-        else
-          m
-        end
-      end
-
       ALIASES = Hash.new do |h,k|
         if k.to_s =~ /(.*)_param/
           h[$1] + ',bold'
@@ -105,6 +96,48 @@ module Cucumber
           eval(code)
         end
       end
+      
+      def self.define_grey
+        begin
+          gem 'genki-ruby-terminfo'
+          require 'terminfo'
+          puts TermInfo.default_object.tigetnum("colors")
+          case TermInfo.default_object.tigetnum("colors")
+          when 0
+            raise "Your terminal doesn't support colours"
+          when 1
+            ::Term::ANSIColor.coloring = false
+            alias grey white
+          when 2..8
+            alias grey white
+          else
+            define_real_grey
+          end
+        rescue Exception => e
+          if e.class.name == 'TermInfo::TermInfoError'
+            STDERR.puts "*** WARNING ***"
+            STDERR.puts "You have the genki-ruby-terminfo gem installed, but you haven't set your TERM variable."
+            STDERR.puts "Try setting it to TERM=xterm-256color to get grey colour in output"
+            STDERR.puts "\n"
+            alias grey white
+          else
+            define_real_grey
+          end
+        end
+      end
+      
+      def self.define_real_grey
+        def grey(m)
+          if ::Term::ANSIColor.coloring?
+            "\e[90m#{m}\e[0m"
+          else
+            m
+          end
+        end
+      end
+      
+      define_grey
+      
     end
   end
 end

data/lib/cucumber/formatter/console.rb

@@ -77,7 +77,7 @@ module Cucumber
         @io.print dump_count(step_mother.steps.length, "step")
         print_status_counts{|status| step_mother.steps(status)}
 
-        @io.puts(format_duration(features.duration)) if features
+        @io.puts(format_duration(features.duration)) if features && features.duration
 
         @io.flush
       end

data/lib/cucumber/formatter/html.rb

@@ -1,10 +1,4 @@
-require 'erb'
-begin
-  require 'builder'
-rescue LoadError
-  gem 'builder'
-  require 'builder'
-end
+require 'cucumber/formatter/ordered_xml_markup'
 require 'cucumber/formatter/duration'
 
 module Cucumber
@@ -20,7 +14,7 @@ module Cucumber
       end
       
       def create_builder(io)
-        Builder::XmlMarkup.new(:target => io, :indent => 0)
+        OrderedXmlMarkup.new(:target => io, :indent => 0)
       end
       
       def visit_features(features)
@@ -65,12 +59,20 @@ module Cucumber
         end
       end
 
+      def visit_tags(tags)
+        super
+        @tag_spacer = nil
+      end
+
       def visit_tag_name(tag_name)
+        @builder.text!(@tag_spacer) if @tag_spacer
+        @tag_spacer = ' '
         @builder.span("@#{tag_name}", :class => 'tag')
       end
 
       def visit_feature_name(name)
         lines = name.split(/\r?\n/)
+        return if lines.empty?
         @builder.h2 do |h2|
           @builder.span(lines[0], :class => 'val')
         end
@@ -192,7 +194,7 @@ module Cucumber
 
       def visit_py_string(string)
         @builder.pre(:class => 'val') do |pre|
-          @builder.text!('  ' + string)
+          @builder << string.gsub("\n", '&#x000A;')
         end
       end
 
@@ -214,7 +216,7 @@ module Cucumber
         @outline_row += 1 if @outline_row
       end
 
-      def visit_table_cell_value(value, width, status)
+      def visit_table_cell_value(value, status)
         cell_type = @outline_row == 0 ? :th : :td
         attributes = {:id => "#{@row_id}_#{@col_index}", :class => 'val'}
         attributes[:class] += " #{status}" if status

data/lib/cucumber/formatter/junit.rb

@@ -1,9 +1,4 @@
-begin
-  require 'builder'
-rescue LoadError
-  gem 'builder'
-  require 'builder'
-end
+require 'cucumber/formatter/ordered_xml_markup'
 
 module Cucumber
   module Formatter
@@ -18,16 +13,18 @@ module Cucumber
 
       def visit_feature(feature)
         @failures = @errors = @tests = 0
-        @builder = Builder::XmlMarkup.new( :indent => 2 )
+        @builder = OrderedXmlMarkup.new( :indent => 2 )
+        @time = 0
         super
 
-        @testsuite = Builder::XmlMarkup.new( :indent => 2 )
+        @testsuite = OrderedXmlMarkup.new( :indent => 2 )
         @testsuite.instruct!
         @testsuite.testsuite(
           :failures => @failures,
           :errors => @errors,
           :tests => @tests,
-          :name => @feature_name ) do
+          :time => @time,
+        :name => @feature_name ) do
           @testsuite << @builder.target!
         end
 
@@ -36,40 +33,80 @@ module Cucumber
         File.open(feature_filename, 'w') { |file| file.write(@testsuite.target!) }
       end
 
+      def visit_background(name)
+        @in_background = true
+        super
+        @in_background = false
+      end
+
       def visit_feature_name(name)
         lines = name.split(/\r?\n/)
         @feature_name = lines[0].sub(/Feature\:/, '').strip
       end
 
-      def visit_scenario_name(keyword, name, file_colon_line, source_indent)
-        @scenario = name
+      def visit_scenario_name(keyword, name, file_colon_line, source_indent)   
+        scenario_name = name.strip
+        scenario_name = "Unnamed scenario" if name == ""
+        @scenario = scenario_name
+        @outline = keyword.include?('Scenario Outline')
+        @output = "Scenario#{ " outline" if @outline}: #{@scenario}\n\n"
       end
 
       def visit_steps(steps)
-        @steps_failed = false
+        return if @in_background
+        start = Time.now
         super
-        @failures += 1 if @steps_failed
-        @tests += 1
+        duration = Time.now - start
+        unless @outline
+          if steps.failed?
+            steps.each { |step| @output += "#{step.keyword} #{step.name}\n" }
+            @output += "\nMessage:\n"
+          end
+          build_testcase(duration, steps.status, steps.exception)
+        end
       end
 
-      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
-        step_name = keyword + " " + step_match.format_args(lambda{|param| "*#{param}*"})
-        @builder.testcase(:classname => "#{@feature_name}.#{@scenario}", :name => step_name) do
-          if status != :passed
-            @builder.failure(:message => step_name) do
-              @builder.text!(format_exception(exception)) if exception
-            end
-            @steps_failed = true
+      def visit_outline_table(outline_table)
+        @header_row = true
+        super(outline_table)
+      end
+
+      def visit_table_row(table_row)
+        start = Time.now
+        super(table_row)
+        duration = Time.now - start
+        unless @header_row
+          name_suffix = " (outline example : #{table_row.name})"
+          if table_row.failed?
+            @output += "Example row: #{table_row.name}\n"
+            @output += "\nMessage:\n"
           end
+          build_testcase(duration, table_row.status, table_row.exception,  name_suffix)
         end
+        @header_row = false
       end
 
       private
 
-      def format_exception(exception)
-        (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
-      end
-    end
+        def build_testcase(duration, status, exception = nil, suffix = "")
+          @time += duration
+          classname = "#{@feature_name}.#{@scenario}"
+          name = "#{@scenario}#{suffix}"
+          @builder.testcase(:classname => classname, :name => name, :time => duration) do
+            if status != :passed
+              @builder.failure(:message => "#{status.to_s} #{name}", :type => status.to_s) do
+                @builder.text! @output
+                @builder.text!(format_exception(exception)) if exception
+              end
+              @failures += 1
+            end
+          end
+          @tests += 1
+        end
 
+        def format_exception(exception)
+          (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
+        end
+    end
   end
 end

data/lib/cucumber/formatter/pretty.rb

@@ -13,13 +13,13 @@ module Cucumber
       include Console
       attr_writer :indent
 
-      def initialize(step_mother, io, options, delim='|')
+      def initialize(step_mother, io, options)
         super(step_mother)
         @io = io
         @options = options
-        @delim = delim
         @exceptions = []
         @indent = 0
+        @prefixes = options[:prefixes] || {}
       end
 
       def visit_features(features)
@@ -145,6 +145,7 @@ module Cucumber
 
       def visit_multiline_arg(multiline_arg)
         return if @options[:no_multiline]
+        @table = multiline_arg
         super
       end
 
@@ -154,7 +155,8 @@ module Cucumber
       end
 
       def visit_table_row(table_row)
-        @io.print @delim.indent(@indent)
+        @col_index = 0
+        @io.print '  |'.indent(@indent-2)
         super
         @io.puts
         if table_row.exception && !@exceptions.index(table_row.exception)
@@ -169,13 +171,26 @@ module Cucumber
         @io.flush
       end
 
-      def visit_table_cell_value(value, width, status)
+      def visit_table_cell(cell)
+        super
+        @col_index += 1
+      end
+
+      def visit_table_cell_value(value, status)
         status ||= @status || :passed
-        @io.print(' ' + format_string((value.to_s || '').ljust(width), status) + ::Term::ANSIColor.reset(" #{@delim}"))
+        width = @table.col_width(@col_index)
+        cell_text = value.to_s || ''
+        padded = cell_text + (' ' * (width - cell_text.jlength))
+        prefix = cell_prefix(status)
+        @io.print(' ' + format_string("#{prefix}#{padded}", status) + ::Term::ANSIColor.reset(" |"))
         @io.flush
       end
 
       private
+      
+      def cell_prefix(status)
+        @prefixes[status]
+      end
 
       def print_summary(features)
         print_stats(features)

data/lib/cucumber/formatter/progress.rb

@@ -23,7 +23,7 @@ module Cucumber
         @status = status
       end
 
-      def visit_table_cell_value(value, width, status)
+      def visit_table_cell_value(value, status)
         status ||= @status
         progress(status) unless table_header_cell?(status)
       end

data/lib/cucumber/formatter/steps.rb

@@ -0,0 +1,49 @@
+module Cucumber
+  module Formatter
+    class Steps < Ast::Visitor
+
+      def initialize(step_mother, io, options)
+        super(step_mother)
+        @io = io
+        @options = options
+        @step_definition_files = collect_steps(step_mother)
+      end
+
+      def visit_features(features)
+        print_summary
+      end
+
+      private
+
+      def print_summary
+        count = 0
+        @step_definition_files.keys.sort.each do |step_definition_file|
+          @io.puts step_definition_file
+          
+          sources = @step_definition_files[step_definition_file]
+          source_indent = source_indent(sources)
+          sources.sort.each do |file_colon_line, regexp|
+            @io.print "#{regexp}".indent(2)
+            @io.print " # #{file_colon_line}".indent(source_indent - regexp.size)
+            @io.puts
+          end
+          @io.puts
+          count += sources.size
+        end
+        @io.puts "#{count} step definition(s) in #{@step_definition_files.size} source file(s)."
+      end
+
+      def collect_steps(step_mother)
+        step_mother.step_definitions.inject({}) do |step_definitions, step_definition|
+          step_definitions[step_definition.file] ||= []
+          step_definitions[step_definition.file] << [ step_definition.file_colon_line, step_definition.regexp.inspect ]
+          step_definitions
+        end
+      end
+
+      def source_indent(sources)
+        sources.map { |file_colon_line, regexp| regexp.size }.max + 1
+      end
+    end
+  end
+end