gherkin 2.2.8-x86-mswin32 → 2.2.9-x86-mswin32

data/History.txt

@@ -1,3 +1,9 @@
+== 2.2.9 (2010-10-15)
+
+=== New Features
+* PrettyFormatter can format features both with and without ANSI Colors. Using Jansi on Java. (Aslak Hellesøy)
+* Extended Java Formatter API with a steps(List<Step>) method for better reporting in Java (Aslak Hellesøy)
+
 == 2.2.8 (2010-10-04)
 
 === Removed Features

data/README.rdoc

@@ -9,7 +9,6 @@ Fast Gherkin lexer and parser based on Ragel. Gherkin is two things:
 
 You'll need MRI (any version) if you want to build for MRI. To build the Java implementation you'll need JRuby.
 You'll also need Ragel installed and on your PATH.
-Finally you'll need the jeweler gem. (Jeweler will tell you what other gems you need when you run rake)
 
 === MRI
 

data/VERSION

@@ -1 +1 @@
-2.2.8
+2.2.9

data/cucumber.yml

@@ -1,3 +1,3 @@
-default: --format pretty --tags ~@pending,~@wip --strict features
+default: --format pretty --tags ~@pending,~@wip --strict --color features
 wip: --format pretty --tags @wip --wip features
 pending: --format pretty --tags @pending,~@native_lexer

data/features/step_definitions/json_parser_steps.rb

@@ -2,6 +2,8 @@ require 'stringio'
 require 'gherkin/formatter/pretty_formatter'
 require 'gherkin/json_parser'
 
+World(Gherkin::Formatter::Colors)
+
 Given /^a PrettyFormatter$/ do
   @io = StringIO.new
   @formatter = Gherkin::Formatter::PrettyFormatter.new(@io, true)

data/features/step_definitions/pretty_formatter_steps.rb

@@ -6,9 +6,11 @@ require 'gherkin/formatter/json_formatter'
 require 'gherkin/json_parser'
 
 module PrettyPlease
+  include Gherkin::Formatter::Colors
+  
   def pretty_machinery(gherkin, feature_path)
     io        = StringIO.new
-    formatter = Gherkin::Formatter::PrettyFormatter.new(io, false)
+    formatter = Gherkin::Formatter::PrettyFormatter.new(io, true)
     parser    = Gherkin::Parser::Parser.new(formatter, true)
     parse(parser, gherkin, feature_path)
     io.string
@@ -20,12 +22,12 @@ module PrettyPlease
     gherkin_parser      = Gherkin::Parser::Parser.new(json_formatter, true)
     parse(gherkin_parser, gherkin, feature_path)
 
-    result              = StringIO.new
-    pretty_formatter    = Gherkin::Formatter::PrettyFormatter.new(result, false)
+    io                  = StringIO.new
+    pretty_formatter    = Gherkin::Formatter::PrettyFormatter.new(io, true)
     json_parser         = Gherkin::JSONParser.new(pretty_formatter)
     json_parser.parse(json.string, "#{feature_path}.json", 0)
     
-    result.string
+    io.string
   end
   
   def parse(parser, gherkin, feature_path)

data/features/support/env.rb

@@ -9,6 +9,7 @@ end
 require 'gherkin'
 require 'gherkin/sexp_recorder'
 require 'gherkin/output_stream_string_io'
+require 'gherkin/java_libs'
 require 'gherkin/json'
 
 module TransformHelpers

data/java/.gitignore

@@ -1,2 +1,5 @@
 .idea
+*.iml
+*.iws
+*.ipr
 target

data/lib/gherkin/formatter/argument.rb

@@ -4,24 +4,11 @@ module Gherkin
   module Formatter
     class Argument
       native_impl('gherkin')
-      attr_reader :byte_offset, :val
+      attr_reader :offset, :val
 
-      def initialize(byte_offset, val)
-        @byte_offset, @val = byte_offset, val
-      end
-      
-      def self.format(string, argument_format, arguments)
-        arguments ||= []
-        s = string.dup
-        offset = past_offset = 0
-        arguments.each do |arg|
-          next if arg.byte_offset.nil? || arg.byte_offset < past_offset
-          replacement = argument_format.format_argument(arg.val)
-          s[arg.byte_offset + offset, arg.val.length] = replacement
-          offset += replacement.unpack("U*").length - arg.val.unpack("U*").length
-          past_offset = arg.byte_offset + arg.val.length
-        end
-        s
+      # Creates a new Argument that starts at character offset +offset+ with value +val+
+      def initialize(offset, val)
+        @offset, @val = offset, val
       end
     end
   end

data/lib/gherkin/formatter/colors.rb

@@ -65,14 +65,11 @@ module Gherkin
       ALIASES.each do |method, color|
         unless method =~ /.*_param/
           code = <<-EOF
-          def #{method}(string=nil, monochrome=false, &proc)
-            return string if monochrome
+          def #{method}(string=nil, &proc)
             #{ALIASES[method].split(",").join("(") + "(string, &proc" + ")" * ALIASES[method].split(",").length}
           end
-          # This resets the colour to the non-param colour
-          def #{method}_param(string=nil, monochrome=false, &proc)
-            return string if monochrome
-            #{ALIASES[method+'_param'].split(",").join("(") + "(string, &proc" + ")" * ALIASES[method+'_param'].split(",").length} + #{ALIASES[method].split(",").join(' + ')}
+          def #{method}_param(string=nil, &proc)
+            #{ALIASES[method+'_param'].split(",").join("(") + "(string, &proc" + ")" * ALIASES[method+'_param'].split(",").length}
           end
           EOF
           eval(code)
@@ -112,7 +109,7 @@ module Gherkin
           "\e[90m#{m}\e[0m"
         end
       end
-    
+
       define_grey
     end
   end

data/lib/gherkin/formatter/model.rb

@@ -150,6 +150,14 @@ module Gherkin
           formatter.step(self)
         end
 
+        def status
+          result ? result.status : 'undefined'
+        end
+
+        def arguments
+          result ? result.arguments : []
+        end
+
         def to_hash
           hash = super
           if Array === @multiline_arg

data/lib/gherkin/formatter/pretty_formatter.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require 'gherkin/formatter/colors'
-require 'gherkin/formatter/monochrome_format'
+require 'gherkin/formatter/step_printer'
 require 'gherkin/formatter/argument'
 require 'gherkin/formatter/escaping'
 require 'gherkin/formatter/model'
@@ -14,10 +14,10 @@ module Gherkin
       include Colors
       include Escaping
 
-      def initialize(io, monochrome)
+      def initialize(io, monochrome=false)
         @io = io
+        @step_printer = StepPrinter.new
         @monochrome = monochrome
-        @format = MonochromeFormat.new #@monochrome ? MonochromeFormat.new : AnsiColorFormat.new
       end
 
       def uri(uri)
@@ -60,13 +60,7 @@ module Gherkin
       end
 
       def step(step)
-        name = Gherkin::Formatter::Argument.format(step.name, @format, (step.result ? step.result.arguments : []))
-
-        step_text = "#{step.keyword}#{step.name}"
-        step_text = self.__send__(step.result.status, step_text, @monochrome) if step.result
-
-        print_comments(step.comments, '    ')
-        @io.puts("    #{step_text}#{indented_step_location!(step.result ? step.result.stepdef_location : nil)}")
+        print_step(step)
         case step.multiline_arg
         when Model::PyString
           py_string(step.multiline_arg)
@@ -75,13 +69,62 @@ module Gherkin
         end
       end
 
+      def print_step(step)
+        print_comments(step.comments, '    ')
+        @io.write('    ')
+        text_format(step).write_text(@io, step.keyword)
+        @step_printer.write_step(@io, text_format(step), arg_format(step), step.name, step.arguments)
+        print_indented_stepdef_location!(step.result.stepdef_location) if step.result
+        # TODO: Print error message
+        @io.puts
+      end
+
+      class MonochromeFormat
+        def write_text(io, text)
+          io.write(text)
+        end
+      end
+
+      class ColorFormat
+        include Colors
+        
+        def initialize(status)
+          @status = status
+        end
+
+        def write_text(io, text)
+          io.write(self.__send__(@status, text))
+        end
+      end
+
+      def text_format(step)
+        format(step.status)
+      end
+
+      def arg_format(step)
+        format(step.status + '_param')
+      end
+
+      def format(key)
+        if @formats.nil?
+          if @monochrome
+            @formats = Hash.new(MonochromeFormat.new)
+          else
+            @formats = Hash.new do |formats, status|
+              formats[status] = ColorFormat.new(status)
+            end
+          end
+        end
+        @formats[key]
+      end
+
       def eof
         # NO-OP
       end
 
       # This method can be invoked before a #scenario, to ensure location arguments are aligned
       def steps(steps)
-        @step_lengths = steps.map {|keyword, name| (keyword+name).unpack("U*").length}
+        @step_lengths = steps.map {|step| (step.keyword+step.name).unpack("U*").length}
         @max_step_length = @step_lengths.max
         @step_index = -1
       end
@@ -114,12 +157,12 @@ module Gherkin
 
       def exception(exception)
         exception_text = "#{exception.message} (#{exception.class})\n#{(exception.backtrace || []).join("\n")}".gsub(/^/, '      ')
-        @io.puts(failed(exception_text, @monochrome))
+        @io.puts(failed(exception_text))
       end
 
       def color(cell, statuses, col)
         if statuses
-          self.__send__(statuses[col], escape_cell(cell), @monochrome) + (@monochrome ? '' : reset)
+          self.__send__(statuses[col], escape_cell(cell)) + reset
         else
           escape_cell(cell)
         end
@@ -161,13 +204,13 @@ module Gherkin
         l = (keyword+name).unpack("U*").length
         @max_step_length = [@max_step_length, l].max
         indent = @max_step_length - l
-        ' ' * indent + ' ' + comments("# #{@uri}:#{line}", @monochrome)
+        ' ' * indent + ' ' + comments("# #{@uri}:#{line}")
       end
 
-      def indented_step_location!(location)
-        return '' if location.nil?
+      def print_indented_stepdef_location!(location)
         indent = @max_step_length - @step_lengths[@step_index+=1]
-        ' ' * indent + ' ' + comments("# #{location}", @monochrome)
+        return if location.nil?
+        @io.write(' ' * indent + ' ' + comments("# #{location}"))
       end
     end
   end

data/lib/gherkin/formatter/step_printer.rb

@@ -0,0 +1,17 @@
+module Gherkin
+  module Formatter
+    class StepPrinter
+      def write_step(io, text_format, arg_format, step_name, arguments)
+        unpacked_step_name = step_name.unpack("U*")
+        
+        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)
+          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
+      end
+    end
+  end
+end

data/lib/gherkin/i18n.rb

@@ -57,7 +57,7 @@ module Gherkin
         require 'gherkin/formatter/pretty_formatter'
         require 'gherkin/formatter/model'
         io = defined?(JRUBY_VERSION) ? Java.java.io.StringWriter.new : StringIO.new
-        pf = Gherkin::Formatter::PrettyFormatter.new(io, true)
+        pf = Gherkin::Formatter::PrettyFormatter.new(io)
         table = all.map do |i18n|
           Formatter::Model::Row.new([], [i18n.iso_code, i18n.keywords('name')[0], i18n.keywords('native')[0]], nil)
         end
@@ -149,7 +149,7 @@ module Gherkin
       require 'gherkin/formatter/pretty_formatter'
       require 'gherkin/formatter/model'
       io = StringIO.new
-      pf = Gherkin::Formatter::PrettyFormatter.new(io, true)
+      pf = Gherkin::Formatter::PrettyFormatter.new(io)
 
       gherkin_keyword_table = KEYWORD_KEYS.map do |key|
         Formatter::Model::Row.new([], [key, keywords(key).map{|keyword| %{"#{keyword}"}}.join(', ')], nil)

data/spec/gherkin/formatter/colors_spec.rb

@@ -11,7 +11,7 @@ module Gherkin
       end
 
       it "should be possible to specify no colouring" do
-        failed("hello", true).should == "hello"
+        uncolored(failed("hello")).should == "hello"
       end
     end
   end

data/spec/gherkin/formatter/filter_formatter_spec.rb

@@ -8,6 +8,8 @@ require 'gherkin/formatter/pretty_formatter'
 module Gherkin
   module Formatter
     describe FilterFormatter do
+      include Colors
+
       attr_accessor :file
 
       before do

data/spec/gherkin/formatter/pretty_formatter_spec.rb

@@ -9,19 +9,22 @@ require 'stringio'
 module Gherkin
   module Formatter
     describe PrettyFormatter do
+      include Colors
+
       def assert_io(s)
         actual = @io.string
+        actual.gsub!(/\e\[m/, "\e[0m") # JANSI resets without the 0.
         actual.should == s
       end
       
-      def assert_pretty(input, output=input)
+      def assert_pretty(input, expected_output=input)
         [true, false].each do |force_ruby|
           io = StringIO.new
           pf = Gherkin::Formatter::PrettyFormatter.new(io, true)
           parser = Gherkin::Parser::Parser.new(pf, true, "root", force_ruby)
           parser.parse(input, "test.feature", 0)
-          actual = io.string
-          actual.should == output
+          output = io.string
+          output.should == expected_output
         end
       end
 
@@ -31,50 +34,54 @@ module Gherkin
 
       before do
         @io = StringIO.new
-        @l = Gherkin::Formatter::PrettyFormatter.new(@io, true)
+        @colf = Gherkin::Formatter::PrettyFormatter.new(@io, false)
       end
 
       it "should print comments when scenario is longer" do
-        @l.uri("features/foo.feature")
-        @l.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
-        @l.steps([
-          ['Given ', 'some stuff'],
-          ['When ', 'foo']
-        ])
-        @l.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
-        @l.step(Model::Step.new([], "Given ", "some stuff", 5, nil, result('passed', nil, nil, "features/step_definitions/bar.rb:56")))
-        @l.step(Model::Step.new([], "When ", "foo", 6, nil, result('passed', nil, nil, "features/step_definitions/bar.rb:96")))
+        @colf.uri("features/foo.feature")
+        @colf.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
+        step1 = Model::Step.new([], "Given ", "some stuff", 5, nil, result('passed', nil, [], "features/step_definitions/bar.rb:56"))
+        step2 = Model::Step.new([], "When ", "foo", 6, nil, result('passed', nil, [], "features/step_definitions/bar.rb:96"))
+        @colf.steps([step1, step2])
+        @colf.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
+        @colf.step(step1)
+        @colf.step(step2)
 
         assert_io(%{Feature: Hello
   World
 
-  Scenario: The scenario # features/foo.feature:4
-    Given some stuff     # features/step_definitions/bar.rb:56
-    When foo             # features/step_definitions/bar.rb:96
+  Scenario: The scenario #{grey('# features/foo.feature:4')}
+    #{green('Given ')}#{green('some stuff')}     #{grey('# features/step_definitions/bar.rb:56')}
+    #{green('When ')}#{green('foo')}             #{grey('# features/step_definitions/bar.rb:96')}
 })
       end
 
       it "should print comments when step is longer" do
-        @l.uri("features/foo.feature")
-        @l.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
-        @l.steps([
-          ['Given ', 'some stuff that is longer']
-        ])
-        @l.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
-        @l.step(Model::Step.new([], "Given ", "some stuff that is longer", 5, nil, result('passed', nil, nil, "features/step_definitions/bar.rb:56")))
+        @colf.uri("features/foo.feature")
+        @colf.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
+        step = Model::Step.new([], "Given ", "some stuff that is longer", 5, nil, result('passed', nil, [], "features/step_definitions/bar.rb:56"))
+        @colf.steps([step])
+        @colf.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
+        @colf.step(step)
 
         assert_io(%{Feature: Hello
   World
 
-  Scenario: The scenario            # features/foo.feature:4
-    Given some stuff that is longer # features/step_definitions/bar.rb:56
+  Scenario: The scenario            #{grey('# features/foo.feature:4')}
+    #{green('Given ')}#{green('some stuff that is longer')} #{grey('# features/step_definitions/bar.rb:56')}
 })
       end
 
       it "should highlight arguments for regular steps" do
         step = Model::Step.new([], "Given ", "I have 999 cukes in my belly", 3, nil, result('passed', nil, [Gherkin::Formatter::Argument.new(7, '999')], nil))
-        @l.step(step)
-        assert_io("    Given I have 999 cukes in my belly\n")
+        @colf.steps([step])
+        @colf.step(step)
+        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[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("    #{green('Given ')}#{green('I have ')}#{green(bold('999'))}#{green(' cukes in my belly')}\n")
+        end
       end
 
       it "should prettify scenario" do

data/spec/gherkin/formatter/step_printer_spec.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'gherkin/formatter/step_printer'
+require 'gherkin/formatter/argument'
+require 'stringio'
+
+module Gherkin
+  module Formatter
+    class ParenthesisFormat
+      def write_text(io, text)
+        io.write("(#{text})")
+      end
+    end
+    
+    class BracketFormat
+      def write_text(io, text)
+        io.write("[#{text}]")
+      end
+    end
+    
+    describe StepPrinter do
+      before do
+        @io = StringIO.new
+        @p = StepPrinter.new
+        @pf = ParenthesisFormat.new
+        @bf = BracketFormat.new
+      end
+
+      it "should replace 0 args" do
+        @p.write_step(@io, @pf, @bf, "I have 10 cukes", [])
+        @io.string.should == "(I have 10 cukes)"
+      end
+
+      it "should replace 1 arg" do
+        @p.write_step(@io, @pf, @bf, "I have 10 cukes", [Argument.new(7, '10')])
+        @io.string.should == "(I have )[10]( cukes)"
+      end
+      
+      it "should replace 1 unicode arg" do
+        @p.write_step(@io, @pf, @bf, "I hæve øæ cåkes", [Argument.new(7, 'øæ')])
+        @io.string.should == "(I hæve )[øæ]( cåkes)"
+      end
+      
+      it "should replace 2 args" do
+        @p.write_step(@io, @pf, @bf, "I have 10 yellow cukes in my belly", [Argument.new(7, '10'), Argument.new(17, 'cukes')])
+        @io.string.should == "(I have )[10]( yellow )[cukes]( in my belly)"
+      end
+
+      it "should replace 2 unicode args" do
+        @p.write_step(@io, @pf, @bf, "Æslåk likes æøå", [Argument.new(0, 'Æslåk'), Argument.new(12, 'æøå')])
+        @io.string.should == "[Æslåk]( likes )[æøå]"
+      end
+    end
+  end
+end

data/spec/gherkin/java_libs.rb

@@ -0,0 +1,13 @@
+if defined?(JRUBY_VERSION)
+  require 'rexml/document'
+  pom = REXML::Document.new(IO.read(File.dirname(__FILE__) + '/../../java/pom.xml'))
+  pom_version = REXML::XPath.first(pom, '//xmlns:project/xmlns:version/text()').to_s
+  REXML::XPath.each(pom, '//xmlns:project/xmlns:dependencies/xmlns:dependency').each do |dep|
+    groupId = dep.get_elements('groupId')[0].text()
+    artifactId = dep.get_elements('artifactId')[0].text()
+    version = dep.get_elements('version')[0].text()
+
+    jar = "~/.m2/repository/#{groupId.gsub(/\./, '/')}/#{artifactId}/#{version}/#{artifactId}-#{version}.jar"
+    require jar
+  end
+end

data/spec/gherkin/output_stream_string_io.rb

@@ -1,15 +1,11 @@
 if defined?(JRUBY_VERSION)
-  class OutputStreamStringIO < Java.java.io.ByteArrayOutputStream
+  class WriterStringIO < Java.java.io.StringWriter
     def write(what)
-      if String === what
-        super(Java.java.lang.String.new(what).getBytes("UTF-8"))
-      else
-        super(what)
-      end
+      super(Java.java.lang.String.new(what.to_s))
     end
 
     def string
-      toString("UTF-8")
+      toString()
     end
   end
 
@@ -17,7 +13,7 @@ if defined?(JRUBY_VERSION)
   class StringIO
     class << self
       def new
-        OutputStreamStringIO.new
+        WriterStringIO.new
       end
     end
   end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'gherkin'
 require 'stringio'
 require 'gherkin/sexp_recorder'
 require 'gherkin/output_stream_string_io'
+require 'gherkin/java_libs'
 require 'gherkin/json'
 require 'gherkin/shared/lexer_group'
 require 'gherkin/shared/tags_group'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 8
-  version: 2.2.8
+  - 9
+  version: 2.2.9
 platform: x86-mswin32
 authors: 
 - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +02:00
+date: 2010-10-15 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -164,9 +164,9 @@ files:
 - lib/gherkin/formatter/json_formatter.rb
 - lib/gherkin/formatter/line_filter.rb
 - lib/gherkin/formatter/model.rb
-- lib/gherkin/formatter/monochrome_format.rb
 - lib/gherkin/formatter/pretty_formatter.rb
 - lib/gherkin/formatter/regexp_filter.rb
+- lib/gherkin/formatter/step_printer.rb
 - lib/gherkin/formatter/tag_count_formatter.rb
 - lib/gherkin/formatter/tag_filter.rb
 - lib/gherkin/i18n.rb
@@ -211,16 +211,17 @@ files:
 - spec/gherkin/fixtures/simple_with_comments.feature
 - spec/gherkin/fixtures/simple_with_tags.feature
 - spec/gherkin/fixtures/with_bom.feature
-- spec/gherkin/formatter/argument_spec.rb
 - spec/gherkin/formatter/colors_spec.rb
 - spec/gherkin/formatter/filter_formatter_spec.rb
 - spec/gherkin/formatter/model_spec.rb
 - spec/gherkin/formatter/pretty_formatter_spec.rb
 - spec/gherkin/formatter/spaces.feature
+- spec/gherkin/formatter/step_printer_spec.rb
 - spec/gherkin/formatter/tabs.feature
 - spec/gherkin/formatter/tag_count_formatter_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
+- spec/gherkin/java_libs.rb
 - spec/gherkin/json.rb
 - spec/gherkin/json_parser_spec.rb
 - spec/gherkin/lexer/i18n_lexer_spec.rb
@@ -367,7 +368,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: gherkin-2.2.8
+summary: gherkin-2.2.9
 test_files: 
 - features/escaped_pipes.feature
 - features/feature_parser.feature
@@ -400,16 +401,17 @@ test_files:
 - spec/gherkin/fixtures/simple_with_comments.feature
 - spec/gherkin/fixtures/simple_with_tags.feature
 - spec/gherkin/fixtures/with_bom.feature
-- spec/gherkin/formatter/argument_spec.rb
 - spec/gherkin/formatter/colors_spec.rb
 - spec/gherkin/formatter/filter_formatter_spec.rb
 - spec/gherkin/formatter/model_spec.rb
 - spec/gherkin/formatter/pretty_formatter_spec.rb
 - spec/gherkin/formatter/spaces.feature
+- spec/gherkin/formatter/step_printer_spec.rb
 - spec/gherkin/formatter/tabs.feature
 - spec/gherkin/formatter/tag_count_formatter_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
+- spec/gherkin/java_libs.rb
 - spec/gherkin/json.rb
 - spec/gherkin/json_parser_spec.rb
 - spec/gherkin/lexer/i18n_lexer_spec.rb

data/lib/gherkin/formatter/monochrome_format.rb

@@ -1,9 +0,0 @@
-module Gherkin
-  module Formatter
-    class MonochromeFormat
-      def format_argument(arg)
-        arg
-      end
-    end
-  end
-end

data/spec/gherkin/formatter/argument_spec.rb

@@ -1,28 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-require 'gherkin/formatter/argument'
-
-module Gherkin
-  module Formatter
-    class BracketFormat
-      class << self
-        def new
-          defined?(JRUBY_VERSION) ? ::Java::GherkinFormatter::ArgumentFormat.new("[", "]") : super
-        end
-      end
-
-      def format_argument(s)
-        "[#{s}]"
-      end
-    end
-    
-    describe Argument do
-      it "should replace one arg" do
-        argument_class = defined?(JRUBY_VERSION) ? ::Java::GherkinFormatter::Argument : Gherkin::Formatter::Argument
-        argument_class.format("I have 10 cukes", Gherkin::Formatter::BracketFormat.new, [Gherkin::Formatter::Argument.new(7, '10')]).should == "I have [10] cukes"
-      end
-      
-      # TODO: Add this spec: http://github.com/alg/cucumber/commit/33188e9db51f59ced74c4861524d7b2e69454630
-    end
-  end
-end