cucumber 0.1.8 → 0.1.9

data/lib/cucumber/formatters/progress_formatter.rb

@@ -7,28 +7,44 @@ module Cucumber
 
       def initialize(io)
         @io = (io == STDOUT) ? Kernel : io
-        @errors = []
+        @errors             = []
+        @pending_scenarios  = []
       end
-      
+
+      def scenario_executing(scenario)
+        if scenario.pending?
+          @pending_scenarios << scenario
+          @io.print pending("P")
+        end
+      end
+
       def step_passed(step, regexp, args)
         @io.print passed('.')
       end
-      
+
       def step_failed(step, regexp, args)
         @errors << step.error
         @io.print failed('F')
       end
-      
+
       def step_pending(step, regexp, args)
+        @pending_scenarios << step.scenario
         @io.print pending('P')
       end
-    
+
       def step_skipped(step, regexp, args)
         @io.print skipped('_')
       end
 
       def dump
+        @io.puts pending
+        @io.puts "\nPending Scenarios:\n\n" if @pending_scenarios.any?
+        @pending_scenarios.uniq.each_with_index do |scenario, n|
+          @io.puts "#{n+1}) #{scenario.feature.header.split("\n").first.gsub(/^(Feature|Story):/, '')} (#{scenario.name})"
+        end
+
         @io.puts failed
+        @io.puts "\nFailed:" if @errors.any?
         @errors.each_with_index do |error,n|
           @io.puts
           @io.puts "#{n+1})"

data/lib/cucumber/languages.yml

@@ -1,3 +1,6 @@
+# http://www.ietf.org/rfc/rfc4646.txt
+# http://www.ietf.org/rfc/rfc4647.txt
+# Others:
 # http://en.wikipedia.org/wiki/IETF_language_tag
 # http://www.iana.org/assignments/language-subtag-registry
 # http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt (Use this I think)
@@ -11,11 +14,35 @@
   then: Then
   and: And
   but: But
-# Please help us keeping the languages below uptodate. The parsers for a language 
+# Please help us keeping the languages below uptodate. The parsers for a language
 # that is missing a keyword will expect the English word until the missing word(s)
 # are added.
 #
 # Please keep the grammars in alphabetical order from here and down.
+
+# Arabic
+"ar":
+  feature: خاصية
+  scenario: سيناريو
+  more_examples: امثلة اكثر
+  given_scenario: بفرض سيناريو معين
+  given: بفرض
+  when: متى
+  then: اذاً
+  and: و
+  but: لكن
+# Welsh
+"cy":
+  feature: Arwedd
+  scenario: Scenario
+  more_examples: Hychwaneg enghreifftiau
+  given_scenario: Anrhegedig scenario
+  given: anrhegedig a
+  when: Pryd
+  then: Yna
+  and: A
+  but: Ond
+# Danish
 "da":
   feature: Egenskab
   scenario: Scenarie
@@ -25,6 +52,7 @@
   then: Så
   and: Og
   but: Men
+# German
 "de":
   feature: Funktionalität
   scenario: Szenario
@@ -34,6 +62,18 @@
   then: Dann
   and: Und
   but: Aber
+# Texan
+"en-tx":
+  feature: Feature
+  scenario: Scenario
+  more_examples: More Examples
+  given_scenario: GivenScenario
+  given: Given y'all
+  when: When y'all
+  then: Then y'all
+  and: And y'all
+  but: But y'all
+# Spanish
 "es":
   feature: Característica
   scenario: Escenario
@@ -44,6 +84,17 @@
   then: Entonces
   and: Y
   but: Pero
+# Estonian
+"et":
+  feature: Omadus
+  scenario: Stsenaarium
+  given_scenario: EeldadesStsenaariumit
+  given: Eeldades
+  when: Kui
+  then: Siis
+  and: Ja
+  but: Kuid
+# French
 "fr":
   feature: Fonction
   scenario: Scenario
@@ -54,6 +105,40 @@
   then: Alors
   and: Et
   but: Mais
+# Malay
+"id":
+  feature: Fitur
+  scenario: Skenario
+  more_examples: Contoh Tambahan
+  given_scenario: DenganSkenario
+  given: Dengan
+  when: Ketika
+  then: Maka
+  and: Dan
+  but: Tapi
+# Italian
+"it":
+  feature: Funzionalità
+  scenario: Scenario
+  more_examples: Più esempi
+  given_scenario: DatoLoScenario
+  given: Dato
+  when: Quando
+  then: Allora
+  and: E
+  but: Ma
+# Japanese
+"ja":
+  feature: フィーチャ
+  scenario: シナリオ
+  more_examples: 他のサンプル
+  given_scenario: 前提シナリオ
+  given: 前提
+  when: もし
+  then: ならば
+  and: かつ
+  but: しかし
+# Dutch
 "nl":
   feature: Functionaliteit
   scenario: Scenario
@@ -64,6 +149,7 @@
   then: Dan
   and: En
   but: Maar
+# Norwegian
 "no":
   feature: Egenskap
   scenario: Scenario
@@ -74,6 +160,18 @@
   then: Så
   and: Og
   but: Men
+# Polish
+"pl":
+  feature: Właściwość
+  scenario: Scenariusz
+  more_examples: WięcejPrzykładów
+  given_scenario: DanyScenariusz
+  given: Dane
+  when: Jeżeli
+  then: Wtedy
+  and: Oraz
+  but: Ale
+# Portuguese
 "pt":
   feature: Característica
   scenario: Cenário
@@ -83,6 +181,29 @@
   then: Então
   and: E
   but: Mas
+# Romanian (without diacritics - the commonly used)
+"ro":
+  feature: Functionalitate
+  scenario: Scenariu
+  more_examples: Mai multe exemple
+  given_scenario: ScenariuDat
+  given: Daca
+  when: Cand
+  then: Atunci
+  and: Si
+  but: Dar
+# Romanian (with diacritics - not commonly used)
+"ro2":
+  feature: Funcționalitate
+  scenario: Scenariu
+  more_examples: Mai multe exemple
+  given_scenario: ScenariuDat
+  given: Dacă
+  when: Când
+  then: Atunci
+  and: Și
+  but: Dar
+# Russian
 "ru":
   feature: Функционал
   scenario: Сценарий
@@ -92,6 +213,7 @@
   then: То
   and: И
   but: Но
+# Swedish
 "se":
   feature: Egenskap
   scenario: Scenario
@@ -101,16 +223,9 @@
   then: Så
   and: Och
   but: Men
-"et":
-  feature: Omadus
-  scenario: Stsenaarium
-  given_scenario: EeldadesStsenaariumit
-  given: Eeldades
-  when: Kui
-  then: Siis
-  and: Ja
-  but: Kuid
+# Chinese simplified
 "zh-CN":
+  feature: 功能
   scenario: 场景
   given_scenario: 引用场景
   given: 假如

data/lib/cucumber/rails/world.rb

@@ -9,7 +9,7 @@ else
 end
 require 'test/unit/testresult'
 
-# These allow exceptions to come through as opposed to being caught and hvaing non-helpful responses returned.
+# These allow exceptions to come through as opposed to being caught and having non-helpful responses returned.
 ActionController::Base.class_eval do
   def perform_action
     perform_action_without_rescue

data/lib/cucumber/rake/task.rb

@@ -3,9 +3,9 @@ module Cucumber
     # Defines a task for running features.
     class Task
       LIB    = File.expand_path(File.dirname(__FILE__) + '/../..')
-      BINARY = File.expand_path(File.dirname(__FILE__) + '/../../../bin/cucumber')
 
       attr_accessor :libs
+      attr_accessor :binary
       attr_accessor :step_list
       attr_accessor :step_pattern
       attr_accessor :feature_list
@@ -13,7 +13,7 @@ module Cucumber
       attr_accessor :cucumber_opts
       attr_accessor :rcov
       attr_accessor :rcov_opts
-      
+
       # Define a task
       def initialize(task_name = "features", desc = "Run Features with Cucumber")
         @task_name, @desc = task_name, desc
@@ -23,33 +23,39 @@ module Cucumber
         yield self if block_given?
 
         @feature_pattern = "features/**/*.feature" if feature_pattern.nil? && feature_list.nil?
-        @step_pattern =  "features/**/*.rb"    if step_pattern.nil? && step_list.nil?
-        define_tasks
+        @step_pattern    = "features/**/*.rb"      if step_pattern.nil? && step_list.nil?
+        @binary        ||= File.expand_path(File.dirname(__FILE__) + '/../../../bin/cucumber')
+        define_task
       end
-    
-      def define_tasks
+
+      def define_task
         desc @desc
         task @task_name do
-          lib_args     = ['"%s"' % ([LIB] + libs).join(File::PATH_SEPARATOR)]
-          cucumber_bin = ['"%s"' % BINARY]
-          cuc_opts     = [(ENV['CUCUMBER_OPTS'] || cucumber_opts)]
-
-          step_files.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).flatten
-          else
-            args = (['-I'] + lib_args + cucumber_bin + cuc_opts + feature_files).flatten
-          end
-          ruby(args.join(" ")) # ruby(*args) is broken on Windows
+          ruby(arguments_for_ruby_execution.join(" ")) # ruby(*args) is broken on Windows
         end
       end
 
+      def arguments_for_ruby_execution(task_args = nil)
+        lib_args     = ['"%s"' % ([LIB] + libs).join(File::PATH_SEPARATOR)]
+        cucumber_bin = ['"%s"' % binary]
+        cuc_opts     = [(ENV['CUCUMBER_OPTS'] || cucumber_opts)]
+
+        step_files(task_args).each do |step_file|
+          cuc_opts << '--require'
+          cuc_opts << step_file
+        end
 
-      def feature_files # :nodoc:
+        if rcov
+          args = (['-I'] + lib_args + ['-S', 'rcov'] + rcov_opts +
+            cucumber_bin + ['--'] + cuc_opts + feature_files(task_args)).flatten
+        else
+          args = (['-I'] + lib_args + cucumber_bin + cuc_opts + feature_files(task_args)).flatten
+        end
+
+        args
+      end
+
+      def feature_files(task_args = nil) # :nodoc:
         if ENV['FEATURE']
           FileList[ ENV['FEATURE'] ]
         else
@@ -60,16 +66,36 @@ module Cucumber
         end
       end
 
-      def step_files # :nodoc:
+      def step_files(task_args = nil) # :nodoc:
         if ENV['STEPS']
           FileList[ ENV['STEPS'] ]
         else
           result = []
-          result += step_list.to_a if step_list
-          result += FileList[step_pattern].to_a if step_pattern
+          result += Array(step_list) if step_list
+          result += Array(FileList[step_pattern]) if step_pattern
           FileList[result]
         end
       end
     end
+
+    class FeatureTask < Task
+
+      def initialize(task_name = "feature", desc = "Run a specified feature with Cucumber.  #{task_name}[feature_name]")
+        super(task_name, desc)
+      end
+
+      def define_task
+        desc @desc
+        task @task_name, :feature_name do |t, args|
+          ruby(arguments_for_ruby_execution(args).join(" ")) # ruby(*args) is broken on Windows
+        end
+      end
+
+      def feature_files(task_arguments) # :nodoc:
+        FileList[File.join("features", "**", "#{task_arguments[:feature_name]}.feature")]
+      end
+
+    end
+
   end
-end
+end

data/lib/cucumber/step_mother.rb

@@ -53,6 +53,7 @@ module Cucumber
     def regexp_args_proc(step_name)
       candidates = @step_procs.map do |regexp, proc|
         if step_name =~ regexp
+          proc = PENDING if proc.nil?
           [regexp, $~.captures, proc]
         end
       end.compact
@@ -76,8 +77,13 @@ module Cucumber
       @step_procs[regexp]
     end
     
+    def has_step_definition?(step_name)
+      _, _, proc = regexp_args_proc(step_name)
+      proc != PENDING
+    end
+    
     # TODO - move execute here?
     def execute(step)
     end
   end
-end
+end

data/lib/cucumber/tree/feature.rb

@@ -1,10 +1,12 @@
 module Cucumber
   module Tree
     class Feature
+      attr_reader :header
+      attr_reader :scenarios
       MIN_PADDING = 2
-      
+
       attr_accessor :file
-      
+
       def initialize(header, &proc)
         @header = header
         @scenarios = []
@@ -16,7 +18,7 @@ module Cucumber
         @scenarios << scenario
         scenario
       end
-      
+
       def add_row_scenario(template_scenario, values, line)
         scenario = RowScenario.new(self, template_scenario, values, line)
         @scenarios << scenario
@@ -34,13 +36,13 @@ module Cucumber
       def Scenario(name, &proc)
         add_scenario(name, &proc)
       end
-      
+
       def Table(matrix = [], &proc)
         table = Table.new(matrix)
         proc.call(table)
         template_scenario = @scenarios.last
         matrix[1..-1].each do |row|
-          @scenarios << RowScenario.new(self, template_scenario, row, row.line)
+          add_row_scenario(template_scenario, row, row.line)
         end
       end
 
@@ -56,4 +58,4 @@ module Cucumber
       end
     end
   end
-end
+end