gherkin 2.3.10-x86-mswin32 → 2.4.0-x86-mswin32

data/ragel/lexer.rb.rl.erb

@@ -23,7 +23,7 @@ module Gherkin
 
         action store_pystring_content {
           con = unindent(@start_col, utf8_pack(data[@content_start...@next_keyword_start-1]).sub(/(\r?\n)?([\t ])*\Z/, '').gsub(/\\"\\"\\"/, '"""'))
-          @listener.py_string(con, @current_line) 
+          @listener.doc_string(con, @current_line) 
         }
  
         action store_feature_content {

data/ragel/lexer_common.rl.erb

@@ -40,11 +40,11 @@
   RowBody = space* Cell** PIPE :>> (space* EOL+ space*) %store_row;
   Row = StartRow :>> RowBody <: EndRow?;
   
-  StartPyString = '"""' >start_pystring space* :>> EOL; 
-  EndPyString = (space* '"""') >next_keyword_start; 
-  PyString = space* StartPyString %begin_pystring_content (^EOL | EOL)* :>> EndPyString %store_pystring_content space* EOL+;
+  StartDocString = '"""' >start_pystring space* :>> EOL; 
+  EndDocString = (space* '"""') >next_keyword_start; 
+  DocString = space* StartDocString %begin_pystring_content (^EOL | EOL)* :>> EndDocString %store_pystring_content space* EOL+;
   
-  Tokens = BOM? (space | EOL)* (Tags | Comment | FeatureHeading | BackgroundHeading | ScenarioHeading | ScenarioOutlineHeading | ExamplesHeading | Step | Row | PyString)* (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/c_lexer_spec.rb

@@ -13,7 +13,7 @@ module Gherkin
 
       it_should_behave_like "a Gherkin lexer"
       it_should_behave_like "a Gherkin lexer lexing tags"
-      it_should_behave_like "a Gherkin lexer lexing py_strings"
+      it_should_behave_like "a Gherkin lexer lexing doc_strings"
       it_should_behave_like "a Gherkin lexer lexing rows"
       it_should_behave_like "parsing windows files"
     end

data/spec/gherkin/fixtures/complex.json

@@ -129,7 +129,7 @@
         { "name" : "All work and no play", 
           "keyword": "Given ",
           "multiline_arg": {
-            "type": "py_string",
+            "type": "doc_string",
             "value": "Makes Homer something something\nAnd something else",
             "line": 777
           }

data/spec/gherkin/java_lexer_spec.rb

@@ -12,7 +12,7 @@ module Gherkin
 
       it_should_behave_like "a Gherkin lexer"
       it_should_behave_like "a Gherkin lexer lexing tags"
-      it_should_behave_like "a Gherkin lexer lexing py_strings"
+      it_should_behave_like "a Gherkin lexer lexing doc_strings"
       it_should_behave_like "a Gherkin lexer lexing rows"
     end
   end

data/spec/gherkin/js_lexer_spec.rb

@@ -13,7 +13,7 @@ module Gherkin
     
       it_should_behave_like "a Gherkin lexer"
       it_should_behave_like "a Gherkin lexer lexing tags"
-      it_should_behave_like "a Gherkin lexer lexing py_strings"
+      it_should_behave_like "a Gherkin lexer lexing doc_strings"
       it_should_behave_like "a Gherkin lexer lexing rows"
       # TODO - make this pass!
       # it_should_behave_like "parsing windows files"

data/spec/gherkin/rb_lexer_spec.rb

@@ -12,7 +12,7 @@ module Gherkin
 
       it_should_behave_like "a Gherkin lexer"
       it_should_behave_like "a Gherkin lexer lexing tags"
-      it_should_behave_like "a Gherkin lexer lexing py_strings"
+      it_should_behave_like "a Gherkin lexer lexing doc_strings"
       it_should_behave_like "a Gherkin lexer lexing rows"
       it_should_behave_like "parsing windows files"
     end

data/spec/gherkin/sexp_recorder.rb

@@ -10,10 +10,10 @@ module Gherkin
     end
 
     # We can't use method_missing - therubyracer isn't able to invoke methods like that.
-    [:comment, :tag, :feature, :background, :scenario, :scenario_outline, :examples, :step, :py_string, :row, :eof, :uri, :syntax_error].each do |event|
+    [:comment, :tag, :feature, :background, :scenario, :scenario_outline, :examples, :step, :doc_string, :row, :eof, :uri, :syntax_error].each do |event|
       define_method(event) do |*args|
         event = :scenario_outline if event == :scenarioOutline # Special Java Lexer handling
-        event = :py_string if event == :pyString # Special Java Lexer handling
+        event = :doc_string if event == :docString # Special Java Lexer handling
         event = :syntax_error if event == :syntaxError # Special Java Lexer handling
         args  = rubify(args)
         args  = sexpify(args)

data/spec/gherkin/shared/{py_string_group.rb → doc_string_group.rb}

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 module Gherkin
   module Lexer
-    shared_examples_for "a Gherkin lexer lexing py_strings" do
+    shared_examples_for "a Gherkin lexer lexing doc_strings" do
       def scan(gherkin)
         @lexer.scan(gherkin)
       end
@@ -23,47 +23,47 @@ Feature: some feature
     """
     Then bar
 EOS
-        @listener.should_receive(:py_string).with("  Hello\nGoodbye", 4)
+        @listener.should_receive(:doc_string).with("  Hello\nGoodbye", 4)
         scan(str)
       end
 
-      it "should parse a simple py_string" do
-        @listener.should_receive(:py_string).with("I am a py_string", 1)
-        scan ps("I am a py_string")
+      it "should parse a simple doc_string" do
+        @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 py_string" do
-        @listener.should_receive(:py_string).with("", 4)
+      it "should parse an empty doc_string" do
+        @listener.should_receive(:doc_string).with("", 4)
         scan("Feature: Hi\nScenario: Hi\nGiven a step\n\"\"\"\n\"\"\"")
       end
 
       it "should treat a string containing only newlines as only newlines" do
-py_string = <<EOS
+doc_string = <<EOS
 """
 
 
 
 """
 EOS
-        @listener.should_receive(:py_string).with("\n\n", 1)
-        scan(py_string)
+        @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 == [
-          [:py_string, "A\n\nB", 1],
+          [:doc_string, "A\n\nB", 1],
           [:eof]
         ]
       end
       
       it "should parse a multiline string" do
-        @listener.should_receive(:py_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(:py_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,17 +74,17 @@ str = <<EOS
  Line two
     """
 EOS
-        @listener.should_receive(:py_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(:py_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
   
-      it "should handle complex py_strings" do
-py_string = <<EOS
+      it "should handle complex doc_strings" do
+doc_string = <<EOS
 # Feature comment
 @one
 Feature: Sample
@@ -98,34 +98,34 @@ Feature: Sample
 
 EOS
         
-        @listener.should_receive(:py_string).with(py_string, 1)
-        scan ps(py_string)
+        @listener.should_receive(:doc_string).with(doc_string, 1)
+        scan ps(doc_string)
       end
  
-      it "should allow whitespace after the closing py_string delimiter" do
+      it "should allow whitespace after the closing doc_string delimiter" do
 str = <<EOS
     """
       Line one
     """           
 EOS
-        @listener.should_receive(:py_string).with("  Line one", 1)
+        @listener.should_receive(:doc_string).with("  Line one", 1)
         scan(str)
       end
 
-      it "should preserve the last newline(s) at the end of a py_string" do
+      it "should preserve the last newline(s) at the end of a doc_string" do
 str = <<EOS
      """
-     PyString text
+     DocString text
 
 
      """
 EOS
-        @listener.should_receive(:py_string).with("PyString text\n\n",1)
+        @listener.should_receive(:doc_string).with("DocString text\n\n",1)
         scan(str)
       end        
 
-      it "should preserve CRLFs within py_strings" do
-        @listener.should_receive(:py_string).with("Line one\r\nLine two\r\n", 1)
+      it "should preserve CRLFs within doc_strings" do
+        @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(:py_string).with('"""', 1)
+        @listener.should_receive(:doc_string).with('"""', 1)
         scan(str)
       end
 
@@ -145,7 +145,7 @@ str = <<EOS
     \\" \\"\\"
     """
 EOS
-        @listener.should_receive(:py_string).with('\" \"\"', 1)
+        @listener.should_receive(:doc_string).with('\" \"\"', 1)
         scan(str)
       end
     end

data/spec/gherkin/shared/lexer_group.rb

@@ -282,11 +282,11 @@ f'real
           ]
         end
         
-        it "should parse steps with inline py_string" do
+        it "should parse steps with inline doc_string" do
           scan("Given I have a string\n\"\"\"\nhello\nworld\n\"\"\"")
           @listener.to_sexp.should == [
             [:step, "Given ", "I have a string", 1],
-            [:py_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],
-            [:py_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],
-            [:py_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/spec/spec_helper.rb

@@ -11,7 +11,7 @@ require 'gherkin/java_libs'
 require 'gherkin/shared/bom_group'
 require 'gherkin/shared/lexer_group'
 require 'gherkin/shared/tags_group'
-require 'gherkin/shared/py_string_group'
+require 'gherkin/shared/doc_string_group'
 require 'gherkin/shared/row_group'
 $:.unshift(File.dirname(__FILE__))
 

data/tasks/compile.rake

@@ -12,7 +12,8 @@ CLEAN.include [
   'ext/**/*.c',
   'java/src/main/java/gherkin/lexer/i18n/*.java',
   'java/src/main/resources/gherkin/*.properties',
-  'js/lib/gherkin/lexer/*.js'
+  'js/lib/gherkin/lexer/*.js',
+  'doc'
 ]
 
 desc "Compile the Java extensions"
@@ -72,7 +73,7 @@ langs.each do |i18n|
         io.write(<<-EOF)
 require 'mkmf'
 CONFIG['warnflags'].gsub!(/-Wshorten-64-to-32/, '') if CONFIG['warnflags']
-$CFLAGS << ' -O0 -Wall -Werror' if CONFIG['CC'] =~ /gcc/
+$CFLAGS << ' -O0 -Wall' if CONFIG['CC'] =~ /gcc/
 dir_config("gherkin_lexer_#{i18n.underscored_iso_code}")
 have_library("c", "main")
 create_makefile("gherkin_lexer_#{i18n.underscored_iso_code}")

data/tasks/cucumber.rake

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

data/tasks/gems.rake

@@ -8,7 +8,7 @@ namespace :gems do
     sh "rvm 1.8.6-p399@cucumber rake cross compile RUBY_CC_VERSION=1.8.6"
     sh "rvm 1.9.1-p243@cucumber rake cross compile RUBY_CC_VERSION=1.9.1"
     # This will copy the .so files to the proper place
-    sh "rake cross compile RUBY_CC_VERSION=1.8.6:1.9.1"
+    sh "rake -t cross compile RUBY_CC_VERSION=1.8.6:1.9.1"
   end
 
   desc 'Prepare JRuby binares'

data/tasks/release.rake

@@ -1,6 +1,6 @@
 namespace :release do
   desc 'Upload all packages and tag git'
-  task :ALL => ['gems:sanity', :ikvm, :push_jar, :push_native_gems, :push_npm_package, :release, :post_release]
+  task :ALL => ['gems:sanity', :ikvm, :push_jar, :push_native_gems, :push_npm_package, :release, :push_yard, :post_release]
 
   desc 'Push all gems to rubygems.org (gemcutter)'
   task :push_native_gems do
@@ -28,4 +28,11 @@ namespace :release do
       sh("npm publish")
     end
   end
+  
+  desc 'Push yardoc to http://cukes.info/gherkin/api/#{GHERKIN_VERSION}'
+  task :push_yard => :yard do
+    sh("tar czf release/api-#{GHERKIN_VERSION}.tgz -C doc .")
+    sh("scp release/api-#{GHERKIN_VERSION}.tgz cukes.info:/var/www/gherkin/api/ruby")
+    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'")
+  end
 end

data/tasks/yard.rake

@@ -0,0 +1,7 @@
+unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
+require 'yard'
+require 'yard/rake/yardoc_task'
+
+YARD::Templates::Engine.register_template_path(File.expand_path(File.join(File.dirname(__FILE__), 'yard')))
+YARD::Rake::YardocTask.new(:yard)
+end

data/tasks/yard/default/layout/html/footer.erb

@@ -0,0 +1,5 @@
+<div id="footer">
+  Generated on <%= Time.now.strftime("%c") %> by 
+  <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
+  <%= YARD::VERSION %> (ruby-<%= RUBY_VERSION %>).
+</div>

data/tasks/yard/default/layout/html/index.erb

@@ -0,0 +1 @@
+<%= yieldall %>

data/tasks/yard/default/layout/html/layout.erb

@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <%= erb(:headers) %>
+  </head>
+  <body>
+    <script type="text/javascript" charset="utf-8">
+      if (window.top.frames.main) document.body.className = 'frames';
+    </script>
+    
+    <div id="header">
+      <%= erb(:logo) %>
+      <%= erb(:breadcrumb) %>
+      <%= erb(:search) %>
+      <div class="clear"></div>
+    </div>
+    
+    <iframe id="search_frame"></iframe>
+    
+    <div id="content"><%= yieldall %></div>
+    
+    <%= erb(:footer) %>
+  </body>
+</html>

data/tasks/yard/default/layout/html/logo.erb

@@ -0,0 +1 @@
+<h3><img src="<%= url_for('images/bubble_32x32.png') %>"></img> Gherkin <%= GHERKIN_VERSION %></h3>

data/tasks/yard/default/layout/html/setup.rb

@@ -0,0 +1,4 @@
+def init
+  super
+  options[:serializer].serialize('/images/bubble_32x32.png', IO.read(File.dirname(__FILE__) + '/bubble_32x32.png'))
+end

metadata

@@ -2,7 +2,7 @@
 name: gherkin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.3.10
+  version: 2.4.0
 platform: x86-mswin32
 authors: 
 - Mike Sassak
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-30 00:00:00 +01:00
+date: 2011-06-05 00:00:00 +01:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,41 +89,61 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.0.beta4
+        version: 0.9.0.beta7
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: term-ansicolor
+  name: yard
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.7.1
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rdiscount
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.6.8
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: term-ansicolor
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.0.5
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.1.2
   type: :development
-  version_requirements: *id009
+  version_requirements: *id011
 description: A fast Gherkin lexer/parser for based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-- History.txt
+extra_rdoc_files: []
+
 files: 
 - .gitattributes
 - .gitignore
@@ -131,10 +151,11 @@ files:
 - .mailmap
 - .rspec
 - .rvmrc
+- .yardopts
 - Gemfile
-- History.txt
+- History.md
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - build_native_gems.sh
 - cucumber.yml
@@ -239,8 +260,8 @@ files:
 - spec/gherkin/rb_lexer_spec.rb
 - spec/gherkin/sexp_recorder.rb
 - spec/gherkin/shared/bom_group.rb
+- spec/gherkin/shared/doc_string_group.rb
 - spec/gherkin/shared/lexer_group.rb
-- spec/gherkin/shared/py_string_group.rb
 - spec/gherkin/shared/row_group.rb
 - spec/gherkin/shared/tags_group.rb
 - spec/gherkin/tag_expression_spec.rb
@@ -254,9 +275,16 @@ files:
 - tasks/gems.rake
 - tasks/ikvm.rake
 - tasks/ragel_task.rb
-- tasks/rdoc.rake
 - tasks/release.rake
 - tasks/rspec.rake
+- tasks/yard.rake
+- tasks/yard/default/layout/html/bubble_32x32.png
+- tasks/yard/default/layout/html/bubble_48x48.png
+- tasks/yard/default/layout/html/footer.erb
+- tasks/yard/default/layout/html/index.erb
+- tasks/yard/default/layout/html/layout.erb
+- tasks/yard/default/layout/html/logo.erb
+- tasks/yard/default/layout/html/setup.rb
 - lib/1.8/gherkin_lexer_ar.so
 - lib/1.8/gherkin_lexer_bg.so
 - lib/1.8/gherkin_lexer_ca.so
@@ -372,7 +400,7 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: gherkin-2.3.10
+summary: gherkin-2.4.0
 test_files: 
 - features/escaped_pipes.feature
 - features/feature_parser.feature
@@ -424,8 +452,8 @@ test_files:
 - spec/gherkin/rb_lexer_spec.rb
 - spec/gherkin/sexp_recorder.rb
 - spec/gherkin/shared/bom_group.rb
+- spec/gherkin/shared/doc_string_group.rb
 - spec/gherkin/shared/lexer_group.rb
-- spec/gherkin/shared/py_string_group.rb
 - spec/gherkin/shared/row_group.rb
 - spec/gherkin/shared/tags_group.rb
 - spec/gherkin/tag_expression_spec.rb