gherkin 2.6.6-java → 2.6.7-java

data/History.md

@@ -1,3 +1,9 @@
+## [2.6.7](https://github.com/cucumber/gherkin/compare/v2.6.6...v2.6.7)
+
+### Bugfixes
+
+* Fix bad packaging of NuSpec package. ([#148](https://github.com/cucumber/gherkin/issues/148) Aslak Hellesøy)
+
 ## [2.6.6](https://github.com/cucumber/gherkin/compare/v2.6.5...v2.6.6)
 
 ### New Features

data/README.md

@@ -7,12 +7,12 @@ A fast lexer and parser for the Gherkin language based on Ragel. Gherkin is two
 
 Supported platforms:
 
-* Ruby 1.8.6-1.9.3 (MRI, JRuby, REE, Rubinius)
-* Pure Java (jar file)
-* JavaScript (NPM package. Tested with V8/node.js/Chrome, but might work on other JavaScript engines)
-* .NET (dll file)
+* [Ruby](https://rubygems.org/gems/gherkin) 1.8.6-1.9.3 (MRI, JRuby, REE, Rubinius)
+* [Pure Java](http://search.maven.org/#search%7Cga%7C1%7Cgherkin) (jar file)
+* [JavaScript](http://search.npmjs.org/#/gherkin) (Tested with V8/node.js/Chrome, but might work on other JavaScript engines)
+* [.NET](http://nuget.org/List/Packages/gherkin) (dll file)
 
-## Installation.pmlcolor"
+## Installation
 
 ### Ruby/JRuby
 
@@ -54,14 +54,14 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.6.6</version>
+        <version>2.6.7</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
 
 ### .NET
 
-Get the dll from https://github.com/cucumber/gherkin/downloads
+Get the dll from [NuGet](http://nuget.org/List/Packages/gherkin)
 
 ## API Docs
 
@@ -162,7 +162,7 @@ TODO: Make all specs pass with js lexer - replace 'c(listener)' with 'js(listene
 
 You must install Mono from source, or use a release of Mono after November 18 2011.
 
-You must also download NuGet.exe from [CodePlex](http://nuget.codeplex.com/releases). When it's installed, update it and register your CodePlex API Key:
+You must also download NuGet.exe from [CodePlex](http://nuget.codeplex.com/releases) and place it in `/usr/local/nuget/NuGet.exe`. When it's installed, update it and register your NuGet API Key:
 
     # In case we need to update
     mono /usr/local/nuget/NuGet.exe Update -self
@@ -174,6 +174,8 @@ Now you can build the .NET dll with:
 
     rake ikvm
 
+This should put the dll into `release/nuspec/lib/gherkin.dll`
+
 ### MinGW Rubies (for Windows gems)
 
 In order to build Windows binaries (so we can release Windows gems from OS X/Linux) we first need to install MinGW. 

data/examples/parse_and_output_json.rb

@@ -0,0 +1,19 @@
+require 'gherkin/parser/parser'
+require 'gherkin/formatter/json_formatter'
+require 'stringio'
+require 'json'
+
+# This example reads a couple of features and outputs them as JSON.
+
+io = StringIO.new
+formatter = Gherkin::Formatter::JSONFormatter.new(io)
+parser = Gherkin::Parser::Parser.new(formatter)
+
+sources = ["features/native_lexer.feature", "features/escaped_pipes.feature"]
+sources.each do |s|
+  path = File.expand_path(File.dirname(__FILE__) + '/../' + s)
+  parser.parse(IO.read(path), path, 0)
+end
+
+formatter.close
+puts JSON.pretty_generate(JSON.parse(io.string))

data/gherkin.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.name        = "gherkin"
   # If bumping the major version here, comment out the cucumber dependency below and uncomment in the Gemfile to build against a local cucumber.
-  s.version     = "2.6.6"
+  s.version     = "2.6.7"
   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}"
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake', '>= 0.9.2')
   s.add_development_dependency('bundler', '>= 1.0.21')
   s.add_development_dependency('rspec', '>= 2.7.0')
+  s.add_development_dependency('rubyzip', '>= 0.9.4')
 
   unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
     s.add_development_dependency('therubyracer', '>= 0.9.9') if ENV['GHERKIN_JS']

data/tasks/gems.rake

@@ -5,7 +5,7 @@ namespace :gems do
       exit(1)
     end
     # rvm and mingw ruby versions have to match to avoid errors
-    sh "rvm 1.8.7-p352@cucumber rake cross compile RUBY_CC_VERSION=1.8.7"
+    sh "rvm 1.8.7-p352@cucumber do rake cross compile RUBY_CC_VERSION=1.8.7"
     sh "rake cross compile RUBY_CC_VERSION=1.9.3"
     # This will copy the .so files to the proper place
     sh "rake -t cross compile RUBY_CC_VERSION=1.8.7:1.9.3"

data/tasks/ikvm.rake

@@ -1,7 +1,11 @@
 # encoding: utf-8
+
 namespace :ikvm do
   IKVM_VERSION    = '0.46.0.1'
-  IKVM_BIN_DIR    = "ikvm/ikvm-#{IKVM_VERSION}/bin"
+  IKVM_DIR        = "ikvm/ikvm-#{IKVM_VERSION}"
+  IKVM_ZIP        = "ikvm/ikvmbin-#{IKVM_VERSION}.zip"
+  CLOBBER.include(IKVM_DIR, IKVM_ZIP)
+  IKVM_BIN_DIR    = "#{IKVM_DIR}/bin"
   IKVMC_EXE       = "#{IKVM_BIN_DIR}/ikvmc.exe"
   GHERKIN_EXE     = "release/gherkin.exe"
   GHERKIN_PKG_DLL = "release/nuspec/lib/gherkin.dll"
@@ -49,6 +53,14 @@ namespace :ikvm do
     pkg_dir = File.dirname(GHERKIN_EXE)
     mkdir_p File.dirname(pkg_dir) unless File.directory?(pkg_dir)
     nuget("Pack #{GHERKIN_NUSPEC} -Version #{GHERKIN_VERSION} -OutputDirectory #{pkg_dir}")
+    # Now, fix the path inside the file - see https://github.com/cucumber/gherkin/issues/148
+    require 'zip/zipfilesystem'
+    Zip::ZipFile.open(GHERKIN_NUPKG) do |zipfile|
+      begin
+        zipfile.file.rename 'lib%2Fgherkin.dll', 'lib/gherkin.dll' 
+      rescue => looks_like_nuget_has_been_fixed
+      end
+    end
   end
 
   file GHERKIN_NUSPEC do
@@ -100,7 +112,7 @@ EOF
   end
 
   file IKVMC_EXE do
-    sh("wget http://downloads.sourceforge.net/project/ikvm/ikvm/#{IKVM_VERSION}/ikvmbin-#{IKVM_VERSION}.zip -O ikvm/ikvmbin-#{IKVM_VERSION}.zip")
+    sh("wget http://downloads.sourceforge.net/project/ikvm/ikvm/#{IKVM_VERSION}/ikvmbin-#{IKVM_VERSION}.zip -O #{IKVM_ZIP}")
     Dir.chdir('ikvm') do
       sh("unzip ikvmbin-#{IKVM_VERSION}.zip")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.7
   prerelease: 
 platform: java
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000 Z
+date: 2011-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152344740 !ruby/object:Gem::Requirement
+  requirement: &2153076120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152344740
+  version_requirements: *2153076120
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152344240 !ruby/object:Gem::Requirement
+  requirement: &2153075640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *2152344240
+  version_requirements: *2153075640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152343740 !ruby/object:Gem::Requirement
+  requirement: &2153075180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2152343740
+  version_requirements: *2153075180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152343140 !ruby/object:Gem::Requirement
+  requirement: &2153074660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *2152343140
+  version_requirements: *2153074660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152342560 !ruby/object:Gem::Requirement
+  requirement: &2153090520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,21 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152342560
+  version_requirements: *2153090520
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &2153089980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :development
+  prerelease: false
+  version_requirements: *2153089980
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2152341800 !ruby/object:Gem::Requirement
+  requirement: &2153089200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +89,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2152341800
+  version_requirements: *2153089200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152341140 !ruby/object:Gem::Requirement
+  requirement: &2153088220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +100,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2152341140
+  version_requirements: *2153088220
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2152340680 !ruby/object:Gem::Requirement
+  requirement: &2153087760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +111,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2152340680
+  version_requirements: *2153087760
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2152340040 !ruby/object:Gem::Requirement
+  requirement: &2153087060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +122,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2152340040
+  version_requirements: *2153087060
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2152412120 !ruby/object:Gem::Requirement
+  requirement: &2153086340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +133,7 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2152412120
+  version_requirements: *2153086340
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -143,6 +154,7 @@ files:
 - Rakefile
 - build_native_gems.sh
 - cucumber.yml
+- examples/parse_and_output_json.rb
 - features/escaped_pipes.feature
 - features/feature_parser.feature
 - features/json_formatter.feature
@@ -287,7 +299,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gherkin-2.6.6
+summary: gherkin-2.6.7
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature