aslakhellesoy-cucumber 0.3.3.2 → 0.3.3.3

data/History.txt

@@ -1,11 +1,20 @@
 == 0.3.4 (In Git)
 
+Hooray - speed improvements when using Rake!
+
 === Bugfixes
 * Problem with multiple terms in languages.yml (#321 Aslak Hellesøy)
 
 === New features
+* Added aliases for Feature and But in Japanese (Leonard Chin)
 * Support for Catalan (Francesc Esplugas)
 
+=== Changed features
+* Rake task should not shell out (#297 Aslak Hellesøy)
+  The Cucumber Rake task will run Cucumber in the same Ruby interpreter as Rake itself
+  unless explicitly told to fork a new interpreter. This is to increase speed. You can
+  force a new interpreter by setting fork=true or rcov=true in the task.
+
 == 0.3.3 2009-05-10
 
 Minor bugfix release, made specially for EuRuKo!
@@ -243,7 +252,7 @@ for multiline arguments are some of the highlights.
 * Pure Ruby features are no longer supported.
 * Remove --color option in autotest. Can be added manually in cucumber.yml (#215 Jean-Michel Garnier)
 
-== (0.16.4 aslakhellesoy-cucumber gem on GitHub)
+== (0.1.16.4 aslakhellesoy-cucumber gem on GitHub)
 
 Bugfix release.
 

data/Manifest.txt

@@ -29,6 +29,10 @@ examples/i18n/bg/features/step_definitons/calculator_steps.rb
 examples/i18n/bg/features/support/env.rb
 examples/i18n/bg/features/support/world.rb
 examples/i18n/bg/lib/calculator.rb
+examples/i18n/cat/Rakefile
+examples/i18n/cat/features/step_definitons/calculator_steps.rb
+examples/i18n/cat/features/suma.feature
+examples/i18n/cat/lib/calculadora.rb
 examples/i18n/da/Rakefile
 examples/i18n/da/features/step_definitons/kalkulator_steps.rb
 examples/i18n/da/features/summering.feature

data/bin/cucumber

@@ -3,4 +3,14 @@
 $:.unshift(File.dirname(__FILE__ + '.rb') + '/../lib') unless $:.include?(File.dirname(__FILE__ + '.rb') + '/../lib')
 
 require 'cucumber/cli/main'
-Cucumber::Cli::Main.execute(ARGV.dup) # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.
+begin
+  # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.
+  failure = Cucumber::Cli::Main.execute(ARGV.dup)
+  Kernel.exit(failure ? 1 : 0)
+rescue SystemExit => e
+  Kernel.exit(e.status)
+rescue Exception => e
+  STDERR.puts("#{e.message} (#{e.class})")
+  STDERR.puts(e.backtrace.join("\n"))
+  Kernel.exit 1
+end

data/examples/cs/Rakefile

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "--format pretty"
+  t.cucumber_opts = %w{--format pretty}
 end
 
 task :features => :compile

data/examples/dos_line_endings/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--format pretty"
+  t.cucumber_opts = %w{--format pretty}
 end

data/examples/i18n/ar/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language ar"
+  t.cucumber_opts = %w{--language ar}
 end

data/examples/i18n/bg/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language bg"
+  t.cucumber_opts = %w{--language bg}
 end

data/examples/i18n/cat/Rakefile

@@ -0,0 +1,6 @@
+$:.unshift(File.dirname(__FILE__) + '/../../../lib')
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--language cat}
+end

data/examples/i18n/cat/features/step_definitons/calculator_steps.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+require 'spec/expectations'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
+require 'cucumber/formatter/unicode'
+require 'calculadora'
+
+Before do
+  @calc = Calculadora.new
+end
+
+Donat /que he introduït (\d+) a la calculadora/ do |n|
+  @calc.push n.to_i
+end
+
+Quan /premo el (\w+)/ do |op|
+  @result = @calc.send op
+end
+
+Aleshores /el resultat ha de ser (\d+) a la pantalla/ do |result|
+  @result.should == result.to_f
+end

data/examples/i18n/cat/features/suma.feature

@@ -0,0 +1,16 @@
+Característica: Suma
+  Per evitar fer errors tontos
+  Com un matemàtic idiota
+  Vull saber la suma dels números
+
+  Esquema de l'escenari: Sumar dos números
+    Donat que he introduït <entrada_1> a la calculadora
+    I que he introduït <entrada_2> a la calculadora
+    Quan premo el <botó>
+    Aleshores el resultat ha de ser <resultat> a la pantalla
+
+  Exemples:
+    | entrada_1 | entrada_2 | botó | resultat |
+    | 20        | 30        | add  | 50       |
+    | 2         | 5         | add  | 7        |
+    | 0         | 40        | add  | 40       |

data/examples/i18n/cat/lib/calculadora.rb

@@ -0,0 +1,16 @@
+class Calculadora
+
+  def push(n)
+    @args ||= []
+    @args << n
+  end
+
+  def add
+    @args.inject(0){|n,sum| sum+=n}
+  end
+
+  def divide
+    @args[0].to_f / @args[1].to_f
+  end
+
+end

data/examples/i18n/da/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language da"
+  t.cucumber_opts = %w{--language da}
 end

data/examples/i18n/de/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language de"
+  t.cucumber_opts = %w{--language de}
 end

data/examples/i18n/en-lol/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language en-lol"
+  t.cucumber_opts = %w{--language en-lol}
 end

data/examples/i18n/en/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language en"
+  t.cucumber_opts = %w{--language en}
 end

data/examples/i18n/es/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language es"
+  t.cucumber_opts = %w{--language es}
 end

data/examples/i18n/et/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language et"
+  t.cucumber_opts = %w{--language et}
 end

data/examples/i18n/fi/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language fi"
+  t.cucumber_opts = %w{--language fi}
 end

data/examples/i18n/fr/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language fr"
+  t.cucumber_opts = %w{--language fr}
 end

data/examples/i18n/he/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language he"
+  t.cucumber_opts = %w{--language he}
 end

data/examples/i18n/hu/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language hu"
+  t.cucumber_opts = %w{--language hu}
 end

data/examples/i18n/id/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language id"
+  t.cucumber_opts = %w{--language id}
 end

data/examples/i18n/it/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language it"
+  t.cucumber_opts = %w{--language it}
 end

data/examples/i18n/ja/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language ja"
+  t.cucumber_opts = %w{--language ja}
 end

data/examples/i18n/ko/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language ko"
+  t.cucumber_opts = %w{--language ko}
 end

data/examples/i18n/lt/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language lt"
+  t.cucumber_opts = %w{--language lt}
 end

data/examples/i18n/lt/features/addition.feature

@@ -3,14 +3,13 @@ Sąvybė: Sudėtis
   Kaip matematinis idiotas
   Aš noriu, kad man pasakytų dviejų skaičių sumą
 
-  # Someone please translate this in languages.yml please
-  Scenario Outline: dviejų skaičių sudėtis
+  Scenarijaus šablonas: dviejų skaičių sudėtis
     Duota aš įvedžiau <įvestis_1> į skaičiuotuvą
     Ir aš įvedžiau <įvestis_2> į skaičiuotuvą
     Kai aš paspaudžiu "<mygtukas>"
     Tada rezultatas ekrane turi būti <išvestis>
 
-  Pavyzdžių
+  Pavyzdžiai
     | įvestis_1 | įvestis_2 | mygtukas | išvestis |
     | 20        | 30        | add      | 50       |
     | 2         | 5         | add      | 7        |

data/examples/i18n/lv/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language lv"
+  t.cucumber_opts = %w{--language lv}
 end

data/examples/i18n/no/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language no"
+  t.cucumber_opts = %w{--language no}
 end

data/examples/i18n/pt/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language pt"
+  t.cucumber_opts = %w{--language pt}
 end

data/examples/i18n/pt/features/support/env.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+$KCODE='u' unless Cucumber::RUBY_1_9
+require 'spec/expectations'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
+require 'cucumber/formatter/unicode'
+require 'calculadora'

data/examples/i18n/ro/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language ro"
+  t.cucumber_opts = %w{--language ro}
 end

data/examples/i18n/ru/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language ru"
+  t.cucumber_opts = %w{--language ru}
 end

data/examples/i18n/se/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language se"
+  t.cucumber_opts = %w{--language se}
 end

data/examples/i18n/sk/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language sk"
+  t.cucumber_opts = %w{--language sk}
 end

data/examples/i18n/zh-CN/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language zh-CN"
+  t.cucumber_opts = %w{--language zh-CN}
 end

data/examples/i18n/zh-TW/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--language zh-TW"
+  t.cucumber_opts = %w{--language zh-TW}
 end

data/examples/java/Rakefile

@@ -1,8 +1,9 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/rake/task'
 
+raise "This example only works with JRuby" unless Cucumber::JRUBY
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "--format pretty"
+  t.cucumber_opts = %w{--format pretty}
 end
 
 task :features => :compile

data/examples/selenium/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--format pretty"
+  t.cucumber_opts = %w{--format pretty}
 end

data/examples/selenium_webrat/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--format pretty"
+  t.cucumber_opts = %w{--format pretty}
 end

data/examples/sinatra/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--format pretty"
+  t.cucumber_opts = %w{--format pretty}
 end

data/examples/test_unit/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--format pretty"
+  t.cucumber_opts = %w{--format pretty}
 end

data/examples/tickets/Rakefile

@@ -2,15 +2,15 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:pretty) do |t|
-  t.cucumber_opts = "--tags ~@intentional_failure --format pretty -q"
+  t.cucumber_opts = %w{--tags ~@intentional_failure --format pretty -q}
 end
 
 Cucumber::Rake::Task.new(:html) do |t|
-  t.cucumber_opts = "--tags ~@intentional_failure --format html --out features.html"
+  t.cucumber_opts = %w{--tags ~@intentional_failure --format html --out features.html}
 end
 
 Cucumber::Rake::Task.new(:progress) do |t|
-  t.cucumber_opts = "--tags ~@intentional_failure --format progress -i -s"
+  t.cucumber_opts = %w{--tags ~@intentional_failure --format progress -i -s}
 end
 
 task :default => [:pretty, :html, :progress]

data/examples/watir/Rakefile

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--format pretty"
+  t.cucumber_opts = %w{--format pretty}
 end

data/features/rake_task.feature

@@ -47,7 +47,7 @@ Feature: Rake task
   Scenario: rake task with a defined profile and cucumber_opts
     Given the following profile is defined:
       """
-      bar: features/missing_step_definitions.feature:3
+      bar: ['features/missing_step_definitions.feature:3']
       """
     And a file named "Rakefile" with:
       """
@@ -56,7 +56,7 @@ Feature: Rake task
 
       Cucumber::Rake::Task.new(:features) do |t|
         t.profile = "bar"
-        t.cucumber_opts = "--quiet --no-color"
+        t.cucumber_opts = %w{--quiet --no-color}
       end
       """
     When I run rake features
@@ -82,7 +82,7 @@ Feature: Rake task
       """
     Given the following profile is defined:
       """
-      baz: --quiet --no-color
+      baz: ['--quiet', '--no-color']
       """
     And a file named "Rakefile" with:
       """
@@ -138,7 +138,7 @@ Feature: Rake task
 
       Cucumber::Rake::Task.new(:features) do |t|
         t.profile = "no_bomb"
-        t.cucumber_opts = "--quiet --no-color"
+        t.cucumber_opts = %w{--quiet --no-color}
       end
       """
 

data/features/step_definitions/cucumber_steps.rb

@@ -27,14 +27,16 @@ When /^I run cucumber (.*)$/ do |cucumber_opts|
 end
 
 When /^I run rake (.*)$/ do |rake_opts|
-  run "rake #{rake_opts}"
+  run "rake #{rake_opts} --trace"
 end
 
 Then /^it should (fail|pass)$/ do |success|
   if success == 'fail'
     last_exit_status.should_not == 0
   else
-    last_exit_status.should == 0
+    if last_exit_status != 0
+      raise "Failed with exit status #{last_exit_status}\nSTDOUT:\n#{last_stdout}\nSTDERR:\n#{last_stderr}"
+    end
   end
 end
 

data/gem_tasks/features.rake

@@ -2,5 +2,9 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--format progress"
+  t.cucumber_opts = %w{--format progress}
+end
+
+Cucumber::Rake::Task.new('pretty') do |t|
+  t.cucumber_opts = %w{--format pretty}
 end

data/lib/cucumber/cli/configuration.rb

@@ -15,6 +15,7 @@ module Cucumber
 
         @paths          = []
         @options        = default_options
+
         @active_format  = DEFAULT_FORMAT
       end
 
@@ -47,7 +48,7 @@ module Cucumber
             %{Run with "--language help" to see all languages},
             %{Run with "--language LANG help" to list keywords for LANG}) do |v|
             if v == 'help'
-              list_languages
+              list_languages_and_exit
             elsif args==['help']
               list_keywords_and_exit(v)
             else
@@ -208,7 +209,8 @@ module Cucumber
             formatter_class = formatter_class(format)
             formatter_class.new(step_mother, out, @options)
           rescue Exception => e
-            exit_with_error("Error creating formatter: #{format}", e)
+            e.message += "\nError creating formatter: #{format}"
+            raise e
           end
         end
 
@@ -244,7 +246,6 @@ module Cucumber
         files
       end
 
-
       def feature_files
         potential_feature_files = @paths.map do |path|
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
@@ -278,7 +279,7 @@ module Cucumber
 
       def parse_args_from_profile(profile)
         unless cucumber_yml.has_key?(profile)
-          return(exit_with_error <<-END_OF_ERROR)
+          raise(<<-END_OF_ERROR)
 Could not find profile: '#{profile}'
 
 Defined profiles in cucumber.yml:
@@ -288,16 +289,16 @@ Defined profiles in cucumber.yml:
 
         args_from_yml = cucumber_yml[profile] || ''
 
-        if !args_from_yml.is_a?(String)
-          exit_with_error "Profiles must be defined as a String.  The '#{profile}' profile was #{args_from_yml.inspect} (#{args_from_yml.class}).\n"
-        elsif args_from_yml =~ /^\s*$/
-          exit_with_error "The 'foo' profile in cucumber.yml was blank.  Please define the command line arguments for the 'foo' profile in cucumber.yml.\n"
-        else
-          parse!(args_from_yml.split(' '))
+        case(args_from_yml)
+          when String
+            raise "The '#{profile}' profile in cucumber.yml was blank.  Please define the command line arguments for the 'foo' profile in cucumber.yml.\n" if args_from_yml =~ /^\s*$/
+            args_from_yml = args_from_yml.split(' ')
+          when Array
+            raise "The '#{profile}' profile in cucumber.yml was empty.  Please define the command line arguments for the 'foo' profile in cucumber.yml.\n" if args_from_yml.empty?
+          else
+            raise "The '#{profile}' profile in cucumber.yml was a #{args_from_yml.class}. It must be a String or Array"
         end
-
-      rescue YmlLoadError => e
-        exit_with_error(e.message)
+        parse!(args_from_yml)
       end
 
       def cucumber_yml
@@ -322,13 +323,13 @@ Defined profiles in cucumber.yml:
 
       def list_keywords_and_exit(lang)
         unless Cucumber::LANGUAGES[lang]
-          exit_with_error("No language with key #{lang}")
+          raise("No language with key #{lang}")
         end
         LanguageHelpFormatter.list_keywords(@out_stream, lang)
         Kernel.exit
       end
 
-      def list_languages
+      def list_languages_and_exit
         LanguageHelpFormatter.list_languages(@out_stream)
         Kernel.exit
       end
@@ -347,15 +348,6 @@ Defined profiles in cucumber.yml:
           :diff_enabled => true
         }
       end
-
-      def exit_with_error(error_message, e=nil)
-        @error_stream.puts(error_message)
-        if e
-          @error_stream.puts("#{e.message} (#{e.class})")
-          @error_stream.puts(e.backtrace.join("\n"))
-        end
-        Kernel.exit 1
-      end
     end
 
   end

data/lib/cucumber/cli/main.rb

@@ -42,8 +42,6 @@ module Cucumber
 
         failure = step_mother.steps(:failed).any? || 
           (configuration.strict? && step_mother.steps(:undefined).any?)
-
-        Kernel.exit(failure ? 1 : 0)
       end
 
       def load_plain_text_features

data/lib/cucumber/languages.yml

@@ -168,7 +168,7 @@
   background: Rerefons
   feature: Característica
   scenario: Escenari
-  scenario_outline: Esquema de l'escenari
+  scenario_outline: Esquema de l\'escenari
   examples: Exemples
   given: Donat
   when: Quan
@@ -285,7 +285,7 @@
   name: Japanese
   native: 日本語
   encoding: UTF-8
-  feature: フィーチャ
+  feature: フィーチャ|機能
   background: 背景
   scenario: シナリオ
   scenario_outline: シナリオアウトライン|シナリオテンプレート|テンプレ|シナリオテンプレ
@@ -294,15 +294,17 @@
   when: もし
   then: ならば
   and: かつ
-  but: しかし
+  but: しかし|但し
   space_after_keyword: false
 "lt":
   name: Lithuanian
   native: lietuvių kalba
   encoding: UTF-8
-  feature: Sąvybė
+  feature: Savybė
+  background: Kontekstas
   scenario: Scenarijus
-  examples: Pavyzdžių
+  scenario_outline: Scenarijaus šablonas
+  examples: Pavyzdžiai|Scenarijai|Variantai
   given: Duota
   when: Kai
   then: Tada

data/lib/cucumber/rake/task.rb

@@ -14,7 +14,7 @@ module Cucumber
     # To further configure the task, you can pass a block:
     #
     #   Cucumber::Rake::Task.new do |t|
-    #     t.cucumber_opts = "--format progress"
+    #     t.cucumber_opts = %w{--format progress}
     #   end
     #
     # This task can also be configured to be run with RCov:
@@ -25,7 +25,62 @@ module Cucumber
     # 
     # See the attributes for additional configuration possibilities.
     class Task
-      LIB    = File.expand_path(File.dirname(__FILE__) + '/../..') # :nodoc:
+      class InProcessCucumberRunner #:nodoc:
+        attr_reader :args
+        
+        def initialize(libs, cucumber_opts, feature_files)
+          libs.reverse.each{|lib| $:.unshift(lib)}
+          @args = (
+            cucumber_opts + 
+            feature_files
+          ).flatten.compact
+        end
+        
+        def run
+          require 'cucumber/cli/main'
+          Cucumber::Cli::Main.execute(args)
+        end
+      end
+      
+      class ForkedCucumberRunner #:nodoc:
+        attr_reader :args
+        
+        def initialize(libs, cucumber_bin, cucumber_opts, feature_files)
+          @args = (
+            ['-I'] + load_path(libs) + 
+            quoted_binary(cucumber_bin) + 
+            cucumber_opts + 
+            feature_files
+          ).flatten
+        end
+
+        def load_path(libs)
+          ['"%s"' % libs.join(File::PATH_SEPARATOR)]
+        end
+
+        def quoted_binary(cucumber_bin)
+          ['"%s"' % cucumber_bin]
+        end
+
+        def run
+          ruby(args.join(" ")) # ruby(*args) is broken on Windows
+        end
+      end
+
+      class RCovCucumberRunner < ForkedCucumberRunner #:nodoc:
+        def initialize(libs, cucumber_bin, cucumber_opts, feature_files, rcov_opts)
+          @args = (
+            ['-I'] + load_path(libs) + 
+            ['-S', 'rcov'] + rcov_opts +
+            quoted_binary(cucumber_bin) + 
+            ['--'] + 
+            cucumber_opts + 
+            feature_files
+          ).flatten
+        end
+      end
+
+      LIB = File.expand_path(File.dirname(__FILE__) + '/../..') # :nodoc:
 
       # TODO: remove depreated accessors for 0.4.0
       def self.deprecate_accessor(attribute) # :nodoc:
@@ -40,24 +95,45 @@ module Cucumber
 
       # Directories to add to the Ruby $LOAD_PATH
       attr_accessor :libs
+
       # Name of the cucumber binary to use for running features. Defaults to Cucumber::BINARY
       attr_accessor :binary
+
       # Array of paths to specific step definition files to use
       deprecate_accessor :step_list
+
       # File pattern for finding step definitions. Defaults to 
       # 'features/**/*.rb'.
       deprecate_accessor :step_pattern
+
       # Array of paths to specific features to run. 
       deprecate_accessor :feature_list
+
       # File pattern for finding features to run. Defaults to 
       # 'features/**/*.feature'. Can be overridden by the FEATURE environment variable.
       deprecate_accessor :feature_pattern
+
       # Extra options to pass to the cucumber binary. Can be overridden by the CUCUMBER_OPTS environment variable.
+      # It's recommended to pass an Array, but if it's a String it will be #split by ' '.
       attr_accessor :cucumber_opts
-      # Run cucumber with RCov?
+      def cucumber_opts=(opts) #:nodoc:
+        @cucumber_opts = String === opts ? opts.split(' ') : opts
+      end
+
+      # Run cucumber with RCov? Defaults to false. If you set this to
+      # true, +fork+ is implicit.
       attr_accessor :rcov
-      # Extra options to pass to rcov
+
+      # Extra options to pass to rcov.
+      # It's recommended to pass an Array, but if it's a String it will be #split by ' '.
       attr_accessor :rcov_opts
+      def rcov_opts=(opts) #:nodoc:
+        @rcov_opts = String === opts ? opts.split(' ') : opts
+      end
+
+      # Whether or not to fork a new ruby interpreter. Defaults to false.
+      attr_accessor :fork
+
       # Define what profile to be used.  When used with cucumber_opts it is simply appended to it. Will be ignored when CUCUMBER_OPTS is used.
       def profile=(profile)
         @profile = profile
@@ -69,13 +145,14 @@ module Cucumber
       end
       attr_reader :profile
 
-      # Define a Rake
+      # Define Cucumber Rake task
       def initialize(task_name = "features", desc = "Run Features with Cucumber")
         @task_name, @desc = task_name, desc
         @libs = ['lib']
         @rcov_opts = %w{--rails --exclude osx\/objc,gems\/}
 
         yield self if block_given?
+        @fork = true if @rcov
 
         @feature_pattern = "features/**/*.feature" if feature_pattern.nil? && feature_list.nil?
         @step_pattern    = "features/**/*.rb"      if step_pattern.nil? && step_list.nil?
@@ -89,32 +166,23 @@ module Cucumber
       def define_task # :nodoc:
         desc @desc
         task @task_name do
-          ruby(arguments_for_ruby_execution.join(" ")) # ruby(*args) is broken on Windows
+          runner.run
         end
       end
 
-      def arguments_for_ruby_execution(task_args = nil) # :nodoc:
-        lib_args     = ['"%s"' % libs.join(File::PATH_SEPARATOR)]
-        cucumber_bin = ['"%s"' % binary]
-        cuc_opts     = [(ENV['CUCUMBER_OPTS'] || cucumber_opts_with_profile)]
-
-        step_files(task_args).each do |step_file|
-          cuc_opts << '--require'
-          cuc_opts << step_file
-        end
-
-        if rcov
-          args = (['-I'] + lib_args + ['-S', 'rcov'] + rcov_opts +
-            cucumber_bin + ['--'] + cuc_opts + feature_files(task_args)).flatten
+      def runner(task_args = nil) # :nodoc:
+        cucumber_opts = [(ENV['CUCUMBER_OPTS'] || cucumber_opts_with_profile)]
+        if(@rcov)
+          RCovCucumberRunner.new(libs, binary, cucumber_opts, feature_files(task_args), rcov_opts)
+        elsif(@fork)
+          ForkedCucumberRunner.new(libs, binary, cucumber_opts, feature_files(task_args))
         else
-          args = (['-I'] + lib_args + cucumber_bin + cuc_opts + feature_files(task_args)).flatten
+          InProcessCucumberRunner.new(libs, cucumber_opts, feature_files(task_args))
         end
-
-        args
       end
 
       def cucumber_opts_with_profile # :nodoc:
-        @profile ? "#{cucumber_opts} --profile #{@profile}" : cucumber_opts
+        @profile ? [cucumber_opts, '--profile', @profile] : cucumber_opts
       end
 
       def feature_files(task_args = nil) # :nodoc:
@@ -149,7 +217,7 @@ module Cucumber
       def define_task # :nodoc:
         desc @desc
         task @task_name, :feature_name do |t, args|
-          ruby(arguments_for_ruby_execution(args).join(" ")) # ruby(*args) is broken on Windows
+          runner(args).run
         end
       end
 

data/lib/cucumber/version.rb

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

data/rails_generators/cucumber/templates/cucumber.rake

@@ -4,7 +4,7 @@ begin
   require 'cucumber/rake/task'
 
   Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = "--format pretty"
+    t.t.cucumber_opts = %w{$1}--format pretty"
   end
   task :features => 'db:test:prepare'
 rescue LoadError

data/spec/cucumber/cli/configuration_spec.rb

@@ -107,8 +107,6 @@ module Cli
       given_cucumber_yml_defined_as({'default' => '--require from/yml', 'html_report' =>  '--format html'})
 
       config = Configuration.new(StringIO.new, error = StringIO.new)
-      config.parse!(%w{--profile i_do_not_exist})
-
       expected_message = <<-END_OF_MESSAGE
 Could not find profile: 'i_do_not_exist'
 
@@ -117,16 +115,15 @@ Defined profiles in cucumber.yml:
   * html_report
 END_OF_MESSAGE
 
-      error.string.should == expected_message
+      lambda{config.parse!(%w{--profile i_do_not_exist})}.should raise_error(expected_message)
     end
 
-    it "should provide a helpful error message when a specified profile is not a String" do
+    it "should allow array as profile" do
       given_cucumber_yml_defined_as({'foo' => [1,2,3]})
 
       config = Configuration.new(StringIO.new, error = StringIO.new)
       config.parse!(%w{--profile foo})
-
-      error.string.should == "Profiles must be defined as a String.  The 'foo' profile was [1, 2, 3] (Array).\n"
+      config.paths.should == [1,2,3]
     end
 
     it "should provide a helpful error message when a specified profile exists but is nil or blank" do
@@ -134,9 +131,8 @@ END_OF_MESSAGE
         given_cucumber_yml_defined_as({'foo' => bad_input})
 
         config = Configuration.new(StringIO.new, error = StringIO.new)
-        config.parse!(%w{--profile foo})
-
-        error.string.should match(/The 'foo' profile in cucumber.yml was blank.  Please define the command line arguments for the 'foo' profile in cucumber.yml./)
+        expected_error = /The 'foo' profile in cucumber.yml was blank.  Please define the command line arguments for the 'foo' profile in cucumber.yml./
+        lambda{config.parse!(%w{--profile foo})}.should raise_error(expected_error)
       end
     end
 
@@ -144,9 +140,8 @@ END_OF_MESSAGE
       File.should_receive(:exist?).with('cucumber.yml').and_return(false)
 
       config = Configuration.new(StringIO.new, error = StringIO.new)
-      config.parse!(%w{--profile i_do_not_exist})
-
-      error.string.should match(/cucumber.yml was not found.  Please refer to cucumber's documentation on defining profiles in cucumber.yml./)
+      expected_error = /cucumber.yml was not found.  Please refer to cucumber's documentation on defining profiles in cucumber.yml./
+      lambda{config.parse!(%w{--profile i_do_not_exist})}.should raise_error(expected_error)
     end
 
     it "should provide a helpful error message when cucumber.yml is blank or malformed" do
@@ -156,9 +151,7 @@ END_OF_MESSAGE
         given_cucumber_yml_defined_as(bad_input)
 
         config = Configuration.new(StringIO.new, error = StringIO.new)
-        config.parse!([])
-
-        error.string.should match(expected_error_message)
+        lambda{config.parse!([])}.should raise_error(expected_error_message)
       end
     end
 
@@ -169,9 +162,7 @@ END_OF_MESSAGE
       YAML.should_receive(:load).and_raise Exception
 
       config = Configuration.new(StringIO.new, error = StringIO.new)
-      config.parse!([])
-
-      error.string.should match(expected_error_message)
+      lambda{config.parse!([])}.should raise_error(expected_error_message)
     end
 
     it "should accept --dry-run option" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.3.2
+  version: 0.3.3.3
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-11 00:00:00 -07:00
+date: 2009-05-13 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,10 @@ files:
 - examples/i18n/bg/features/support/env.rb
 - examples/i18n/bg/features/support/world.rb
 - examples/i18n/bg/lib/calculator.rb
+- examples/i18n/cat/Rakefile
+- examples/i18n/cat/features/step_definitons/calculator_steps.rb
+- examples/i18n/cat/features/suma.feature
+- examples/i18n/cat/lib/calculadora.rb
 - examples/i18n/da/Rakefile
 - examples/i18n/da/features/step_definitons/kalkulator_steps.rb
 - examples/i18n/da/features/summering.feature
@@ -191,6 +195,7 @@ files:
 - examples/i18n/pt/Rakefile
 - examples/i18n/pt/features/adicao.feature
 - examples/i18n/pt/features/step_definitions/calculadora_steps.rb
+- examples/i18n/pt/features/support/env.rb
 - examples/i18n/pt/lib/calculadora.rb
 - examples/i18n/ro/Rakefile
 - examples/i18n/ro/features/step_definitons/calculator_steps.rb