gherkin 2.4.18-java → 2.4.19-java

data/Gemfile.lock

@@ -1,25 +1,26 @@
 PATH
   remote: .
   specs:
-    gherkin (2.4.18)
-      json (>= 1.4.6)
+    gherkin (2.4.19)
+      json (>= 1.6.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    cucumber (1.0.2)
+    cucumber (1.0.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.16)
+      gherkin (~> 2.4.18)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
-    json (1.5.4)
-    json (1.5.4-java)
+    json (1.6.0)
+    libv8 (3.3.10.2)
     rake (0.9.2)
     rake-compiler (0.7.9)
       rake
+    rdiscount (1.6.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -29,6 +30,9 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     term-ansicolor (1.0.6)
+    therubyracer (0.9.4)
+      libv8 (~> 3.3.10)
+    yard (0.7.2)
 
 PLATFORMS
   java
@@ -37,9 +41,12 @@ PLATFORMS
 DEPENDENCIES
   builder (>= 2.1.2)
   bundler (>= 1.0.18)
-  cucumber (>= 1.0.2)
+  cucumber (>= 1.0.6)
   gherkin!
   rake (>= 0.9.2)
   rake-compiler (>= 0.7.9)
+  rdiscount (>= 1.6.8)
   rspec (>= 2.6.0)
   term-ansicolor (>= 1.0.6)
+  therubyracer (>= 0.9.4)
+  yard (>= 0.7.2)

data/History.md

@@ -1,3 +1,10 @@
+## [2.4.19](https://github.com/cucumber/gherkin/compare/v2.4.18...v2.4.19)
+
+### Bugfixes
+
+* Filtering on Examples with 0 or 1 row now works ([from mailing list](http://groups.google.com/group/cukes/browse_thread/thread/3e55777ee29c445c) Aslak Hellesøy)
+* Exclude .gitignore files from packaged gem ([#125](https://github.com/cucumber/gherkin/pull/125) John Hume)
+
 ## [2.4.18](https://github.com/cucumber/gherkin/compare/v2.4.17...v2.4.18)
 
 ### New Features

data/README.md

@@ -52,10 +52,10 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.4.18</version>
+        <version>2.4.19</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/)
+You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
 
 ### .NET
 

data/gherkin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gherkin"
-  s.version     = "2.4.18"
+  s.version     = "2.4.19"
   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}"
@@ -42,9 +42,14 @@ Gem::Specification.new do |s|
     s.add_development_dependency('rake-compiler', '>= 0.7.9')
   end
 
-  s.add_dependency('json', '>= 1.4.6')
+  # Hack because json is released as two different versions for MRI and JRuby :-/
+  if defined?(JRUBY_VERSION)
+    s.add_dependency('json', '>= 1.6.0.1')
+  else
+    s.add_dependency('json', '>= 1.6.0')
+  end
 
-  s.add_development_dependency('cucumber', '>= 1.0.2')
+  s.add_development_dependency('cucumber', '>= 1.0.6')
   s.add_development_dependency('rake', '>= 0.9.2')
   s.add_development_dependency('bundler', '>= 1.0.18')
   s.add_development_dependency('rspec', '>= 2.6.0')

data/lib/gherkin/formatter/filter_formatter.rb

@@ -61,7 +61,12 @@ module Gherkin
         @examples_tags = examples.tags
         @examples_name = examples.name
 
-        table_body_range = examples.rows[1].line..examples.rows[-1].line
+        table_body_range = case(examples.rows.length)
+          when 0 then examples.line_range.last..examples.line_range.last
+          when 1 then examples.rows[0].line..examples.rows[0].line
+          else examples.rows[1].line..examples.rows[-1].line
+        end
+
         @examples_range = examples.line_range.first..table_body_range.last
         if(@filter.eval([], [], [table_body_range]))
           examples.rows = @filter.filter_table_body_rows(examples.rows)

data/spec/gherkin/fixtures/examples_with_only_header.feature

@@ -0,0 +1,14 @@
+Feature: An example with only a header
+  See [this thread](http://groups.google.com/group/cukes/browse_thread/thread/3e55777ee29c445c)
+
+  Scenario Outline: 
+    When I do <foo>
+    Then something
+
+    Examples: A
+      | page |
+      | Golf | 
+
+    @failing
+    Examples: B
+      | Scottish Football |

data/spec/gherkin/formatter/filter_formatter_spec.rb

@@ -60,6 +60,16 @@ module Gherkin
           self.file = 'scenario_outline_with_tags.feature'
           verify_filter(['~@wip'], 1..2, 12..14)
         end
+
+        it "should not replay examples from ignored scenario outline" do
+          self.file = 'scenario_outline_with_tags.feature'
+          verify_filter(['~@wip'], 1..2, 12..14)
+        end
+
+        it "should not choke on examples with only header" do
+          self.file = 'examples_with_only_header.feature'
+          verify_filter(['@failing'], 1..7, 12..15)
+        end
       end
 
       context "names" do
@@ -88,6 +98,11 @@ module Gherkin
           self.file = 'hantu_pisang.feature'
           verify_filter([/The background/], 1..5)
         end
+
+        it "should not choke on examples with only header" do
+          self.file = 'examples_with_only_header.feature'
+          verify_filter([/B/], 1..7, 12..15)
+        end
       end
 
       context "lines" do
@@ -112,6 +127,12 @@ module Gherkin
           it "should filter on second examples line" do
             verify_filter([57], 1..14, 46..49, 56..61)
           end
+
+          it "should not choke on examples with only header" do
+            self.file = 'examples_with_only_header.feature'
+            verify_filter([13], 1..7, 12..15)
+            verify_filter([14], 1..7, 12..15)
+          end
         end
 
         context "on the same line as step keyword" do

data/tasks/gems.rake

@@ -13,7 +13,15 @@ namespace :gems do
 
   desc 'Prepare JRuby binares'
   task :jruby => [:jar] do
-    sh "rvm jruby@cucumber exec rspec spec"
+    begin
+      # Need to move the Gemfile.lock out of the way because the latest json gems
+      # don't exist in identical versions: https://github.com/flori/json/pull/95
+      # native gem is 1.6.0 and java gem is 1.6.0.1
+      mv "Gemfile.lock", "Gemfile.lock.hack"
+      sh "rvm jruby@cucumber exec rspec spec"
+    ensure
+      mv "Gemfile.lock.hack", "Gemfile.lock"
+    end
   end
 
   desc 'Prepare IronRuby binaries'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.4.18
+  version: 2.4.19
   prerelease: 
 platform: java
 authors:
@@ -11,33 +11,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2011-09-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152713420 !ruby/object:Gem::Requirement
+  requirement: &2160530660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152713420
+  version_requirements: *2160530660
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152712940 !ruby/object:Gem::Requirement
+  requirement: &2160530080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2152712940
+  version_requirements: *2160530080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152712480 !ruby/object:Gem::Requirement
+  requirement: &2160529420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2152712480
+  version_requirements: *2160529420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152712020 !ruby/object:Gem::Requirement
+  requirement: &2160528880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *2152712020
+  version_requirements: *2160528880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152711560 !ruby/object:Gem::Requirement
+  requirement: &2160528380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152711560
+  version_requirements: *2160528380
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2152711020 !ruby/object:Gem::Requirement
+  requirement: &2160527800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 0.9.4
   type: :development
   prerelease: false
-  version_requirements: *2152711020
+  version_requirements: *2160527800
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152710560 !ruby/object:Gem::Requirement
+  requirement: &2160527340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2152710560
+  version_requirements: *2160527340
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2152730580 !ruby/object:Gem::Requirement
+  requirement: &2160526840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2152730580
+  version_requirements: *2160526840
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2152730120 !ruby/object:Gem::Requirement
+  requirement: &2160526360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2152730120
+  version_requirements: *2160526360
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2152729660 !ruby/object:Gem::Requirement
+  requirement: &2160525880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2152729660
+  version_requirements: *2160525880
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -218,6 +218,7 @@ files:
 - spec/gherkin/fixtures/complex_for_filtering.feature
 - spec/gherkin/fixtures/complex_with_tags.feature
 - spec/gherkin/fixtures/dos_line_endings.feature
+- spec/gherkin/fixtures/examples_with_only_header.feature
 - spec/gherkin/fixtures/hantu_pisang.feature
 - spec/gherkin/fixtures/i18n_fr.feature
 - spec/gherkin/fixtures/i18n_no.feature
@@ -295,10 +296,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gherkin-2.4.18
+summary: gherkin-2.4.19
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature
@@ -322,6 +323,7 @@ test_files:
 - spec/gherkin/fixtures/complex_for_filtering.feature
 - spec/gherkin/fixtures/complex_with_tags.feature
 - spec/gherkin/fixtures/dos_line_endings.feature
+- spec/gherkin/fixtures/examples_with_only_header.feature
 - spec/gherkin/fixtures/hantu_pisang.feature
 - spec/gherkin/fixtures/i18n_fr.feature
 - spec/gherkin/fixtures/i18n_no.feature