gherkin 1.0.1 → 1.0.2

data/lib/gherkin/i18n_lexer.rb

@@ -1,17 +1,20 @@
 require 'gherkin/lexer'
+require 'gherkin/i18n'
 
 module Gherkin
   # The main entry point to lexing Gherkin source.
   class I18nLexer
     LANGUAGE_PATTERN = /language\s*:\s*(.*)/ #:nodoc:
 
+    attr_reader :language
+
     def initialize(parser)
       @parser = parser
     end
 
     def scan(source)
-      lang = lang(source) || 'en'
-      delegate = Lexer[lang].new(@parser)
+      @language = lang(source) 
+      delegate = Lexer[@language.key].new(@parser)
       delegate.scan(source)
     end
 
@@ -19,11 +22,8 @@ module Gherkin
 
     def lang(source)
       line_one = source.split(/\n/)[0]
-      if line_one =~ LANGUAGE_PATTERN
-        $1.strip
-      else
-        nil
-      end
+      match = LANGUAGE_PATTERN.match(line_one)
+      I18n.get(match ? match[1] : 'en')
     end
   end
-end
+end

data/lib/gherkin/lexer.rb

@@ -15,7 +15,8 @@ module Gherkin
             begin
               c[i18n_lang]
             rescue NameError, LoadError => e
-              warn("WARNING: #{e.message}. Reverting to Ruby lexer")
+              warn("WARNING: #{e.message}. Reverting to Ruby lexer.") unless defined?(@warned)
+              @warned = true
               rb[i18n_lang]
             end
           end

data/lib/gherkin/tools.rb

@@ -0,0 +1,8 @@
+module Gherkin
+  module Tools
+    SUB_COMMANDS = %w(stats reformat)
+    SUB_COMMANDS.each do |cmd|
+      autoload cmd.capitalize.to_sym, "gherkin/tools/#{cmd}"
+    end
+  end
+end

data/lib/gherkin/tools/files.rb

@@ -0,0 +1,30 @@
+require 'gherkin'
+
+module Gherkin
+  module Tools
+    # Base class for file based operations
+    class Files
+      include Enumerable
+
+      def initialize(paths)
+        raise "Please specify one or more paths" if paths.empty?
+        @paths = paths
+      end
+
+      def each(&proc)
+        globs = @paths.map do |path|
+          raise "#{path} does not exist" unless File.exist?(path)
+          File.directory?(path) ? File.join(path, '**', '*.feature') : path
+        end
+
+        Dir[*globs].uniq.sort.each(&proc)
+      end
+
+      def scan(file, listener)
+        parser = Parser.new(listener, true)
+        lexer = I18nLexer.new(parser)
+        lexer.scan(IO.read(file))
+      end
+    end
+  end
+end

data/lib/gherkin/tools/{pretty_printer.rb → pretty_listener.rb}

@@ -1,9 +1,10 @@
 # encoding: utf-8
 module Gherkin
   module Tools
-    class PrettyPrinter
+    class PrettyListener
       def initialize(io)
         @io = io
+        @tags = nil
       end
 
       def tag(name, line)
@@ -38,7 +39,7 @@ module Gherkin
       end
 
       def examples(keyword, name, line)
-        @io.puts "\n  #{keyword}: #{indent(name, '    ')}"
+        @io.puts "\n    #{keyword}: #{indent(name, '    ')}"
       end
 
       def step(keyword, name, line)
@@ -48,8 +49,8 @@ module Gherkin
       def table(rows, line)
         rows = rows.to_a.map {|row| row.to_a} if defined?(JRUBY_VERSION) # Convert ArrayList
         max_lengths =  rows.transpose.map { |col| col.map { |cell| cell.unpack("U*").length }.max }.flatten
-        rows.each do |line|
-          @io.puts '      | ' + line.zip(max_lengths).map { |cell, max_length| cell + ' ' * (max_length-cell.unpack("U*").length) }.join(' | ') + ' |'
+        rows.each do |table_line|
+          @io.puts '      | ' + table_line.zip(max_lengths).map { |cell, max_length| cell + ' ' * (max_length-cell.unpack("U*").length) }.join(' | ') + ' |'
         end
       end
 

data/lib/gherkin/tools/reformat.rb

@@ -0,0 +1,19 @@
+require 'stringio'
+require 'gherkin/tools/files'
+require 'gherkin/tools/pretty_listener'
+
+module Gherkin
+  module Tools
+    class Reformat < Files
+      def run
+        each do |file|
+          purdy = StringIO.new
+          listener = PrettyListener.new(purdy)
+          scan(file, listener)
+          purdy.rewind
+          File.open(file, 'w') {|io| io.write(purdy.read)}
+        end
+      end
+    end
+  end
+end

data/lib/gherkin/tools/stats.rb

@@ -0,0 +1,21 @@
+require 'gherkin'
+require 'gherkin/tools/files'
+require 'gherkin/tools/stats_listener'
+
+module Gherkin
+  module Tools
+    class Stats < Files
+      def run
+        listener = StatsListener.new
+        each do |f|
+          parser = Gherkin::Parser.new(listener, true)
+          lexer = Gherkin::I18nLexer.new(parser)
+          lexer.scan(IO.read(f))
+        end
+        puts "Features:  #{listener.features}"
+        puts "Scenarios: #{listener.scenarios}"
+        puts "Steps:     #{listener.steps}"
+      end
+    end
+  end
+end

data/lib/gherkin/tools/stats_listener.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+module Gherkin
+  module Tools
+    class StatsListener
+      attr_reader :features, :scenarios, :steps
+
+      def initialize
+        @features  = 0
+        @scenarios = 0
+        @steps     = 0
+      end
+
+      def tag(name, line)
+      end
+
+      def comment(content, line)
+      end
+
+      def feature(keyword, name, line)
+        @features += 1
+      end
+
+      def background(keyword, name, line)
+      end
+
+      def scenario(keyword, name, line)
+        @scenarios += 1
+      end
+
+      def scenario_outline(keyword, name, line)
+      end
+
+      def examples(keyword, name, line)
+      end
+
+      def step(keyword, name, line)
+        @steps += 1
+      end
+
+      def table(rows, line)
+      end
+
+      def py_string(string, line)
+      end
+
+      def syntax_error(state, event, legal_events, line)
+      end
+    end
+  end
+end

data/nativegems.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 # Builds gems for all supported platforms
-rake gemspec build PLATFORM=universal-java-1.5
+rake gemspec build PLATFORM=java
 rake cross compile gemspec build PLATFORM=i386-mswin32 RUBY_CC_VERSION=1.8.6
 rake gemspec build PLATFORM=i386-mingw32 RUBY_CC_VERSION=1.8.6

data/ragel/lexer.java.rl.erb

@@ -139,62 +139,62 @@ public class <%= @i18n.sanitized_key.capitalize %> implements Lexer {
     include lexer_common "lexer_common.<%= @i18n.sanitized_key %>.rl"; 
   }%%
 
-    private final Listener listener;
-
-    public <%= @i18n.sanitized_key.capitalize %>(Listener listener) {
-        this.listener = listener;
-    }
-
-    %% write data noerror;
-
-    public void scan(CharSequence inputSequence) {
-        String input = inputSequence.toString() + "\n%_FEATURE_END_%";
-        byte[] data = input.getBytes();
-        int cs, p = 0, pe = data.length;
-        int eof = pe;
-
-        int lineNumber = 1;
-        int lastNewline = 0;
-
-        int contentStart = -1;
-        int currentLine = -1;
-        int startCol = -1;
-        int nextKeywordStart = -1;
-        int keywordStart = -1;
-        String keyword = null;
-        List<List<String>> rows = null;
-        List<String> currentRow = null;
-
-        %% write init;
-        %% write exec;
-    }
-
-    private String keywordContent(byte[] data, int p, int eof, int nextKeywordStart, int contentStart) {
-      int endPoint = (nextKeywordStart == -1 || (p == eof)) ? p : nextKeywordStart;
-      return substring(data, contentStart, endPoint);
-    }
-
-    private String multilineStrip(String text) {
-        StringBuffer result = new StringBuffer();
-        for(String s : text.split("\n")) {
-            result.append(s.trim()).append("\n");
-        }
-        return result.toString().trim();
-    }
-
-    private String unindent(int startCol, String text) {
-        return Pattern.compile("^ {0," + startCol + "}", Pattern.MULTILINE).matcher(text).replaceAll("");
-    }
-
-    private String currentLineContent(byte[] data, int lastNewline) {
-        return substring(data, lastNewline, data.length).trim();
-    }
-
-    private String substring(byte[] data, int start, int end) {
-        try {
-            return new String(data, start, end-start, "utf-8");
-        } catch(java.io.UnsupportedEncodingException e) {
-            throw new RuntimeException("Internal error", e);
-        }
-    }
+  private final Listener listener;
+
+  public <%= @i18n.sanitized_key.capitalize %>(Listener listener) {
+    this.listener = listener;
+  }
+
+  %% write data noerror;
+
+  public void scan(CharSequence inputSequence) {
+    String input = inputSequence.toString() + "\n%_FEATURE_END_%";
+    byte[] data = input.getBytes();
+    int cs, p = 0, pe = data.length;
+    int eof = pe;
+
+    int lineNumber = 1;
+    int lastNewline = 0;
+
+    int contentStart = -1;
+    int currentLine = -1;
+    int startCol = -1;
+    int nextKeywordStart = -1;
+    int keywordStart = -1;
+    String keyword = null;
+    List<List<String>> rows = null;
+    List<String> currentRow = null;
+
+    %% write init;
+    %% write exec;
+  }
+
+  private String keywordContent(byte[] data, int p, int eof, int nextKeywordStart, int contentStart) {
+    int endPoint = (nextKeywordStart == -1 || (p == eof)) ? p : nextKeywordStart;
+    return substring(data, contentStart, endPoint);
+  }
+
+  private String multilineStrip(String text) {
+    StringBuffer result = new StringBuffer();
+    for(String s : text.split("\n")) {
+      result.append(s.trim()).append("\n");
+    }
+    return result.toString().trim();
+  }
+
+  private String unindent(int startCol, String text) {
+    return Pattern.compile("^ {0," + startCol + "}", Pattern.MULTILINE).matcher(text).replaceAll("");
+  }
+
+  private String currentLineContent(byte[] data, int lastNewline) {
+    return substring(data, lastNewline, data.length).trim();
+  }
+
+  private String substring(byte[] data, int start, int end) {
+    try {
+      return new String(data, start, end-start, "utf-8");
+    } catch(java.io.UnsupportedEncodingException e) {
+      throw new RuntimeException("Internal error", e);
+    }
+  }
 }

data/spec/gherkin/i18n_lexer_spec.rb

@@ -0,0 +1,22 @@
+#encoding: utf-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+module Gherkin
+  describe I18nLexer do
+    before do
+      @lexer = I18nLexer.new(SexpRecorder.new)
+    end
+
+    it "should store the i18n language of the last scanned feature" do
+      @lexer.scan("# language: fr\n")
+      @lexer.language.key.should == "fr"
+      @lexer.scan("# language: no\n")
+      @lexer.language.key.should == "no"
+    end
+
+    it "should use English i18n by default" do
+      @lexer.scan("Feature: foo\n")
+      @lexer.language.key.should == "en"
+    end
+  end
+end

data/tasks/bench.rake

@@ -179,13 +179,6 @@ namespace :bench do
     benchmarker.report("native_gherkin_no_parser")
   end
 
-  desc "Show basic statistics about the features in tasks/bench/generated"
-  task :stats do
-    ["Feature", "Scenario", "Given"].each do |kw|
-      sh "grep #{kw} #{GENERATED_FEATURES}/* | wc -l"
-    end
-  end
-
   desc "Remove all generated features in tasks/bench/generated"
   task :clean do
     rm_f FileList[GENERATED_FEATURES + "/**/*feature"]

data/tasks/compile.rake

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/ragel_task'
 require 'gherkin/i18n'
 
 CLEAN.include [
+  'pkg', 'tmp',
   '**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log}', 'ext',
   'java/target',
   'ragel/i18n/*.rl',
@@ -23,11 +24,12 @@ Gherkin::I18n.all.each do |i18n|
   task :jar     => rb.target
 
   begin
+  unless defined?(JRUBY_VERSION)
     require 'rake/extensiontask'
+
     c = RagelTask.new('c', i18n)
 
     extconf = "ext/gherkin_lexer_#{i18n.sanitized_key}/extconf.rb"
-
     file extconf do
       FileUtils.mkdir(File.dirname(extconf)) unless File.directory?(File.dirname(extconf))
       File.open(extconf, "w") do |io|
@@ -48,9 +50,6 @@ EOF
       end
     end
 
-    task :compile => c.target
-    task :compile => rb.target
-
     # The way tasks are defined with compile:xxx (but without namespace) in rake-compiler forces us
     # to use these hacks for setting up dependencies. Ugly!
     Rake::Task["compile:gherkin_lexer_#{i18n.sanitized_key}"].prerequisites.unshift(extconf)
@@ -60,6 +59,7 @@ EOF
     Rake::Task["compile"].prerequisites.unshift(extconf)
     Rake::Task["compile"].prerequisites.unshift(c.target)
     Rake::Task["compile"].prerequisites.unshift(rb.target)
+  end
   rescue LoadError
     unless defined?($c_warned)
       warn "WARNING: Rake::ExtensionTask not installed. Skipping C compilation." 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gherkin
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Mike Sassak
@@ -11,16 +11,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 +01:00
+date: 2009-12-30 00:00:00 +01:00
 default_executable: gherkin
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: trollop
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.15"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.2.9
     version: 
@@ -30,9 +40,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.4
+        version: 0.5.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -40,15 +50,14 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.7.0
     version: 
-description: A fast Gherkin lexer in Ragel
+description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: 
 - gherkin
-- gherkin-purdy
 extensions: 
 - ext/gherkin_lexer_ar/extconf.rb
 - ext/gherkin_lexer_bg/extconf.rb
@@ -95,12 +104,13 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- .mailmap
+- History.txt
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION.yml
 - bin/gherkin
-- bin/gherkin-purdy
 - cucumber.yml
 - ext/gherkin_lexer_ar/gherkin_lexer_ar.c
 - ext/gherkin_lexer_bg/gherkin_lexer_bg.c
@@ -165,6 +175,7 @@ files:
 - lib/.gitignore
 - lib/gherkin.rb
 - lib/gherkin/c_lexer.rb
+- lib/gherkin/cli/main.rb
 - lib/gherkin/core_ext/array.rb
 - lib/gherkin/i18n.rb
 - lib/gherkin/i18n.yml
@@ -219,7 +230,12 @@ files:
 - lib/gherkin/rb_lexer/zhCN.rb
 - lib/gherkin/rb_lexer/zhTW.rb
 - lib/gherkin/rb_parser.rb
-- lib/gherkin/tools/pretty_printer.rb
+- lib/gherkin/tools.rb
+- lib/gherkin/tools/files.rb
+- lib/gherkin/tools/pretty_listener.rb
+- lib/gherkin/tools/reformat.rb
+- lib/gherkin/tools/stats.rb
+- lib/gherkin/tools/stats_listener.rb
 - nativegems.sh
 - ragel/i18n/.gitignore
 - ragel/lexer.c.rl.erb
@@ -235,6 +251,7 @@ files:
 - spec/gherkin/fixtures/simple.feature
 - spec/gherkin/fixtures/simple_with_comments.feature
 - spec/gherkin/fixtures/simple_with_tags.feature
+- spec/gherkin/i18n_lexer_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
 - spec/gherkin/parser_spec.rb
@@ -281,9 +298,10 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Fast Gherkin lexer
+summary: Fast Gherkin lexer/parser
 test_files: 
 - spec/gherkin/c_lexer_spec.rb
+- spec/gherkin/i18n_lexer_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
 - spec/gherkin/parser_spec.rb