rspec-core 2.0.0.beta.12 → 2.0.0.beta.13

data/.gitignore

@@ -7,3 +7,4 @@ pkg
 tmp
 tags
 rerun.txt
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,14 @@
+gem "bundler"
+gem "rake"
+gem "jeweler"
+gem "cucumber"
+gem "aruba"
+gem "autotest"
+gem "rcov"
+gem "mocha"
+gem "rr"
+gem "flexmock"
+gem "rspec-core", :path => "."
+gem "rspec-expectations", :path => "../rspec-expectations"
+gem "rspec-mocks", :path => "../rspec-mocks"
+gem "ruby-debug"

data/Rakefile

@@ -1,29 +1,32 @@
+require "bundler"
+Bundler.setup
+
 gem "jeweler", ">= 1.4.0"
-require 'rake'
-require 'yaml'
+require "rake"
+require "yaml"
 
-$:.unshift File.expand_path('../lib', __FILE__)
+$:.unshift File.expand_path("../lib", __FILE__)
 
-require 'rake/rdoctask'
-require 'rspec/core/rake_task'
-require 'rspec/core/version'
-require 'cucumber/rake/task'
+require "rake/rdoctask"
+require "rspec/core/rake_task"
+require "rspec/core/version"
+require "cucumber/rake/task"
 
 begin
-  require 'jeweler'
+  require "jeweler"
   Jeweler::Tasks.new do |gem|
     gem.name = "rspec-core"
     gem.version = RSpec::Core::Version::STRING
     gem.summary = "rspec-core-#{RSpec::Core::Version::STRING}"
-    gem.description = 'RSpec runner and example group classes'
+    gem.description = "RSpec runner and example groups"
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
-    gem.homepage = "http://github.com/rspec/core"
+    gem.homepage = "http://github.com/rspec/rspec-core"
     gem.authors = ["Chad Humphries", "David Chelimsky"]
     gem.rubyforge_project = "rspec"
     gem.add_development_dependency "rspec-expectations", ">= #{RSpec::Core::Version::STRING}"
     gem.add_development_dependency "rspec-mocks", ">= #{RSpec::Core::Version::STRING}"
-    gem.add_development_dependency('cucumber', '>= 0.5.3')
-    gem.add_development_dependency('autotest', '>= 4.2.9')
+    gem.add_development_dependency "cucumber", ">= 0.5.3"
+    gem.add_development_dependency "autotest", ">= 4.2.9"
     gem.post_install_message = <<-EOM
 #{"*"*50}
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.12
+2.0.0.beta.13

data/features/command_line/example_name_option.feature

@@ -24,6 +24,16 @@ Feature: example name option
         it "second example in second group" do; end
       end
       """
+    Given a file named "third_spec.rb" with:
+      """
+      describe "third group" do
+        it "first example in third group" do; end
+        context "nested group" do
+          it "first example in nested group" do; end
+          it "second example in nested group" do; end
+        end
+      end
+      """
 
   Scenario: no matches
     When I run "rspec . --example nothing_like_this"
@@ -31,11 +41,11 @@ Feature: example name option
 
   Scenario: match on one word
     When I run "rspec . --example example"
-    Then I should see "4 examples, 0 failures"
+    Then I should see "7 examples, 0 failures"
 
-  Scenario: one match in each file
+  Scenario: one match in each context
     When I run "rspec . --example 'first example'"
-    Then I should see "2 examples, 0 failures"
+    Then I should see "4 examples, 0 failures"
 
   Scenario: one match in one file using just the example name
     When I run "rspec . --example 'first example in first group'"
@@ -56,3 +66,7 @@ Feature: example name option
   Scenario: one match in one file with group name
     When I run "rspec . --example 'second group first example'"
     Then I should see "1 example, 0 failures"
+
+  Scenario: all examples in one group including examples in nested groups
+    When I run "rspec . --example 'third group'"
+    Then I should see "3 examples, 0 failures"

data/features/command_line/exit_status.feature

@@ -0,0 +1,49 @@
+Feature: exit status
+  In order to fail the build when it should,
+  the spec CLI exits with an appropriate exit status
+
+  Scenario: exit with 0 when all examples pass
+    Given a file named "ok_spec.rb" with:
+      """
+      describe "ok" do
+        it "passes" do
+        end
+      end
+      """
+    When I run "rspec ok_spec.rb"
+    Then it should pass with:
+      """
+      1 example, 0 failures
+      """
+
+  Scenario: exit with 1 when one example fails
+    Given a file named "ko_spec.rb" with:
+      """
+      describe "KO" do
+        it "fails" do
+          raise "KO"
+        end
+      end
+      """
+    When I run "rspec ko_spec.rb"
+    Then it should fail with:
+      """
+      1 example, 1 failure
+      """
+
+  Scenario: exit with 1 when a nested examples fails
+    Given a file named "nested_ko_spec.rb" with:
+      """
+      describe "KO" do
+        describe "nested" do
+          it "fails" do
+            raise "KO"
+          end
+        end
+      end
+      """
+    When I run "rspec nested_ko_spec.rb"
+    Then it should fail with:
+      """
+      1 example, 1 failure
+      """

data/features/hooks/before_and_after_hooks.feature

@@ -14,10 +14,12 @@ Feature: before and after hooks
     after(:all) blocks are run once after all of the examples in a group
 
     Before and after blocks are called in the following order:
+      before suite
       before all
       before each
-      after each
-      after all
+      after  each
+      after  all
+      after  suite
 
     Before and after blocks can be defined in the example groups to which they
     apply or in a configuration. When defined in a configuration, they can be
@@ -155,6 +157,53 @@ Feature: before and after hooks
     When I run "rspec ./ensure_block_order_spec.rb"
     Then I should see matching /before all\nbefore each\nafter each\n.after all/
   
+  Scenario: before/after blocks defined in config are run in order
+    Given a file named "configuration_spec.rb" with:
+      """
+      require "rspec/expectations"
+
+      RSpec.configure do |config|
+        config.before(:suite) do
+          puts "before suite"
+        end
+  
+        config.before(:all) do
+          puts "before all"
+        end
+  
+        config.before(:each) do
+          puts "before each"
+        end
+  
+        config.after(:each) do
+          puts "after each"
+        end
+  
+        config.after(:all) do
+          puts "after all"
+        end
+  
+        config.after(:suite) do
+          puts "after suite"
+        end
+      end
+  
+      describe "ignore" do
+        example "ignore" do
+        end
+      end
+      """
+    When I run "rspec configuration_spec.rb"
+    Then I should see matching:
+      """
+      before suite
+      before all
+      before each
+      after each
+      .after all
+      after suite
+      """
+
   Scenario: before/after all blocks are run once
     Given a file named "before_and_after_all_spec.rb" with:
       """
@@ -278,20 +327,3 @@ Feature: before and after hooks
     When I run "rspec ./error_in_before_each_spec.rb"
     Then I should see "1 example, 1 failure"
     And I should see "this error"
-
-@wip
-  Scenario: exception in before(:all) is captured and reported as failure
-    Given a file named "error_in_before_all_spec.rb" with:
-      """
-      describe "error in before(:all)" do
-        before(:all) do
-          raise "this error"
-        end
-
-        it "is reported as failure" do
-        end
-      end
-      """
-    When I run "rspec ./error_in_before_all_spec.rb"
-    Then I should see "1 example, 1 failure"
-    And I should see "this error"

data/features/hooks/halt.feature

@@ -10,7 +10,7 @@ Feature: halt
       """
       RSpec.configure do |c|
         c.after(:each) do
-          running_example.halt(:group, :status => 'failed')
+          example.halt(:group, :status => 'failed')
         end
       end
       describe "something" do

data/features/support/env.rb

@@ -1,11 +1,13 @@
-$LOAD_PATH.unshift File.expand_path("../../../../rspec-expectations/lib", __FILE__)
-require 'rspec/expectations'
+require "bundler"
+Bundler.setup
+
 require 'aruba'
+require 'rspec/expectations'
 
 module ArubaOverrides
   def detect_ruby_script(cmd)
     if cmd =~ /^rspec /
-      "ruby  -I../../lib -S ../../bin/#{cmd}"
+      "bundle exec ../../bin/#{cmd}"
     else
       super(cmd)
     end

data/lib/rspec/core/command_line.rb

@@ -1,9 +1,13 @@
 module RSpec
   module Core
     class CommandLine
-      def initialize(argv)
-        @options = RSpec::Core::ConfigurationOptions.new(argv)
-        @options.parse_options
+      def initialize(args_or_options)
+        if RSpec::Core::ConfigurationOptions === args_or_options
+          @options = args_or_options
+        else
+          @options = RSpec::Core::ConfigurationOptions.new(args_or_options)
+          @options.parse_options
+        end
         @options.configure(configuration)
         configuration.require_files_to_run
         configuration.configure_mock_framework
@@ -15,9 +19,14 @@ module RSpec
         world.announce_inclusion_filter
 
         configuration.reporter.report(example_count) do |reporter|
-          example_groups.run_examples(reporter)
+          begin
+            configuration.run_hook(:before, :suite)
+            example_groups.run_examples(reporter)
+          ensure
+            configuration.run_hook(:after, :suite)
+          end
         end
-        
+
         example_groups.success?
       end
 

data/lib/rspec/core/configuration.rb

@@ -1,6 +1,10 @@
+require "rbconfig"
+
 module RSpec
   module Core
     class Configuration
+      include RSpec::Core::Hooks
+
       def self.add_setting(name, opts={})
         if opts[:alias]
           alias_method name, opts[:alias]
@@ -16,6 +20,7 @@ module RSpec
       add_setting :error_stream
       add_setting :output_stream
       add_setting :output, :alias => :output_stream
+      add_setting :drb
       add_setting :drb_port
       add_setting :color_enabled
       add_setting :profile_examples
@@ -82,13 +87,6 @@ module RSpec
         output_stream.puts(message)
       end
 
-      def hooks
-        @hooks ||= { 
-          :before => { :each => [], :all => [], :suite => [] }, 
-          :after => { :each => [], :all => [], :suite => [] } 
-        }
-      end
-
       def settings
         @settings ||= {}
       end
@@ -123,7 +121,7 @@ module RSpec
       def color_enabled=(bool)
         return unless bool
         settings[:color_enabled] = true
-        if bool && Config::CONFIG['host_os'] =~ /mswin|mingw/
+        if bool && ::Config::CONFIG['host_os'] =~ /mswin|mingw/
           orig_output_stream = settings[:output_stream]
           begin
             require 'Win32/Console/ANSI'
@@ -171,7 +169,9 @@ EOM
       end
       
       def formatter=(formatter_to_use)
-        if formatter_to_use.is_a?(Class)
+        if string_const?(formatter_to_use) && Object.const_defined?(formatter_to_use)
+          formatter_class = Object.const_get(formatter_to_use)
+        elsif formatter_to_use.is_a?(Class)
           formatter_class = formatter_to_use
         else
           formatter_class = case formatter_to_use.to_s
@@ -185,7 +185,11 @@ EOM
         end
         self.formatter_class = formatter_class
       end
-
+      
+      def string_const?(str)
+        str.is_a?(String) && /\A[A-Z][a-zA-Z0-9_:]*\z/ =~ str
+      end
+      
       def formatter
         @formatter ||= formatter_class.new(output)
       end
@@ -237,20 +241,6 @@ EOM
         end
       end
 
-      def before(each_or_all=:each, options={}, &block)
-        hooks[:before][each_or_all] << [options, block]
-      end
-
-      def after(each_or_all=:each, options={}, &block)
-        hooks[:after][each_or_all] << [options, block]
-      end
-
-      def find_hook(hook, each_or_all, group)
-        hooks[hook][each_or_all].select do |filters, block|
-          group.all_apply?(filters)
-        end.map { |filters, block| block }
-      end
-
       def configure_mock_framework
         require_mock_framework_adapter
         RSpec::Core::ExampleGroup.send(:include, RSpec::Core::MockFrameworkAdapter)

data/lib/rspec/core/configuration_options.rb

@@ -13,26 +13,31 @@ module RSpec
       def initialize(args)
         @args = args
       end
-
+      
       def configure(config)
-        sorted_keys.each do |key|
+        keys = options.keys
+        keys.unshift(:requires) if keys.delete(:requires)
+        keys.unshift(:libs)     if keys.delete(:libs)
+        keys.each do |key|
           config.send("#{key}=", options[key])
         end
       end
-
-      def sorted_keys
-        options.keys.sort{|a,b| a.to_s <=> b.to_s}
-      end
-
+      
       def drb_argv
         argv = []
-        argv << "--color"    if options[:color_enabled]
+        argv << "--color"     if options[:color_enabled]
         argv << "--profile"   if options[:profile_examples]
         argv << "--backtrace" if options[:full_backtrace]
         argv << "--format"       << options[:formatter]               if options[:formatter]
         argv << "--line_number"  << options[:line_number]             if options[:line_number]
         argv << "--options_file" << options[:options_file]            if options[:options_file]
         argv << "--example"      << options[:full_description].source if options[:full_description]
+        (options[:libs] || []).each do |path|
+          argv << "-I" << path
+        end
+        (options[:requires] || []).each do |path|
+          argv << "--require" << path
+        end
         argv + options[:files_or_directories_to_run]
       end
 

data/lib/rspec/core/drb_command_line.rb

@@ -1,9 +1,8 @@
 module RSpec
   module Core
     class DRbCommandLine
-      def initialize(argv)
-        @options = RSpec::Core::ConfigurationOptions.new(argv)
-        @options.parse_options
+      def initialize(options)
+        @options = options
       end
 
       def drb_port