aslakhellesoy-cucumber 0.1.99.12 → 0.1.99.13

data/History.txt

@@ -56,6 +56,12 @@ which is a richer DSL than JBehave's language. -Over 20 spoken languages, Tables
 Scenario Outlines, the rich command line, the nice output format and everything 
 pure Ruby users have been enjoying for a while.
 
+== TODO Before 0.2 release
+* Verify that custom formatters work - write a feature for it
+* Implement at least a basic HTML formatter
+* Get cucumber.jar working. Move to separate github project. I have it somewhat working with:
+  mvn compile && java -classpath /usr/local/jruby/lib/jruby-complete.jar:target/classes:/usr/local/jruby/lib/ruby/gems/1.8/gems/treetop-1.2.4/lib:/usr/local/jruby/lib/ruby/gems/1.8/gems/polyglot-0.2.3/lib:/usr/local/jruby/lib/ruby/gems/1.8/gems/term-ansicolor-1.0.3/lib:. cukes.Cucumber --help
+
 == Bugfixes
 * -n option does not suppress the line info for a Scenario Outline (#175 Aslak Hellesøy)
 * Errors with rspec-rails matchers in cucumber 0.1.99 (#173 David Chelimsky)
@@ -69,6 +75,7 @@ pure Ruby users have been enjoying for a while.
 * Pending steps in > steps called from steps (#65 Aslak Hellesøy)
 
 === New features
+* Keywords can be aliased in languages.yml. See English for an example (scenarios: Scenarios|Examples)
 * Adding support for Background (#153 Joseph Wilk) 
 * Added Česky/Czech (Vojtech Salbaba)
 * New --no-multiline option to reduce noise. Useful if lots of features are failing.

data/Manifest.txt

@@ -217,6 +217,7 @@ lib/cucumber/rake/task.rb
 lib/cucumber/step_definition.rb
 lib/cucumber/step_mother.rb
 lib/cucumber/version.rb
+pom.xml
 rails_generators/cucumber/USAGE
 rails_generators/cucumber/cucumber_generator.rb
 rails_generators/cucumber/templates/cucumber
@@ -271,3 +272,4 @@ spec/cucumber/treetop_parser/with_tags.feature
 spec/cucumber/world/pending_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+src/main/java/cukes/Cucumber.java

data/Rakefile

@@ -5,4 +5,4 @@ require 'config/hoe' # setup Hoe + all gem configuration
 Dir['gem_tasks/**/*.rake'].each { |rake| load rake }
 
 # Hoe gives us :default => :test, but we don't have Test::Unit tests.
-Rake::Task[:default].clear_prerequisites
+Rake::Task[:default].clear_prerequisites rescue nil # For some super weird reason this fails for some...

data/lib/cucumber/formatter/ansicolor.rb

@@ -1,7 +1,11 @@
 # Hack to work around Win32/Console, which bundles a licence-violating, outdated
 # copy of term/ansicolor that doesn't implement Term::ANSIColor#coloring=.
 # We want the official one!
-gem 'term-ansicolor'
+begin
+  gem 'term-ansicolor' 
+rescue Exception => ignore
+  # In order to work with Cucumber.java, which doesn't bundle gems.
+end
 $LOAD_PATH.each{|path| $LOAD_PATH.unshift($LOAD_PATH.delete(path)) if path =~ /term-ansicolor/}
 require 'term/ansicolor'
 

data/lib/cucumber/languages.yml

@@ -2,6 +2,10 @@
 # We use the codes here (prefer 2 letters when possible)
 # http://en.wikipedia.org/wiki/List_of_ISO_639-2_codes
 #
+# If you want several aliases for a keyword, just separate them
+# with a | character. Make sure there are no ambiguities in the
+# keywords.
+#
 "en":
   name: English
   native: English
@@ -10,7 +14,7 @@
   background: Background
   scenario: Scenario
   scenario_outline: Scenario Outline
-  examples: Examples
+  examples: Examples|Scenarios
   given: Given
   when: When
   then: Then

data/lib/cucumber/parser.rb

@@ -13,12 +13,30 @@ module Cucumber
   #
   # The AST classes are defined in the Cucumber::Ast module.
   module Parser
+    translator = Module.new do
+      def keywordz(key)
+        'Scenario'
+      end
+    end
+
     def self.load_parser(keywords)
-      template = File.open(File.dirname(__FILE__) + "/parser/i18n.tt", Cucumber.file_mode('r')).read
-      erb = ERB.new(template)
-      grammar = erb.result(binding)
-      Treetop.load_from_string(grammar)
-      require 'cucumber/parser/feature'
+      Loader.new(keywords)
+    end
+    
+    class Loader
+      def initialize(keywords)
+        @keywords = keywords
+        template = File.open(File.dirname(__FILE__) + "/parser/i18n.tt", Cucumber.file_mode('r')).read
+        erb = ERB.new(template)
+        grammar = erb.result(binding)
+        Treetop.load_from_string(grammar)
+        require 'cucumber/parser/feature'
+      end
+
+      def keywords(key)
+        values = @keywords[key].split('|')
+        values.map{|value| "'#{value}'"}.join(" / ")
+      end
     end
   end
 end

data/lib/cucumber/parser/i18n.tt

@@ -3,27 +3,27 @@ module Cucumber
     grammar I18n
 
       rule background_keyword
-        "<%= keywords['background'] %>:"
+        (<%= keywords('background') %>) ':'
       end
 
       rule scenario_keyword
-        '<%= keywords['scenario'] %>:'
+        (<%= keywords('scenario') %>) ':'
       end
 
       rule scenario_outline_keyword
-        '<%= keywords['scenario_outline'] %>:'
+        (<%= keywords('scenario_outline') %>) ':'
       end
 
       rule step_keyword
-        '<%= keywords['given'] %>' /
-        '<%= keywords['when'] %>' /
-        '<%= keywords['then'] %>' /
-        '<%= keywords['and'] %>' /
-        '<%= keywords['but'] %>'
+        (<%= keywords('given') %>) /
+        (<%= keywords('when') %>) /
+        (<%= keywords('then') %>) /
+        (<%= keywords('and') %>) /
+        (<%= keywords('but') %>)
       end
 
       rule examples_keyword
-        '<%= keywords['examples'] %>' ':'?
+        (<%= keywords('examples') %>) ':'?
       end
 
     end

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 1
     TINY  = 99
-    PATCH = 12 # Set to nil for official release
+    PATCH = 13 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.99.12
+  version: 0.1.99.13
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-27 00:00:00 -08:00
+date: 2009-01-28 00:00:00 -08:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.8.3
     version: 
 description: Executable Feature scenarios
 email: