gherkin 2.7.6-java → 2.7.7-java

data/History.md

@@ -1,3 +1,9 @@
+## [2.7.7](https://github.com/cucumber/gherkin/compare/v2.7.6...v2.7.7)
+
+* [C] Allow compilation with clang (datanoise)
+* [Ruby] Expose AnsiEscapes methods on the class level as well, for easy calling without inclusion ([#161](https://github.com/cucumber/gherkin/pull/161) Ben Woosley)
+* [Ruby] Lexer load failure fix ([#159](https://github.com/cucumber/gherkin/pull/159) Ben Woosley)
+
 ## [2.7.6](https://github.com/cucumber/gherkin/compare/v2.7.5...v2.7.6)
 
 * [Java] Previous release accidentally had pretty formatting for both JSONFormatter and JSONPrettyFormatter (Aslak Hellesøy)

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.7.6</version>
+        <version>2.7.7</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)

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.7.6"
+  s.version     = "2.7.7"
   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}"
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
     s.add_development_dependency('therubyracer', '>= 0.9.9') if ENV['GHERKIN_JS']
     # For Documentation:
-    s.add_development_dependency('yard', '>= 0.7.4')
+    s.add_development_dependency('yard', '>= 0.7.5')
     s.add_development_dependency('rdiscount', '>= 1.6.8')
   end
 

data/lib/gherkin/formatter/ansi_escapes.rb

@@ -90,6 +90,8 @@ module Gherkin
       def up(n)
         "\e[#{n}A"
       end
+
+      extend self
     end
   end
 end

data/lib/gherkin/i18n.rb

@@ -4,6 +4,8 @@ require 'gherkin/native'
 
 module Gherkin
   class I18n
+    LexerNotFound = Class.new(LoadError)
+
     native_impl('gherkin') unless defined?(BYPASS_NATIVE_IMPL)
 
     FEATURE_ELEMENT_KEYS = %w{feature background scenario scenario_outline examples}
@@ -92,20 +94,18 @@ module Gherkin
     end
 
     def lexer(listener, force_ruby=false)
-      begin
-        if force_ruby
+      if force_ruby
+        rb(listener)
+      else
+        begin
+          c(listener)
+        rescue NameError, LoadError => e
+          warn("WARNING: #{e.message}. Reverting to Ruby lexer.")
           rb(listener)
-        else
-          begin
-            c(listener)
-          rescue NameError, LoadError => e
-            warn("WARNING: #{e.message}. Reverting to Ruby lexer.")
-            rb(listener)
-          end
         end
-      rescue LoadError => e
-        raise I18nLexerNotFound, "No lexer was found for #{i18n_language_name} (#{e.message}). Supported languages are listed in gherkin/i18n.yml."
       end
+    rescue LoadError => e
+      raise LexerNotFound, "No lexer was found for #{iso_code} (#{e.message}). Supported languages are listed in gherkin/i18n.yml."
     end
 
     def c(listener)

data/lib/gherkin/lexer/i18n_lexer.rb

@@ -3,7 +3,6 @@ require 'gherkin/native'
 
 module Gherkin
   module Lexer
-    I18nLexerNotFound = Class.new(LoadError)
     LexingError = Class.new(StandardError)
 
     # The main entry point to lexing Gherkin source.

data/spec/gherkin/formatter/ansi_escapes_spec.rb

@@ -4,16 +4,29 @@ require 'gherkin/formatter/ansi_escapes'
 module Gherkin
   module Formatter
     describe AnsiEscapes do
-      include Gherkin::Formatter::AnsiEscapes
+      describe "instance methods" do
+        include AnsiEscapes
 
-      it "failed should be red" do
-        failed.should == "\e[31m"
-      end
+        it "failed should be red" do
+          failed.should == "\e[31m"
+        end
 
-      it "failed arg should be red bold" do
-        failed_arg.should == "\e[31m\e[1m"
+        it "failed_arg should be red bold" do
+          failed_arg.should == "\e[31m\e[1m"
+        end
       end
 
+      describe "class methods" do
+        subject { AnsiEscapes }
+
+        it "failed should be red" do
+          subject.failed.should == "\e[31m"
+        end
+
+        it "failed_arg should be red bold" do
+          subject.failed_arg.should == "\e[31m\e[1m"
+        end
+      end
     end
   end
 end

data/spec/gherkin/json_parser_spec.rb

@@ -16,13 +16,17 @@ module Gherkin
       expected = JSON.parse(json)
       actual   = JSON.parse(io.string)
 
-      puts "EXPECTED"
-      puts json
-      puts "ACTUAL"
-      puts io.string
-      puts "======"
+      begin
+        actual.should == expected
+      rescue
+        puts "EXPECTED"
+        puts json
+        puts "ACTUAL"
+        puts io.string
+        puts "======"
 
-      actual.should == expected
+        raise
+      end
     end
 
     xit "should parse a barely empty feature" do

data/tasks/compile.rake

@@ -81,7 +81,7 @@ langs.each do |i18n|
         io.write(<<-EOF)
 require 'mkmf'
 CONFIG['warnflags'].gsub!(/-Wshorten-64-to-32/, '') if CONFIG['warnflags']
-$CFLAGS << ' -O0 -Wall' if CONFIG['CC'] =~ /gcc/
+$CFLAGS << ' -O0 -Wall' if CONFIG['CC'] =~ /gcc|clang/
 dir_config("gherkin_lexer_#{i18n.underscored_iso_code}")
 have_library("c", "main")
 create_makefile("gherkin_lexer_#{i18n.underscored_iso_code}")

data/tasks/ragel_task.rb

@@ -19,7 +19,10 @@ class RagelTask
   end
 
   def define_tasks
-    file target => [lang_ragel, common_ragel] do
+    deps = [lang_ragel, common_ragel]
+    deps.unshift(UGLIFYJS) if(@lang == 'js')
+
+    file target => deps do
       mkdir_p(File.dirname(target)) unless File.directory?(File.dirname(target))
       sh "ragel #{flags} #{lang_ragel} -o #{target}"
       if(@lang == 'js')
@@ -31,6 +34,14 @@ class RagelTask
       end
     end
 
+    file UGLIFYJS do
+      unless File.exist?(UGLIFYJS)
+        Dir.chdir('js') do
+          sh "npm link"
+        end
+      end
+    end
+
     file lang_ragel => lang_erb do
       write(ERB.new(IO.read(lang_erb)).result(binding), lang_ragel)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.7.6
+  version: 2.7.7
   prerelease: 
 platform: java
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2151899180 !ruby/object:Gem::Requirement
+  requirement: &2166211360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2151899180
+  version_requirements: *2166211360
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2151898420 !ruby/object:Gem::Requirement
+  requirement: &2166210880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *2151898420
+  version_requirements: *2166210880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151897540 !ruby/object:Gem::Requirement
+  requirement: &2166210420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2151897540
+  version_requirements: *2166210420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151896460 !ruby/object:Gem::Requirement
+  requirement: &2166209960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *2151896460
+  version_requirements: *2166209960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151895360 !ruby/object:Gem::Requirement
+  requirement: &2166225860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2151895360
+  version_requirements: *2166225860
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2151893800 !ruby/object:Gem::Requirement
+  requirement: &2166225400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *2151893800
+  version_requirements: *2166225400
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2151893020 !ruby/object:Gem::Requirement
+  requirement: &2166224860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,21 +89,21 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2151893020
+  version_requirements: *2166224860
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151892180 !ruby/object:Gem::Requirement
+  requirement: &2166224400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *2151892180
+  version_requirements: *2166224400
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2151891540 !ruby/object:Gem::Requirement
+  requirement: &2166223940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2151891540
+  version_requirements: *2166223940
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2151890480 !ruby/object:Gem::Requirement
+  requirement: &2166223480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2151890480
+  version_requirements: *2166223480
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2151889000 !ruby/object:Gem::Requirement
+  requirement: &2166223020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,7 +133,7 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2151889000
+  version_requirements: *2166223020
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -300,7 +300,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gherkin-2.7.6
+summary: gherkin-2.7.7
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature