cucumber 0.4.3 → 0.4.4

data/lib/cucumber/ast/background.rb

@@ -23,7 +23,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_background_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
         with_visitor(hook_context, visitor) do

data/lib/cucumber/ast/comment.rb

@@ -17,7 +17,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         @value.strip.split("\n").each do |line|
           visitor.visit_comment_line(line.strip)
         end

data/lib/cucumber/ast/examples.rb

@@ -6,7 +6,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_examples_name(@keyword, @name)
         visitor.visit_outline_table(@outline_table)

data/lib/cucumber/ast/feature.rb

@@ -16,7 +16,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_tags(@tags)
         visitor.visit_feature_name(@name)

data/lib/cucumber/ast/feature_element.rb

@@ -49,8 +49,7 @@ module Cucumber
       end
 
       def accept_hook?(hook)
-        parsed_hook_tag_names = hook.tag_names.map {|tag_string| Cli::Options.parse_tag_arguments(tag_string)}
-        Tags.matches?(source_tag_names, parsed_hook_tag_names)
+        Tags.matches?(source_tag_names, hook.tag_name_lists)
       end
 
       def source_tag_names
@@ -62,7 +61,7 @@ module Cucumber
       end
 
       def language
-        @feature.language
+        @feature.language if @feature
       end
     end
   end

data/lib/cucumber/ast/features.rb

@@ -23,7 +23,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         start = Time.now
         self.each do |feature|
           visitor.visit_feature(feature)

data/lib/cucumber/ast/outline_table.rb

@@ -9,7 +9,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         cells_rows.each_with_index do |row, n|
           if(visitor.options[:expand])
             row.accept(visitor)
@@ -44,7 +44,11 @@ module Cucumber
         @scenario_outline.visit_scenario_name(visitor, row)
       end
 
-      class ExampleRow < Cells #:nodoc:
+      def language
+        @scenario_outline.language
+      end
+
+      class ExampleRow < Cells #:nodoc:        
         class InvalidForHeaderRowError < NoMethodError
           def initialize(*args)
             super 'This is a header row and cannot pass or fail'
@@ -53,6 +57,11 @@ module Cucumber
         
         attr_reader :scenario_outline # https://rspec.lighthouseapp.com/projects/16211/tickets/342
 
+        def initialize(table, cells)
+          super
+          @scenario_exception = nil
+        end
+
         def create_step_invocations!(scenario_outline)
           @scenario_outline = scenario_outline
           @step_invocations = scenario_outline.step_invocations(self)
@@ -65,7 +74,7 @@ module Cucumber
         end
 
         def accept(visitor)
-          return if $cucumber_interrupted
+          return if Cucumber.wants_to_quit
           visitor.options[:expand] ? accept_expand(visitor) : accept_plain(visitor)
         end
 
@@ -141,7 +150,11 @@ module Cucumber
         def name
           "| #{@cells.collect{|c| c.value }.join(' | ')} |"
         end
-        
+
+        def language
+          @table.language
+        end
+
         private
 
         def header?

data/lib/cucumber/ast/py_string.rb

@@ -17,6 +17,8 @@ module Cucumber
     # Note how the indentation from the source is stripped away.
     #
     class PyString #:nodoc:
+      attr_accessor :file
+
       def self.default_arg_name
         "string"
       end
@@ -31,7 +33,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         visitor.visit_py_string(to_s)
       end
       

data/lib/cucumber/ast/scenario.rb

@@ -29,10 +29,12 @@ module Cucumber
         step_invocations = steps.map{|step| step.step_invocation}
         @steps = @background.step_collection(step_invocations)
         @background.feature_elements << self
+        
+        @exception = @executed = nil
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         
         with_visitor(visitor) do
           visitor.visit_comment(@comment) unless @comment.empty?

data/lib/cucumber/ast/scenario_outline.rb

@@ -5,7 +5,7 @@ module Cucumber
 
       module ExamplesArray #:nodoc:
         def accept(visitor)
-          return if $cucumber_interrupted
+          return if Cucumber.wants_to_quit
           each do |examples|
             visitor.visit_examples(examples)
           end
@@ -39,7 +39,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        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))

data/lib/cucumber/ast/step.rb

@@ -38,7 +38,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         # The only time a Step is visited is when it is in a ScenarioOutline.
         # Otherwise it's always StepInvocation that gets visited instead.
         visit_step_result(visitor, first_match(visitor), @multiline_arg, :skipped, nil, nil)

data/lib/cucumber/ast/step_collection.rb

@@ -10,7 +10,7 @@ module Cucumber
       end
 
       def accept(visitor, &proc)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         @steps.each do |step|
           visitor.visit_step(step) if proc.nil? || proc.call(step)
         end

data/lib/cucumber/ast/step_invocation.rb

@@ -22,6 +22,7 @@ module Cucumber
       def initialize(step, name, multiline_arg, matched_cells)
         @step, @name, @multiline_arg, @matched_cells = step, name, multiline_arg, matched_cells
         status!(:skipped)
+        @skip_invoke = @exception = @step_match = @different_table = @reported_exception = @background = nil
       end
 
       def background?
@@ -33,7 +34,7 @@ module Cucumber
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         invoke(visitor.step_mother, visitor.options)
         visit_step_result(visitor)
       end

data/lib/cucumber/ast/table.rb

@@ -148,7 +148,7 @@ module Cucumber
       end
 
       def accept(visitor) #:nodoc:
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         cells_rows.each do |row|
           visitor.visit_table_row(row)
         end
@@ -567,7 +567,7 @@ module Cucumber
         end
 
         def accept(visitor)
-          return if $cucumber_interrupted
+          return if Cucumber.wants_to_quit
           each do |cell|
             visitor.visit_table_cell(cell)
           end
@@ -623,7 +623,7 @@ module Cucumber
         end
 
         def accept(visitor)
-          return if $cucumber_interrupted
+          return if Cucumber.wants_to_quit
           visitor.visit_table_cell_value(value, status)
         end
 

data/lib/cucumber/ast/tags.rb

@@ -10,9 +10,12 @@ module Cucumber
     # This gets stored internally as <tt>["invoice", "release_2"]</tt>
     #
     class Tags #:nodoc:
-
       class And #:nodoc:
         def initialize(tag_names)
+          if String === tag_names # They still come in as single strings on cuke4duke some times. Not sure why...
+            raise "Commas in tags??? #{tag_names.inspect}" if tag_names =~ /,/ # just in case...
+            tag_names = [tag_names] 
+          end
           @negative_tags, @positive_tags = tag_names.partition{|tag_name| Tags.exclude_tag?(tag_name)}
           @negative_tags = Tags.strip_negative_char(@negative_tags)
         end
@@ -47,9 +50,9 @@ module Cucumber
       class << self
         EXCLUDE_PATTERN = /^~/
 
-        def matches?(source_tag_names, tag_names)
-          validate_tags(tag_names)
-          tag_names.empty? ? true : check_if_tags_match(source_tag_names, tag_names)
+        def matches?(source_tag_names, tag_name_lists)
+          validate_tags(tag_name_lists)
+          tag_name_lists.empty? ? true : check_if_tags_match(source_tag_names, tag_name_lists)
         end
 
         def exclude_tag?(tag_name)
@@ -60,22 +63,26 @@ module Cucumber
           tag_names.map{|name| name[1..-1]}
         end
 
+        def parse_tags(tags_string)
+          tags_string.split(',')
+        end
+
         private
 
-        def validate_tags(tag_name_list)
-          all_tag_names = tag_name_list.flatten
+        def validate_tags(tag_name_lists)
+          all_tag_names = tag_name_lists.flatten
           exclude_tag_names, include_tag_names = all_tag_names.partition{|tag_name| exclude_tag?(tag_name)}
           exclude_tag_names = strip_negative_char(exclude_tag_names)
           check_at_sign_prefix(exclude_tag_names + include_tag_names)
         end
 
-        def check_if_tags_match(source_tag_names, tag_names)
-          tag_exp = Or.new(tag_names.map{|tag_name_list| And.new(tag_name_list) })
+        def check_if_tags_match(source_tag_names, tag_name_lists)
+          tag_exp = Or.new(tag_name_lists.map{|tag_name_list| And.new(tag_name_list) })
           tag_exp.matches?(source_tag_names)
         end
 
         def check_at_sign_prefix(tag_names)
-          tag_names.each{|tag_name| raise "Tag names must start with an @ sign. The following tag name didn't: #{tag_name}" unless tag_name[0..0] == '@'}
+          tag_names.each{|tag_name| raise "Tag names must start with an @ sign. The following tag name didn't: #{tag_name.inspect}" unless tag_name[0..0] == '@'}
         end
 
       end
@@ -87,14 +94,14 @@ module Cucumber
       end
 
       def accept(visitor)
-        return if $cucumber_interrupted
+        return if Cucumber.wants_to_quit
         @tag_names.each do |tag_name|
           visitor.visit_tag_name(tag_name)
         end
       end
 
       def accept_hook?(hook)
-        self.class.matches?(@tag_names, hook.tag_names)
+        self.class.matches?(@tag_names, hook.tag_name_lists)
       end
 
       def count(tag)

data/lib/cucumber/ast/tree_walker.rb

@@ -75,6 +75,22 @@ module Cucumber
       end
 
       def visit_examples_name(keyword, name)
+        unless keyword =~ /:$/
+          message = <<EOS
+
+
+(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)
+
+                    DEPRECATION WARNING
+                    
+Future versions of Cucumber will not recognize #{keyword} 
+unless it is followed by a colon. Make this change in
+your features now to prevent this warning from appearing.
+
+(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)
+EOS
+          announce(message)
+        end
         broadcast(keyword, name)
       end
 

data/lib/cucumber/cli/main.rb

@@ -29,6 +29,7 @@ module Cucumber
         @args         = args
         @out_stream   = out_stream == STDOUT ? Formatter::ColorIO.new : out_stream
         @error_stream = error_stream
+        @configuration = nil
       end
 
       def execute!(step_mother)
@@ -110,8 +111,8 @@ module Cucumber
 
       def trap_interrupt
         trap('INT') do
-          exit!(1) if $cucumber_interrupted
-          $cucumber_interrupted = true
+          exit!(1) if Cucumber.wants_to_quit
+          Cucumber.wants_to_quit = true
           STDERR.puts "\nExiting... Interrupt again to exit immediately."
         end
       end

data/lib/cucumber/cli/options.rb

@@ -48,10 +48,6 @@ module Cucumber
         new(out_stream, error_stream, options).parse!(args)
       end
 
-      def self.parse_tag_arguments(tags_string)
-        tags_string.split(',')
-      end
-
       def initialize(out_stream = STDOUT, error_stream = STDERR, options = {})
         @out_stream   = out_stream
         @error_stream = error_stream
@@ -60,7 +56,9 @@ module Cucumber
         @skip_profile_information = options[:skip_profile_information]
         @profiles = []
         @overridden_paths = []
-        @options        = default_options
+        @options = default_options
+        
+        @quiet = @disable_profile_loading = nil
       end
 
       def [](key)
@@ -292,7 +290,7 @@ module Cucumber
       end
 
       def parse_tags(tag_string)
-        tag_names = Options.parse_tag_arguments(tag_string)
+        tag_names = Ast::Tags.parse_tags(tag_string)
         parse_tag_limits(tag_names)
       end
 

data/lib/cucumber/cli/profile_loader.rb

@@ -3,6 +3,10 @@ module Cucumber
 
     class ProfileLoader
 
+      def initialize
+        @cucumber_yml = nil
+      end
+
       def args_from(profile)
         unless cucumber_yml.has_key?(profile)
           raise(ProfileNotFound, <<-END_OF_ERROR)

data/lib/cucumber/filter.rb

@@ -3,7 +3,7 @@ module Cucumber
   class Filter #:nodoc:
     def initialize(lines, options)
       @lines = lines
-      @tag_names = options[:tag_names] ? options[:tag_names].map{|tags_with_limit| tags_with_limit.keys } : []
+      @tag_name_lists = options[:tag_names] ? options[:tag_names].map{|tags_with_limit| tags_with_limit.keys } : []
       @name_regexps = options[:name_regexps] || []
     end
 
@@ -27,7 +27,7 @@ module Cucumber
     end
 
     def matches_tags?(syntax_node)
-      syntax_node.matches_tags?(@tag_names)
+      syntax_node.matches_tags?(@tag_name_lists)
     end
 
     def outline_matches_names?(syntax_node)

data/lib/cucumber/formatter/ansicolor.rb

@@ -1,6 +1,14 @@
 require 'term/ansicolor'
 require 'cucumber/platform'
 
+if Cucumber::IRONRUBY
+	begin
+		require 'iron-term-ansicolor'
+	rescue LoadError
+		STDERR.puts %{*** WARNING: You must "igem install iron-term-ansicolor" to get coloured ouput in on IronRuby}
+	end
+end
+
 if Cucumber::WINDOWS_MRI
   begin
     require 'Win32/Console/ANSI'

data/lib/cucumber/formatter/pretty.rb

@@ -178,13 +178,13 @@ module Cucumber
       end
 
       def before_table_row(table_row)
-        return unless @table
+        return if !@table || @hide_this_step
         @col_index = 0
         @io.print '  |'.indent(@indent-2)
       end
 
       def after_table_row(table_row)
-        return unless @table
+        return if !@table || @hide_this_step
         print_table_row_announcements
         @io.puts
         if table_row.exception && !@exceptions.include?(table_row.exception)
@@ -198,7 +198,7 @@ module Cucumber
       end
 
       def table_cell_value(value, status)
-        return unless @table
+        return if !@table || @hide_this_step
         status ||= @status || :passed
         width = @table.col_width(@col_index)
         cell_text = value.to_s || ''
@@ -234,7 +234,6 @@ module Cucumber
         print_passing_wip(@options)
         print_tag_limit_warnings(@options)
       end
-
     end
   end
 end