gherkin 2.3.7-x86-mswin32 → 2.3.8-x86-mswin32

data/.gitignore

@@ -9,3 +9,4 @@ tmp
 release
 .bundle
 Gemfile.lock
+npm-debug.log

data/History.txt

@@ -1,4 +1,9 @@
-== (In Git)
+== 2.3.8 (2011-05-16)
+
+=== Insignificant changes
+* Improve build system so we don't need to add generated js lexers to git.
+
+== 2.3.7 (2011-05-01)
 
 * Removed incorrect (and unneeded) case statement that could blow up if V8 is installed. (Aslak Hellesøy, Niklas H)
 * Added connect support for gherkin.js (Aslak Hellesøy)

data/README.rdoc

@@ -97,6 +97,8 @@ If you're hacking and just want to rebuild the English parser:
 
   rake js/lib/gherkin/lexer/en.js
 
+TODO: Make all specs pass with js lexer - replace 'c(listener)' with 'js(listener)' in i18n.rb
+
 === .NET and IronRuby
 
 You must install Mono and IKVM to build the pure .NET dll and the IronRuby gem:
@@ -156,7 +158,8 @@ Make sure you have openssl installed first.
 == Release process
 
 * Make sure GHERKIN_JS is defined (see Javascript section above)
-* Bump version in the VERSION file and:
+* Bump version in:
+** gherkin.gemspec
 ** java/pom.xml
 ** ikvm/Gherkin/Gherkin.csproj (2 places)
 ** js/package.json

data/Rakefile

@@ -1,4 +1,5 @@
 # encoding: utf-8
+GHERKIN_VERSION = Gem::Specification.load(File.dirname(__FILE__) + '/gherkin.gemspec').version.version
 require 'rubygems'
 require 'bundler'
 unless ENV['RUBY_CC_VERSION']
@@ -10,7 +11,6 @@ ENV['RUBYOPT'] = nil # Necessary to prevent Bundler from *&^%$#ing up rake-compi
 require 'rake/clean'
 
 $:.unshift(File.dirname(__FILE__) + '/lib')
-require 'gherkin/version'
 
 Dir['tasks/**/*.rake'].each { |rake| load File.expand_path(rake) }
 

data/gherkin.gemspec

@@ -1,16 +1,13 @@
 # -*- 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.version     = "2.3.8"
   s.authors     = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
   s.description = "A fast Gherkin lexer/parser for based on the Ragel State Machine Compiler."
-  s.summary     = "gherkin-#{Gherkin::VERSION}"
+  s.summary     = "#{s.name}-#{s.version}"
   s.email       = "cukes@googlegroups.com"
-  s.homepage    = "http://github.com/aslakhellesoy/gherkin"
+  s.homepage    = "http://github.com/cucumber/gherkin"
 
   s.rubygems_version   = "1.3.7"
   s.default_executable = "gherkin"
@@ -51,12 +48,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency('json', '>= 1.4.6')
 
-  s.add_development_dependency('cucumber', '>= 0.10.0')
+  s.add_development_dependency('cucumber', '>= 0.10.2')
   s.add_development_dependency('rake', '>= 0.8.7')
-  s.add_development_dependency('bundler', '>= 1.0.10')
+  s.add_development_dependency('bundler', '>= 1.0.13')
   s.add_development_dependency('rspec', '>= 2.5.0')
   s.add_development_dependency('awesome_print', '>= 0.3')
-  s.add_development_dependency('therubyracer', '>= 0.8.2.pre2') if ENV['GHERKIN_JS'] && !defined?(JRUBY_VERSION)
+  s.add_development_dependency('therubyracer', '>= 0.9.0.beta3') if ENV['GHERKIN_JS'] && !defined?(JRUBY_VERSION)
 
   # Only needed by Cucumber. Remove when Cucumber no longer needs those.
   s.add_development_dependency('term-ansicolor', '>= 1.0.5')

data/ragel/lexer.c.rl.erb

@@ -334,7 +334,7 @@ store_pystring_content(VALUE listener,
 static void 
 raise_lexer_error(const char * at, int line)
 { 
-  rb_raise(rb_eGherkinLexingError, "Lexing error on line %d: '%s'. See http://wiki.github.com/aslakhellesoy/gherkin/lexingerror for more information.", line, at);
+  rb_raise(rb_eGherkinLexingError, "Lexing error on line %d: '%s'. See http://wiki.github.com/cucumber/gherkin/lexingerror for more information.", line, at);
 }
 
 static void lexer_init(lexer_state *lexer) {

data/ragel/lexer.java.rl.erb

@@ -131,7 +131,7 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
     action end_feature {
       if(cs < lexer_first_final) {
         String content = currentLineContent(data, lastNewline);
-        throw new LexingError("Lexing error on line " + lineNumber + ": '" + content + "'. See http://wiki.github.com/aslakhellesoy/gherkin/lexingerror for more information.");
+        throw new LexingError("Lexing error on line " + lineNumber + ": '" + content + "'. See http://wiki.github.com/cucumber/gherkin/lexingerror for more information.");
       } else {
         listener.eof();
       }

data/ragel/lexer.js.rl.erb

@@ -106,7 +106,7 @@
   action end_feature {
     if(this.cs < lexer_first_final) {
       var content = this.current_line_content(data, p);
-      throw "Lexing error on line " + this.line_number + ": '" + content + "'. See http://wiki.github.com/aslakhellesoy/gherkin/lexingerror for more information.";
+      throw "Lexing error on line " + this.line_number + ": '" + content + "'. See http://wiki.github.com/cucumber/gherkin/lexingerror for more information.";
     } else {
       this.listener.eof();
     }

data/ragel/lexer.rb.rl.erb

@@ -106,7 +106,7 @@ module Gherkin
         action end_feature {
           if cs < lexer_first_final
             content = current_line_content(data, p)
-            raise Gherkin::Lexer::LexingError.new("Lexing error on line %d: '%s'. See http://wiki.github.com/aslakhellesoy/gherkin/lexingerror for more information." % [@line_number, content])
+            raise Gherkin::Lexer::LexingError.new("Lexing error on line %d: '%s'. See http://wiki.github.com/cucumber/gherkin/lexingerror for more information." % [@line_number, content])
           else
             @listener.eof
           end

data/tasks/gems.rake

@@ -20,7 +20,7 @@ namespace :gems do
   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
+    raise "The jruby gem looks too small" if File.stat("release/gherkin-#{GHERKIN_VERSION}-java.gem").size < 1000000
   end
 
   desc "Prepare binaries for all gems"

data/tasks/ikvm.rake

@@ -52,14 +52,14 @@ namespace :ikvm do
 
   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}")
+    ikvmc("-target:exe lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.exe #{references}")
   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'
+    ikvmc("-target:library lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.dll  #{references}")
+    cp "release/gherkin-#{GHERKIN_VERSION}.dll", 'lib/gherkin.dll'
   end
 
   desc 'Copy the IKVM .dll files over to the pkg dir'
@@ -74,7 +74,7 @@ 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"
+  mono "release/gherkin-#{GHERKIN_VERSION}.exe features"
   puts "************** DONE Pretty printing some features with .NET. All OK. **************"
 end
 

data/tasks/rdoc.rake

@@ -2,7 +2,7 @@ require 'rake/rdoctask'
 
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "Gherkin #{Gherkin::VERSION}"
+  rdoc.title = "Gherkin"
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.rdoc_files.exclude('lib/gherkin/lexer')

data/tasks/release.rake

@@ -1,6 +1,6 @@
 namespace :release do
   desc 'Upload all packages and tag git'
-  task :ALL => ['gems:sanity', :push_dll, :push_jar, :push_native_gems, :push_npm_package, :release]
+  task :ALL => ['gems:sanity', :ikvm, :push_jar, :push_native_gems, :push_npm_package, :release, :post_release]
 
   desc 'Push all gems to rubygems.org (gemcutter)'
   task :push_native_gems do
@@ -11,14 +11,8 @@ namespace :release do
     end
   end
 
-  desc 'Push dll to Github'
-  task :push_dll => :ikvm do
-    Dir.chdir('release') do
-      # 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
+  task :post_release => :ikvm do
+    puts "\n\n****** Manually upload gherkin-#{GHERKIN_VERSION}.dll to http://github.com/cucumber/gherkin/downloads ******\n\n"
   end
 
   desc 'Push jar to cukes.info Maven repo'

metadata

@@ -2,7 +2,7 @@
 name: gherkin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.3.7
+  version: 2.3.8
 platform: x86-mswin32
 authors: 
 - Mike Sassak
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 +01:00
+date: 2011-05-16 00:00:00 +01:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 0.10.2
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.10
+        version: 1.0.13
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.2.pre2
+        version: 0.9.0.beta3
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -136,7 +136,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - build_native_gems.sh
 - cucumber.yml
 - features/escaped_pipes.feature
@@ -161,6 +160,7 @@ files:
 - js/.gitignore
 - js/.npmignore
 - js/lib/gherkin/lexer/.gitignore
+- js/lib/gherkin/lexer/.npmignore
 - lib/.gitignore
 - lib/gherkin.rb
 - lib/gherkin/c_lexer.rb
@@ -197,7 +197,6 @@ files:
 - lib/gherkin/rb_lexer/README.rdoc
 - lib/gherkin/rubify.rb
 - lib/gherkin/tag_expression.rb
-- lib/gherkin/version.rb
 - ragel/i18n/.gitignore
 - ragel/lexer.c.rl.erb
 - ragel/lexer.java.rl.erb
@@ -347,7 +346,7 @@ files:
 - lib/1.9/gherkin_lexer_zh_cn.so
 - lib/1.9/gherkin_lexer_zh_tw.so
 has_rdoc: true
-homepage: http://github.com/aslakhellesoy/gherkin
+homepage: http://github.com/cucumber/gherkin
 licenses: []
 
 post_install_message: 
@@ -373,7 +372,7 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: gherkin-2.3.7
+summary: gherkin-2.3.8
 test_files: 
 - features/escaped_pipes.feature
 - features/feature_parser.feature

data/VERSION

@@ -1 +0,0 @@
-2.3.7

data/lib/gherkin/version.rb

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