gherkin 2.2.0-universal-dotnet → 2.2.1-universal-dotnet

data/.gitignore

@@ -1,4 +1,5 @@
 *.sw?
+*.rbc
 .DS_Store
 coverage
 rdoc
@@ -6,4 +7,4 @@ pkg
 ext
 tmp
 release
-gherkin.gemspec
+.bundle

data/.rvmrc

@@ -0,0 +1 @@
+rvm @cucumber

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,49 @@
+PATH
+  remote: /Users/aslakhellesoy/scm/cucumber
+  specs:
+    cucumber (0.9.0)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      json_pure (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+
+PATH
+  remote: .
+  specs:
+    gherkin (2.2.1)
+      trollop (~> 1.16.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    awesome_print (0.2.1)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    json_pure (1.4.6)
+    rake (0.8.7)
+    rake-compiler (0.7.1)
+      rake (>= 0.8.3, < 0.9)
+    rspec (2.0.0.beta.20)
+      rspec-core (= 2.0.0.beta.20)
+      rspec-expectations (= 2.0.0.beta.20)
+      rspec-mocks (= 2.0.0.beta.20)
+    rspec-core (2.0.0.beta.20)
+    rspec-expectations (2.0.0.beta.20)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.20)
+    term-ansicolor (1.0.5)
+    trollop (1.16.2)
+
+PLATFORMS
+  java
+  ruby
+  x86-mingw32
+
+DEPENDENCIES
+  awesome_print (~> 0.2.1)
+  cucumber!
+  gherkin!
+  rake (~> 0.8.7)
+  rake-compiler (~> 0.7.1)
+  rspec (~> 2.0.0.beta.20)
+  trollop (~> 1.16.2)

data/History.txt

@@ -1,3 +1,11 @@
+== 2.2.1
+
+=== New Features
+* Windows gems are now built against 1.8.6-p287 and 1.9.1-p243, on both mswin32 and mingw32, and should work on 1.8.6, 1.8.7, 1.9.1 and 1.9.2 versions of rubyinstaller.org as well as older windows rubies. (Aslak Hellesøy)
+
+=== Changed features
+* Build system no longer uses Jeweler - only Rake, Bundler and Rubygems (Aslak Hellesøy)
+
 == 2.2.0 (2010-07-26)
 
 This release breaks some APIs since the previous 2.1.5 release. If you install gherkin 2.2.0 you must also upgrade to

data/README.rdoc

@@ -33,7 +33,7 @@ E.g. in Bash, export RL_LANG="en,fr,no". This can be quite helpful when modifyin
 ** ikvm/Gherkin/Gherkin.csproj
 * Make sure both JRuby and MRI has the latest Cucumber installed (from source) otherwise the jruby gem might not get the jar inside it.
 ** Install cucumber without gherkin dep: gem install --ignore-dependencies pkg/cucumber
-* rake release:ALL
+* rake gems:prepare && ./build_native_gems.sh && rake release:ALL
 * Announce on Cucumber list, IRC and Twitter.
 
 == Configuring Rake-Compiler for cross compilation
@@ -41,7 +41,7 @@ In order to build Windows binaries (so we can release Windows gems from OS X/Lin
 
 http://github.com/luislavena/rake-compiler/
 
-I didn't want to install macports (I'm on homebrew) and I couldn't figure out how to build MinGW myself. I got prebuilt binaries:
+I didn't want to install macports (I'm on homebrew) and I couldn't figure out how to build MinGW myself. I got prebuilt binaries (version 4.3.0):
 http://crossgcc.rts-software.org/doku.php - just add the bin folder to your PATH
 
 == Note on Patches/Pull Requests

data/Rakefile

@@ -1,56 +1,13 @@
 # encoding: utf-8
-require 'rbconfig'
 require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'yaml'
-
-config = YAML.load_file('VERSION.yml')
-GHERKIN_VERSION = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+require 'bundler'
+Bundler.setup
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "gherkin"
-    gem.summary = %Q{Fast Gherkin lexer/parser}
-    gem.description = %Q{A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.}
-    gem.email = "cukes@googlegroups.com"
-    gem.homepage = "http://github.com/aslakhellesoy/gherkin"
-    gem.authors = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
-    gem.executables = ["gherkin"]
-    gem.add_dependency "trollop", "~> 1.16.2"
-    gem.add_development_dependency 'awesome_print', '~> 0.2.1'
-    gem.add_development_dependency 'rspec', '~> 2.0.0.beta.17'
-    gem.add_development_dependency "cucumber", "~> 0.9.0"
-    gem.add_development_dependency "rake-compiler", "~> 0.7.0" unless defined?(JRUBY_VERSION)
+require 'rake/clean'
 
-    gem.files -= FileList['ikvm/**/*']
-    gem.files -= FileList['java/**/*']
-    case ENV['PLATFORM']
-    when 'java'
-      gem.platform = 'java'
-      gem.files += FileList['lib/gherkin.jar']
-      gem.extensions = []
-    when 'i386-mswin32', 'i386-mingw32'
-      gem.platform = ENV['PLATFORM']
-      gem.files += FileList['lib/*/*.so']
-      gem.extensions = []
-    when 'universal-dotnet'
-      gem.platform = ENV['PLATFORM']
-      gem.files += FileList['lib/*.dll']
-      gem.extensions = []
-    else
-      gem.files += FileList['lib/gherkin/rb_lexer/*.rb']
-      gem.files += FileList['ext/**/*.c']
-      gem.extensions = FileList['ext/**/extconf.rb']
-    end
-    
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  warn "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+$:.unshift(File.dirname(__FILE__) + '/lib')
+require 'gherkin/version'
 
 Dir['tasks/**/*.rake'].each { |rake| load File.expand_path(rake) }
 

data/VERSION

@@ -0,0 +1 @@
+2.2.1

data/build_native_gems.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+rm -Rf release
+mkdir release
+GEM_PLATFORM=java gem build gherkin.gemspec
+GEM_PLATFORM=i386-mswin32 gem build gherkin.gemspec
+GEM_PLATFORM=i386-mingw32 gem build gherkin.gemspec
+GEM_PLATFORM=universal-dotnet gem build gherkin.gemspec
+mv *.gem release

data/features/step_definitions/{json_lexer_steps.rb → json_parser_steps.rb}

@@ -12,7 +12,7 @@ Given /^a JSON lexer$/ do
 end
 
 Given /^the following JSON is parsed:$/ do |text|
-  @json_parser.parse(JSON.pretty_generate(JSON.parse(text)), "unknown.json")
+  @json_parser.parse(JSON.pretty_generate(JSON.parse(text)), "unknown.json", 0)
 end
 
 Then /^the outputted text should be:$/ do |expected_text|

data/features/step_definitions/pretty_formatter_steps.rb

@@ -23,7 +23,7 @@ module PrettyPlease
     result              = StringIO.new
     pretty_formatter    = Gherkin::Formatter::PrettyFormatter.new(result, false)
     json_parser         = Gherkin::JSONParser.new(pretty_formatter)
-    json_parser.parse(json.string, "#{feature_path}.json")
+    json_parser.parse(json.string, "#{feature_path}.json", 0)
     
     result.string
   end

data/features/support/env.rb

@@ -1,3 +1,7 @@
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+
 # I'm sure there's a better way than this...
 %w{ /../../spec /../../lib}.each do |path|
   $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + path)

data/gherkin.gemspec

@@ -0,0 +1,57 @@
+# -*- encoding: utf-8 -*-
+gherkin_dir = Dir.pwd =~ /gherkin\/tmp/ ? File.expand_path("../../../..", Dir.pwd) : File.expand_path("..", __FILE__)
+$LOAD_PATH.unshift File.join(gherkin_dir, 'lib')
+require "gherkin/version"
+
+Gem::Specification.new do |s|
+  s.name        = "gherkin"
+  s.version     = Gherkin::VERSION
+  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     = "gherkin-#{Gherkin::VERSION}"
+  s.email       = "cukes@googlegroups.com"
+  s.homepage    = "http://github.com/aslakhellesoy/gherkin"
+
+  s.rubygems_version   = "1.3.7"
+  s.default_executable = "gherkin"
+
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.extra_rdoc_files = ["LICENSE", "README.rdoc", "History.txt"]
+  s.rdoc_options     = ["--charset=UTF-8"]
+  s.require_path     = "lib"
+
+  s.files -= Dir['ikvm/**/*']
+  s.files -= Dir['java/**/*']
+  s.files -= Dir['ext/**/*']
+  s.files -= Dir['lib/gherkin.jar']
+  s.files -= Dir['lib/**/*.dll']
+  s.files -= Dir['lib/**/*.bundle']
+  s.files -= Dir['lib/**/*.so']
+  
+  if ENV['GEM_PLATFORM']
+    puts "GEM_PLATFORM:#{ENV['GEM_PLATFORM']}"
+    puts "PLATFORM:#{PLATFORM}"
+  end
+  s.platform = ENV['GEM_PLATFORM'] if ENV['GEM_PLATFORM'] 
+  case s.platform.to_s
+  when /java/
+    s.files += ['lib/gherkin.jar']
+  when /mswin|mingw32/
+    s.files += Dir['lib/*/*.so']
+  when /dotnet/
+    s.files += Dir['lib/*.dll']
+  else # MRI or Rubinius
+    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.1')
+  end
+
+  s.add_dependency('trollop', '~> 1.16.2')
+  s.add_development_dependency('rake', '~> 0.8.7')
+  s.add_development_dependency('awesome_print', '~> 0.2.1')
+  s.add_development_dependency('rspec', '~> 2.0.0.beta.20')
+  s.add_development_dependency('cucumber', '~> 0.9.0') unless File.directory?(File.join(gherkin_dir, '../cucumber'))
+end

data/lib/gherkin/formatter/model.rb

@@ -20,10 +20,10 @@ module Gherkin
       end
       
       class BasicStatement < Hashable
-        attr_reader :comments, :keyword, :name, :description, :line
+        attr_reader :comments, :keyword, :name, :line
         
-        def initialize(comments, keyword, name, description, line)
-          @comments, @keyword, @name, @description, @line = comments, keyword, name, description, line
+        def initialize(comments, keyword, name, line)
+          @comments, @keyword, @name, @line = comments, keyword, name, line
         end
 
         def line_range
@@ -36,7 +36,16 @@ module Gherkin
         end
       end
 
-      class TagStatement < BasicStatement
+      class DescribedStatement < BasicStatement
+        attr_reader :description
+
+        def initialize(comments, keyword, name, description, line)
+          super(comments, keyword, name, line)
+          @description = description
+        end
+      end
+
+      class TagStatement < DescribedStatement
         attr_reader :tags
 
         def initialize(comments, tags, keyword, name, description, line)
@@ -61,7 +70,7 @@ module Gherkin
         end
       end
 
-      class Background < BasicStatement
+      class Background < DescribedStatement
         native_impl('gherkin')
 
         def initialize(comments, keyword, name, description, line)
@@ -120,8 +129,8 @@ module Gherkin
 
         attr_accessor :multiline_arg, :result
 
-        def initialize(comments, keyword, name, description, line, multiline_arg=nil, result=nil)
-          super(comments, keyword, name, nil, line)
+        def initialize(comments, keyword, name, line, multiline_arg=nil, result=nil)
+          super(comments, keyword, name, line)
           @multiline_arg = multiline_arg
           @result = result
         end

data/lib/gherkin/json_parser.rb

@@ -48,7 +48,7 @@ module Gherkin
           multiline_arg = Formatter::Model::PyString.new(ma['value'], ma['line'])
         end
       end
-      Formatter::Model::Step.new(comments(o), keyword(o), name(o), nil, line(o), multiline_arg)
+      Formatter::Model::Step.new(comments(o), keyword(o), name(o), line(o), multiline_arg)
     end
 
     def rows(o)

data/lib/gherkin/listener/formatter_listener.rb

@@ -49,7 +49,7 @@ module Gherkin
 
       def step(keyword, name, line)
         replay_step_or_examples
-        @step_statement = Formatter::Model::Step.new(grab_comments!, keyword, name, nil, line)
+        @step_statement = Formatter::Model::Step.new(grab_comments!, keyword, name, line)
       end
 
       def row(cells, line)

data/lib/gherkin/tools/files.rb

@@ -20,7 +20,7 @@ module Gherkin
         Dir[*globs].uniq.sort.each(&proc)
       end
 
-      def scan(file, formatter)
+      def parse(file, formatter)
         parser = Gherkin::Parser::Parser.new(formatter, true, "root")
         begin
           parser.parse(IO.read(file), file, 0)

data/lib/gherkin/tools/reformat.rb

@@ -10,8 +10,7 @@ module Gherkin
         each do |file|
           io = defined?(JRUBY_VERSION) ? Java.java.io.StringWriter.new : StringIO.new
           formatter = Formatter::PrettyFormatter.new(io, true)
-          listener = Listener::FormatterListener.new(formatter)
-          scan(file, listener)
+          parse(file, formatter)
           string = defined?(JRUBY_VERSION) ? io.getBuffer.toString : io.string
           File.open(file, 'w') {|io| io.write(string)}
         end

data/lib/gherkin/version.rb

@@ -0,0 +1,3 @@
+module Gherkin
+  VERSION = IO.read(File.dirname(__FILE__) + '/../../VERSION').strip
+end

data/spec/gherkin/formatter/pretty_formatter_spec.rb

@@ -42,8 +42,8 @@ module Gherkin
           ['When ', 'foo']
         ])
         @l.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
-        @l.step(Model::Step.new([], "Given ", "some stuff", "", 5, nil, result('passed', nil, nil, "features/step_definitions/bar.rb:56")))
-        @l.step(Model::Step.new([], "When ", "foo", "", 6, nil, result('passed', nil, nil, "features/step_definitions/bar.rb:96")))
+        @l.step(Model::Step.new([], "Given ", "some stuff", 5, nil, result('passed', nil, nil, "features/step_definitions/bar.rb:56")))
+        @l.step(Model::Step.new([], "When ", "foo", 6, nil, result('passed', nil, nil, "features/step_definitions/bar.rb:96")))
 
         assert_io(%{Feature: Hello
   World
@@ -61,7 +61,7 @@ module Gherkin
           ['Given ', 'some stuff that is longer']
         ])
         @l.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
-        @l.step(Model::Step.new([], "Given ", "some stuff that is longer", "", 5, nil, result('passed', nil, nil, "features/step_definitions/bar.rb:56")))
+        @l.step(Model::Step.new([], "Given ", "some stuff that is longer", 5, nil, result('passed', nil, nil, "features/step_definitions/bar.rb:56")))
 
         assert_io(%{Feature: Hello
   World
@@ -72,7 +72,7 @@ module Gherkin
       end
 
       it "should highlight arguments for regular steps" do
-        step = Model::Step.new([], "Given ", "I have 999 cukes in my belly", "", 3, nil, result('passed', nil, [Gherkin::Formatter::Argument.new(7, '999')], nil))
+        step = Model::Step.new([], "Given ", "I have 999 cukes in my belly", 3, nil, result('passed', nil, [Gherkin::Formatter::Argument.new(7, '999')], nil))
         @l.step(step)
         assert_io("    Given I have 999 cukes in my belly\n")
       end

data/spec/gherkin/json_parser_spec.rb

@@ -11,7 +11,7 @@ module Gherkin
       io = StringIO.new
       f = Formatter::JSONFormatter.new(io)
       p = JSONParser.new(f)
-      p.parse(json, 'unknown.json')
+      p.parse(json, 'unknown.json', 0)
       expected = JSON.parse(json)
       actual   = JSON.parse(io.string)
 

data/spec/gherkin/shared/lexer_group.rb

@@ -5,7 +5,7 @@ module Gherkin
   module Lexer
     shared_examples_for "a Gherkin lexer" do
       def scan(gherkin)
-        @lexer.scan(gherkin, "test.feature", 0)
+        @lexer.scan(gherkin)
       end
 
       describe "Comments" do

data/spec/gherkin/shared/py_string_group.rb

@@ -5,7 +5,7 @@ module Gherkin
   module Lexer
     shared_examples_for "a Gherkin lexer lexing py_strings" do
       def scan(gherkin)
-        @lexer.scan(gherkin, "test.feature", 0)
+        @lexer.scan(gherkin)
       end
 
       def ps(content)

data/spec/gherkin/shared/tags_group.rb

@@ -5,7 +5,7 @@ module Gherkin
   module Lexer
     shared_examples_for "a Gherkin lexer lexing tags" do
       def scan(gherkin)
-        @lexer.scan(gherkin, "test.feature", 0)
+        @lexer.scan(gherkin)
       end
 
       it "should lex a single tag" do

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
 require 'rubygems'
+require 'bundler'
+Bundler.setup
+
 require 'rspec/autorun'
 require 'gherkin'
 require 'stringio'

data/tasks/compile.rake

@@ -4,7 +4,7 @@ require 'gherkin/i18n'
 
 CLEAN.include [
   'pkg', 'tmp',
-  '**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log}', 'ext',
+  '**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log,rbc}', 'ext',
   'java/target',
   'ragel/i18n/*.rl',
   'lib/gherkin/rb_lexer/*.rb',

data/tasks/cucumber.rake

@@ -4,7 +4,6 @@ require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:cucumber) do |t|
   t.cucumber_opts = "--profile default"
 end
-task :cucumber => [:check_dependencies]
 
 namespace :cucumber do
   Cucumber::Rake::Task.new(:rcov, "Run Cucumber using RCov") do |t|
@@ -16,7 +15,7 @@ namespace :cucumber do
   Cucumber::Rake::Task.new(:native_lexer, "Run Native lexer Cucumber features") do |t|
     t.cucumber_opts = "--profile native_lexer"
   end
-  task :native_lexer => [:check_dependencies, :clean, :compile]
+  task :native_lexer => [:clean, :compile]
 end
 
 rescue LoadError

data/tasks/gems.rake

@@ -1,46 +1,42 @@
 namespace :gems do
-  desc "Build MRI/C POSIX gem"
-  task :posix => :release_dir  do
-    sh "rake clean spec"
-    sh "rake gemspec build"
-    mv "pkg/gherkin-#{GHERKIN_VERSION}.gem", 'release'
-  end
+  task :win do
+    unless File.directory?(File.expand_path('~/.rake-compiler'))
+      STDERR.puts <<-EOM
+
+You must install Windows rubies to ~/.rake-compiler with:
 
-  [:mswin32, :mingw32].each do |win_compiler|
-    desc "Build MRI/C precompiled #{win_compiler} gem"
-    task win_compiler do
-      # Bootstrap with:
-      #
-      #   rake-compiler cross-ruby VERSION=1.9.1-p243
-      #   rake-compiler cross-ruby VERSION=1.8.6-p114
-      #
-      sh "rake cross compile RUBY_CC_VERSION=1.8.6:1.9.1"
-      sh "rake gemspec build PLATFORM=i386-#{win_compiler}"
-      mv "pkg/gherkin-#{GHERKIN_VERSION}-x86-#{win_compiler}.gem", 'release'
+  rake-compiler cross-ruby VERSION=1.8.6-p287
+  # (Later 1.9.1 patch levels don't compile on mingw) 
+  rake-compiler cross-ruby VERSION=1.9.1-p243
+EOM
+      exit(1)
     end
+    # rvm and mingw ruby versions have to match to avoid errors
+    sh "rvm 1.8.6@cucumber rake cross compile RUBY_CC_VERSION=1.8.6"
+    sh "rvm 1.9.1@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"
   end
 
-  desc 'Build JRuby gem'
-  task :jruby => :release_dir do
-    sh "rvm jruby rake spec"
-    sh "rvm jruby rake gemspec build PLATFORM=java"
-    raise "The jruby gem looks too small" if File.stat("pkg/gherkin-#{GHERKIN_VERSION}-java.gem").size < 1000000
-    mv "pkg/gherkin-#{GHERKIN_VERSION}-java.gem", 'release'
+  desc 'Prepare JRuby binares'
+  task :jruby => [:jar] do
+    sh "rvm jruby@cucumber -S rspec spec"
   end
 
-  desc 'Build IronRuby gem'
-  task :ironruby => [:jruby, 'ikvm:dll', 'ikvm:copy_ikvm_dlls'] do
-    sh "rake gemspec build PLATFORM=universal-dotnet"
-    mv "pkg/gherkin-#{GHERKIN_VERSION}-universal-dotnet.gem", 'release'
-  end
+  desc 'Prepare IronRuby binaries'
+  task :ironruby => [:jruby, 'ikvm:dll', 'ikvm:copy_ikvm_dlls']
 
-  task :release_dir do
-    mkdir 'release' unless File.directory?('release')
+  task :sanity do
+    raise "The jruby gem looks too small" if File.stat("release/gherkin-#{Gherkin::VERSION}-java.gem").size < 1000000
   end
 
-  task :clean_release_dir do
-    rm_rf 'release' if File.directory?('release')
-  end
-end
+  desc "Prepare binaries for all gems"
+  task :prepare => [
+    :clean,
+    :spec,
+    :win,
+    :jruby,
+    :ironruby
+  ]
 
-task :gems => ['gems:clean_release_dir', 'gems:posix', 'gems:mswin32', 'gems:mingw32', 'gems:jruby', 'gems:ironruby']
+end

data/tasks/ikvm.rake

@@ -20,18 +20,21 @@ require File.dirname(__FILE__) + '/../spec/gherkin/json'
 #   [mono] mono ikvm/Gherkin/bin/Debug/Gherkin.exe features/steps_parser.feature
 #
 namespace :ikvm do
-  desc 'Make a .NET .exe'
-  task :exe => 'lib/gherkin.jar' do
+  task :dependent_dlls do
     mkdir_p 'release' unless File.directory?('release')
-    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:exe lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.exe")
+    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library #{JSON_SIMPLE_JAR} -out:release/json-simple.dll")
+  end
+
+  desc 'Make a .NET .exe'
+  task :exe => ['lib/gherkin.jar', :dependent_dlls] do
+    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:exe lib/gherkin.jar -out:release/gherkin-#{Gherkin::VERSION}.exe -reference:release/json-simple.dll")
   end
 
   desc 'Make a .NET .dll'
-  task :dll => 'lib/gherkin.jar' do
+  task :dll => ['lib/gherkin.jar', :dependent_dlls] do
     mkdir_p 'release' unless File.directory?('release')
-    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library #{JSON_SIMPLE_JAR} -out:release/json-simple.dll")
-    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.dll -reference:release/json-simple.dll")
-    cp "release/gherkin-#{GHERKIN_VERSION}.dll", 'lib/gherkin.dll'
+    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library lib/gherkin.jar -out:release/gherkin-#{Gherkin::VERSION}.dll -reference:release/json-simple.dll")
+    cp "release/gherkin-#{Gherkin::VERSION}.dll", 'lib/gherkin.dll'
   end
 
   desc 'Copy the IKVM .dll files over to the pkg dir'
@@ -44,6 +47,8 @@ namespace :ikvm do
 end
 
 task :ikvm => ['ikvm:copy_ikvm_dlls', 'ikvm:exe', 'ikvm:dll'] do
-  sh "mono release/gherkin-#{GHERKIN_VERSION}.exe features"
+  puts "************** Pretty printing some features with .NET. **************"
+  sh "mono release/gherkin-#{Gherkin::VERSION}.exe features"
+  puts "************** DONE Pretty printing some features with .NET. All OK. **************"
 end
 

data/tasks/rdoc.rake

@@ -1,11 +1,8 @@
 require 'rake/rdoctask'
 
 Rake::RDocTask.new do |rdoc|
-  config = YAML.load_file('VERSION.yml')
-  version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "Gherkin #{version}"
+  rdoc.title = "Gherkin #{Gherkin::VERSION}"
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.rdoc_files.exclude('lib/gherkin/lexer')

data/tasks/release.rake

@@ -1,9 +1,9 @@
 namespace :release do
-  desc 'Uplad all packages and tag git'
-  task :ALL => [:gems, :push_dll, :push_jar, :push_gems, 'git:release']
+  desc 'Upload all packages and tag git'
+  task :ALL => ['gems:sanity', :push_dll, :push_jar, :push_native_gems, :release]
 
   desc 'Push all gems to rubygems.org (gemcutter)'
-  task :push_gems do
+  task :push_native_gems do
     Dir.chdir('release') do
       Dir['*.gem'].each do |gem_file|
         sh("gem push #{gem_file}")
@@ -14,18 +14,10 @@ namespace :release do
   desc 'Push dll to Github'
   task :push_dll => :ikvm do
     Dir.chdir('release') do
-      # This requires aslakhellesoy's build of the github gem,
-      # which has tekkub's upload command.
-      begin
-        sh("github upload gherkin-#{GHERKIN_VERSION}.dll")
-      rescue => e
-        # For some reason we're getting an error even if the upload is successful. Verify that here...
-        head = `curl -I -X HEAD http://github.com/downloads/aslakhellesoy/gherkin/gherkin-#{GHERKIN_VERSION}.dll`
-        if !(head =~ /302 Found/in)
-          e.message << "\n\nUpload of gherkin-#{GHERKIN_VERSION}.dll failed:\n\n#{head}"
-          raise e
-        end
-      end
+      # No known way to do scripted uploads. github/upload or aslakhellesoy's fork of github-gem no longer work
+      puts "Manually upload gherkin-#{Gherkin::VERSION}.dll to http://github.com/aslakhellesoy/gherkin/downloads"
+      puts "Then press enter"
+      STDIN.gets
     end
   end
 

data/tasks/rspec.rake

@@ -1,7 +1,6 @@
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
-task :spec => [:check_dependencies]
 
 RSpec::Core::RakeTask.new(:rcov) do |t|
   t.rcov = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gherkin
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 1
+  version: 2.2.1
 platform: universal-dotnet
 authors: 
 - Mike Sassak
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 +02:00
+date: 2010-09-13 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,71 +37,55 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: awesome_print
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 49
         segments: 
         - 0
-        - 2
-        - 1
-        version: 0.2.1
+        - 8
+        - 7
+        version: 0.8.7
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: awesome_print
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196417
+        hash: 21
         segments: 
-        - 2
-        - 0
         - 0
-        - beta
-        - 17
-        version: 2.0.0.beta.17
+        - 2
+        - 1
+        version: 0.2.1
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 62196427
         segments: 
+        - 2
         - 0
-        - 9
         - 0
-        version: 0.9.0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
-  type: :development
-  version_requirements: *id005
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: 
@@ -111,17 +95,22 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
+- History.txt
 files: 
 - .gitattributes
 - .gitignore
 - .mailmap
 - .rspec
+- .rvmrc
+- Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION.yml
+- VERSION
 - bin/gherkin
+- build_native_gems.sh
 - cucumber.yml
 - features/escaped_pipes.feature
 - features/feature_parser.feature
@@ -133,21 +122,16 @@ files:
 - features/step_definitions/eyeball_steps.rb
 - features/step_definitions/gherkin_steps.rb
 - features/step_definitions/json_formatter_steps.rb
-- features/step_definitions/json_lexer_steps.rb
+- features/step_definitions/json_parser_steps.rb
 - features/step_definitions/pretty_formatter_steps.rb
 - features/steps_parser.feature
 - features/support/env.rb
+- gherkin.gemspec
 - ikvm/.gitignore
 - java/.gitignore
 - java/src/main/java/gherkin/lexer/i18n/.gitignore
 - java/src/main/resources/gherkin/.gitignore
-- json-simple-1.1.dll
 - lib/.gitignore
-- lib/IKVM.OpenJDK.Core.dll
-- lib/IKVM.OpenJDK.Security.dll
-- lib/IKVM.OpenJDK.Text.dll
-- lib/IKVM.Runtime.dll
-- lib/gherkin.dll
 - lib/gherkin.rb
 - lib/gherkin/c_lexer.rb
 - lib/gherkin/cli/main.rb
@@ -187,6 +171,7 @@ files:
 - lib/gherkin/tools/reformat.rb
 - lib/gherkin/tools/stats.rb
 - lib/gherkin/tools/stats_listener.rb
+- lib/gherkin/version.rb
 - ragel/i18n/.gitignore
 - ragel/lexer.c.rl.erb
 - ragel/lexer.java.rl.erb
@@ -244,6 +229,11 @@ files:
 - tasks/rdoc.rake
 - tasks/release.rake
 - tasks/rspec.rake
+- lib/gherkin.dll
+- lib/IKVM.OpenJDK.Core.dll
+- lib/IKVM.OpenJDK.Security.dll
+- lib/IKVM.OpenJDK.Text.dll
+- lib/IKVM.Runtime.dll
 has_rdoc: true
 homepage: http://github.com/aslakhellesoy/gherkin
 licenses: []
@@ -277,14 +267,46 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Fast Gherkin lexer/parser
+summary: gherkin-2.2.1
 test_files: 
+- features/escaped_pipes.feature
+- features/feature_parser.feature
+- features/json_formatter.feature
+- features/json_parser.feature
+- features/native_lexer.feature
+- features/parser_with_native_lexer.feature
+- features/pretty_formatter.feature
+- features/step_definitions/eyeball_steps.rb
+- features/step_definitions/gherkin_steps.rb
+- features/step_definitions/json_formatter_steps.rb
+- features/step_definitions/json_parser_steps.rb
+- features/step_definitions/pretty_formatter_steps.rb
+- features/steps_parser.feature
+- features/support/env.rb
 - spec/gherkin/c_lexer_spec.rb
+- spec/gherkin/fixtures/1.feature
+- spec/gherkin/fixtures/comments_in_table.feature
+- spec/gherkin/fixtures/complex.feature
+- spec/gherkin/fixtures/complex.json
+- spec/gherkin/fixtures/complex_for_filtering.feature
+- spec/gherkin/fixtures/complex_with_tags.feature
+- spec/gherkin/fixtures/dos_line_endings.feature
+- spec/gherkin/fixtures/hantu_pisang.feature
+- spec/gherkin/fixtures/i18n_fr.feature
+- spec/gherkin/fixtures/i18n_no.feature
+- spec/gherkin/fixtures/i18n_zh-CN.feature
+- spec/gherkin/fixtures/scenario_outline_with_tags.feature
+- spec/gherkin/fixtures/scenario_without_steps.feature
+- spec/gherkin/fixtures/simple_with_comments.feature
+- spec/gherkin/fixtures/simple_with_tags.feature
+- spec/gherkin/fixtures/with_bom.feature
 - spec/gherkin/formatter/argument_spec.rb
 - spec/gherkin/formatter/colors_spec.rb
 - spec/gherkin/formatter/filter_formatter_spec.rb
 - spec/gherkin/formatter/model_spec.rb
 - spec/gherkin/formatter/pretty_formatter_spec.rb
+- spec/gherkin/formatter/spaces.feature
+- spec/gherkin/formatter/tabs.feature
 - spec/gherkin/formatter/tag_count_formatter_spec.rb
 - spec/gherkin/i18n_spec.rb
 - spec/gherkin/java_lexer_spec.rb

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:major: 2
-:minor: 2
-:patch: 0
-:build: