gherkin 2.9.0-x86-mingw32 → 2.9.1-x86-mingw32

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
 gemspec
 
-# gem 'cucumber', :path => '../cucumber'
+# gem 'cucumber', :path => '../cucumber'
+

data/History.md

@@ -1,3 +1,8 @@
+## [2.9.1](https://github.com/cucumber/gherkin/compare/v2.9.0...v2.9.1)
+
+* Package gherkin.jar as OSGi bundle ([#166](https://github.com/cucumber/gherkin/pull/166) Jan Stamer)
+* The build system and instruction has been updated to work on OS X Lion. (Aslak Hellesøy)
+
 ## [2.9.0](https://github.com/cucumber/gherkin/compare/v2.8.0...v2.9.0)
 
 * Added output to Reporter API (Aslak Hellesøy)

data/README.md

@@ -130,12 +130,16 @@ In order to build and test Gherkin for JavaScript you must install:
 * Node.js (0.4.6 or higher)
 * NPM (0.3.18 or higher)
 * Ragel with JavaScript support: http://github.com/dominicmarks/ragel-js
+** Make sure you have `autoconf` and `automake` (`brew install automake && brew install autoconf`)
+** Make sure you have the official ragel (`brew install ragel`)
+** Make sure you have kelbt (`brew install kelbt`). If that fails, install manually from http://www.complang.org/kelbt/
+** `cd ragel-js/ragel-svn && ./autogen.sh && ./configure --disable-manual`
 * Define the GHERKIN_JS environment variable in your shell (any value will do)
 
 Prepare the environment:
 
     pushd js
-    npm link
+    npm install
     popd
 
 Now you can build the JavaScript with:
@@ -154,14 +158,14 @@ TODO: Make all specs pass with js lexer - replace 'c(listener)' with 'js(listene
 
 ### .NET dll
 
-You must install Mono from source, or use a release of Mono after November 18 2011.
+You must install Mono SDK 2.10.8 or newer.
 
 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
 
-    # The key is at http://nuget.org/Contribute/MyAccount
+    # The key is at https://nuget.org/account
     mono /usr/local/nuget/NuGet.exe SetApiKey xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx
 
 Now you can build the .NET dll with:
@@ -173,17 +177,30 @@ 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. 
-On OS X, download prebuilt binaries (version 4.3.0) from http://crossgcc.rts-software.org/doku.php. 
-Unpack it under /usr/local and add it to your PATH, typically in your `~/.bashrc`:
+Follow the MinGW installation instructions from the [rake-compiler](https://github.com/luislavena/rake-compiler) project.
+IMPORTANT! You may have to get an older version - gcc 4.7.0 is experimental. See [this issue](https://github.com/luislavena/rake-compiler/issues/50)
 
-    export PATH=$PATH:/usr/local/i386-mingw32-4.3.0/bin
+Now, make sure you have openssl installed:
+
+    brew install openssl
+
+Next, we're going to install Ruby 1.8.7 and Ruby 1.9.3 for MinGW. We need both versions so we can build Windows binaries for both.
+OS X Lion (or later) doesn't ship with an LLVM free gcc, which you will need in order to install ruby 1.8.7. We can install it with:
+
+    brew install https://raw.github.com/adamv/homebrew-alt/master/duplicates/apple-gcc42.rb
+    export CC=gcc-4.2 
+
+For more info see:
+
+* http://stackoverflow.com/questions/6170813/why-cant-i-install-rails-on-lion-using-rvm
+* https://github.com/mxcl/homebrew/wiki/Custom-GCC-and-cross-compilers
 
 Now we need to set up [rake-compiler](http://github.com/luislavena/rake-compiler/)
-We'll start by installing some rubies.
+First, set the `CC` variable to your mingw32-gcc, for example:
 
-Make sure you have openssl installed first.
+    export CC=/usr/local/mingw/bin/i686-w64-mingw32-gcc
 
-    brew install openssl
+Now, let's install some rubies:
 
     # 1.8.7
     rvm install 1.8.7-p352
@@ -196,14 +213,14 @@ Make sure you have openssl installed first.
     rake-compiler cross-ruby VERSION=1.8.7-p352
 
     # 1.9.3
-    rvm install 1.9.3-p0
-    rvm use 1.9.3-p0
+    rvm install 1.9.3-p125
+    rvm use 1.9.3-p125
     rvm gemset create cucumber
     rvm gemset use cucumber
     gem install bundler
     unset GHERKIN_JS
     bundle install
-    rake-compiler cross-ruby VERSION=1.9.3-p0
+    rake-compiler cross-ruby VERSION=1.9.3-p125
 
 Now you can build Windows gems:
 

data/gherkin.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   # If the major version is bumped, verify that the change is ok:
   #
   # * Comment out cucumber dependency in gemspec
-  # * Uncomment cucumber location in Gemspec
+  # * Uncomment cucumber location in Gemfile
   # * Bump cucumber's gherkin dependency to the new version
   # * bundle update
   # * bundle exec rake
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   # When both are building OK, do a `bundle exec rake install` in both cucumber and gherkin projects, revert the changes in the first 2 steps 
   # and release both projects.
   #
-  s.version     = "2.9.0"
+  s.version     = "2.9.1"
   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}"
@@ -52,15 +52,15 @@ Gem::Specification.new do |s|
     s.files += Dir['lib/gherkin/rb_lexer/*.rb']
     s.files += Dir['ext/**/*.c']
     s.extensions = Dir['ext/**/extconf.rb']
-    s.add_development_dependency('rake-compiler', '>= 0.7.9')
+    s.add_development_dependency('rake-compiler', '>= 0.8.0')
   end
   s.files -= Dir['**/.gitignore']
 
   s.add_runtime_dependency('json', '>= 1.4.6')
 
-  s.add_development_dependency('cucumber', '>= 1.1.5')
+  s.add_development_dependency('cucumber', '>= 1.1.9')
   s.add_development_dependency('rake', '>= 0.9.2')
-  s.add_development_dependency('bundler', '>= 1.0.22')
+  s.add_development_dependency('bundler', '>= 1.1.0')
   s.add_development_dependency('rspec', '~> 2.7.0') # No 2.8.0 until this is fixed: https://github.com/rspec/rspec-expectations/issues/112
   s.add_development_dependency('rubyzip', '>= 0.9.6.1')
 

data/tasks/ikvm.rake

@@ -15,7 +15,8 @@ namespace :ikvm do
 
   def mono(args)
     if(`which mono`.strip =~ /mono/)
-      sh("mono #{args}")
+      # http://monomvc.wordpress.com/2012/03/06/nuget-on-mono/
+      sh("mono --runtime=v4.0.30319 #{args}")
     else
       raise "[ERROR] You must install Mono and IKVM build gherkin for .NET. See README.md"
     end
@@ -26,7 +27,7 @@ namespace :ikvm do
       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"
+        e.message << "\n\n[ERROR] You must install Mono and IKVM build gherkin for .NET. See README.md"
       end
       raise e
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2166168720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,21 +23,31 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2166168720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2166168240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.9
   type: :development
   prerelease: false
-  version_requirements: *2166168240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2166167780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,21 +55,31 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2166167780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2166167220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.22
+        version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2166167220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2166166700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +87,15 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2166166700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2166166180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +103,15 @@ dependencies:
         version: 0.9.6.1
   type: :development
   prerelease: false
-  version_requirements: *2166166180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.6.1
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2166165640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +119,15 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *2166165640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.10
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2166165160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +135,15 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *2166165160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2166164680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +151,15 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2166164680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2166164180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +167,15 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2166164180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2166163720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,7 +183,12 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2166163720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -386,10 +441,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
-summary: gherkin-2.9.0
+summary: gherkin-2.9.1
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature