cucumber 0.6.2 → 0.6.3

data/lib/cucumber/formatter/pdf.rb

@@ -1,6 +1,14 @@
 require 'cucumber/formatter/console'
 require 'cucumber/formatter/io'
 require 'fileutils'
+
+begin
+  require 'htmlentities'
+rescue LoadError => e
+  e.message << "\nPlease gem install htmlentities"
+  raise e
+end
+
 begin
   gem 'prawn', '=0.6.3'
   require 'prawn'
@@ -9,7 +17,7 @@ begin
   gem 'prawn-format', '=0.2.3'
   require "prawn/format"
 rescue LoadError => e
-  e.message << "\nPlease gem install prawn --version 0.6.3 && gem install prawn-format --version 0.2.3"
+  e.message << "\nPlease gem install prawn --version 0.6.3 && gem install prawn-format --version 0.2.3. Newer versions are not known to work."
   raise e
 end
 
@@ -28,6 +36,7 @@ module Cucumber
       def initialize(step_mother, path_or_io, options)
         @step_mother = step_mother
         @file = ensure_file(path_or_io, "pdf")
+        @coder = HTMLEntities.new
 
         if(options[:dry_run])
           @status_colors = { :passed => BLACK, :skipped => BLACK, :undefined => BLACK, :failed => BLACK}
@@ -138,7 +147,7 @@ module Cucumber
 
       def step_name(keyword, step_match, status, source_indent, background)
         return if @hide_this_step
-        line = "<b>#{keyword}</b> #{step_match.format_args("%s").gsub('<', '&lt;').gsub('>', '&gt;')}"
+        line = "<b>#{keyword}</b> #{encode(step_match.format_args("%s"))}"
         colorize(line, status)
       end
 
@@ -154,7 +163,7 @@ module Cucumber
         return if @hide_this_step
         if(table.kind_of? Cucumber::Ast::Table)
           keep_with do
-            @doc.table(table.rows, :headers => table.headers, :position => :center, :row_colors => ['ffffff', 'f0f0f0'])
+            print_table(table, ['ffffff', 'f0f0f0'])
           end
         end
       end
@@ -164,7 +173,7 @@ module Cucumber
         return if @hide_this_step
         row_colors = table.example_rows.map { |r| @status_colors[r.status] unless r.status == :skipped}
         keep_with do
-          @doc.table(table.rows, :headers => table.headers, :position => :center, :row_colors => row_colors)
+          print_table(table, row_colors)
         end
       end
 
@@ -173,9 +182,7 @@ module Cucumber
         s = %{"""\n#{string}\n"""}.indent(10)
         s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}
         s.each do |line|
-          line.gsub!('<', '&lt;')
-          line.gsub!('>', '&gt;')
-          keep_with { @doc.text line, :size => 8 }
+          keep_with { @doc.text(encode(line), :size => 8) }
         end
       end
 
@@ -199,6 +206,10 @@ module Cucumber
       
       private
       
+      def encode(text)
+        @coder.encode(text, :decimal)
+      end
+      
       def colorize(text, status)
         keep_with do
           @doc.fill_color(@status_colors[status] || BLACK)
@@ -233,6 +244,12 @@ module Cucumber
         @pdf.move_down(20)
         @buffer = []
       end
+      
+      def print_table(table, row_colors)
+        rows = table.rows.map { |row| row.map{ |cell| encode(cell) }}
+        headers = table.headers.map { |text| encode(text) }
+        @doc.table(rows, :headers => headers, :position => :center, :row_colors => row_colors)
+      end
     end
   end
 end

data/lib/cucumber/formatter/rerun.rb

@@ -35,9 +35,12 @@ module Cucumber
         @io.close
       end
 
-      # feature_element() is never executed at all, either... ?
+      def before_feature_element(feature_element)
+        @rerun = false
+      end
+
       def after_feature_element(feature_element)
-        if feature_element.failed?
+        if @rerun
           file, line = *feature_element.file_colon_line.split(':')
           @file_colon_lines[file] << line
           @file_names << file
@@ -45,7 +48,7 @@ module Cucumber
       end
 
       def step_name(keyword, step_match, status, source_indent, background)
-        @rerun = true if [:failed].index(status)
+        @rerun = true if [:failed, :pending, :undefined].index(status)
       end
     end
   end

data/lib/cucumber/formatter/unicode.rb

@@ -52,7 +52,7 @@ if Cucumber::WINDOWS
   elsif `cmd /c chcp` =~ /(\d+)/
     Cucumber::CODEPAGE = "cp#{$1.to_i}"
   else
-    STDERR.cucumber_puts("WARNING: Couldn't detect your output codepage. Assuming it is 1252. You may have to chcp 1252.")
     Cucumber::CODEPAGE = "cp1252"
+    STDERR.cucumber_puts("WARNING: Couldn't detect your output codepage. Assuming it is 1252. You may have to chcp 1252 or SET CUCUMBER_OUTPUT_ENCODING=cp1252.")
   end
 end

data/lib/cucumber/languages.yml

@@ -56,13 +56,13 @@
   name: Catalan
   native: català
   background: Rerefons|Antecedents
-  feature: Característica
+  feature: Característica|Funcionalitat
   scenario: Escenari
   scenario_outline: Esquema de l'escenari
   examples: Exemples
-  given: "*|Donat|Donada"
+  given: "*|Donat|Donada|Atès|Atesa"
   when: "*|Quan"
-  then: "*|Aleshores"
+  then: "*|Aleshores|Cal"
   and: "*|I"
   but: "*|Però"
 "cy":
@@ -112,7 +112,7 @@
   scenario: Szenario
   scenario_outline: Szenariogrundriss
   examples: Beispiele
-  given: "*|Gegeben sei"
+  given: "*|Angenommen|Gegeben sei"
   when: "*|Wenn"
   then: "*|Dann"
   and: "*|Und"
@@ -294,11 +294,11 @@
   scenario: 시나리오
   scenario_outline: 시나리오 개요
   examples: 예
-  given: "*|조건<"
-  when: "*|만일<"
+  given: "*|조건<|먼저<"
+  when: "*|만일<|만약<"
   then: "*|그러면<"
   and: "*|그리고<"
-  but: "*|하지만<"
+  but: "*|하지만<|단<"
 "lt":
   name: Lithuanian
   native: lietuvių kalba

data/lib/cucumber/parser/natural_language.rb

@@ -39,6 +39,13 @@ module Cucumber
         template = File.open(i18n_tt, Cucumber.file_mode('r')).read
         erb = ERB.new(template)
         grammar = erb.result(binding)
+
+        # The Rails 2-3-stable branch has decided to monkey-patch ERB so that ERB#result
+        # returns a subclass of String (SafeBuffer). This class will escape '&',  '>',  '<' and '"',
+        # effectively breaking any other library that relies on ERB behavig the way it _should_.
+        # This is a workaround hack until this has been fixed in Rails.
+        grammar = "" + grammar # Make SafeBuffer a String again.
+
         Treetop.load_from_string(grammar)
         @parser = Parser::I18n.const_get("#{@keywords['grammar_name']}Parser").new
         def @parser.inspect

data/lib/cucumber/parser/treetop_ext.rb

@@ -47,6 +47,7 @@ module Treetop #:nodoc:
     end
 
     class CompiledParser #:nodoc:
+      public :prepare_to_parse
       include Cucumber::Parser::TreetopExt
     end
   end

data/lib/cucumber/rb_support/rb_world.rb

@@ -42,6 +42,11 @@ module Cucumber
         @__cucumber_step_mother.announce(announcement)
       end
 
+      # See StepMother#ask
+      def ask(question, timeout_seconds=60)
+        @__cucumber_step_mother.ask(question, timeout_seconds)
+      end
+
       # See StepMother#embed
       def embed(file, mime_type)
         @__cucumber_step_mother.embed(file, mime_type)

data/lib/cucumber/step_match.rb

@@ -57,9 +57,10 @@ module Cucumber
 
     def replace_arguments(string, step_arguments, format, &proc)
       s = string.dup
-      offset = 0
+      offset = past_offset = 0
       step_arguments.each do |step_argument|
-        next if step_argument.byte_offset.nil?
+        next if step_argument.byte_offset.nil? || step_argument.byte_offset < past_offset
+        
         replacement = if block_given?
           proc.call(step_argument.val)
         elsif Proc === format
@@ -70,6 +71,7 @@ module Cucumber
 
         s[step_argument.byte_offset + offset, step_argument.val.length] = replacement
         offset += replacement.jlength - step_argument.val.jlength
+        past_offset = step_argument.byte_offset + step_argument.val.length
       end
       s
     end

data/lib/cucumber/step_mother.rb

@@ -3,6 +3,7 @@ require 'cucumber/core_ext/instance_exec'
 require 'cucumber/parser/natural_language'
 require 'cucumber/language_support/language_methods'
 require 'cucumber/formatter/duration'
+require 'timeout'
 
 module Cucumber
   # Raised when there is no matching StepDefinition for a step.
@@ -131,14 +132,42 @@ module Cucumber
     # This is an alternative to using Kernel#puts - it will display
     # nicer, and in all outputs (in case you use several formatters)
     #
-    # Beware that the output will be printed *before* the corresponding
-    # step. This is because the step itself will not be printed until
-    # after it has run, so it can be coloured according to its status.
-    #
     def announce(msg)
       @visitor.announce(msg)
     end
 
+    # Suspends execution and prompts +question+ to the console (STDOUT).
+    # An operator (manual tester) can then enter a line of text and hit
+    # <ENTER>. The entered text is returned, and both +question+ and
+    # the result is added to the output using #announce.
+    #
+    # If you want a beep to happen (to grab the manual tester's attention),
+    # just prepend ASCII character 7 to the question:
+    #
+    #   ask("#{7.chr}How many cukes are in the external system?")
+    #
+    # If that doesn't issue a beep, you can shell out to something else
+    # that makes a sound before invoking #ask.
+    #
+    def ask(question, timeout_seconds)
+      STDOUT.puts(question)
+      STDOUT.flush
+      announce(question)
+
+      if(Cucumber::JRUBY)
+        answer = jruby_gets(timeout_seconds)
+      else
+        answer = mri_gets(timeout_seconds)
+      end
+      
+      if(answer)
+        announce(answer)
+        answer
+      else
+        raise("Waited for input for #{timeout_seconds} seconds, then timed out.")
+      end
+    end
+
     # Embed +file+ of MIME type +mime_type+ into the output. This may or may
     # not be ignored, depending on what kind of formatter(s) are active.
     #
@@ -346,5 +375,25 @@ module Cucumber
     def log
       @log ||= Logger.new(STDOUT)
     end
+
+    def mri_gets(timeout_seconds)
+      begin
+        Timeout.timeout(timeout_seconds) do
+          STDIN.gets
+        end
+      rescue Timeout::Error => e
+        nil
+      end
+    end
+
+    def jruby_gets(timeout_seconds)
+      answer = nil
+      t = java.lang.Thread.new do
+        answer = STDIN.gets
+      end
+      t.start
+      t.join(timeout_seconds * 1000)
+      answer
+    end
   end
 end

data/lib/cucumber/wire_support/configuration.rb

@@ -7,12 +7,22 @@ module Cucumber
         params = YAML.load_file(wire_file)
         @host = params['host']
         @port = params['port']
-        @timeouts = params['timeout'] || {}
+        @timeouts = default_timeouts.merge(params['timeout'] || {})
       end
       
       def timeout(message = nil)
         return @timeouts[message.to_s] || 3
       end
+      
+      private
+      
+      def default_timeouts
+        {
+          'invoke' => 120,
+          'begin_scenario' => 120,
+          'end_scenario' => 120
+        }
+      end
     end
   end
 end

data/lib/cucumber/wire_support/wire_language.rb

@@ -41,17 +41,20 @@ module Cucumber
       end
       
       def step_matches(step_name, formatted_step_name)
-        @connections.map{ |remote| remote.step_matches(step_name, formatted_step_name)}.flatten
+        @connections.map{ |c| c.step_matches(step_name, formatted_step_name)}.flatten
       end
       
       protected
       
       def begin_scenario(scenario)
-        @connections.each { |remote| remote.begin_scenario(scenario) }
+        @connections.each { |c| c.begin_scenario(scenario) }
+        @current_scenario = scenario
       end
       
       def end_scenario
-        @connections.each { |remote| remote.end_scenario }
+        scenario = @current_scenario
+        @connections.each { |c| c.end_scenario(scenario) }
+        @current_scenario = nil
       end
     end
   end

data/lib/cucumber/wire_support/wire_protocol.rb

@@ -34,9 +34,9 @@ module Cucumber
         handler.execute(scenario)
       end
 
-      def end_scenario
+      def end_scenario(scenario)
         handler = Requests::EndScenario.new(self)
-        handler.execute
+        handler.execute(scenario)
       end
       
     end

data/lib/cucumber/wire_support/wire_protocol/requests.rb

@@ -64,12 +64,16 @@ module Cucumber
           def handle_pending(message)
             raise Pending, message || "TODO"
           end
-        
-          def handle_diff(tables)
+          
+          def handle_diff!(tables)
             table1 = Ast::Table.new(tables[0])
             table2 = Ast::Table.new(tables[1])
+            table1.diff!(table2)
+          end
+        
+          def handle_diff(tables)
             begin
-              table1.diff!(table2)
+              handle_diff!(tables)
             rescue Cucumber::Ast::Table::Different
               @connection.diff_failed
             end
@@ -87,13 +91,31 @@ module Cucumber
           alias :handle_step_failed :handle_fail
         end
       
+        module Tags
+          def clean_tags(scenario)
+            scenario.source_tag_names.map { |tag| tag.gsub(/^@/, '') }.sort
+          end
+          
+          def request_params(scenario)
+            return nil unless scenario.source_tag_names.any?
+            { "tags" => clean_tags(scenario) }
+          end
+        end
+      
         class BeginScenario < RequestHandler
+          include Tags
+
           def execute(scenario)
-            super(nil) # not passing the scenario yet
+            super(request_params(scenario))
           end
         end
 
         class EndScenario < RequestHandler
+          include Tags
+
+          def execute(scenario)
+            super(request_params(scenario))
+          end
         end
       end
     end

data/spec/cucumber/ast/background_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/ast'
 require 'cucumber/rb_support/rb_language'
 
@@ -7,8 +7,8 @@ module Cucumber
     describe Background do
 
       before do
-        extend(RbSupport::RbDsl)
-        @step_mother = StepMother.new
+        extend(Cucumber::RbSupport::RbDsl)
+        @step_mother = Cucumber::StepMother.new
         @step_mother.load_natural_language('en')
         @rb = @step_mother.load_programming_language('rb')
 

data/spec/cucumber/ast/feature_element_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/step_mother'
 require 'cucumber/ast'
 
@@ -11,7 +11,7 @@ module Cucumber
         it "should select the longest line as the text length" do
           @keyword = "key"  
           @name = "short\nvery longer\ntiny"
-          text_length.should == 11 + Ast::Step::INDENT - 1
+          text_length.should == 11 + Step::INDENT - 1
         end
       
         it "should add keyword to first lines length" do