gherkin 2.6.2 → 2.6.3

data/.travis.yml

@@ -6,9 +6,10 @@ rvm:
 branches:
   only:
     - master
-# Needed to build lexers
-before_script: sudo apt-get install -y ragel
 
 notifications:
   email:
-    - cukes-devs@googlegroups.com
+    - cukes-devs@googlegroups.com
+  irc:
+    - "irc.freenode.org#cucumber"
+    

data/History.md

@@ -1,3 +1,12 @@
+## [2.6.3](https://github.com/cucumber/gherkin/compare/v2.6.2...v2.6.3) (In Git)
+
+### Changed Features
+
+* Windows gems are compiled against 1.9.3 instead of 1.9.2. Should still work on 1.9.3. (Aslak Hellesøy)
+* NPM package contains UglifyJS-minified scripts (Aslak Hellesøy)
+* NPM package no longer contains Ace ([#109](https://github.com/cucumber/gherkin/issues/109) Aslak Hellesøy)
+* JavaScript exports for require.js works in non-AMD mode (needed for Ace) (Aslak Hellesøy)
+
 ## [2.6.2](https://github.com/cucumber/gherkin/compare/v2.6.1...v2.6.2)
 
 ### Changed Features

data/README.md

@@ -3,11 +3,11 @@
 A fast lexer and parser for the Gherkin language based on Ragel. Gherkin is two things:
 
 * The language that has evolved out of the Cucumber project.
-* This library
+* This library.
 
 Supported platforms:
 
-* Ruby 1.8.6-1.9.2 (MRI, JRuby, REE, Rubinius)
+* 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)
@@ -54,7 +54,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.6.2</version>
+        <version>2.6.3</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -124,18 +124,22 @@ Now you can build the jar with:
 
 ### JavaScript
 
-In order to build and test Gherkin for Javascript you must install:
+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
+* Ragel with JavaScript support: http://github.com/dominicmarks/ragel-js
 * Define the GHERKIN_JS environment variable in your shell (any value will do)
 
-Now you can build the Javascript with:
+Prepare the environment:
+
+    pushd js
+    npm link
+    popd
+
+Now you can build the JavaScript with:
 
     rake js
-    cd js
-    npm install
 
 And you can try it out with node.js:
 
@@ -190,19 +194,24 @@ Make sure you have openssl installed first.
     bundle install
     rake-compiler cross-ruby VERSION=1.8.7-p352
 
-    # 1.9.2
-    rvm install 1.9.2-p290
-    rvm use 1.9.2-p290
+    # 1.9.3
+    rvm install 1.9.3-p0
+    rvm use 1.9.3-p0
     rvm gemset create cucumber
     rvm gemset use cucumber
     gem install bundler
     unset GHERKIN_JS
     bundle install
-    rake-compiler cross-ruby VERSION=1.9.2-p290
+    rake-compiler cross-ruby VERSION=1.9.3-p0
+
+Now you can build Windows gems:
+
+    rake compile
+    rake gems:win
 
 ## Release process
 
-* Make sure GHERKIN_JS is defined (see Javascript section above)
+* Make sure GHERKIN_JS is defined (see JavaScript section above)
 * Bump version in:
   * This file (Installation/Java section)
   * gherkin.gemspec

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.2"
+  s.version     = "2.6.3"
   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}"
@@ -46,15 +46,15 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('json', '>= 1.4.6')
 
-  s.add_development_dependency('cucumber', '>= 1.1.1')
+  s.add_development_dependency('cucumber', '>= 1.1.2')
   s.add_development_dependency('rake', '>= 0.9.2')
   s.add_development_dependency('bundler', '>= 1.0.21')
   s.add_development_dependency('rspec', '>= 2.7.0')
 
   unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
-    s.add_development_dependency('therubyracer', '>= 0.9.8') if ENV['GHERKIN_JS']
+    s.add_development_dependency('therubyracer', '>= 0.9.9') if ENV['GHERKIN_JS']
     # For Documentation:
-    s.add_development_dependency('yard', '>= 0.7.2')
+    s.add_development_dependency('yard', '>= 0.7.3')
     s.add_development_dependency('rdiscount', '>= 1.6.8')
   end
 

data/lib/gherkin/js_lexer.rb

@@ -13,7 +13,7 @@ module Gherkin
         p a
       end
 
-      cxt.load(File.dirname(__FILE__) + "/../../js/lib/gherkin/lexer/#{i18n_underscored_iso_code}.js")
+      cxt.load(File.dirname(__FILE__) + "/../../js/lib/gherkin/lexer/#{i18n_underscored_iso_code}.min.js")
       cxt['exports']['Lexer']
     end
   end

data/ragel/lexer.js.rl.erb

@@ -212,8 +212,16 @@ if(typeof exports !== 'undefined') {
   exports.Lexer = Lexer;
 }
 // Require.js export
-if (typeof define !== 'undefined' && define.amd) {
-  define('gherkin/lexer/<%= @i18n.underscored_iso_code %>', [], function() {return Lexer});
+if (typeof define !== 'undefined') {
+  if(define.amd) {
+    define('gherkin/lexer/<%= @i18n.underscored_iso_code %>', [], function() {
+      return Lexer
+    });
+  } else {
+    define('gherkin/lexer/<%= @i18n.underscored_iso_code %>', function(require, exports, module) {
+      exports.Lexer = Lexer;
+    });
+  }
 }
 
 })();

data/tasks/gems.rake

@@ -6,9 +6,9 @@ namespace :gems do
     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 "rake cross compile RUBY_CC_VERSION=1.9.2"
+    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.2"
+    sh "rake -t cross compile RUBY_CC_VERSION=1.8.7:1.9.3"
   end
 
   desc 'Prepare JRuby binares'

data/tasks/ragel_task.rb

@@ -10,6 +10,7 @@ class RagelTask
   end
 
   RL_OUTPUT_DIR = File.dirname(__FILE__) + "/../ragel/i18n"
+  UGLIFYJS      = File.dirname(__FILE__) + "/../js/node_modules/uglify-js/bin/uglifyjs"
 
   def initialize(lang, i18n)
     @lang     = lang
@@ -24,6 +25,9 @@ class RagelTask
       if(@lang == 'js')
         # Ragel chokes if we put the escaped triple quotes in .rl, so we'll do the replace with sed after the fact. Lots of backslashes!!
         sh %{sed -i '' 's/ESCAPED_TRIPLE_QUOTE/\\\\\\\\\\\\"\\\\\\\\\\\\"\\\\\\\\\\\\"/' #{target}}
+        
+        # Minify
+        sh %{node #{UGLIFYJS} #{target} > #{target.gsub(/\.js$/, '.min.js')}}
       end
     end
 

data/tasks/release.rake

@@ -2,7 +2,7 @@ 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]
 
-  desc 'Push all gems to rubygems.org (gemcutter)'
+  desc 'Push all gems to rubygems.org'
   task :push_native_gems do
     Dir.chdir('release') do
       Dir['*.gem'].each do |gem_file|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000Z
+date: 2011-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2153074440 !ruby/object:Gem::Requirement
+  requirement: &2152310860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 0.7.9
   type: :development
   prerelease: false
-  version_requirements: *2153074440
+  version_requirements: *2152310860
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153063680 !ruby/object:Gem::Requirement
+  requirement: &2152325880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,21 +34,21 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153063680
+  version_requirements: *2152325880
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2153062040 !ruby/object:Gem::Requirement
+  requirement: &2152324400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *2153062040
+  version_requirements: *2152324400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153060600 !ruby/object:Gem::Requirement
+  requirement: &2152322160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2153060600
+  version_requirements: *2152322160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153059320 !ruby/object:Gem::Requirement
+  requirement: &2152336320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *2153059320
+  version_requirements: *2152336320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153058380 !ruby/object:Gem::Requirement
+  requirement: &2152335080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,32 +78,32 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2153058380
+  version_requirements: *2152335080
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2153057100 !ruby/object:Gem::Requirement
+  requirement: &2152333120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2153057100
+  version_requirements: *2152333120
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153055980 !ruby/object:Gem::Requirement
+  requirement: &2152332300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2153055980
+  version_requirements: *2152332300
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2153054740 !ruby/object:Gem::Requirement
+  requirement: &2152330840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2153054740
+  version_requirements: *2152330840
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2153053160 !ruby/object:Gem::Requirement
+  requirement: &2152329900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2153053160
+  version_requirements: *2152329900
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2153051500 !ruby/object:Gem::Requirement
+  requirement: &2152329080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,7 +133,7 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2153051500
+  version_requirements: *2152329080
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -186,7 +186,6 @@ extensions:
 extra_rdoc_files: []
 files:
 - .gitattributes
-- .gitmodules
 - .mailmap
 - .rbenv-gemsets
 - .rspec
@@ -194,7 +193,6 @@ files:
 - .travis.yml
 - .yardopts
 - Gemfile
-- Gemfile.lock
 - History.md
 - LICENSE
 - README.md
@@ -479,7 +477,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gherkin-2.6.2
+summary: gherkin-2.6.3
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "js/example/ace"]
-	path = js/example/ace
-	url = git://github.com/cucumber/ace.git

data/Gemfile.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: .
-  specs:
-    gherkin (2.6.2)
-      json (>= 1.4.6)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.0.0)
-    cucumber (1.1.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.0)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    diff-lcs (1.1.3)
-    json (1.6.1)
-    json (1.6.1-java)
-    libv8 (3.3.10.2)
-    rake (0.9.2.2)
-    rake-compiler (0.7.9)
-      rake
-    rdiscount (1.6.8)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    term-ansicolor (1.0.7)
-    therubyracer (0.9.8)
-      libv8 (~> 3.3.10)
-    yard (0.7.3)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  builder (>= 2.1.2)
-  bundler (>= 1.0.21)
-  cucumber (>= 1.1.1)
-  gherkin!
-  rake (>= 0.9.2)
-  rake-compiler (>= 0.7.9)
-  rdiscount (>= 1.6.8)
-  rspec (>= 2.7.0)
-  term-ansicolor (>= 1.0.6)
-  therubyracer (>= 0.9.8)
-  yard (>= 0.7.2)