aslakhellesoy-cucumber 0.1.99.5 → 0.1.99.6

data/lib/cucumber/formatter/unicode.rb

@@ -0,0 +1,35 @@
+# Require this file if you need Unicode support.
+require 'cucumber/platform'
+require 'cucumber/formatter/ansicolor'
+
+$KCODE='u' unless Cucumber::RUBY_1_9
+
+if Cucumber::WINDOWS_MRI && `chcp` =~ /(\d+)/
+  codepage = $1.to_i
+  codepages = (1251..1252)
+
+  if codepages.include?(codepage)
+    Cucumber::CODEPAGE = "cp#{codepage}"
+  
+    require 'iconv'
+    module Kernel
+      alias cucumber_print print
+      def print(*a)
+        begin
+          cucumber_print(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a))
+        rescue Iconv::IllegalSequence
+          cucumber_print(*a)
+        end
+      end
+
+      alias cucumber_puts puts
+      def puts(*a)
+        begin
+          cucumber_puts(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a))
+        rescue Iconv::IllegalSequence
+          cucumber_puts(*a)
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/parser/feature.rb

@@ -741,6 +741,10 @@ module Cucumber
         def multi
           elements[5]
         end
+
+        def white
+          elements[6]
+        end
       end
 
       module Step1
@@ -828,6 +832,10 @@ module Cucumber
                     r11 = SyntaxNode.new(input, index...index)
                   end
                   s0 << r11
+                  if r11
+                    r13 = _nt_white
+                    s0 << r13
+                  end
                 end
               end
             end
@@ -870,13 +878,8 @@ module Cucumber
             break
           end
         end
-        if s0.empty?
-          self.index = i0
-          r0 = nil
-        else
-          r0 = SyntaxNode.new(input, i0...index, s0)
-          r0.extend(ExamplesSections0)
-        end
+        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0.extend(ExamplesSections0)
 
         node_cache[:examples_sections][start_index] = r0
 
@@ -892,9 +895,17 @@ module Cucumber
           elements[3]
         end
 
+        def eol
+          elements[4]
+        end
+
         def table
           elements[5]
         end
+
+        def white
+          elements[6]
+        end
       end
 
       module Examples1
@@ -947,25 +958,15 @@ module Cucumber
               end
               s0 << r6
               if r6
-                s8, i8 = [], index
-                loop do
-                  r9 = _nt_eol
-                  if r9
-                    s8 << r9
-                  else
-                    break
-                  end
-                end
-                if s8.empty?
-                  self.index = i8
-                  r8 = nil
-                else
-                  r8 = SyntaxNode.new(input, i8...index, s8)
-                end
+                r8 = _nt_eol
                 s0 << r8
                 if r8
-                  r10 = _nt_table
-                  s0 << r10
+                  r9 = _nt_table
+                  s0 << r9
+                  if r9
+                    r10 = _nt_white
+                    s0 << r10
+                  end
                 end
               end
             end

data/lib/cucumber/parser/feature.tt

@@ -88,7 +88,7 @@ module Cucumber
       end
 
       rule step
-        space* step_keyword space* name:line_to_eol (eol+ / eof) multi:multiline_arg? {
+        space* step_keyword space* name:line_to_eol (eol+ / eof) multi:multiline_arg? white {
           def build
             if multi.respond_to?(:build)
               Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value, multi.build)
@@ -100,7 +100,7 @@ module Cucumber
       end
 
       rule examples_sections
-        examples+ {
+        examples* {
           def build
             elements.map{|e| e.build}
           end
@@ -108,7 +108,7 @@ module Cucumber
       end
 
       rule examples
-        space* examples_keyword space* name:line_to_eol? eol+ table {
+        space* examples_keyword space* name:line_to_eol? eol table white {
           def build
             [examples_keyword.line, examples_keyword.text_value, name.text_value, table.raw]
           end

data/lib/cucumber/parser/treetop_ext.rb

@@ -28,13 +28,9 @@ module Cucumber
     class SyntaxError < StandardError
       def initialize(parser, file, line_offset)
         tf = parser.terminal_failures
-        expected = tf.size == 1 ? tf[0].expected_string.inspect : "one of #{tf.map{|f| f.expected_string.inspect}.uniq*', '}"
-        after = parser.input[parser.index...parser.failure_index]
-        found = parser.input[parser.failure_index..parser.failure_index]
-        
+        expected = tf.size == 1 ? tf[0].expected_string.inspect : "one of #{tf.map{|f| f.expected_string}.uniq*', '}"
         line = parser.failure_line + line_offset
-        message = "#{file}:#{line}:#{parser.failure_column}: " +
-          "Parse error, expected #{expected}. After #{after.inspect}. Found: #{found.inspect}"
+        message = "#{file}:#{line}:#{parser.failure_column}: Parse error, expected #{expected}."
         super(message)
       end
     end

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 1
     TINY  = 99
-    PATCH = 5 # Set to nil for official release
+    PATCH = 6 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/spec/cucumber/step_mother_spec.rb

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+require 'cucumber/step_mother'
+
+module Cucumber
+  describe StepMother do
+    before do
+      @step_mother = Object.new
+      @step_mother.extend(StepMother)
+      @visitor = mock('Visitor')
+    end
+
+    it "should format step names" do
+      @step_mother.Given(/it (.*) in (.*)/) do |what, month|
+      end
+      @step_mother.Given(/nope something else/) do |what, month|
+      end
+      format = @step_mother.step_definition("it snows in april").format_args("it snows in april", "[%s]")
+      format.should == "it [snows] in [april]"
+    end
+
+    it "should raise Ambiguous error when multiple step definitions match" do
+      @step_mother.Given(/Three (.*) mice/) {|disability|}
+      @step_mother.Given(/Three blind (.*)/) {|animal|}
+
+      lambda do
+        @step_mother.step_definition("Three blind mice")
+      end.should raise_error(StepMother::Ambiguous, %{Ambiguous match of "Three blind mice":
+
+spec/cucumber/step_mother_spec.rb:23:in `/Three (.*) mice/'
+spec/cucumber/step_mother_spec.rb:24:in `/Three blind (.*)/'
+
+})
+    end
+
+    it "should raise Undefined error when no step definitions match" do
+      lambda do
+        @step_mother.step_definition("Three blind mice")
+      end.should raise_error(StepMother::Undefined)
+    end
+
+    it "should raise Redundant error when same regexp is registered twice" do
+      @step_mother.Given(/Three (.*) mice/) {|disability|}
+      lambda do
+        @step_mother.Given(/Three (.*) mice/) {|disability|}
+      end.should raise_error(StepMother::Redundant)
+    end
+  end
+end

data/spec/cucumber/treetop_parser/scenario_outline.feature

@@ -4,7 +4,7 @@ Scenario Outline: Joe fails to login
   Given I login as Joe without the '<Privilege>' privilege
   When I <Request Method> /admin/<Path>
   Then I should see the text "Sorry Joe, you're not allowed to see <Path>"
-    
+  
   Examples:
   | Privilege | Request Method | Path       |
   | user      | GET            | reports    |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.99.5
+  version: 0.1.99.6
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-25 00:00:00 -08:00
+date: 2009-01-26 00:00:00 -08:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -251,12 +251,7 @@ files:
 - lib/cucumber/formatter/profile.rb
 - lib/cucumber/formatter/progress.rb
 - lib/cucumber/formatter/rerun.rb
-- lib/cucumber/formatters/autotest_formatter.rb
-- lib/cucumber/formatters/cucumber.css
-- lib/cucumber/formatters/cucumber.js
-- lib/cucumber/formatters/html_formatter.rb
-- lib/cucumber/formatters/jquery.js
-- lib/cucumber/formatters/pretty_formatter.rb
+- lib/cucumber/formatter/unicode.rb
 - lib/cucumber/formatters/unicode.rb
 - lib/cucumber/jbehave.rb
 - lib/cucumber/languages.yml
@@ -274,7 +269,6 @@ files:
 - lib/cucumber/rake/task.rb
 - lib/cucumber/step_definition.rb
 - lib/cucumber/step_mother.rb
-- lib/cucumber/treetop_parser/feature_fi.rb
 - lib/cucumber/version.rb
 - pretty.txt
 - rails_generators/cucumber/USAGE
@@ -305,8 +299,6 @@ files:
 - spec/cucumber/formatter/html/index.html
 - spec/cucumber/formatter/html/jquery-1.3.min.js
 - spec/cucumber/formatter/html/jquery.uitableedit.js
-- spec/cucumber/formatters/autotest_formatter_spec.rb
-- spec/cucumber/formatters/features.html
 - spec/cucumber/formatters/profile_formatter_spec.rb
 - spec/cucumber/parser/feature_parser_spec.rb
 - spec/cucumber/parser/table_parser_spec.rb
@@ -315,7 +307,7 @@ files:
 - spec/cucumber/rails/world_spec.rb
 - spec/cucumber/sell_cucumbers.feature
 - spec/cucumber/step_definition_spec.rb
-- spec/cucumber/step_mom_spec.rb
+- spec/cucumber/step_mother_spec.rb
 - spec/cucumber/treetop_parser/empty_feature.feature
 - spec/cucumber/treetop_parser/empty_scenario.feature
 - spec/cucumber/treetop_parser/empty_scenario_outline.feature