gherkin 1.0.19-i386-mingw32 → 1.0.20-i386-mingw32

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.20
+
+=== Bugfixes
+* The gherkin CLI is working again (Gregory Hnatiuk)
+
 == 1.0.19
 
 === New Features

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :build: 
-:patch: 19
+:patch: 20

data/features/step_definitions/pretty_formatter_steps.rb

@@ -6,7 +6,7 @@ module PrettyPlease
   def pretty(source)
     io       = StringIO.new
     listener = Gherkin::Formatter::PrettyFormatter.new(io)
-    parser   = Gherkin::Parser.new(listener, true)
+    parser   = Gherkin::Parser::Parser.new(listener, true)
     lexer    = Gherkin::I18nLexer.new(parser)
     lexer.scan(source)
     io.rewind

data/lib/gherkin/formatter/pretty_formatter.rb

@@ -15,7 +15,7 @@ module Gherkin
       def initialize(io, monochrome=false)
         @io = io
         @monochrome = monochrome
-        @format = @monochrome ? MonochromeFormat.new : AnsiColorFormat.new
+        @format = MonochromeFormat.new #@monochrome ? MonochromeFormat.new : AnsiColorFormat.new
         @tags = nil
         @comments = nil
       end
@@ -71,7 +71,7 @@ module Gherkin
       end
 
       def py_string(string, line)
-        @io.puts "      \"\"\"\n" + string.gsub(START, '      ') + "\n      \"\"\""
+        @io.puts "      \"\"\"\n" + string.gsub(START, '      ').gsub(/"""/,'\"\"\"') + "\n      \"\"\""
       end
 
       def syntax_error(state, event, legal_events, line)

data/lib/gherkin/tools/files.rb

@@ -21,8 +21,8 @@ module Gherkin
       end
 
       def scan(file, listener)
-        parser = Parser.new(listener, true)
-        lexer = I18nLexer.new(parser)
+        parser = Gherkin::Parser::Parser.new(listener, true, "root")
+        lexer = Gherkin::I18nLexer.new(parser, false)
         begin
           lexer.scan(IO.read(file))
         rescue => e

data/lib/gherkin/tools/reformat.rb

@@ -16,4 +16,4 @@ module Gherkin
       end
     end
   end
-end
+end

data/lib/gherkin/tools/stats.rb

@@ -8,7 +8,7 @@ module Gherkin
       def run
         listener = StatsListener.new
         each do |f|
-          parser = Gherkin::Parser.new(listener, true)
+          parser = Gherkin::Parser::Parser.new(listener, true)
           lexer = Gherkin::I18nLexer.new(parser)
           lexer.scan(IO.read(f))
         end

data/lib/gherkin/tools/stats_listener.rb

@@ -37,7 +37,7 @@ module Gherkin
         @steps += 1
       end
 
-      def table(rows, line)
+      def row(row, line)
       end
 
       def py_string(string, line)
@@ -45,6 +45,9 @@ module Gherkin
 
       def syntax_error(state, event, legal_events, line)
       end
+
+      def eof
+      end
     end
   end
 end

data/spec/gherkin/i18n_spec.rb

@@ -64,13 +64,13 @@ module Gherkin
       describe 'keywords' do
         it "should have code keywords without space, comma or apostrophe" do
           ['Akkor', 'Etantdonné', 'Lorsque', '假設'].each do |code_keyword|
-            I18n.code_keywords.should include(code_keyword)
+            Gherkin::I18n.code_keywords.should include(code_keyword)
           end
         end
 
         unless defined?(JRUBY_VERSION)
         it "should print available languages" do
-          ("\n" + I18n.language_table).should == %{
+          ("\n" + Gherkin::I18n.language_table).should == %{
       | ar        | Arabic                 | العربية              |
       | bg        | Bulgarian              | български            |
       | ca        | Catalan                | català               |
@@ -119,7 +119,7 @@ module Gherkin
         end
 
         it "should print keywords for a given language" do
-          ("\n" + I18n.get('fr').keyword_table).should == %{
+          ("\n" + Gherkin::I18n.get('fr').keyword_table).should == %{
       | feature          | "Fonctionnalité"                       |
       | background       | "Contexte"                             |
       | scenario         | "Scénario"                             |

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 19
-  version: 1.0.19
+  - 20
+  version: 1.0.20
 platform: i386-mingw32
 authors: 
 - Mike Sassak