gherkin 2.4.17 → 2.4.18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gherkin (2.4.17)
+    gherkin (2.4.18)
       json (>= 1.4.6)
 
 GEM
@@ -11,9 +11,9 @@ GEM
     cucumber (1.0.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.5)
+      gherkin (~> 2.4.16)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
+      term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     json (1.5.4)
     json (1.5.4-java)

data/History.md

@@ -1,3 +1,9 @@
+## [2.4.18](https://github.com/cucumber/gherkin/compare/v2.4.17...v2.4.18)
+
+### New Features
+
+* Fenced Code Blocks for DocStrings ([#123](https://github.com/cucumber/gherkin/issues/123) Gregory Hnatiuk, Aslak Hellesøy)
+
 ## [2.4.17](https://github.com/cucumber/gherkin/compare/v2.4.16...v2.4.17)
 
 ### New Features

data/README.md

@@ -52,7 +52,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.4.17</version>
+        <version>2.4.18</version>
     </dependency>
 
 You can get it manually from [ibiblio](http://mirrors.ibiblio.org/pub/mirrors/maven2/info/cukes/gherkin) or by searching at [maven central](http://search.maven.org/)

data/features/json_formatter.feature

@@ -53,7 +53,7 @@ Feature: JSON formatter
           When I was
             |asleep|
           And so
-            \"\"\"
+            \"\"\"plaintext
             innocent
             \"\"\"
 
@@ -181,6 +181,7 @@ Feature: JSON formatter
                 "line": 26,
                 "multiline_arg": {
                   "type": "doc_string",
+                  "content_type": "plaintext",
                   "value": "innocent",
                   "line": 27
                 }

data/features/step_definitions/eyeball_steps.rb

@@ -1,3 +1,3 @@
 Given /^they have arrived$/ do |table|
-  announce table.raw
+  puts table.raw
 end

data/gherkin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gherkin"
-  s.version     = "2.4.17"
+  s.version     = "2.4.18"
   s.authors     = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
   s.description = "A fast Gherkin lexer/parser based on the Ragel State Machine Compiler."
   s.summary     = "#{s.name}-#{s.version}"

data/lib/gherkin/formatter/model.rb

@@ -146,6 +146,7 @@ module Gherkin
             }
           elsif DocString === @multiline_arg
             hash['multiline_arg']['type'] = 'doc_string'
+            hash['multiline_arg']['content_type'] = @multiline_arg.content_type
           end
           hash
         end
@@ -182,10 +183,10 @@ module Gherkin
       class DocString < Hashable
         native_impl('gherkin')
 
-        attr_reader :value, :line
+        attr_reader :content_type, :value, :line
         
-        def initialize(value, line)
-          @value, @line = value, line
+        def initialize(content_type, value, line)
+          @content_type, @value, @line = content_type, value, line
         end
 
         def line_range
@@ -233,4 +234,4 @@ module Gherkin
       end
     end
   end
-end
+end

data/lib/gherkin/formatter/pretty_formatter.rb

@@ -181,7 +181,7 @@ module Gherkin
     private
 
       def doc_string(doc_string)
-        @io.puts "      \"\"\"\n" + escape_triple_quotes(indent(doc_string.value, '      ')) + "\n      \"\"\""
+        @io.puts "      \"\"\"" + doc_string.content_type + "\n" + escape_triple_quotes(indent(doc_string.value, '      ')) + "\n      \"\"\""
       end
 
       def exception(exception)

data/lib/gherkin/json_parser.rb

@@ -57,7 +57,7 @@ module Gherkin
         if(ma['type'] == 'table')
           step.multiline_arg = rows(ma['value'])
         else
-          step.multiline_arg = Formatter::Model::DocString.new(ma['value'], ma['line'])
+          step.multiline_arg = Formatter::Model::DocString.new(ma['content_type'].to_s, ma['value'], ma['line'])
         end
       end
 

data/lib/gherkin/listener/formatter_listener.rb

@@ -57,8 +57,8 @@ module Gherkin
         @table << Formatter::Model::Row.new(grab_comments!, cells, line)
       end
 
-      def doc_string(string, line)
-        @doc_string = Formatter::Model::DocString.new(string, line)
+      def doc_string(string, content_type, line)
+        @doc_string = Formatter::Model::DocString.new(string, content_type, line)
       end
 
       def eof

data/lib/gherkin/rubify.rb

@@ -10,7 +10,7 @@ module Gherkin
           o.map{|e| rubify(e)}
         when Java.gherkin.formatter.model.DocString
           require 'gherkin/formatter/model'
-          Formatter::Model::DocString.new(o.value, o.line)
+          Formatter::Model::DocString.new(o.content_type, o.value, o.line)
         else
           o
         end

data/ragel/lexer.c.rl.erb

@@ -45,6 +45,8 @@ typedef struct lexer_state {
   size_t next_keyword_start;
   size_t content_start;
   size_t content_end;
+  size_t docstring_content_type_start;
+  size_t docstring_content_type_end;
   size_t query_start;
   size_t last_newline;
   size_t final_newline;
@@ -84,23 +86,33 @@ static VALUE rb_eGherkinLexingError;
     lexer->start_col = lexer->content_start - lexer->last_newline - (lexer->keyword_end - lexer->keyword_start) + 2;
   }
   
-  action begin_pystring_content {
+  action begin_docstring_content {
     MARK(content_start, p);
   }
 
-  action start_pystring {
+  action start_docstring {
     lexer->current_line = lexer->line_number;
     lexer->start_col = p - data - lexer->last_newline;
   }
  
-  action store_pystring_content {
+  action store_docstring_content {
     int len = LEN(content_start, PTR_TO(final_newline));
+    int type_len = LEN(docstring_content_type_start, PTR_TO(docstring_content_type_end));
 
     if (len < 0) len = 0;
+    if (type_len < 0) len = 0;
 
-    store_pystring_content(listener, lexer->start_col, PTR_TO(content_start), len, lexer->current_line);
+    store_docstring_content(listener, lexer->start_col, PTR_TO(docstring_content_type_start), type_len, PTR_TO(content_start), len, lexer->current_line);
   } 
  
+  action start_docstring_content_type { 
+    MARK(docstring_content_type_start, p);
+  }
+
+  action end_docstring_content_type { 
+    MARK(docstring_content_type_end, p);
+  }
+
   action store_feature_content {
     STORE_KW_END_CON(feature);
   }
@@ -311,26 +323,27 @@ store_attr(VALUE listener, const char * attr_type,
   VALUE val = ENCODED_STR_NEW(at, length);
   rb_funcall(listener, rb_intern(attr_type), 2, val, INT2FIX(line));
 }
-
 static void 
-store_pystring_content(VALUE listener, 
+store_docstring_content(VALUE listener, 
           int start_col, 
+          const char *type_at, size_t type_length,
           const char *at, size_t length, 
           int current_line)
 {
   VALUE re2;
   VALUE unescape_escaped_quotes;
   VALUE con = ENCODED_STR_NEW(at, length);
+  VALUE con_type = ENCODED_STR_NEW(type_at, type_length);
 
   unindent(con, start_col);
 
   re2 = rb_reg_regcomp(rb_str_new2("\r\\Z"));
   unescape_escaped_quotes = rb_reg_regcomp(rb_str_new2("\\\\\"\\\\\"\\\\\""));
   rb_funcall(con, rb_intern("sub!"), 2, re2, rb_str_new2(""));
+  rb_funcall(con_type, rb_intern("strip!"), 0);
   rb_funcall(con, rb_intern("gsub!"), 2, unescape_escaped_quotes, rb_str_new2("\"\"\""));
-  rb_funcall(listener, rb_intern("doc_string"), 2, con, INT2FIX(current_line));
+  rb_funcall(listener, rb_intern("doc_string"), 3, con_type, con, INT2FIX(current_line));
 }
-
 static void 
 raise_lexer_error(const char * at, int line)
 { 
@@ -341,6 +354,8 @@ static void lexer_init(lexer_state *lexer) {
   lexer->content_start = 0;
   lexer->content_end = 0;
   lexer->content_len = 0;
+  lexer->docstring_content_type_start = 0;
+  lexer->docstring_content_type_end = 0;
   lexer->mark = 0;
   lexer->keyword_start = 0;
   lexer->keyword_end = 0;

data/ragel/lexer.java.rl.erb

@@ -21,18 +21,27 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
       }
     }
 
-    action start_pystring {
+    action start_docstring {
       currentLine = lineNumber;
       startCol = p - lastNewline;
     }
     
-    action begin_pystring_content {
+    action begin_docstring_content {
       contentStart = p;
     }
 
-    action store_pystring_content {
+    action start_docstring_content_type {
+      docstringContentTypeStart = p;
+    }
+
+    action end_docstring_content_type {
+      docstringContentTypeEnd = p;
+    }
+
+    action store_docstring_content {
       String con = unindent(startCol, substring(data, contentStart, nextKeywordStart-1).replaceFirst("(\\r?\\n)?([\\t ])*\\Z", "").replaceAll("\\\\\"\\\\\"\\\\\"", "\"\"\""));
-      listener.docString(con, currentLine);
+      String conType = substring(data, docstringContentTypeStart, docstringContentTypeEnd).trim();
+      listener.docString(conType, con, currentLine);
     }
 
     action store_feature_content {
@@ -164,6 +173,8 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
 
     int contentStart = -1;
     int currentLine = -1;
+    int docstringContentTypeStart = -1;
+    int docstringContentTypeEnd = -1;
     int startCol = -1;
     int nextKeywordStart = -1;
     int keywordStart = -1;

data/ragel/lexer.js.rl.erb

@@ -9,21 +9,30 @@
     this.start_col = p - this.last_newline - (this.keyword+':').length;
   }
 
-  action start_pystring {
+  action start_docstring {
     this.current_line = this.line_number;
     this.start_col = p - this.last_newline;
   }
   
-  action begin_pystring_content {
+  action begin_docstring_content {
     this.content_start = p;
   }
 
-  action store_pystring_content {
+  action start_docstring_content_type {
+    this.docstring_content_type_start = p;
+  }
+
+  action end_docstring_content_type {
+    this.docstring_content_type_end = p;
+  }
+
+  action store_docstring_content {
     var con = this.unindent(
       this.start_col, 
       this.bytesToString(data.slice(this.content_start, this.next_keyword_start-1)).replace(/(\r?\n)?([\t ])*$/, '').replace(/ESCAPED_TRIPLE_QUOTE/mg, '"""')
     );
-    this.listener.doc_string(con, this.current_line); 
+    var con_type = this.bytesToString(data.slice(this.docstring_content_type_start, this.docstring_content_type_end)).trim();
+    this.listener.doc_string(con_type, con, this.current_line); 
   }
 
   action store_feature_content {

data/ragel/lexer.rb.rl.erb

@@ -12,20 +12,27 @@ module Gherkin
           @start_col = p - @last_newline - "#{@keyword}:".length
         }
 
-        action start_pystring {
+        action start_docstring {
           @current_line = @line_number
           @start_col = p - @last_newline
         }
         
-        action begin_pystring_content {
+        action begin_docstring_content {
           @content_start = p
         }
 
-        action store_pystring_content {
+        action start_docstring_content_type {
+          @docstring_content_type_start = p
+        }
+        action end_docstring_content_type {
+          @docstring_content_type_end = p
+        }
+
+        action store_docstring_content {
           con = unindent(@start_col, utf8_pack(data[@content_start...@next_keyword_start-1]).sub(/(\r?\n)?([\t ])*\Z/, '').gsub(/\\"\\"\\"/, '"""'))
-          @listener.doc_string(con, @current_line) 
+          con_type = utf8_pack(data[@docstring_content_type_start...@docstring_content_type_end]).strip
+          @listener.doc_string(con_type, con, @current_line) 
         }
- 
         action store_feature_content {
           p = store_keyword_content(:feature, data, p, eof)
         }

data/ragel/lexer_common.rl.erb

@@ -40,11 +40,11 @@
   RowBody = space* Cell** PIPE :>> (space* EOL+ space*) %store_row;
   Row = StartRow :>> RowBody <: EndRow?;
   
-  StartDocString = '"""' >start_pystring space* :>> EOL; 
-  EndDocString = (space* '"""') >next_keyword_start; 
-  DocString = space* StartDocString %begin_pystring_content (^EOL | EOL)* :>> EndDocString %store_pystring_content space* EOL+;
+  StartDocString = '"""' >start_docstring ^EOL* >start_docstring_content_type %end_docstring_content_type :>> EOL;
+  EndDocString = (space* '"""') >next_keyword_start;
+  DocString = space* StartDocString %begin_docstring_content (^EOL | EOL)* :>> EndDocString %store_docstring_content space* EOL+;
   
-  Tokens = BOM? (space | EOL)* (Tags | Comment | FeatureHeading | BackgroundHeading | ScenarioHeading | ScenarioOutlineHeading | ExamplesHeading | Step | Row | DocString)* (space | EOL)* EOF;
+  Tokens = BOM? (space | EOL)* (Tags | Comment | FeatureHeading | BackgroundHeading | ScenarioHeading | ScenarioOutlineHeading | ExamplesHeading | Step | Row | DocString )* (space | EOL)* EOF;
 
   main := Tokens %end_feature @!end_feature;
 }%%

data/spec/gherkin/fixtures/complex.json

@@ -130,6 +130,7 @@
           "keyword": "Given ",
           "multiline_arg": {
             "type": "doc_string",
+            "content_type": "text",
             "value": "Makes Homer something something\nAnd something else",
             "line": 777
           }

data/spec/gherkin/shared/doc_string_group.rb

@@ -23,17 +23,17 @@ Feature: some feature
     """
     Then bar
 EOS
-        @listener.should_receive(:doc_string).with("  Hello\nGoodbye", 4)
+        @listener.should_receive(:doc_string).with('', "  Hello\nGoodbye", 4)
         scan(str)
       end
 
       it "should parse a simple doc_string" do
-        @listener.should_receive(:doc_string).with("I am a doc_string", 1)
+        @listener.should_receive(:doc_string).with('', "I am a doc_string", 1)
         scan ps("I am a doc_string")
       end
 
       it "should parse an empty doc_string" do
-        @listener.should_receive(:doc_string).with("", 4)
+        @listener.should_receive(:doc_string).with('', '', 4)
         scan("Feature: Hi\nScenario: Hi\nGiven a step\n\"\"\"\n\"\"\"")
       end
 
@@ -45,25 +45,25 @@ doc_string = <<EOS
 
 """
 EOS
-        @listener.should_receive(:doc_string).with("\n\n", 1)
+        @listener.should_receive(:doc_string).with('', "\n\n", 1)
         scan(doc_string)
       end
       
       it "should parse content separated by two newlines" do
         scan ps("A\n\nB")
         @listener.to_sexp.should == [
-          [:doc_string, "A\n\nB", 1],
+          [:doc_string, '', "A\n\nB", 1],
           [:eof]
         ]
       end
       
       it "should parse a multiline string" do
-        @listener.should_receive(:doc_string).with("A\nB\nC\nD", 1)
+        @listener.should_receive(:doc_string).with('', "A\nB\nC\nD", 1)
         scan ps("A\nB\nC\nD")
       end
             
       it "should ignore unescaped quotes inside the string delimeters" do
-        @listener.should_receive(:doc_string).with("What does \"this\" mean?", 1)
+        @listener.should_receive(:doc_string).with('', "What does \"this\" mean?", 1)
         scan ps('What does "this" mean?')
       end
       
@@ -74,12 +74,12 @@ str = <<EOS
  Line two
     """
 EOS
-        @listener.should_receive(:doc_string).with("  Line one\nLine two", 1)
+        @listener.should_receive(:doc_string).with('', "  Line one\nLine two", 1)
         scan(str)
       end
             
       it "should preserve tabs within the content" do
-        @listener.should_receive(:doc_string).with("I have\tsome tabs\nInside\t\tthe content", 1)
+        @listener.should_receive(:doc_string).with('', "I have\tsome tabs\nInside\t\tthe content", 1)
         scan ps("I have\tsome tabs\nInside\t\tthe content")
       end
   
@@ -98,7 +98,7 @@ Feature: Sample
 
 EOS
         
-        @listener.should_receive(:doc_string).with(doc_string, 1)
+        @listener.should_receive(:doc_string).with('', doc_string, 1)
         scan ps(doc_string)
       end
  
@@ -108,7 +108,7 @@ str = <<EOS
       Line one
     """           
 EOS
-        @listener.should_receive(:doc_string).with("  Line one", 1)
+        @listener.should_receive(:doc_string).with('', "  Line one", 1)
         scan(str)
       end
 
@@ -120,12 +120,12 @@ str = <<EOS
 
      """
 EOS
-        @listener.should_receive(:doc_string).with("DocString text\n\n",1)
+        @listener.should_receive(:doc_string).with('', "DocString text\n\n", 1)
         scan(str)
       end        
 
       it "should preserve CRLFs within doc_strings" do
-        @listener.should_receive(:doc_string).with("Line one\r\nLine two\r\n", 1)
+        @listener.should_receive(:doc_string).with('', "Line one\r\nLine two\r\n", 1)
         scan("\"\"\"\r\nLine one\r\nLine two\r\n\r\n\"\"\"")
       end
 
@@ -135,7 +135,7 @@ str = <<EOS
     \\"\\"\\"
     """
 EOS
-        @listener.should_receive(:doc_string).with('"""', 1)
+        @listener.should_receive(:doc_string).with('', '"""', 1)
         scan(str)
       end
 
@@ -145,7 +145,17 @@ str = <<EOS
     \\" \\"\\"
     """
 EOS
-        @listener.should_receive(:doc_string).with('\" \"\"', 1)
+        @listener.should_receive(:doc_string).with('', '\" \"\"', 1)
+        scan(str)
+      end
+      
+      it "should lex doc_string content_types" do
+str = <<EOS
+    """gherkin type
+    Feature: Doc String Types
+    """
+EOS
+        @listener.should_receive(:doc_string).with('gherkin type', 'Feature: Doc String Types', 1)
         scan(str)
       end
     end

data/spec/gherkin/shared/lexer_group.rb

@@ -286,7 +286,7 @@ f'real
           scan("Given I have a string\n\"\"\"\nhello\nworld\n\"\"\"")
           @listener.to_sexp.should == [
             [:step, "Given ", "I have a string", 1],
-            [:doc_string, "hello\nworld", 2],
+            [:doc_string, '', "hello\nworld", 2],
             [:eof]
           ]
         end
@@ -497,7 +497,7 @@ f'real
             [:step, "Then ", "I am happy", 37],
             [:scenario, "Scenario", "Hammerzeit", "", 39],
             [:step, "Given ", "All work and no play", 40],
-            [:doc_string, "Makes Homer something something\nAnd something else", 41 ],
+            [:doc_string, '', "Makes Homer something something\nAnd something else", 41 ],
             [:step, "Then ", "crazy", 45],
             [:eof]
           ]
@@ -540,7 +540,7 @@ f'real
             [:step, "Then ", "I am happy", 37],
             [:scenario, "Scenario", "Hammerzeit", "", 39],
             [:step, "Given ", "All work and no play", 40],
-            [:doc_string, "Makes Homer something something\r\nAnd something else", 41],
+            [:doc_string, '', "Makes Homer something something\r\nAnd something else", 41],
             [:step, "Then ", "crazy", 45],
             [:eof]
           ]

data/tasks/cucumber.rake

@@ -1,4 +1,4 @@
-unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
+unless ENV['RUBY_CC_VERSION']
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber) do |t|

data/tasks/release.rake

@@ -45,6 +45,6 @@ namespace :release do
 
   task :symlink_docs do
     sh("ssh cukes.info 'cd /var/www/gherkin/api/ruby && mkdir #{GHERKIN_VERSION} && tar xzf api-#{GHERKIN_VERSION}.tgz -C #{GHERKIN_VERSION} && rm -f latest && ln -s #{GHERKIN_VERSION} latest'")
-    sh("ssh cukes.info 'cd /var/www/gherkin/api/ruby && rm -f latest && ln -s #{GHERKIN_VERSION} latest'")
+    sh("ssh cukes.info 'cd /var/www/gherkin/api/java && rm -f latest && ln -s #{GHERKIN_VERSION} latest'")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.4.17
+  version: 2.4.18
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-04 00:00:00.000000000Z
+date: 2011-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2168708000 !ruby/object:Gem::Requirement
+  requirement: &2168910260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 0.7.9
   type: :development
   prerelease: false
-  version_requirements: *2168708000
+  version_requirements: *2168910260
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2168707520 !ruby/object:Gem::Requirement
+  requirement: &2168909780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2168707520
+  version_requirements: *2168909780
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2168707040 !ruby/object:Gem::Requirement
+  requirement: &2168909320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2168707040
+  version_requirements: *2168909320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2168706580 !ruby/object:Gem::Requirement
+  requirement: &2168908860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2168706580
+  version_requirements: *2168908860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2168706120 !ruby/object:Gem::Requirement
+  requirement: &2168908400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *2168706120
+  version_requirements: *2168908400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168705660 !ruby/object:Gem::Requirement
+  requirement: &2168907940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2168705660
+  version_requirements: *2168907940
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2168705120 !ruby/object:Gem::Requirement
+  requirement: &2168907400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.9.4
   type: :development
   prerelease: false
-  version_requirements: *2168705120
+  version_requirements: *2168907400
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2168704660 !ruby/object:Gem::Requirement
+  requirement: &2168906940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2168704660
+  version_requirements: *2168906940
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2168704200 !ruby/object:Gem::Requirement
+  requirement: &2168906480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2168704200
+  version_requirements: *2168906480
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2168703740 !ruby/object:Gem::Requirement
+  requirement: &2168906020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2168703740
+  version_requirements: *2168906020
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2168693020 !ruby/object:Gem::Requirement
+  requirement: &2168898780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,7 +133,7 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2168693020
+  version_requirements: *2168898780
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -218,7 +218,6 @@ files:
 - gherkin.gemspec
 - ikvm/.gitignore
 - java/.gitignore
-- java/Gherkin.iml
 - java/src/main/java/gherkin/lexer/i18n/.gitignore
 - java/src/main/resources/gherkin/.gitignore
 - js/.gitignore
@@ -487,7 +486,7 @@ rubyforge_project:
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: gherkin-2.4.17
+summary: gherkin-2.4.18
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature