gherkin 1.0.20 → 1.0.21

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.21 (2010-04-27)
+
+=== Bugfixes
+* Fix compile warning on ruby 1.9.2dev (2009-07-18 trunk 24186) (#53 Aslak Hellesøy)
+
 == 1.0.20
 
 === Bugfixes

data/VERSION.yml

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

data/features/pretty_printer.feature

@@ -6,9 +6,9 @@ Feature: Pretty printer
     Given I have Cucumber's home dir defined in CUCUMBER_HOME
     When I find all of the .feature files
     And I parse the prettified representation of each of them
-# Of course, we don't really want any errors. The last
-# two files that were not identical are written to p1.feature
-# and p2.feature. Do a diff -u p1.feature p2.feature
-#
+    # Of course, we don't really want any errors. The last
+    # two files that were not identical are written to p1.feature
+    # and p2.feature. Do a diff -u p1.feature p2.feature
+    #
     Then the following files should have errors:
       | Path | Error |

data/lib/gherkin/cli/main.rb

@@ -16,11 +16,10 @@ module Gherkin
         end
 
         cmd_name = args.shift
+        die("Missing command") if cmd_name.nil?
+        cmd = Tools.const_get(cmd_name.capitalize.to_sym).new(args) rescue die("Unknown command #{cmd_name}")
         begin
-          die("Missing command") if cmd_name.nil?
-          Tools.const_get(cmd_name.capitalize.to_sym).new(args).run
-        rescue NameError
-          die("Unknown command #{cmd_name}")
+          cmd.run
         rescue => e
           Trollop::die(e.message)
         end

data/lib/gherkin/tools/reformat.rb

@@ -8,7 +8,7 @@ module Gherkin
       def run
         each do |file|
           purdy = StringIO.new
-          listener = PrettyFormatter.new(purdy)
+          listener = Formatter::PrettyFormatter.new(purdy)
           scan(file, listener)
           purdy.rewind
           File.open(file, 'w') {|io| io.write(purdy.read)}

data/tasks/bench.rake

@@ -106,30 +106,32 @@ class Benchmarker
 
   def run_rb_gherkin    
     require 'gherkin'
-    require 'gherkin/rb_lexer/en'
+    require 'gherkin/i18n_lexer'
     require 'null_listener'
+    parser = Gherkin::Parser::Parser.new(NullListener.new, true, "root")
+    lexer = Gherkin::I18nLexer.new(parser, true)
     @features.each do |feature|
-      parser = Gherkin::Parser.new(NullListener.new, true, "root")
-      lexer = Gherkin::RbLexer::En.new(parser)
       lexer.scan(File.read(feature))
     end
   end
 
   def run_native_gherkin
     require 'gherkin'
+    require 'gherkin/i18n_lexer'
     require 'null_listener'
+    parser = Gherkin::Parser::Parser.new(NullListener.new, true, "root")
+    lexer = Gherkin::I18nLexer.new(parser, false)
     @features.each do |feature|
-      parser = Gherkin::Parser.new(NullListener.new, true, "root")
-      lexer = Gherkin::Lexer['en'].new(parser)
       lexer.scan(File.read(feature))
     end
   end
 
   def run_native_gherkin_no_parser
     require 'gherkin'
+    require 'gherkin/i18n_lexer'
     require 'null_listener'
+    lexer = Gherkin::I18nLexer.new(NullListener.new, false)
     @features.each do |feature|
-      lexer = Gherkin::Lexer['en'].new(NullListener.new)
       lexer.scan(File.read(feature))
     end
   end

data/tasks/compile.rake

@@ -53,6 +53,7 @@ langs.each do |i18n|
       File.open(extconf, "w") do |io|
         io.write(<<-EOF)
 require 'mkmf'
+CONFIG['warnflags'].gsub!(/-Wshorten-64-to-32/, '') if CONFIG['warnflags']
 $CFLAGS << ' -O0 -Wall -Werror'
 dir_config("gherkin_lexer_#{i18n.underscored_iso_code}")
 have_library("c", "main")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 20
-  version: 1.0.20
+  - 21
+  version: 1.0.21
 platform: ruby
 authors: 
 - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 +02:00
+date: 2010-04-27 00:00:00 -05:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency