gherkin 2.3.0-java → 2.3.1-java

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.3.1

data/gherkin.gemspec

@@ -54,5 +54,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake', '~> 0.8.7')
   s.add_development_dependency('awesome_print', '~> 0.2.1')
   s.add_development_dependency('rspec', '~> 2.0.1')
-  s.add_development_dependency('cucumber', '~> 0.9.4')
+  s.add_development_dependency('cucumber', '~> 0.10.0')
 end

data/lib/gherkin/formatter/colors.rb

@@ -10,28 +10,28 @@ module Gherkin
     #
     # The colours that you can change are:
     #
-    # * <tt>undefined</tt>       - defaults to <tt>yellow</tt>
-    # * <tt>pending</tt>         - defaults to <tt>yellow</tt>
-    # * <tt>pending_param</tt>   - defaults to <tt>yellow,bold</tt>
-    # * <tt>executing</tt>       - defaults to <tt>magenta</tt>
-    # * <tt>executing_param</tt> - defaults to <tt>magenta,bold</tt>
-    # * <tt>failed</tt>          - defaults to <tt>red</tt>
-    # * <tt>failed_param</tt>    - defaults to <tt>red,bold</tt>
-    # * <tt>passed</tt>          - defaults to <tt>green</tt>
-    # * <tt>passed_param</tt>    - defaults to <tt>green,bold</tt>
-    # * <tt>outline</tt>         - defaults to <tt>cyan</tt>
-    # * <tt>outline_param</tt>   - defaults to <tt>cyan,bold</tt>
-    # * <tt>skipped</tt>         - defaults to <tt>cyan</tt>
-    # * <tt>skipped_param</tt>   - defaults to <tt>cyan,bold</tt>
-    # * <tt>comment</tt>         - defaults to <tt>grey</tt>
-    # * <tt>tag</tt>             - defaults to <tt>cyan</tt>
+    # <tt>undefined</tt>::     defaults to <tt>yellow</tt>
+    # <tt>pending</tt>::       defaults to <tt>yellow</tt>
+    # <tt>pending_arg</tt>::   defaults to <tt>yellow,bold</tt>
+    # <tt>executing</tt>::     defaults to <tt>magenta</tt>
+    # <tt>executing_arg</tt>:: defaults to <tt>magenta,bold</tt>
+    # <tt>failed</tt>::        defaults to <tt>red</tt>
+    # <tt>failed_arg</tt>::    defaults to <tt>red,bold</tt>
+    # <tt>passed</tt>::        defaults to <tt>green</tt>
+    # <tt>passed_arg</tt>::    defaults to <tt>green,bold</tt>
+    # <tt>outline</tt>::       defaults to <tt>cyan</tt>
+    # <tt>outline_arg</tt>::   defaults to <tt>cyan,bold</tt>
+    # <tt>skipped</tt>::       defaults to <tt>cyan</tt>
+    # <tt>skipped_arg</tt>::   defaults to <tt>cyan,bold</tt>
+    # <tt>comment</tt>::       defaults to <tt>grey</tt>
+    # <tt>tag</tt>::           defaults to <tt>cyan</tt>
     #
     # For instance, if your shell has a black background and a green font (like the
     # "Homebrew" settings for OS X' Terminal.app), you may want to override passed
     # steps to be white instead of green. Examples:
     #
     #   export GHERKIN_COLORS="passed=white"
-    #   export GHERKIN_COLORS="passed=white,bold:passed_param=white,bold,underline"
+    #   export GHERKIN_COLORS="passed=white,bold:passed_arg=white,bold,underline"
     #
     # (If you're on Windows, use SET instead of export).
     # To see what colours and effects are available, just run this in your shell:
@@ -43,7 +43,7 @@ module Gherkin
       include Term::ANSIColor
 
       ALIASES = Hash.new do |h,k|
-        if k.to_s =~ /(.*)_param/
+        if k.to_s =~ /(.*)_arg/
           h[$1] + ',bold'
         end
       end.merge({
@@ -66,13 +66,13 @@ module Gherkin
       end
 
       ALIASES.each do |method, color|
-        unless method =~ /.*_param/
+        unless method =~ /.*_arg$/
           code = <<-EOF
           def #{method}(string=nil, &proc)
             #{ALIASES[method].split(",").join("(") + "(string, &proc" + ")" * ALIASES[method].split(",").length}
           end
-          def #{method}_param(string=nil, &proc)
-            #{ALIASES[method+'_param'].split(",").join("(") + "(string, &proc" + ")" * ALIASES[method+'_param'].split(",").length}
+          def #{method}_arg(string=nil, &proc)
+            #{ALIASES[method+'_arg'].split(",").join("(") + "(string, &proc" + ")" * ALIASES[method+'_arg'].split(",").length}
           end
           EOF
           eval(code)

data/lib/gherkin/formatter/json_formatter.rb

@@ -27,6 +27,9 @@ module Gherkin
         @gherkin_object = feature.to_hash
       end
 
+      def steps(steps)
+      end
+
       def background(background)
         feature_elements << background.to_hash
       end
@@ -44,7 +47,7 @@ module Gherkin
       end
 
       def step(step)
-        steps << step.to_hash
+        current_steps << step.to_hash
       end
 
       def match(match)
@@ -77,12 +80,12 @@ module Gherkin
         feature_element['examples'] ||= []
       end
 
-      def steps
+      def current_steps
         feature_element['steps'] ||= []
       end
 
       def last_step
-        steps[-1]
+        current_steps[-1]
       end
 
       def embeddings

data/lib/gherkin/formatter/model.rb

@@ -129,12 +129,12 @@ module Gherkin
           formatter.step(self)
         end
 
-        def status
-          result ? result.status : 'undefined'
-        end
-
-        def arguments
-          result ? result.arguments : []
+        def outline_args
+          offset = 0
+          name.scan(/<[^<]*>/).map do |val|
+            offset = name.index(val, offset)
+            Argument.new(offset, val)
+          end
         end
 
         def to_hash

data/lib/gherkin/formatter/pretty_formatter.rb

@@ -61,23 +61,29 @@ module Gherkin
 
       def step(step)
         @step = step
+        @step_index += 1 if @step_index
         match(Model::Match.new([], nil)) if @monochrome
       end
 
       def match(match)
-        print_step(format('executing'), format('executing_param'), match.arguments, match.location)
+        @match = match
+        print_step('executing', @match.arguments, @match.location)
       end
 
       def result(result)
-        # TODO: Print error message
+        @io.write("\033[1A")
+        print_step(result.status, @match.arguments, @match.location)
       end
 
-      def print_step(text_format, arg_format, arguments, location)
+      def print_step(status, arguments, location)
+        text_format = format(status)
+        arg_format = arg_format(status)
+        
         print_comments(@step.comments, '    ')
         @io.write('    ')
-        text_format.write_text(@io, @step.keyword)
+        @io.write(text_format.text(@step.keyword))
         @step_printer.write_step(@io, text_format, arg_format, @step.name, arguments)
-        print_indented_stepdef_location!(location) if location
+        print_indented_step_location(location) if location
 
         @io.puts
         case @step.multiline_arg
@@ -89,8 +95,8 @@ module Gherkin
       end
 
       class MonochromeFormat
-        def write_text(io, text)
-          io.write(text)
+        def text(text)
+          text
         end
       end
 
@@ -101,17 +107,13 @@ module Gherkin
           @status = status
         end
 
-        def write_text(io, text)
-          io.write(self.__send__(@status, text))
+        def text(text)
+          self.__send__(@status, text)
         end
       end
 
-      def text_format(step)
-        format(step.status)
-      end
-
-      def arg_format(step)
-        format(step.status + '_param')
+      def arg_format(key)
+        format("#{key}_arg")
       end
 
       def format(key)
@@ -216,8 +218,8 @@ module Gherkin
         ' ' * indent + ' ' + comments("# #{@uri}:#{line}")
       end
 
-      def print_indented_stepdef_location!(location)
-        indent = @max_step_length - @step_lengths[@step_index+=1]
+      def print_indented_step_location(location)
+        indent = @max_step_length - @step_lengths[@step_index]
         return if location.nil?
         @io.write(' ' * indent + ' ' + comments("# #{location}"))
       end

data/lib/gherkin/formatter/step_printer.rb

@@ -6,11 +6,11 @@ module Gherkin
         
         text_start = 0
         arguments.each do |arg|
-          text_format.write_text(io, unpacked_step_name[text_start..arg.offset-1].pack("U*")) unless arg.offset == 0
-          arg_format.write_text(io, arg.val)
+          io.write(text_format.text(unpacked_step_name[text_start..arg.offset-1].pack("U*"))) unless arg.offset == 0
+          io.write(arg_format.text(arg.val))
           text_start = arg.offset + arg.val.unpack("U*").length
         end
-        text_format.write_text(io, unpacked_step_name[text_start..-1].pack("U*")) unless text_start == unpacked_step_name.length
+        io.write(text_format.text(unpacked_step_name[text_start..-1].pack("U*"))) unless text_start == unpacked_step_name.length
       end
     end
   end

data/spec/gherkin/formatter/model_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'gherkin/formatter/model'
+require 'gherkin/formatter/argument'
 
 module Gherkin
   module Formatter
@@ -10,6 +11,18 @@ module Gherkin
           tags.to_a.uniq.length.should == 2
         end
       end
+
+      describe Step do
+        it "should provide arguments for outline tokens" do
+          step = Step.new([], 'Given ', "I have <number> cukes in <whose> belly", 10)
+          step.outline_args.map{|arg| [arg.offset, arg.val]}.should == [[7, "<number>"], [25, "<whose>"]]
+        end
+
+        it "should provide no arguments when there are no outline tokens" do
+          step = Step.new([], 'Given ', "I have 33 cukes in my belly", 10)
+          step.outline_args.to_a.should == []
+        end
+      end
     end
   end
 end

data/spec/gherkin/formatter/pretty_formatter_spec.rb

@@ -30,12 +30,12 @@ module Gherkin
 
       before do
         @io = StringIO.new
-        @colf = Gherkin::Formatter::PrettyFormatter.new(@io, false)
+        @f = Gherkin::Formatter::PrettyFormatter.new(@io, false)
       end
 
       it "should print comments when scenario is longer" do
-        @colf.uri("features/foo.feature")
-        @colf.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
+        @f.uri("features/foo.feature")
+        @f.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
 
         step1 = Model::Step.new([], "Given ", "some stuff", 5)
         match1 = Model::Match.new([], "features/step_definitions/bar.rb:56")
@@ -45,44 +45,47 @@ module Gherkin
         match2 = Model::Match.new([], "features/step_definitions/bar.rb:96")
         result2 = Model::Result.new('passed', nil)
 
-        @colf.steps([step1, step2])
-        @colf.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
+        @f.steps([step1, step2])
+        @f.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
 
-        @colf.step(step1)
-        @colf.match(match1)
-        @colf.result(result1)
+        @f.step(step1)
+        @f.match(match1)
+        @f.result(result1)
 
-        @colf.step(step2)
-        @colf.match(match2)
-        @colf.result(result2)
+        @f.step(step2)
+        @f.match(match2)
+        @f.result(result2)
 
         assert_io(%{Feature: Hello
   World
 
   Scenario: The scenario #{grey('# features/foo.feature:4')}
     #{magenta('Given ')}#{magenta('some stuff')}     #{grey('# features/step_definitions/bar.rb:56')}
+\033[1A    #{green('Given ')}#{green('some stuff')}     #{grey('# features/step_definitions/bar.rb:56')}
     #{magenta('When ')}#{magenta('foo')}             #{grey('# features/step_definitions/bar.rb:96')}
+\033[1A    #{green('When ')}#{green('foo')}             #{grey('# features/step_definitions/bar.rb:96')}
 })
       end
 
       it "should print comments when step is longer" do
-        @colf.uri("features/foo.feature")
-        @colf.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
+        @f.uri("features/foo.feature")
+        @f.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
         step = Model::Step.new([], "Given ", "some stuff that is longer", 5)
         match = Model::Match.new([], "features/step_definitions/bar.rb:56")
         result = Model::Result.new('passed', nil)
 
-        @colf.steps([step])
-        @colf.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
-        @colf.step(step)
-        @colf.match(match)
-        @colf.result(result)
+        @f.steps([step])
+        @f.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
+        @f.step(step)
+        @f.match(match)
+        @f.result(result)
 
         assert_io(%{Feature: Hello
   World
 
   Scenario: The scenario            #{grey('# features/foo.feature:4')}
     #{magenta('Given ')}#{magenta('some stuff that is longer')} #{grey('# features/step_definitions/bar.rb:56')}
+\033[1A    #{green('Given ')}#{green('some stuff that is longer')} #{grey('# features/step_definitions/bar.rb:56')}
 })
       end
 
@@ -91,16 +94,22 @@ module Gherkin
         match = Model::Match.new([Gherkin::Formatter::Argument.new(7, '999')], nil)
         result = Model::Result.new('passed', nil)
 
-        @colf.steps([step])
-        @colf.step(step)
-        @colf.match(match)
-        @colf.result(result)
+        @f.steps([step])
+        @f.step(step)
+        @f.match(match)
+        @f.result(result)
 
         if defined?(JRUBY_VERSION)
           # Not terribly readable. The result on Java is different because JANSI uses semicolons when there are several codes.
-          assert_io("    \e[35mGiven \e[0m\e[35mI have \e[0m\e[35;1m999\e[0m\e[35m cukes in my belly\e[0m\n")
+          assert_io(
+            "    \e[35mGiven \e[0m\e[35mI have \e[0m\e[35;1m999\e[0m\e[35m cukes in my belly\e[0m\n" +
+            "\033[1A    \e[32mGiven \e[0m\e[32mI have \e[0m\e[32;1m999\e[0m\e[32m cukes in my belly\e[0m\n"
+          )
         else
-          assert_io("    #{magenta('Given ')}#{magenta('I have ')}#{magenta(bold('999'))}#{magenta(' cukes in my belly')}\n")
+          assert_io(
+            "    #{magenta('Given ')}#{magenta('I have ')}#{magenta(bold('999'))}#{magenta(' cukes in my belly')}\n" +
+            "\033[1A    #{green('Given ')}#{green('I have ')}#{green(bold('999'))}#{green(' cukes in my belly')}\n"
+          )
         end
       end
 

data/spec/gherkin/formatter/step_printer_spec.rb

@@ -7,14 +7,14 @@ require 'stringio'
 module Gherkin
   module Formatter
     class ParenthesisFormat
-      def write_text(io, text)
-        io.write("(#{text})")
+      def text(text)
+        "(#{text})"
       end
     end
     
     class BracketFormat
-      def write_text(io, text)
-        io.write("[#{text}]")
+      def text(text)
+        "[#{text}]"
       end
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 3
-  - 0
-  version: 2.3.0
+  - 1
+  version: 2.3.1
 platform: java
 authors: 
 - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +00:00
+date: 2010-11-13 00:00:00 +00:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,9 +104,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        - 10
+        - 0
+        version: 0.10.0
   type: :development
   version_requirements: *id006
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
@@ -278,7 +278,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: gherkin-2.3.0
+summary: gherkin-2.3.1
 test_files: 
 - features/escaped_pipes.feature
 - features/feature_parser.feature