aslakhellesoy-cucumber 0.2.3.4 → 0.3.0

data/History.txt

@@ -13,7 +13,17 @@ The Visitor API (which is used for formatters) has also changed slightly. Howeve
 do this in a backwards compatible way, so if you have custom formatters for Cucumber 0.2 they should
 still work.
 
+One of the most significant new features is Tagged Hooks: http://wiki.github.com/aslakhellesoy/cucumber/hooks
+This lets you associate Before and After blocks with specific scenarios.
+
+We are also deprecating the step_list, step_pattern, feature_list, and feature_pattern accessors on
+Cucumber::Rake::Task. These accessors will be completely removed in version 0.4. For complex settings 
+please rely on cucumber profiles in your rake tasks:
+http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles
+
 === New features
+* Use Hooks with @tags (#229 Aslak Hellesøy)
+* Rake task supports cucumber.yml profiles (#187 Ben Mabey)
 * Field value steps for Webrat (Jack Chen)
 * Added translation for Bulgarian (Krasimir Angelov)
 * Updated translation for Polish (#273 Grzegorz Marszałek)
@@ -26,6 +36,7 @@ still work.
 * Support description string for Backgrounds (#271 Joseph Wilk)
 
 === Bugfixes
+* After methods not being executed when Background fails (#288 Luismi Cavallé)
 * Fixed dependency on internal files in rspec breaks cucumber w/ rspec-1.2.4 (#291 Aslak Hellesøy)
 * Fix color use when using autotest on Linux. (Hans de Graaff)
 * Fixed incorrect calculation of pystring indentation (#279 Eugene Naydanov)

data/Manifest.txt

@@ -182,6 +182,8 @@ examples/tickets/features/177/1.feature
 examples/tickets/features/177/2.feature
 examples/tickets/features/177/3.feature
 examples/tickets/features/180.feature
+examples/tickets/features/229/tagged_hooks.feature
+examples/tickets/features/229/tagged_hooks.rb
 examples/tickets/features/236.feature
 examples/tickets/features/241.feature
 examples/tickets/features/246.feature
@@ -209,6 +211,7 @@ features/cucumber_cli.feature
 features/cucumber_cli_diff_disabled.feature
 features/cucumber_cli_outlines.feature
 features/custom_formatter.feature
+features/rake_task.feature
 features/report_called_undefined_steps.feature
 features/snippet.feature
 features/step_definitions/cucumber_steps.rb

data/config/hoe.rb

@@ -53,7 +53,7 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.summary = DESCRIPTION
   p.url = HOMEPATH
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store', '**/*.class', '**/*.jar']  #An array of file patterns to delete on clean.
+  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store', '**/*.class', '**/*.jar', '**/tmp']  #An array of file patterns to delete on clean.
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")

data/cucumber.yml

@@ -1 +1 @@
-default: --format progress features
+default: --format progress features --tags ~@pending

data/examples/self_test/features/background/passing_background.feature

@@ -4,7 +4,7 @@ Feature: Passing background sample
     Given '10' cukes
 
   Scenario: passing background
-    Then I should have '10' cukes
-    
+    Then I should have '10' cukes    
+
   Scenario: another passing background
     Then I should have '10' cukes

data/examples/self_test/features/step_definitions/sample_steps.rb

@@ -68,3 +68,13 @@ end
 
 Given /^another unused$/ do
 end
+
+after_file = File.dirname(__FILE__) + '/../../tmp/after.txt'
+
+Before('@after_file') do
+  FileUtils.rm(after_file) if File.exist?(after_file)
+end
+
+After('@after_file') do
+  FileUtils.touch(after_file)
+end

data/examples/tickets/features/229/tagged_hooks.feature

@@ -0,0 +1,8 @@
+Feature: Tagged hooks
+  In order to provide more flexible setups
+  I should be able to specify exactly
+  where hooks are executed
+  
+  @i_am_so_special
+  Scenario: Yes I am
+    When special me goes to town

data/examples/tickets/features/229/tagged_hooks.rb

@@ -0,0 +1,14 @@
+require 'spec/expectations'
+
+Before('@i_am_so_special') do
+  @something_special = 10
+end
+
+After('@i_am_so_special') do
+  @something_special.should == 20
+end
+
+When /special me goes to town/ do
+  @something_special.should == 10
+  @something_special = 20
+end

data/examples/tickets/features/279/py_string_indent.steps.rb

@@ -1,6 +1,7 @@
 require 'spec/expectations'
 
 require File.dirname(__FILE__) + '/../../../../features/step_definitions/cucumber_steps.rb'
+require File.dirname(__FILE__) + '/../../../../features/support/env.rb'
 
 Given /^multiline string$/ do |string|
   @string = string

data/examples/tickets/features/step_definitons/tickets_steps.rb

@@ -1,12 +1,5 @@
 require 'spec/expectations'
 
-World do
-  Object.new
-end
-
-After do |scenario|
-end
-
 Given "be_empty" do
   [1,2].should_not be_empty
 end

data/features/background.feature

@@ -93,6 +93,7 @@ Feature: backgrounds
     5 skipped steps
 
     """
+    And "examples/self_test/tmp/after.txt" should exist
 
   Scenario: run a feature with scenario outlines that has a background that fails
     When I run cucumber -q features/background/scenario_outline_failing_background.feature --require features

data/features/rake_task.feature

@@ -0,0 +1,132 @@
+Feature: Rake task
+  In order to ease the development process
+  As a developer and CI server administrator
+  Cucumber features should be executable via Rake
+
+  Background:
+    Given a standard Cucumber project directory structure
+    And a file named "features/missing_step_definitions.feature" with:
+    """
+    Feature: Sample
+
+      Scenario: Wanted
+        Given I want to run this
+
+      Scenario: Unwanted
+        Given I don't want this ran
+    """
+
+
+  Scenario: rake task with a defined profile
+    Given the following profile is defined:
+    """
+    foo: --quiet --no-color features/missing_step_definitions.feature:3
+    """
+    And a file named "Rakefile" with:
+    """
+    $LOAD_PATH.unshift(CUCUMBER_LIB)
+    require 'cucumber/rake/task'
+
+    Cucumber::Rake::Task.new(:features) do |t|
+      t.profile = "foo"
+    end
+    """
+
+    When I run rake features
+    Then it should pass
+    And the output should contain
+    """
+    Feature: Sample
+
+      Scenario: Wanted
+        Given I want to run this
+
+    1 scenario
+    1 undefined step
+    """
+
+  Scenario: rake task with a defined profile and cucumber_opts
+    Given the following profile is defined:
+    """
+    bar: features/missing_step_definitions.feature:3
+    """
+    And a file named "Rakefile" with:
+    """
+    $LOAD_PATH.unshift(CUCUMBER_LIB)
+    require 'cucumber/rake/task'
+
+    Cucumber::Rake::Task.new(:features) do |t|
+      t.profile = "bar"
+      t.cucumber_opts = "--quiet --no-color"
+    end
+    """
+
+    When I run rake features
+    Then it should pass
+    And the output should contain
+    """
+    Feature: Sample
+
+      Scenario: Wanted
+        Given I want to run this
+
+    1 scenario
+    1 undefined step
+    """
+
+  Scenario: rake task with a defined profile and feature list
+    Given a file named "features/the_one_i_want_to_run.feature" with:
+    """
+    Feature: Desired
+
+      Scenario: Something
+        Given this is missing
+    """
+   Given the following profile is defined:
+    """
+    baz: --quiet --no-color
+    """
+    And a file named "Rakefile" with:
+    """
+    $LOAD_PATH.unshift(CUCUMBER_LIB)
+    require 'cucumber/rake/task'
+
+    Cucumber::Rake::Task.new(:features) do |t|
+      t.profile = "baz"
+      t.feature_list = ['features/the_one_i_want_to_run.feature']
+    end
+    """
+
+    When I run rake features
+    Then it should pass
+    And the output should contain
+    """
+    Feature: Desired
+
+      Scenario: Something
+        Given this is missing
+
+    1 scenario
+    1 undefined step
+    """
+
+  Scenario: deprecation warnings
+    Given a file named "Rakefile" with:
+    """
+    $LOAD_PATH.unshift(CUCUMBER_LIB)
+    require 'cucumber/rake/task'
+
+    Cucumber::Rake::Task.new(:features) do |t|
+      t.feature_list = ['features/missing_step_definitions.feature']
+    end
+    """
+    When I run rake features
+    Then it should pass
+    And STDERR should match
+    """
+    Cucumber::Rake::Task#feature_list is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles
+    """
+
+
+
+

data/features/step_definitions/cucumber_steps.rb

@@ -1,32 +1,46 @@
-require 'tempfile'
-
-Given /^I am in (.*)$/ do |dir|
-  @dir = dir
+Given /^I am in (.*)$/ do |example_dir_relative_path|
+  @current_dir = examples_dir(example_dir_relative_path)
 end
 
-When /^I run cucumber (.*)$/ do |cmd|
-  @dir ||= 'self_test'
-  full_dir ||= File.expand_path(File.dirname(__FILE__) + "/../../examples/#{@dir}")
-  @stderr = Tempfile.new('cucumber')
-  @stderr.close
-  Dir.chdir(full_dir) do
-    @full_cmd = "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} --no-color #{cmd} 2> #{@stderr.path}"
-    @out = `#{@full_cmd}`
-    @status = $?.exitstatus
+Given /^a standard Cucumber project directory structure$/ do
+  @current_dir = working_dir
+  in_current_dir do
+    FileUtils.mkdir_p 'features/support'
+    FileUtils.mkdir 'features/step_definitions'
   end
 end
 
-Then /^it should (fail|pass) with$/ do |success, output|
-  @out.should == output
+Given /^a file named "([^\"]*)" with:$/ do |file_name, file_content|
+  create_file(file_name, file_content)
+end
+
+Given /^the following profiles? (?:are|is) defined:$/ do |profiles|
+  create_file('cucumber.yml', profiles)
+end
+
+When /^I run cucumber (.*)$/ do |cucumber_opts|
+  run "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} --no-color #{cucumber_opts}"
+end
+
+When /^I run rake (.*)$/ do |rake_opts|
+  run "rake #{rake_opts}"
+end
+
+Then /^it should (fail|pass)$/ do |success|
   if success == 'fail'
-    @status.should_not == 0
+    last_exit_status.should_not == 0
   else
-    @status.should == 0
+    last_exit_status.should == 0
   end
 end
 
+Then /^it should (fail|pass) with$/ do |success, output|
+  last_stdout.should == output
+  Then("it should #{success}")
+end
+
 Then /^the output should contain$/ do |text|
-  @out.should include(text)
+  last_stdout.should include(text)
 end
 
 Then /^"(.*)" should contain$/ do |file, text|
@@ -38,5 +52,10 @@ Then /^"(.*)" should match$/ do |file, text|
 end
 
 Then /^STDERR should match$/ do |text|
-  Then %{"#{@stderr.path}" should match}, text
+  last_stderr.should =~ /#{text}/
+end
+
+Then /^"(.*)" should exist$/ do |file|
+  File.exists?(file).should be_true
+  FileUtils.rm(file)
 end

data/features/support/env.rb

@@ -1,8 +1,65 @@
 require 'rubygems'
+require 'tempfile'
 require 'spec/expectations'
 require 'fileutils'
+require 'forwardable'
 
-After do
-  FileUtils.rm_rf 'examples/self_test/tmp'
-  FileUtils.mkdir 'examples/self_test/tmp'
-end
+class CucumberWorld
+  extend Forwardable
+  def_delegators CucumberWorld, :examples_dir, :self_test_dir, :working_dir, :cucumber_lib_dir
+
+  def self.examples_dir(subdir=nil)
+    @examples_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '../../examples'))
+    subdir ? File.join(@examples_dir, subdir) : @examples_dir
+  end
+
+  def self.self_test_dir
+    @self_test_dir ||= examples_dir('self_test')
+  end
+
+  def self.working_dir
+    @working_dir ||= examples_dir('self_test/tmp')
+  end
+
+  def cucumber_lib_dir
+    @cucumber_lib_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
+  end
+
+  def initialize
+    @current_dir = self_test_dir
+  end
+
+  private
+  attr_reader :last_exit_status, :last_stdout, :last_stderr
+
+  def create_file(file_name, file_content)
+    file_content.gsub!("CUCUMBER_LIB", "'#{cucumber_lib_dir}'") # Some files, such as Rakefiles need to use the lib dir
+    in_current_dir do
+      File.open(file_name, 'w') { |f| f << file_content }
+    end
+  end
+
+  def in_current_dir(&block)
+    Dir.chdir(@current_dir, &block)
+  end
+
+  def run(command)
+    stderr_file = Tempfile.new('cucumber')
+    stderr_file.close
+    in_current_dir do
+      @last_stdout = `#{command} 2> #{stderr_file.path}`
+      @last_exit_status = $?.exitstatus
+    end
+    @last_stderr = IO.read(stderr_file.path)
+  end
+
+end
+
+World do
+  CucumberWorld.new
+end
+
+Before do
+  FileUtils.rm_rf CucumberWorld.working_dir
+  FileUtils.mkdir CucumberWorld.working_dir
+end

data/gem_tasks/deployment.rake

@@ -5,7 +5,7 @@ end
 
 namespace :manifest do
   desc 'Recreate Manifest.txt to include ALL files'
-  task :refresh do
+  task :refresh => :clobber do
     `rake check_manifest | patch -p0 > Manifest.txt`
   end
 end

data/lib/cucumber/ast/background.rb

@@ -24,9 +24,19 @@ module Cucumber
       def accept(visitor)
         visitor.visit_comment(@comment)
         visitor.visit_background_name(@keyword, @name, file_colon_line(@line), source_indent(text_length))
-        visitor.step_mother.before_and_after(self)
+        visitor.step_mother.before(self)
         visitor.visit_steps(@step_invocations)
         @failed = @step_invocations.detect{|step_invocation| step_invocation.exception}
+        visitor.step_mother.after(self) if @failed
+      end
+
+      def accept_hook?(hook)
+        # TODO: When background is involved - no tag based hook filtering is occurring with
+        # the current implementation. All hooks will be executed. This is because of the line
+        #   visitor.step_mother.before(self)
+        # in the #accept method above. Instead, we should really be passing the first scenario
+        # here. We currently don't have access to that, so a refactoring is in order to make that happen.
+        true
       end
 
       def failed?

data/lib/cucumber/ast/feature_element.rb

@@ -28,6 +28,10 @@ module Cucumber
       @steps.max_line_length(self)
     end
 
+    def accept_hook?(hook)
+      @tags.accept_hook?(hook)
+    end
+
     # TODO: Remove when we use StepCollection everywhere
     def previous_step(step)
       i = @steps.index(step) || -1

data/lib/cucumber/ast/outline_table.rb

@@ -15,6 +15,10 @@ module Cucumber
         nil
       end
 
+      def accept_hook?(hook)
+        @scenario_outline.accept_hook?(hook)
+      end
+
       def skip_invoke!
         example_rows.each do |cells|
           cells.skip_invoke!
@@ -62,6 +66,10 @@ module Cucumber
           end
         end
 
+        def accept_hook?(hook)
+          @table.accept_hook?(hook)
+        end
+
         private
 
         def header?

data/lib/cucumber/ast/tags.rb

@@ -7,6 +7,10 @@ module Cucumber
     # This gets stored internally as <tt>["invoice", "release_2"]</tt>
     #
     class Tags
+      def self.strip_prefix(tag_name)
+        tag_name =~ /^@(.*)/ ? $1 : tag_name
+      end
+    
       def initialize(line, tag_names)
         @line, @tag_names = line, tag_names
       end
@@ -16,7 +20,11 @@ module Cucumber
           visitor.visit_tag_name(tag_name)
         end
       end
-      
+
+      def accept_hook?(hook)
+        hook.matches_tag_names?(@tag_names)
+      end
+
       def to_sexp
         @tag_names.map{|tag_name| [:tag, tag_name]}
       end

data/lib/cucumber/cli/configuration.rb

@@ -187,8 +187,8 @@ module Cucumber
         excludes = excludes.map{|tag| tag[1..-1]}
 
         # Strip @
-        includes = includes.map{|tag| tag =~ /^@(.*)/ ? $1 : tag}
-        excludes = excludes.map{|tag| tag =~ /^@(.*)/ ? $1 : tag}
+        includes = includes.map{|tag| Ast::Tags.strip_prefix(tag)}
+        excludes = excludes.map{|tag| Ast::Tags.strip_prefix(tag)}
         [includes, excludes]
       end
 

data/lib/cucumber/cli/main.rb

@@ -92,7 +92,11 @@ module Cucumber
 
       def enable_diffing
         if configuration.diff_enabled? && defined?(::Spec)
-          require 'spec/runner/differs/default'
+          begin
+            require 'spec/runner/differs/default' # RSpec >=1.2.4
+          rescue ::LoadError
+            require 'spec/expectations/differs/default' # RSpec <=1.2.3
+          end
           options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
           ::Spec::Expectations.differ = ::Spec::Expectations::Differs::Default.new(options)
         end

data/lib/cucumber/parser/feature.rb

@@ -216,7 +216,7 @@ module Cucumber
         end
 
         def has_tags?(tags)
-          tag_names.detect{|tag_name| tags.index(tag_name)}
+          (tag_names & tags).any?
         end
 
         def build
@@ -224,7 +224,7 @@ module Cucumber
         end
         
         def tag_names
-          ts.elements.map{|e| e.tag.tag_name.text_value}
+          @tag_names ||= ts.elements.map{|e| e.tag.tag_name.text_value}
         end
       end
 

data/lib/cucumber/parser/feature.tt

@@ -46,7 +46,7 @@ module Cucumber
           end
 
           def has_tags?(tags)
-            tag_names.detect{|tag_name| tags.index(tag_name)}
+            (tag_names & tags).any?
           end
 
           def build
@@ -54,7 +54,7 @@ module Cucumber
           end
           
           def tag_names
-            ts.elements.map{|e| e.tag.tag_name.text_value}
+            @tag_names ||= ts.elements.map{|e| e.tag.tag_name.text_value}
           end
         }
       end

data/lib/cucumber/rake/task.rb

@@ -27,26 +27,45 @@ module Cucumber
     class Task
       LIB    = File.expand_path(File.dirname(__FILE__) + '/../..') # :nodoc:
 
+      # TODO: remove depreated accessors for 0.4.0
+      def self.deprecate_accessor(attribute) # :nodoc:
+        attr_reader attribute
+        class_eval <<-EOF, __FILE__, __LINE__ + 1
+          def #{attribute}=(value)
+            @#{attribute} = value
+            warn("Cucumber::Rake::Task##{attribute} is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles")
+          end
+        EOF
+      end
+
       # 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
-      attr_accessor :step_list
+      deprecate_accessor :step_list
       # File pattern for finding step definitions. Defaults to 
       # 'features/**/*.rb'.
-      attr_accessor :step_pattern
+      deprecate_accessor :step_pattern
       # Array of paths to specific features to run. 
-      attr_accessor :feature_list
+      deprecate_accessor :feature_list
       # File pattern for finding features to run. Defaults to 
-      # 'features/**/*.feature'. Can be overriden by the FEATURE environment variable.
-      attr_accessor :feature_pattern
+      # '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.
       attr_accessor :cucumber_opts
       # Run cucumber with RCov?
       attr_accessor :rcov
       # Extra options to pass to rcov
       attr_accessor :rcov_opts
+      # 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
+        unless feature_list
+          @feature_list = [] # Don't use accessor to avoid deprecation warning.
+        end
+      end
+      attr_reader :profile
 
       # Define a Rake
       def initialize(task_name = "features", desc = "Run Features with Cucumber")
@@ -75,7 +94,7 @@ module Cucumber
       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)]
+        cuc_opts     = [(ENV['CUCUMBER_OPTS'] || cucumber_opts_with_profile)]
 
         step_files(task_args).each do |step_file|
           cuc_opts << '--require'
@@ -92,6 +111,10 @@ module Cucumber
         args
       end
 
+      def cucumber_opts_with_profile # :nodoc:
+        @profile ? "#{cucumber_opts} --profile #{@profile}" : cucumber_opts
+      end
+
       def feature_files(task_args = nil) # :nodoc:
         if ENV['FEATURE']
           FileList[ ENV['FEATURE'] ]

data/lib/cucumber/step_mother.rb

@@ -67,6 +67,21 @@ module Cucumber
   # so #register_step_definition (and more interestingly - its aliases) are
   # available from the top-level.
   module StepMother
+    class Hook
+      def initialize(tag_names, proc)
+        @tag_names = tag_names.map{|tag| Ast::Tags.strip_prefix(tag)}
+        @proc = proc
+      end
+
+      def matches_tag_names?(tag_names)
+        @tag_names.empty? || (@tag_names & tag_names).any?
+      end
+
+      def execute_in(world, scenario, location)
+        world.cucumber_instance_exec(false, location, scenario, &@proc)
+      end
+    end
+
     class << self
       def alias_adverb(adverb)
         adverb = adverb.gsub(/\s/, '')
@@ -114,12 +129,26 @@ module Cucumber
 
     # Registers a Before proc. You can call this method as many times as you
     # want (typically from ruby scripts under <tt>support</tt>).
-    def Before(&proc)
-      (@before_procs ||= []) << proc
+    def Before(*tag_names, &proc)
+      register_hook(:before, tag_names, proc)
+    end
+
+    def After(*tag_names, &proc)
+      register_hook(:after, tag_names, proc)
     end
 
-    def After(&proc)
-      (@after_procs ||= []).unshift(proc)
+    def register_hook(phase, tags, proc)
+      hook = Hook.new(tags, proc)
+      hooks[phase] << hook
+      hook
+    end
+
+    def hooks
+      @hooks ||= Hash.new {|hash, phase| hash[phase] = []}
+    end
+
+    def hooks_for(phase, scenario)
+      hooks[phase].select{|hook| scenario.accept_hook?(hook)}
     end
 
     # Registers any number of +world_modules+ (Ruby Modules) and/or a Proc.
@@ -197,16 +226,22 @@ module Cucumber
     end
 
     def before_and_after(scenario, skip=false)
-      unless current_world || skip
+      before(scenario) unless skip
+      yield
+      after(scenario) unless skip
+      scenario_visited(scenario)
+    end
+    
+    def before(scenario)
+      unless current_world
         new_world!
         execute_before(scenario)
       end
-      if block_given?
-        yield
-        execute_after(scenario) unless skip
-        nil_world!
-        scenario_visited(scenario)
-      end
+    end
+    
+    def after(scenario)
+      execute_after(scenario)
+      nil_world!
     end
 
     private
@@ -268,14 +303,14 @@ module Cucumber
     end
 
     def execute_before(scenario)
-      (@before_procs ||= []).each do |proc|
-        @current_world.cucumber_instance_exec(false, 'Before', scenario, &proc)
+      hooks_for(:before, scenario).each do |hook|
+        hook.execute_in(@current_world, scenario, 'Before')
       end
     end
 
     def execute_after(scenario)
-      (@after_procs ||= []).each do |proc|
-        @current_world.cucumber_instance_exec(false, 'After', scenario, &proc)
+      hooks_for(:after, scenario).each do |hook|
+        hook.execute_in(@current_world, scenario, 'After')
       end
     end
 

data/lib/cucumber/version.rb

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

data/spec/cucumber/cli/main_spec.rb

@@ -1,6 +1,10 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'yaml'
-require 'spec/runner/differs/default'
+begin
+  require 'spec/runner/differs/default' # RSpec >=1.2.4
+rescue ::LoadError
+  require 'spec/expectations/differs/default' # RSpec <=1.2.3
+end
 
 module Cucumber
 module Cli

data/spec/cucumber/step_mother_spec.rb

@@ -133,5 +133,16 @@ Use Ruby modules instead to extend your worlds. See the #World RDoc.
 
 })
     end
+
+    it "should find before hooks" do
+      fish = @step_mother.Before('@fish'){}
+      meat = @step_mother.Before('@meat'){}
+      
+      scenario = mock('Scenario')
+      scenario.should_receive(:accept_hook?).with(fish).and_return(true)
+      scenario.should_receive(:accept_hook?).with(meat).and_return(false)
+      
+      @step_mother.hooks_for(:before, scenario).should == [fish]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.2.3.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -07:00
+date: 2009-04-14 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -269,6 +269,8 @@ files:
 - examples/tickets/features/177/2.feature
 - examples/tickets/features/177/3.feature
 - examples/tickets/features/180.feature
+- examples/tickets/features/229/tagged_hooks.feature
+- examples/tickets/features/229/tagged_hooks.rb
 - examples/tickets/features/236.feature
 - examples/tickets/features/241.feature
 - examples/tickets/features/246.feature
@@ -296,6 +298,7 @@ files:
 - features/cucumber_cli_diff_disabled.feature
 - features/cucumber_cli_outlines.feature
 - features/custom_formatter.feature
+- features/rake_task.feature
 - features/report_called_undefined_steps.feature
 - features/snippet.feature
 - features/step_definitions/cucumber_steps.rb