gherkin 2.6.5-java → 2.6.6-java

data/.travis.yml

@@ -2,6 +2,7 @@ rvm:
   - 1.9.3
   - 1.9.2
   - 1.8.7
+  - jruby
 # whitelist
 branches:
   only:

data/History.md

@@ -1,3 +1,19 @@
+## [2.6.6](https://github.com/cucumber/gherkin/compare/v2.6.5...v2.6.6)
+
+### New Features
+
+* .NET dll is released as a NuGet package instead of being uploaded to https://github.com/cucumber/gherkin/downloads ([#144](https://github.com/cucumber/gherkin/issues/144), [#147](https://github.com/cucumber/gherkin/pull/147) Jeffrey Cameron, Aslak Hellesøy)
+
+### Changed Features
+
+* The lib/gherkin.jar that goes into the JRuby gem contains json-simple and base64 classes instead of separate jars (Aslak Hellesøy)
+* .NET dll, which is based on lib/gherkin.jar also contains json-simple and base64 (Aslak Hellesøy)
+* gherkin jars published to Maven repo do *not* bundle the json-simple and base64 jars. (Aslak Hellesøy)
+
+### Removed Features
+
+* IronRuby gems are no longer published. Nobody seems to be using it, and it's too much pain to test. (Aslak Hellesøy)
+
 ## [2.6.5](https://github.com/cucumber/gherkin/compare/v2.6.4...v2.6.5)
 
 ### Bugfixes

data/README.md

@@ -54,7 +54,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.6.5</version>
+        <version>2.6.6</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -158,12 +158,17 @@ If you're hacking and just want to rebuild the English parser:
 
 TODO: Make all specs pass with js lexer - replace 'c(listener)' with 'js(listener)' in i18n.rb
 
-### .NET and IronRuby
+### .NET dll
 
-You must install Mono and IKVM to build the pure .NET dll and the IronRuby gem:
+You must install Mono from source, or use a release of Mono after November 18 2011.
 
-* Install Mono from http://www.mono-project.com/ and make sure it's on your $PATH
-* Download IKVM from http://www.ikvm.net/ and extract it to /usr/local/ikvm so that you have a /usr/local/ikvm/bin/ikvmc.exe
+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:
+
+    # In case we need to update
+    mono /usr/local/nuget/NuGet.exe Update -self
+
+    # The key is at http://nuget.org/Contribute/MyAccount
+    mono /usr/local/nuget/NuGet.exe SetApiKey xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx
 
 Now you can build the .NET dll with:
 
@@ -216,7 +221,6 @@ Now you can build Windows gems:
   * This file (Installation/Java section)
   * gherkin.gemspec
   * java/pom.xml
-  * ikvm/Gherkin/Gherkin.csproj (2 places)
   * js/package.json
 * Run `bundle update`, so Gemfile.lock gets updated with the changes.
 * Commit changes, otherwise you will get an error at the end when a tag is made.

data/build_native_gems.sh

@@ -4,5 +4,4 @@ mkdir release
 GEM_PLATFORM=java gem build gherkin.gemspec
 GEM_PLATFORM=x86-mswin32 gem build gherkin.gemspec
 GEM_PLATFORM=x86-mingw32 gem build gherkin.gemspec
-GEM_PLATFORM=universal-dotnet gem build gherkin.gemspec
 mv *.gem release

data/features/support/env.rb

@@ -14,7 +14,6 @@ end
 require 'gherkin'
 require 'gherkin/sexp_recorder'
 require 'gherkin/output_stream_string_io'
-require 'gherkin/java_libs'
 
 module TransformHelpers
   def tr_line_number(step_arg)

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.5"
+  s.version     = "2.6.6"
   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.rb

@@ -1,7 +1,2 @@
 require 'gherkin/lexer/i18n_lexer'
 require 'gherkin/parser/parser'
-
-if defined?(JRUBY_VERSION)
-  require 'json-simple-1.1.jar'
-  require 'base64-2.3.8.jar'
-end

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ require 'gherkin'
 require 'stringio'
 require 'gherkin/sexp_recorder'
 require 'gherkin/output_stream_string_io'
-require 'gherkin/java_libs'
 require 'gherkin/shared/bom_group'
 require 'gherkin/shared/lexer_group'
 require 'gherkin/shared/tags_group'

data/tasks/gems.rake

@@ -13,20 +13,9 @@ namespace :gems do
 
   desc 'Prepare JRuby binares'
   task :jruby => [:jar] do
-    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
+    sh "rvm jruby@cucumber exec rspec spec"
   end
 
-  desc 'Prepare IronRuby binaries'
-  task :ironruby => [:jruby, 'ikvm:dll', 'ikvm:copy_ikvm_dlls']
-
   task :sanity do
     raise "The jruby gem looks too small" if File.stat("release/gherkin-#{GHERKIN_VERSION}-java.gem").size < 1000000
   end
@@ -36,8 +25,7 @@ namespace :gems do
     :clean,
     :spec,
     :win,
-    :jruby,
-    :ironruby
+    :jruby
   ]
 
 end

data/tasks/ikvm.rake

@@ -1,36 +1,25 @@
-require File.dirname(__FILE__) + '/../spec/gherkin/java_libs'
-# To test out the pure Java main program on .NET, execute:
-#
-#   rake ikvm
-#
-# Just print dots:
-#
-#   [mono] pkg/gherkin.exe features
-#
-# Pretty print all to STDOUT:
-#
-#   [mono] pkg/gherkin.exe features pretty
-#
-# To test out the pure C# main program on .NET, execute:
-#
-#   rake ikvm (you need this to generate all the .dll files needed for the next step)
-#
-# Then build ikvm/Gherkin.sln. Then:
-#
-#   [mono] mono ikvm/Gherkin/bin/Debug/Gherkin.exe features/steps_parser.feature
-#
+# encoding: utf-8
 namespace :ikvm do
+  IKVM_VERSION    = '0.46.0.1'
+  IKVM_BIN_DIR    = "ikvm/ikvm-#{IKVM_VERSION}/bin"
+  IKVMC_EXE       = "#{IKVM_BIN_DIR}/ikvmc.exe"
+  GHERKIN_EXE     = "release/gherkin.exe"
+  GHERKIN_PKG_DLL = "release/nuspec/lib/gherkin.dll"
+  GHERKIN_NUSPEC  = "release/nuspec/gherkin.nuspec"
+  GHERKIN_NUPKG   = "release/gherkin.#{GHERKIN_VERSION}.nupkg"
+  GHERKIN_LIB_DLL = 'lib/gherkin.dll'
+
   def mono(args)
     if(`which mono`.strip =~ /mono/)
       sh("mono #{args}")
     else
-      raise "[ERROR] You must install Mono and IKVM build gherkin for .NET. See README.rdoc"
+      raise "[ERROR] You must install Mono and IKVM build gherkin for .NET. See README.md"
     end
   end
 
   def ikvmc(args)
     begin
-      mono("/usr/local/ikvm/bin/ikvmc.exe #{args}")
+      mono("#{IKVMC_EXE} #{args}")
     rescue => e
       if e.message =~ /Cannot open assembly/
         e.message << "\n\n[ERROR] You must install Mono and IKVM build gherkin for .NET. See README.rdoc"
@@ -39,42 +28,84 @@ namespace :ikvm do
     end
   end
 
-  def references
-    JAVA_LIBS.keys.map{|name| "-reference:release/#{name}.dll"}.join(' ')
+  def nuget(args)
+    mono("/usr/local/nuget/NuGet.exe #{args}")
+  end
+
+  file GHERKIN_EXE => [IKVMC_EXE, 'lib/gherkin.jar'] do
+    ikvmc("-target:exe lib/gherkin.jar -out:#{GHERKIN_EXE}")
+  end
+
+  file GHERKIN_PKG_DLL => [IKVMC_EXE, 'lib/gherkin.jar'] do
+    mkdir_p File.dirname(GHERKIN_PKG_DLL) unless File.directory?(File.dirname(GHERKIN_PKG_DLL))
+    ikvmc("-target:library lib/gherkin.jar -out:#{GHERKIN_PKG_DLL} -version:#{GHERKIN_VERSION}")
+  end
+
+  file GHERKIN_LIB_DLL => GHERKIN_PKG_DLL do
+    cp GHERKIN_PKG_DLL, GHERKIN_LIB_DLL
   end
 
-  task :dependent_dlls do
-    mkdir_p 'release' unless File.directory?('release')
-    JAVA_LIBS.each do |name, jar|
-      ikvmc("-target:library #{jar} -out:release/#{name}.dll")
+  file GHERKIN_NUPKG => [GHERKIN_PKG_DLL, GHERKIN_NUSPEC] 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}")
+  end
+
+  file GHERKIN_NUSPEC do
+    mkdir_p File.dirname(GHERKIN_NUSPEC) unless File.directory?(File.dirname(GHERKIN_NUSPEC))
+    File.open(GHERKIN_NUSPEC, "w") do |io|
+      io.write(<<-EOF)
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <id>gherkin</id>
+    <version>#{GHERKIN_VERSION}</version>
+    <authors>aslakhellesoy</authors>
+    <owners>Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy</owners>
+    <projectUrl>https://github.com/cucumber/gherkin</projectUrl>
+    <licenseUrl>https://github.com/cucumber/gherkin/blob/master/LICENSE</licenseUrl>
+    <iconUrl>https://github.com/cucumber/cukes.info/raw/master/templates/images/gherkin/gherkin_32x32.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>A fast lexer and parser for the Gherkin language based on Ragel</description>
+    <copyright>Copyright (c) 2009-2011 Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy</copyright>
+    <dependencies>
+      <dependency id="IKVM" version="#{IKVM_VERSION}" />
+    </dependencies>
+    <tags>gherkin cucumber specflow bdd lexer parser</tags>
+  </metadata>
+</package>
+EOF
     end
   end
 
-  desc 'Make a .NET .exe'
-  task :exe => ['lib/gherkin.jar', :dependent_dlls] do
-    ikvmc("-target:exe lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.exe #{references}")
+  task :nupkg => GHERKIN_NUPKG
+
+  task :check => [GHERKIN_EXE, :copy_ikvm_dlls] do
+    puts "************** Pretty printing some features with .NET. **************"
+    mono "#{GHERKIN_EXE} features"
+    puts "************** DONE Pretty printing some features with .NET. All OK. **************"
   end
 
-  desc 'Make a .NET .dll'
-  task :dll => ['lib/gherkin.jar', :dependent_dlls] do
-    mkdir_p 'release' unless File.directory?('release')
-    ikvmc("-target:library lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.dll  #{references}")
-    cp "release/gherkin-#{GHERKIN_VERSION}.dll", 'lib/gherkin.dll'
+  task :copy_ikvm_dlls => IKVMC_EXE do
+    exe_dir = File.dirname(GHERKIN_EXE)
+    mkdir_p File.dirname(exe_dir) unless File.directory?(exe_dir)
+    Dir["#{IKVM_BIN_DIR}/*.dll"].each do |dll|
+      cp dll, exe_dir
+    end
   end
 
-  desc 'Copy the IKVM .dll files over to the pkg dir'
-  task :copy_ikvm_dlls do
-    Dir['/usr/local/ikvm/bin/{IKVM.OpenJDK.Core,IKVM.OpenJDK.Text,IKVM.OpenJDK.Security,IKVM.Runtime}.dll'].each do |dll|
-      mkdir_p 'release' unless File.directory?('release')
-      cp dll, 'release'
-      cp dll, 'lib'
+  task :push => GHERKIN_NUPKG do
+    nuget("Push #{GHERKIN_NUPKG}")
+    nuget("Publish gherkin #{GHERKIN_VERSION}")
+  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")
+    Dir.chdir('ikvm') do
+      sh("unzip ikvmbin-#{IKVM_VERSION}.zip")
     end
   end
 end
 
-task :ikvm => ['ikvm:copy_ikvm_dlls', 'ikvm:exe', 'ikvm:dll'] do
-  puts "************** Pretty printing some features with .NET. **************"
-  mono "release/gherkin-#{GHERKIN_VERSION}.exe features"
-  puts "************** DONE Pretty printing some features with .NET. All OK. **************"
-end
+task :ikvm => ['ikvm:check']
 

data/tasks/release.rake

@@ -1,6 +1,6 @@
 namespace :release do
   desc 'Upload all packages and tag git'
-  task :ALL => ['gems:sanity', :ikvm, :mvn_deploy_jar, :mvn_deploy_site, :push_native_gems, :push_npm_package, :release, :push_yard, :symlink_docs, :post_release]
+  task :ALL => ['gems:sanity', 'ikvm:check', :mvn_deploy_jar, :mvn_deploy_site, :push_native_gems, :push_npm_package, 'ikvm:push', :release, :push_yard, :symlink_docs, :post_release]
 
   desc 'Push all gems to rubygems.org'
   task :push_native_gems do
@@ -12,7 +12,6 @@ namespace :release do
   end
 
   task :post_release => :ikvm do
-    puts "\n\n****** Manually upload gherkin-#{GHERKIN_VERSION}.dll to http://github.com/cucumber/gherkin/downloads ******\n\n"
     puts "\n\n****** Manually close and release at https://oss.sonatype.org/index.html#stagingRepositories ******\n\n"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.6
   prerelease: 
 platform: java
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000 Z
+date: 2011-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156370880 !ruby/object:Gem::Requirement
+  requirement: &2152344740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156370880
+  version_requirements: *2152344740
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156370380 !ruby/object:Gem::Requirement
+  requirement: &2152344240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *2156370380
+  version_requirements: *2152344240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156369900 !ruby/object:Gem::Requirement
+  requirement: &2152343740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2156369900
+  version_requirements: *2152343740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156369440 !ruby/object:Gem::Requirement
+  requirement: &2152343140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *2156369440
+  version_requirements: *2152343140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156368980 !ruby/object:Gem::Requirement
+  requirement: &2152342560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2156368980
+  version_requirements: *2152342560
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2156368440 !ruby/object:Gem::Requirement
+  requirement: &2152341800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2156368440
+  version_requirements: *2152341800
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156349520 !ruby/object:Gem::Requirement
+  requirement: &2152341140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2156349520
+  version_requirements: *2152341140
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2156349000 !ruby/object:Gem::Requirement
+  requirement: &2152340680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2156349000
+  version_requirements: *2152340680
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2156348500 !ruby/object:Gem::Requirement
+  requirement: &2152340040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2156348500
+  version_requirements: *2152340040
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2156347860 !ruby/object:Gem::Requirement
+  requirement: &2152412120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2156347860
+  version_requirements: *2152412120
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -230,7 +230,6 @@ files:
 - spec/gherkin/formatter/tag_count_formatter_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
-- spec/gherkin/java_libs.rb
 - spec/gherkin/js_lexer_spec.rb
 - spec/gherkin/json_parser_spec.rb
 - spec/gherkin/lexer/i18n_lexer_spec.rb
@@ -263,9 +262,7 @@ files:
 - tasks/yard/default/layout/html/layout.erb
 - tasks/yard/default/layout/html/logo.erb
 - tasks/yard/default/layout/html/setup.rb
-- lib/base64-2.3.8.jar
 - lib/gherkin.jar
-- lib/json-simple-1.1.jar
 homepage: http://github.com/cucumber/gherkin
 licenses: []
 post_install_message: 
@@ -290,7 +287,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gherkin-2.6.5
+summary: gherkin-2.6.6
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature
@@ -337,7 +334,6 @@ test_files:
 - spec/gherkin/formatter/tag_count_formatter_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb
-- spec/gherkin/java_libs.rb
 - spec/gherkin/js_lexer_spec.rb
 - spec/gherkin/json_parser_spec.rb
 - spec/gherkin/lexer/i18n_lexer_spec.rb

data/spec/gherkin/java_libs.rb

@@ -1,20 +0,0 @@
-JAVA_LIBS = {}
-
-unless RUBY_VERSION == '1.8.6'
-  # When we're building native windows gems with 1.8.6 this block of code fails.
-  # We'll just disable running it - it's not needed at that stage of the build.
-  
-  require 'rexml/document'
-  pom = REXML::Document.new(IO.read(File.dirname(__FILE__) + '/../../java/pom.xml'))
-  pom_version = REXML::XPath.first(pom, '//xmlns:project/xmlns:version/text()').to_s
-  REXML::XPath.each(pom, '//xmlns:project/xmlns:dependencies/xmlns:dependency').each do |dep|
-    groupId = dep.get_elements('groupId')[0].text()
-    artifactId = dep.get_elements('artifactId')[0].text()
-    version = dep.get_elements('version')[0].text()
-    scope = dep.get_elements('scope')[0].text() rescue nil
-
-    jar = "~/.m2/repository/#{groupId.gsub(/\./, '/')}/#{artifactId}/#{version}/#{artifactId}-#{version}.jar"
-    JAVA_LIBS["#{groupId}-#{artifactId}"] = jar if scope != 'test'
-    require jar if defined?(JRUBY_VERSION)
-  end
-end