cucumber 0.1.8 → 0.1.9

data/lib/cucumber/core_ext/proc.rb

@@ -10,10 +10,9 @@ module Cucumber
       
       def call_in(obj, *args)
         obj.extend(mod)
-        a = arity == -1 ? 0 : arity
-        if self != StepMother::PENDING && args.length != a
+        if self != StepMother::PENDING && args.length != arity2
           # We have to manually raise when the block has arity -1 (no pipes)
-          raise ArityMismatchError.new("expected #{arity == -1 ? 0 : arity} block argument(s), got #{args.length}")
+          raise ArityMismatchError.new("expected #{arity2} block argument(s), got #{args.length}")
         else
           obj.__send__(meth, *args)
         end

data/lib/cucumber/executor.rb

@@ -3,22 +3,26 @@ require 'cucumber/core_ext/proc'
 module Cucumber
   class Executor
     attr_reader :failed
-    attr_accessor :formatter
-    
+    attr_accessor :formatters
+    attr_writer :scenario_names
+
     def line=(line)
       @line = line
     end
 
     def initialize(step_mother)
-      @world_proc = lambda do 
+      @world_proc = lambda do
         Object.new
       end
       @before_scenario_procs = []
       @after_scenario_procs = []
       @after_step_procs = []
       @step_mother = step_mother
+
+      @executed_scenarios = {}
+      @regular_scenario_cache = {}
     end
-    
+
     def register_world_proc(&proc)
       @world_proc = proc
     end
@@ -40,47 +44,65 @@ module Cucumber
 
     def visit_features(features)
       raise "Line number can only be specified when there is 1 feature. There were #{features.length}." if @line && features.length != 1
-      formatter.visit_features(features) if formatter.respond_to?(:visit_features)
+      formatters.visit_features(features)
       features.accept(self)
-      formatter.dump
+      formatters.dump
     end
 
     def visit_feature(feature)
-      formatter.visit_feature(feature) if formatter.respond_to?(:visit_feature)
-      feature.accept(self)
+      if accept_feature?(feature)
+        formatters.feature_executing(feature)
+        feature.accept(self)
+        @executed_scenarios = {}
+        @regular_scenario_cache = {}
+      end
     end
 
     def visit_header(header)
-      formatter.header_executing(header) if formatter.respond_to?(:header_executing)
+      formatters.header_executing(header)
     end
 
     def visit_row_scenario(scenario)
+      execute_scenario(@regular_scenario_cache[scenario.name]) if executing_unprepared_row_scenario?(scenario)
       visit_scenario(scenario)
     end
 
     def visit_regular_scenario(scenario)
+      @regular_scenario_cache[scenario.name] = scenario
       visit_scenario(scenario)
     end
 
     def visit_scenario(scenario)
-      if accept?(scenario)
-        @error = nil
-        @pending = nil
-
-        @world = @world_proc.call
-        @world.extend(Spec::Matchers) if defined?(Spec::Matchers)
-        define_step_call_methods(@world)
-
-        formatter.scenario_executing(scenario) if formatter.respond_to?(:scenario_executing)
-        @before_scenario_procs.each{|p| p.call_in(@world, *[])}
-        scenario.accept(self)
-        @after_scenario_procs.each{|p| p.call_in(@world, *[])}
-        formatter.scenario_executed(scenario) if formatter.respond_to?(:scenario_executed)
+      if accept_scenario?(scenario)
+        @executed_scenarios[scenario.name] = true
+        execute_scenario(scenario)
       end
     end
+
+    def execute_scenario(scenario)
+      @error = nil
+      @pending = nil
+
+      @world = @world_proc.call
+      @world.extend(Spec::Matchers) if defined?(Spec::Matchers)
+      define_step_call_methods(@world)
+
+      formatters.scenario_executing(scenario)
+      @before_scenario_procs.each{|p| p.call_in(@world, *[])}
+      scenario.accept(self)
+      @after_scenario_procs.each{|p| p.call_in(@world, *[])}
+      formatters.scenario_executed(scenario)
+    end
     
-    def accept?(scenario)
-      @line.nil? || scenario.at_line?(@line)
+    def accept_scenario?(scenario)
+      accept = true
+      accept &&= scenario.at_line?(@line) if @line
+      accept &&= @scenario_names.include? scenario.name if @scenario_names && !@scenario_names.empty?
+      accept
+    end
+
+    def accept_feature?(feature)
+      feature.scenarios.any? { |s| accept_scenario?(s) }
     end
 
     def visit_row_step(step)
@@ -95,33 +117,33 @@ module Cucumber
       unless @pending || @error
         begin
           regexp, args, proc = step.regexp_args_proc(@step_mother)
-          formatter.step_executing(step, regexp, args) if formatter.respond_to?(:step_executing)
+          formatters.step_executing(step, regexp, args)
           step.execute_in(@world, regexp, args, proc)
           @after_step_procs.each{|p| p.call_in(@world, *[])}
-          formatter.step_passed(step, regexp, args)
+          formatters.step_passed(step, regexp, args)
         rescue Pending
           record_pending_step(step, regexp, args)
         rescue => e
           @failed = true
           @error = step.error = e
-          formatter.step_failed(step, regexp, args)
+          formatters.step_failed(step, regexp, args)
         end
       else
         begin
           regexp, args, proc = step.regexp_args_proc(@step_mother)
           step.execute_in(@world, regexp, args, proc)
-          formatter.step_skipped(step, regexp, args)
+          formatters.step_skipped(step, regexp, args)
         rescue Pending
           record_pending_step(step, regexp, args)
         rescue Exception
-          formatter.step_skipped(step, regexp, args)
+          formatters.step_skipped(step, regexp, args)
         end
       end
     end
-    
+
     def record_pending_step(step, regexp, args)
       @pending = true
-      formatter.step_pending(step, regexp, args)
+      formatters.step_pending(step, regexp, args)
     end
 
     def define_step_call_methods(world)
@@ -139,5 +161,10 @@ module Cucumber
         end
       end
     end
+    
+    def executing_unprepared_row_scenario?(scenario)
+      accept_scenario?(scenario) && !@executed_scenarios[scenario.name]
+    end
+    
   end
-end
+end

data/lib/cucumber/formatters.rb

@@ -1 +1 @@
-%w{html pretty progress profile}.each{|n| require "cucumber/formatters/#{n}_formatter"}
+%w{html pretty progress profile autotest}.each{|n| require "cucumber/formatters/#{n}_formatter"}

data/lib/cucumber/formatters/ansicolor.rb

@@ -91,17 +91,16 @@ module Cucumber
       
       #Not supported in Term::ANSIColor
       def grey(m)
-        if ENV['CUCUMBER_COLORS_DISABLED'] == '1'
-          m
-        else
+        if ::Term::ANSIColor.coloring?
           "\e[90m#{m}\e[0m" 
+        else
+          m
         end
       end
       
       ALIASES.each do |m, color_string|
         colors = color_string.split(",").reverse
         define_method(m) do |*s|
-          ::Term::ANSIColor.coloring = false if ENV['CUCUMBER_COLORS_DISABLED'] == '1'
           clear + colors.inject(s[0]) do |memo, color|
             s[0].nil? ? __send__(color) + memo.to_s : __send__(color, memo.to_s)
           end

data/lib/cucumber/formatters/autotest_formatter.rb

@@ -0,0 +1,23 @@
+require 'cucumber/formatters/ansicolor'
+
+module Cucumber
+  module Formatters
+    class AutotestFormatter
+      def initialize(io)
+        @io = io
+        @failed_scenarios = []
+      end
+      
+      def step_didnt_pass(step, regexp, args)
+        unless @failed_scenarios.include? step.scenario.name
+          @failed_scenarios << step.scenario.name
+          @io.puts step.scenario.name
+        end
+      end
+      
+      alias step_failed  step_didnt_pass
+      alias step_pending step_didnt_pass
+      alias step_skipped step_didnt_pass
+    end
+  end
+end

data/lib/cucumber/formatters/pretty_formatter.rb

@@ -7,21 +7,23 @@ module Cucumber
 
       INDENT = "\n      "
       BACKTRACE_FILTER_PATTERNS = [/vendor\/rails/, /vendor\/plugins\/cucumber/, /spec\/expectations/, /spec\/matchers/]
-    
+
       def initialize(io, step_mother, options={})
         @io = (io == STDOUT) ? Kernel : io
         @options = options
         @step_mother = step_mother
-        @passed = []
-        @failed = []
-        @pending = []
-        @skipped = []
+        @pending_scenarios  = []
+        @passed             = []
+        @failed             = []
+        @pending_steps      = []
+        @skipped            = []
+        @last_executed_was_row = false
       end
- 
-      def visit_feature(feature)
+
+      def feature_executing(feature)
         @feature = feature
       end
- 
+
       def header_executing(header)
         @io.puts if @feature_newline
         @feature_newline = true
@@ -31,18 +33,27 @@ module Cucumber
           @io.print line
           if @options[:source] && index==0
             @io.print padding_spaces(@feature)
-            @io.print comment("# #{@feature.file}") 
+            @io.print comment("# #{@feature.file}")
           end
           @io.puts
         end
       end
-  
+
       def scenario_executing(scenario)
         @scenario_failed = false
+        @io.puts if @last_executed_was_row && !scenario.row?
         if scenario.row?
+          @last_executed_was_row = true
           @io.print "    |"
         else
-          @io.print passed("  #{Cucumber.language['scenario']}: #{scenario.name}")
+          if scenario.pending?
+            @pending_scenarios << scenario
+            @io.print pending("  #{Cucumber.language['scenario']}: #{scenario.name}")
+          else
+            @io.print passed("  #{Cucumber.language['scenario']}: #{scenario.name}")
+          end
+          @last_executed_was_row = false
+
           if @options[:source]
             @io.print padding_spaces(scenario)
             @io.print comment("# #{scenario.file}:#{scenario.line}")
@@ -54,57 +65,59 @@ module Cucumber
       def scenario_executed(scenario)
         @io.puts
         if !scenario.row? && scenario.table_header
+          @table_column_widths = scenario.table_column_widths
+          @current_column = -1
           @io.print "    |"
-          scenario.table_header.each { |h| @io.print h ; @io.print "|" }
+          print_row(scenario.table_header)
           @io.puts
         elsif scenario.row? && @scenario_failed
           @io.puts
-          output_failing_step(@failed.last) 
+          output_failing_step(@failed.last)
         end
       end
-      
+
       def step_passed(step, regexp, args)
         if step.row?
           @passed << step
-          args.each{|arg| @io.print passed(arg) ; @io.print "|"}
+          print_passed_args(args)
         else
           @passed << step
           @io.print passed("    #{step.keyword} #{step.format(regexp){|param| passed_param(param) << passed}}")
           if @options[:source]
             @io.print padding_spaces(step)
-            @io.print source_comment(step) 
+            @io.print source_comment(step)
           end
           @io.puts
         end
       end
-      
+
       def step_failed(step, regexp, args)
         if step.row?
           @failed << step
           @scenario_failed = true
-          args.each{|arg| @io.print failed(arg) ; @io.print "|"}
+          print_failed_args(args)
         else
           @failed << step
           @scenario_failed = true
-          @io.print failed("    #{step.keyword} #{step.format(regexp){|param| failed_param(param) << failed}}") 
+          @io.print failed("    #{step.keyword} #{step.format(regexp){|param| failed_param(param) << failed}}")
           if @options[:source]
             @io.print padding_spaces(step)
-            @io.print source_comment(step) 
+            @io.print source_comment(step)
           end
           @io.puts
           output_failing_step(step)
         end
       end
-      
+
       def step_skipped(step, regexp, args)
         @skipped << step
         if step.row?
-          args.each{|arg| @io.print skipped(arg) ; @io.print "|"}
+          print_skipped_args(args)
         else
-          @io.print skipped("    #{step.keyword} #{step.format(regexp){|param| skipped_param(param) << skipped}}") 
+          @io.print skipped("    #{step.keyword} #{step.format(regexp){|param| skipped_param(param) << skipped}}")
           if @options[:source]
             @io.print padding_spaces(step)
-            @io.print source_comment(step) 
+            @io.print source_comment(step)
           end
           @io.puts
         end
@@ -112,10 +125,10 @@ module Cucumber
 
       def step_pending(step, regexp, args)
         if step.row?
-          @pending << step
-          args.each{|arg| @io.print pending(arg) ; @io.print "|"}
+          @pending_steps << step
+          print_pending_args(args)
         else
-          @pending << step
+          @pending_steps << step
           @io.print pending("    #{step.keyword} #{step.name}")
           if @options[:source]
             @io.print padding_spaces(step)
@@ -124,7 +137,7 @@ module Cucumber
           @io.puts
         end
       end
-      
+
       def output_failing_step(step)
         backtrace = step.error.backtrace || []
         clean_backtrace = backtrace.map {|b| b.split("\n") }.flatten.reject do |line|
@@ -136,42 +149,86 @@ module Cucumber
 
       def dump
         @io.puts
-        @io.puts passed("#{@passed.length} steps passed") unless @passed.empty?
-        @io.puts failed("#{@failed.length} steps failed") unless @failed.empty?
-        @io.puts skipped("#{@skipped.length} steps skipped") unless @skipped.empty?
-        @io.puts pending("#{@pending.length} steps pending") unless @pending.empty?
+
+        @io.puts pending("#{@pending_scenarios.length} scenarios pending") if @pending_scenarios.any?
+
+        @io.puts passed("#{@passed.length} steps passed")           if @passed.any?
+        @io.puts failed("#{@failed.length} steps failed")           if @failed.any?
+        @io.puts skipped("#{@skipped.length} steps skipped")        if @skipped.any?
+        @io.puts pending("#{@pending_steps.length} steps pending")  if @pending_steps.any?
+
         @io.print reset
-        print_snippets
+
+        print_snippets if @options[:snippets]
       end
-            
+
       def print_snippets
-        unless @pending.empty?
+        snippets = @pending_steps
+        snippets.delete_if {|snippet| snippet.row? || @step_mother.has_step_definition?(snippet.name)}
+
+        unless snippets.empty?
           @io.puts "\nYou can use these snippets to implement pending steps:\n\n"
-          
+
           prev_keyword = nil
-          snippets = @pending.map do |step|
-            next if step.row?
-            snippet = "#{step.actual_keyword} /^#{step.name}$/ do\nend\n\n"
+          snippets = snippets.map do |step|
+            snippet = "#{step.actual_keyword} /^#{escape_regexp_characters(step.name)}$/ do\nend\n\n"
             prev_keyword = step.keyword
             snippet
           end.compact.uniq
-          
+
           snippets.each do |snippet|
             @io.puts snippet
           end
         end
       end
-      
+
       private
 
+      def escape_regexp_characters(string)
+        Regexp.escape(string).gsub('\ ', ' ').gsub('/', '\/') unless string.nil?
+      end
+      
       def source_comment(step)
         _, _, proc = step.regexp_args_proc(@step_mother)
         comment(proc.to_comment_line)
       end
-      
+
       def padding_spaces(tree_item)
         " " * tree_item.padding_length
       end
+
+      def next_column_index
+        @current_column ||= -1
+        @current_column += 1
+        @current_column = 0 if @current_column >= @table_column_widths.size
+        @current_column
+      end
+
+      def print_row row_args, &colorize_proc
+        colorize_proc = Proc.new{|row_element| row_element} unless colorize_proc
+
+        row_args.each do |row_arg|
+          column_index = next_column_index
+          @io.print colorize_proc[row_arg.ljust(@table_column_widths[column_index])]
+          @io.print "|"
+        end
+      end
+
+      def print_passed_args args
+        print_row(args) {|arg| passed(arg)}
+      end
+
+      def print_skipped_args args
+        print_row(args) {|arg| skipped(arg)}
+      end
+
+      def print_failed_args args
+        print_row(args) {|arg| failed(arg)}
+      end
+
+      def print_pending_args args
+        print_row(args) {|arg| pending(arg)}
+      end
     end
   end
 end