aslakhellesoy-cucumber 0.3.5 → 0.3.6.1

data/lib/cucumber/formatter/pretty.rb

@@ -76,6 +76,7 @@ module Cucumber
 
       def visit_feature_element(feature_element)
         @indent = 2
+        @scenario_indent = 2
         super
         @io.puts
         @io.flush
@@ -83,6 +84,7 @@ module Cucumber
 
       def visit_background(background)
         @indent = 2
+        @scenario_indent = 2
         @in_background = true
         super
         @in_background = nil
@@ -100,6 +102,7 @@ module Cucumber
         names[1..-1].each {|s| @io.puts "      #{s}" }
         @io.flush
         @indent = 6
+        @scenario_indent = 6
       end
 
       def visit_scenario_name(keyword, name, file_colon_line, source_indent)
@@ -107,8 +110,9 @@ module Cucumber
       end
 
       def visit_feature_element_name(keyword, name, file_colon_line, source_indent)
+        @io.puts if @scenario_indent == 6
         names = name.empty? ? [name] : name.split("\n")
-        line = "  #{keyword} #{names[0]}"
+        line = "#{keyword} #{names[0]}".indent(@scenario_indent)
         @io.print(line)
         if @options[:source]
           line_comment = " # #{file_colon_line}".indent(source_indent)
@@ -137,7 +141,7 @@ module Cucumber
       def visit_step_name(keyword, step_match, status, source_indent, background)
         source_indent = nil unless @options[:source]
         formatted_step_name = format_step(keyword, step_match, status, source_indent)
-        @io.puts("    " + formatted_step_name)
+        @io.puts(formatted_step_name.indent(@scenario_indent + 2))
       end
 
       def visit_multiline_arg(multiline_arg)
@@ -177,6 +181,7 @@ module Cucumber
       def print_summary
         print_counts
         print_snippets(@options)
+        print_passing_wip(@options)
       end
 
     end

data/lib/cucumber/formatter/progress.rb

@@ -35,6 +35,7 @@ module Cucumber
         print_steps(:failed)
         print_counts
         print_snippets(@options)
+        print_passing_wip(@options)
       end
 
       CHARS = {

data/lib/cucumber/formatter/tag_cloud.rb

@@ -0,0 +1,27 @@
+module Cucumber
+  module Formatter
+    # Custom formatter that prints a tag cloud
+    class TagCloud < Cucumber::Ast::Visitor
+      def initialize(step_mother, io, options)
+        super(step_mother)
+        @io = io
+        @counts = Hash.new{|h,k| h[k] = 0}
+      end
+
+      def visit_features(features)
+        super
+        print_summary
+      end
+
+      def visit_tag_name(tag_name)
+        @counts[tag_name] += 1
+      end
+  
+      def print_summary
+        matrix = @counts.to_a.sort{|paira, pairb| paira[0] <=> pairb[0]}.transpose
+        table = Cucumber::Ast::Table.new(matrix)
+        Cucumber::Formatter::Pretty.new(@step_mother, @io, {}).visit_multiline_arg(table)
+      end
+    end
+  end
+end

data/lib/cucumber/languages.yml

@@ -43,6 +43,36 @@
   and: و
   but: لكن
   space_after_keyword: true
+"bg":
+  name: Bulgarian
+  native: български
+  encoding: UTF-8
+  feature: Функционалност
+  background: Предистория
+  scenario: Сценарий
+  scenario_outline: Рамка на сценарий
+  examples: Примери
+  given: Дадено
+  when: Когато
+  then: То
+  and: И
+  but: Но
+  space_after_keyword: true
+"cat":
+  name: Catalan
+  native: català
+  encoding: UTF-8
+  background: Rerefons
+  feature: Característica
+  scenario: Escenari
+  scenario_outline: Esquema de l\'escenari
+  examples: Exemples
+  given: Donat
+  when: Quan
+  then: Aleshores
+  and: I
+  but: Però
+  space_after_keyword: true
 "cy":
   name: Welsh
   native: Cymraeg
@@ -161,21 +191,6 @@
   and: Y
   but: Pero
   space_after_keyword: true
-"cat":
-  name: Catalan
-  native: català
-  encoding: UTF-8
-  background: Rerefons
-  feature: Característica
-  scenario: Escenari
-  scenario_outline: Esquema de l\'escenari
-  examples: Exemples
-  given: Donat
-  when: Quan
-  then: Aleshores
-  and: I
-  but: Però
-  space_after_keyword: true
 "et":
   name: Estonian
   native: eesti keel
@@ -296,6 +311,21 @@
   and: かつ
   but: しかし|但し
   space_after_keyword: false
+"ko":
+  name: Korean
+  native: 한국어
+  encoding: UTF-8
+  background: 배경
+  feature: 기능
+  scenario: 시나리오
+  scenario_outline: 시나리오 개요
+  examples: 예
+  given: 조건
+  when: 만일
+  then: 그러면
+  and: 그리고
+  but: 하지만
+  space_after_keyword: false
 "lt":
   name: Lithuanian
   native: lietuvių kalba
@@ -455,6 +485,21 @@
   and: A
   but: Ale
   space_after_keyword: true
+"vi":
+  name: Vietnamese
+  native: Tiếng Việt
+  encoding: UTF-8
+  feature: Tính năng
+  background: Bối cảnh
+  scenario: Tình huống|Kịch bản
+  scenario_outline: Khung tình huống|Khung kịch bản
+  examples: Dữ liệu
+  given: Biết|Cho
+  when: Khi
+  then: Thì
+  and: Và
+  but: Nhưng
+  space_after_keyword: true
 "zh-CN":
   name: Chinese simplified
   native: 简体中文
@@ -485,48 +530,3 @@
   and: 而且|並且
   but: 但是
   space_after_keyword: false
-"ko":
-  name: Korean
-  native: 한국어
-  encoding: UTF-8
-  background: 배경
-  feature: 기능
-  scenario: 시나리오
-  scenario_outline: 시나리오 개요
-  examples: 예
-  given: 조건
-  when: 만일
-  then: 그러면
-  and: 그리고
-  but: 하지만
-  space_after_keyword: false
-"bg":
-  name: Bulgarian
-  native: български
-  encoding: UTF-8
-  feature: Функционалност
-  background: Предистория
-  scenario: Сценарий
-  scenario_outline: Рамка на сценарий
-  examples: Примери
-  given: Дадено
-  when: Когато
-  then: То
-  and: И
-  but: Но
-  space_after_keyword: true
-"vi":
-  name: Vietnamese
-  native: Tiếng Việt
-  encoding: UTF-8
-  feature: Tính năng
-  background: Bối cảnh
-  scenario: Kịch bản
-  scenario_outline: Khung kịch bản
-  examples: Dữ liệu
-  given: Cho
-  when: Khi
-  then: Thì
-  and: Và
-  but: Nhưng
-  space_after_keyword: true

data/lib/cucumber/rails/world.rb

@@ -68,13 +68,26 @@ module Cucumber #:nodoc:
 
     def self.bypass_rescue
       ActionController::Base.class_eval do
+        alias_method :rescue_action_without_bypass, :rescue_action
+
         def rescue_action(exception)
           raise exception
         end
       end
-      ActionController::Dispatcher.class_eval do
-        def self.failsafe_response(output, status, exception = nil)
-          raise exception
+
+      begin
+        ActionController::Failsafe.class_eval do
+          alias_method :failsafe_response_without_bypass, :failsafe_response
+        
+          def failsafe_response(exception)
+            raise exception
+          end
+        end
+      rescue NameError # Failsafe was introduced in Rails 2.3.2
+        ActionController::Dispatcher.class_eval do
+          def self.failsafe_response(output, status, exception = nil)
+            raise exception
+          end
         end
       end
     end

data/lib/cucumber/rake/task.rb

@@ -135,7 +135,8 @@ module Cucumber
       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)
+      attr_accessor :profile
+      def profile=(profile) #:nodoc:
         @profile = profile
         unless feature_list
           # TODO: remove once we completely remove these from the rake task.
@@ -143,7 +144,6 @@ module Cucumber
           @feature_list = [] # Don't use accessor to avoid deprecation warning.
         end
       end
-      attr_reader :profile
 
       # Define Cucumber Rake task
       def initialize(task_name = "features", desc = "Run Features with Cucumber")

data/lib/cucumber/step_match.rb

@@ -33,12 +33,13 @@ module Cucumber
   class NoStepMatch
     attr_reader :step_definition
 
-    def initialize(step)
+    def initialize(step, name)
       @step = step
+      @name = name
     end
     
     def format_args(format)
-      @step.name
+      @name
     end
 
     def file_colon_line

data/lib/cucumber/step_mother.rb

@@ -78,8 +78,16 @@ module Cucumber
         @tag_names.empty? || (@tag_names & tag_names).any?
       end
 
-      def execute_in(world, scenario, location)
-        world.cucumber_instance_exec(false, location, scenario, &@proc)
+      def execute_in(world, scenario, location, exception_fails_scenario = true)
+        begin
+          world.cucumber_instance_exec(false, location, scenario, &@proc)
+        rescue Exception => exception
+          if exception_fails_scenario
+            scenario.fail!(exception)
+          else
+            raise
+          end
+        end
       end
     end
 
@@ -143,6 +151,10 @@ module Cucumber
       register_hook(:after, tag_names, proc)
     end
 
+    def AfterStep(*tag_names, &proc)
+      register_hook(:after_step, tag_names, proc)
+    end
+
     def register_hook(phase, tags, proc)
       hook = Hook.new(tags, proc)
       hooks[phase] << hook
@@ -233,7 +245,9 @@ module Cucumber
 
     def before_and_after(scenario, skip=false)
       before(scenario) unless skip
-      yield
+      @current_scenario = scenario
+      yield scenario
+      @current_scenario = nil
       after(scenario) unless skip
       scenario_visited(scenario)
     end
@@ -249,7 +263,11 @@ module Cucumber
       execute_after(scenario)
       nil_world!
     end
-
+    
+    def after_step
+      execute_after_step(@current_scenario)
+    end
+    
     private
 
     def max_step_definition_length
@@ -323,6 +341,13 @@ module Cucumber
       end
     end
 
+    def execute_after_step(scenario)
+      return if options[:dry_run]
+      hooks_for(:after_step, scenario).each do |hook|
+        hook.execute_in(@current_world, scenario, 'AfterStep', false)
+      end
+    end
+
     def scenario_visited(scenario)
       scenarios << scenario unless scenarios.index(scenario)
     end

data/lib/cucumber/version.rb

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

data/rails_generators/cucumber/templates/cucumber.rake

@@ -5,7 +5,7 @@ begin
 
   Cucumber::Rake::Task.new(:features) do |t|
     t.fork = true
-    t.cucumber_opts = %w{--format pretty}
+    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
   end
   task :features => 'db:test:prepare'
 rescue LoadError

data/rails_generators/feature/feature_generator.rb

@@ -1,4 +1,4 @@
-# This generator bootstraps a Rails project for use with Cucumber
+# This generator generates a baic feature.
 class FeatureGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|

data/spec/cucumber/cli/configuration_spec.rb

@@ -81,11 +81,8 @@ module Cli
           "/features/support/fooz.rb"
         ]
       end
-
-
     end
 
-
     it "should expand args from YAML file" do
       given_cucumber_yml_defined_as({'bongo' => '--require from/yml'})
 

data/spec/cucumber/formatter/color_io_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/formatter/color_io'
 
 module Cucumber
   module Formatter

data/spec/cucumber/formatter/progress_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/formatter/progress'
 
 module Cucumber
   module Formatter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-15 00:00:00 -07:00
+date: 2009-05-20 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -267,7 +267,6 @@ files:
 - examples/self_test/features/search_sample.feature
 - examples/self_test/features/step_definitions/sample_steps.rb
 - examples/self_test/features/support/env.rb
-- examples/self_test/features/support/tag_count_formatter.rb
 - examples/self_test/features/tons_of_cukes.feature
 - examples/self_test/features/undefined_multiline_args.feature
 - examples/sinatra/Rakefile
@@ -315,6 +314,8 @@ files:
 - examples/watir/features/search.feature
 - examples/watir/features/step_definitons/search_steps.rb
 - examples/watir/features/support/env.rb
+- features/after_block_exceptions.feature
+- features/after_step_block_exceptions.feature
 - features/background.feature
 - features/cucumber_cli.feature
 - features/cucumber_cli_diff_disabled.feature
@@ -330,6 +331,7 @@ files:
 - features/step_definitions/extra_steps.rb
 - features/support/env.rb
 - features/usage.feature
+- features/work_in_progress.feature
 - gem_tasks/deployment.rake
 - gem_tasks/environment.rake
 - gem_tasks/features.rake
@@ -370,7 +372,6 @@ files:
 - lib/cucumber/core_ext/instance_exec.rb
 - lib/cucumber/core_ext/proc.rb
 - lib/cucumber/core_ext/string.rb
-- lib/cucumber/formatter.rb
 - lib/cucumber/formatter/ansicolor.rb
 - lib/cucumber/formatter/color_io.rb
 - lib/cucumber/formatter/console.rb
@@ -382,6 +383,7 @@ files:
 - lib/cucumber/formatter/profile.rb
 - lib/cucumber/formatter/progress.rb
 - lib/cucumber/formatter/rerun.rb
+- lib/cucumber/formatter/tag_cloud.rb
 - lib/cucumber/formatter/unicode.rb
 - lib/cucumber/formatter/usage.rb
 - lib/cucumber/formatters/unicode.rb