cucumber 0.6.3 → 0.6.4

data/features/wire_protocol_tags.feature

@@ -5,7 +5,15 @@ Feature: Wire protocol tags
 
   Background:
     Given a standard Cucumber project directory structure
-    And a file named "features/wired.feature" with:
+    And a file named "features/step_definitions/some_remote_place.wire" with:
+      """
+      host: localhost
+      port: 54321
+
+      """
+
+  Scenario: Run a scenario
+    Given a file named "features/wired.feature" with:
       """
         @foo @bar
         Feature: Wired
@@ -15,15 +23,7 @@ Feature: Wire protocol tags
             Given we're all wired
 
       """
-    And a file named "features/step_definitions/some_remote_place.wire" with:
-      """
-      host: localhost
-      port: 54321
-
-      """
-
-  Scenario: Run the scenario
-    Given there is a wire server running on port 54321 which understands the following protocol:
+    And there is a wire server running on port 54321 which understands the following protocol:
       | request                                              | response                            |
       | ["step_matches",{"name_to_match":"we're all wired"}] | ["success",[{"id":"1", "args":[]}]] |
       | ["begin_scenario", {"tags":["bar","baz","foo"]}]     | ["success"]                         |
@@ -45,3 +45,43 @@ Feature: Wire protocol tags
 
       """
 
+  Scenario: Run a scenario outline example
+  Given a file named "features/wired.feature" with:
+    """
+      @foo @bar
+      Feature: Wired
+      
+        @baz
+        Scenario Outline: Everybody's Wired
+          Given we're all <something>
+          
+        Examples:
+          | something |
+          | wired     |
+
+    """
+  And there is a wire server running on port 54321 which understands the following protocol:
+    | request                                              | response                            |
+    | ["step_matches",{"name_to_match":"we're all wired"}] | ["success",[{"id":"1", "args":[]}]] |
+    | ["begin_scenario", {"tags":["bar","baz","foo"]}]     | ["success"]                         |
+    | ["invoke",{"id":"1","args":[]}]                      | ["success"]                         |
+    | ["end_scenario", {"tags":["bar","baz","foo"]}]       | ["success"]                         |
+  When I run cucumber -f pretty -q
+  Then STDERR should be empty
+  And it should pass with
+    """
+    @foo @bar
+    Feature: Wired
+    
+      @baz
+      Scenario Outline: Everybody's Wired
+        Given we're all <something>
+
+        Examples: 
+          | something |
+          | wired     |
+
+    1 scenario (1 passed)
+    1 step (1 passed)
+
+    """

data/gem_tasks/contributors.rake

@@ -1,7 +1,9 @@
 # encoding: utf-8
+desc 'List contributors'
 task :contributors do
-  contributors = `git log --pretty=short --no-merges | git shortlog -ne | egrep -ve '^ +' | egrep -ve '^$'`
-  puts contributors.split("\n").length
+  contributors = `git log --pretty=short --no-merges | git shortlog -ne | egrep -ve '^ +' | egrep -ve '^$'`.split("\n")
+  puts contributors
+  puts "Total: #{contributors.length}"
 end
 
 task :codeswarm do

data/lib/autotest/cucumber_rails_rspec2.rb

@@ -0,0 +1,6 @@
+require 'autotest/cucumber_mixin'
+require 'autotest/rails_rspec2'
+
+class Autotest::CucumberRailsRspec2 < Autotest::RailsRspec2
+  include CucumberMixin
+end

data/lib/autotest/cucumber_rspec2.rb

@@ -0,0 +1,6 @@
+require 'autotest/cucumber_mixin'
+require 'autotest/rspec2'
+
+class Autotest::CucumberRspec2 < Autotest::Rspec2
+  include CucumberMixin
+end

data/lib/cucumber/ast/outline_table.rb

@@ -23,6 +23,10 @@ module Cucumber
       def accept_hook?(hook)
         @scenario_outline.accept_hook?(hook)
       end
+      
+      def source_tag_names
+        @scenario_outline.source_tag_names
+      end
 
       def skip_invoke!
         example_rows.each do |cells|
@@ -61,6 +65,10 @@ module Cucumber
           super
           @scenario_exception = nil
         end
+        
+        def source_tag_names
+          @table.source_tag_names
+        end
 
         def create_step_invocations!(scenario_outline)
           @scenario_outline = scenario_outline

data/lib/cucumber/ast/py_string.rb

@@ -29,7 +29,11 @@ module Cucumber
       end
 
       def to_s
-        @string.indent(-@quotes_indent)
+        # Assume all whitespace before the first triple quote is the same.
+        # Also assume the contents of the pystring is indented with the same prefix.
+        # This allows indentation with both " " and "\t" characters.
+        return @string if @quotes_indent == ""
+        @string.gsub(/^#{@quotes_indent[0..0]}{0,#{@quotes_indent.length}}/, "")
       end
 
       def accept(visitor)

data/lib/cucumber/ast/step_invocation.rb

@@ -142,11 +142,11 @@ module Cucumber
       end
 
       def actual_keyword
-        repeat_keywords = [language.but_keywords(false), language.and_keywords(false)].flatten
+        repeat_keywords = [language.but_keywords(false), language.and_keywords(false)].flatten.uniq.reject{|kw| kw == '*'}
         if repeat_keywords.index(@step.keyword) && previous
           previous.actual_keyword
         else
-          keyword
+          keyword == '*' ? language.given_keyword : keyword
         end
       end
 

data/lib/cucumber/cli/options.rb

@@ -352,6 +352,7 @@ module Cucumber
         end
         @options[:source] &= other_options[:source]
         @options[:snippets] &= other_options[:snippets]
+        @options[:strict] |= other_options[:strict]
 
         @profiles += other_options.profiles
         @expanded_args += other_options.expanded_args

data/lib/cucumber/cli/profile_loader.rb

@@ -22,8 +22,14 @@ Defined profiles in cucumber.yml:
         case(args_from_yml)
           when String
             raise YmlLoadError, "The '#{profile}' profile in cucumber.yml was blank.  Please define the command line arguments for the '#{profile}' profile in cucumber.yml.\n" if args_from_yml =~ /^\s*$/
-            require 'shellwords'
-            args_from_yml = Shellwords.shellwords(args_from_yml)
+            if(Cucumber::WINDOWS)
+              #Shellwords treats backslash as an escape character so here's a rudimentary approximation of the same code
+              args_from_yml = args_from_yml.split
+              args_from_yml = args_from_yml.collect {|x| x.gsub(/^\"(.*)\"/,'\1') }
+            else
+              require 'shellwords'
+              args_from_yml = Shellwords.shellwords(args_from_yml)
+            end
           when Array
             raise YmlLoadError, "The '#{profile}' profile in cucumber.yml was empty.  Please define the command line arguments for the '#{profile}' profile in cucumber.yml.\n" if args_from_yml.empty?
           else

data/lib/cucumber/formatter/pdf.rb

@@ -39,9 +39,9 @@ module Cucumber
         @coder = HTMLEntities.new
 
         if(options[:dry_run])
-          @status_colors = { :passed => BLACK, :skipped => BLACK, :undefined => BLACK, :failed => BLACK}
+          @status_colors = { :passed => BLACK, :skipped => BLACK, :undefined => BLACK, :failed => BLACK, :announced => GREY}
         else
-          @status_colors = { :passed => '055902', :skipped => GREY, :undefined => 'F27405', :failed => '730202'}
+          @status_colors = { :passed => '055902', :skipped => GREY, :undefined => 'F27405', :failed => '730202', :announced => GREY}
         end
 
         @pdf = Prawn::Document.new
@@ -82,6 +82,13 @@ module Cucumber
         end
       end
 
+      def announce(announcement)
+        @pdf.fill_color(@status_colors[:announced])  
+        @pdf.text announcement, :size => 10
+        @pdf.fill_color BLACK
+      end
+
+
       def after_features(features)
         @pdf.render_file(@file.path)
         puts "\ndone"

data/lib/cucumber/formatter/progress.rb

@@ -19,15 +19,33 @@ module Cucumber
         print_summary(features)
       end
 
+      def before_feature_element(*args)
+        @exception_raised = false
+      end
+
+      def after_feature_element(*args)
+        progress(:failed) if @exception_raised
+        @exception_raised = false
+      end
+
+      def before_steps(*args)
+        progress(:failed) if @exception_raised
+        @exception_raised = false
+      end
+
+      def after_steps(*args)
+        @exception_raised = false
+      end
+
       def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         progress(status)
         @status = status
       end
-      
+
       def before_outline_table(outline_table)
         @outline_table = outline_table
       end
-      
+
       def after_outline_table(outline_table)
         @outline_table = nil
       end
@@ -38,6 +56,10 @@ module Cucumber
         progress(status) unless table_header_cell?(status)
       end
 
+      def exception(*args)
+        @exception_raised = true
+      end
+
       private
 
       def print_summary(features)

data/lib/cucumber/formatter/unicode.rb

@@ -7,6 +7,17 @@ $KCODE='u' unless Cucumber::RUBY_1_9
 if Cucumber::WINDOWS
   require 'iconv'
 
+  if ENV['CUCUMBER_OUTPUT_ENCODING']
+    Cucumber::CODEPAGE = ENV['CUCUMBER_OUTPUT_ENCODING']
+  elsif Cucumber::WINDOWS_MRI
+    Cucumber::CODEPAGE = "cp#{Win32::Console::OutputCP()}"
+  elsif `cmd /c chcp` =~ /(\d+)/
+    Cucumber::CODEPAGE = "cp#{$1.to_i}"
+  else
+    Cucumber::CODEPAGE = "cp1252"
+    STDERR.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
+
   module Cucumber
     module WindowsOutput #:nodoc:
       def self.extended(o)
@@ -44,15 +55,4 @@ if Cucumber::WINDOWS
       STDERR.extend(self)
     end
   end
-
-  if ENV['CUCUMBER_OUTPUT_ENCODING']
-    Cucumber::CODEPAGE = ENV['CUCUMBER_OUTPUT_ENCODING']
-  elsif Cucumber::WINDOWS_MRI
-    Cucumber::CODEPAGE = "cp#{Win32::Console::OutputCP()}"
-  elsif `cmd /c chcp` =~ /(\d+)/
-    Cucumber::CODEPAGE = "cp#{$1.to_i}"
-  else
-    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

@@ -1,11 +1,16 @@
 # encoding: UTF-8
-# We use the codes here (prefer 2 letters when possible)
-# http://en.wikipedia.org/wiki/List_of_ISO_639-2_codes
+#
+# We use ISO 639-1 (language) and ISO 3166 alpha-2 (region - if appliccable):
+# http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+# http://en.wikipedia.org/wiki/ISO_3166-1
 #
 # If you want several aliases for a keyword, just separate them
 # with a | character. Make sure there are no ambiguities in the
 # keywords.
 #
+# If you do *not* want a trailing space after a keyword, end it with a < character.
+# (See Chinese for examples).
+#
 "en":
   name: English
   native: English
@@ -20,10 +25,6 @@
   and: "*|And"
   but: "*|But"
 
-# Please help us keeping the languages below uptodate. The parsers for a language
-# that is missing a keyword will expect the English word until the missing word(s)
-# are added.
-#
 # Please keep the grammars in alphabetical order by name from here and down.
 
 "ar":
@@ -52,7 +53,7 @@
   then: "*|То"
   and: "*|И"
   but: "*|Но"
-"cat":
+"ca":
   name: Catalan
   native: català
   background: Rerefons|Antecedents
@@ -65,7 +66,7 @@
   then: "*|Aleshores|Cal"
   and: "*|I"
   but: "*|Però"
-"cy":
+"cy-GB":
   name: Welsh
   native: Cymraeg
   background: Cefndir
@@ -390,7 +391,7 @@
   then: "*|Atunci"
   and: "*|Si"
   but: "*|Dar"
-"ro2":
+"ro-RO":
   name: Romanian (diacritical)
   native: română (diacritical)
   background: Condiţii
@@ -416,7 +417,7 @@
   then: "*|То"
   and: "*|И|К тому же"
   but: "*|Но|А"
-"se":
+"sv":
   name: Swedish
   native: Svenska
   feature: Egenskap
@@ -443,8 +444,8 @@
   and: "*|A"
   but: "*|Ale"
 "sr-Latn":
-  name: Serbian_latin
-  native: Srpski_latinica
+  name: Serbian (Latin)
+  native: Srpski (Latinica)
   feature: Funkcionalnost|Mogućnost|Mogucnost|Osobina
   background: Kontekst|Osnova|Pozadina
   scenario: Scenario|Primer
@@ -455,7 +456,7 @@
   then: "*|Onda"
   and: "*|I"
   but: "*|Ali"
-"sr":
+"sr-Cyrl":
   name: Serbian
   native: Српски
   feature: Функционалност|Могућност|Особина

data/lib/cucumber/parser/feature.rb

@@ -1542,263 +1542,6 @@ module Cucumber
         r0
       end
 
-      module PyString0
-      end
-
-      module PyString1
-        def open_py_string
-          elements[0]
-        end
-
-        def s
-          elements[1]
-        end
-
-        def close_py_string
-          elements[2]
-        end
-      end
-
-      module PyString2
-        def at_line?(line)
-          line >= open_py_string.line && line <= close_py_string.line
-        end
-
-        def build
-          Ast::PyString.new(open_py_string.line, close_py_string.line, s.text_value, open_py_string.indentation)
-        end
-      end
-
-      def _nt_py_string
-        start_index = index
-        if node_cache[:py_string].has_key?(index)
-          cached = node_cache[:py_string][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        i0, s0 = index, []
-        r1 = _nt_open_py_string
-        s0 << r1
-        if r1
-          s2, i2 = [], index
-          loop do
-            i3, s3 = index, []
-            i4 = index
-            r5 = _nt_close_py_string
-            if r5
-              r4 = nil
-            else
-              @index = i4
-              r4 = instantiate_node(SyntaxNode,input, index...index)
-            end
-            s3 << r4
-            if r4
-              if index < input_length
-                r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
-              else
-                terminal_parse_failure("any character")
-                r6 = nil
-              end
-              s3 << r6
-            end
-            if s3.last
-              r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-              r3.extend(PyString0)
-            else
-              @index = i3
-              r3 = nil
-            end
-            if r3
-              s2 << r3
-            else
-              break
-            end
-          end
-          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-          s0 << r2
-          if r2
-            r7 = _nt_close_py_string
-            s0 << r7
-          end
-        end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(PyString1)
-          r0.extend(PyString2)
-        else
-          @index = i0
-          r0 = nil
-        end
-
-        node_cache[:py_string][start_index] = r0
-
-        r0
-      end
-
-      module OpenPyString0
-        def indent
-          elements[0]
-        end
-
-        def eol
-          elements[3]
-        end
-      end
-
-      module OpenPyString1
-        def indentation
-          indent.text_value.length
-        end
-
-        def line
-          indent.line
-        end
-      end
-
-      def _nt_open_py_string
-        start_index = index
-        if node_cache[:open_py_string].has_key?(index)
-          cached = node_cache[:open_py_string][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        i0, s0 = index, []
-        s1, i1 = [], index
-        loop do
-          r2 = _nt_space
-          if r2
-            s1 << r2
-          else
-            break
-          end
-        end
-        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-        s0 << r1
-        if r1
-          if has_terminal?('"""', false, index)
-            r3 = instantiate_node(SyntaxNode,input, index...(index + 3))
-            @index += 3
-          else
-            terminal_parse_failure('"""')
-            r3 = nil
-          end
-          s0 << r3
-          if r3
-            s4, i4 = [], index
-            loop do
-              r5 = _nt_space
-              if r5
-                s4 << r5
-              else
-                break
-              end
-            end
-            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-            s0 << r4
-            if r4
-              r6 = _nt_eol
-              s0 << r6
-            end
-          end
-        end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(OpenPyString0)
-          r0.extend(OpenPyString1)
-        else
-          @index = i0
-          r0 = nil
-        end
-
-        node_cache[:open_py_string][start_index] = r0
-
-        r0
-      end
-
-      module ClosePyString0
-        def eol
-          elements[0]
-        end
-
-        def quotes
-          elements[2]
-        end
-
-        def white
-          elements[3]
-        end
-      end
-
-      module ClosePyString1
-        def line
-          quotes.line
-        end
-      end
-
-      def _nt_close_py_string
-        start_index = index
-        if node_cache[:close_py_string].has_key?(index)
-          cached = node_cache[:close_py_string][index]
-          if cached
-            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-            @index = cached.interval.end
-          end
-          return cached
-        end
-
-        i0, s0 = index, []
-        r1 = _nt_eol
-        s0 << r1
-        if r1
-          s2, i2 = [], index
-          loop do
-            r3 = _nt_space
-            if r3
-              s2 << r3
-            else
-              break
-            end
-          end
-          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-          s0 << r2
-          if r2
-            if has_terminal?('"""', false, index)
-              r4 = instantiate_node(SyntaxNode,input, index...(index + 3))
-              @index += 3
-            else
-              terminal_parse_failure('"""')
-              r4 = nil
-            end
-            s0 << r4
-            if r4
-              r5 = _nt_white
-              s0 << r5
-            end
-          end
-        end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(ClosePyString0)
-          r0.extend(ClosePyString1)
-        else
-          @index = i0
-          r0 = nil
-        end
-
-        node_cache[:close_py_string][start_index] = r0
-
-        r0
-      end
-
       def _nt_white
         start_index = index
         if node_cache[:white].has_key?(index)