rspec-core 2.0.0.beta.20 → 2.0.0.beta.22

data/.rspec

@@ -1 +1 @@
--Ispec
+--color

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 
 gem "rake"
-gem "jeweler"
 gem "cucumber"
 gem "aruba", ">= 0.2.0"
 gem "autotest"
@@ -15,9 +14,11 @@ gem "syntax"
 gem "rspec-core", :path => "."
 gem "rspec-expectations", :path => "../rspec-expectations"
 gem "rspec-mocks", :path => "../rspec-mocks"
-case RUBY_VERSION
-when /^1.9.1/
-  gem "ruby-debug19"
-when /^1.8/
-  gem "ruby-debug"
+unless RUBY_PLATFORM == "java"
+  case RUBY_VERSION
+  when /^1.9.2/
+    gem "ruby-debug19"
+  when /^1.8/
+    gem "ruby-debug"
+  end
 end

data/History.md

@@ -0,0 +1,30 @@
+## rspec-core release history (incomplete)
+
+### 2.0.0.beta.22 / 2010-09-12
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.0.0.beta.20...v2.0.0.beta.22)
+
+* Enhancements
+  * removed at_exit hook
+  * CTRL-C stops the run (almost) immediately
+    * first it cleans things up by running the appropriate after(:all) and after(:suite) hooks
+    * then it reports on any examples that have already run
+  * cleaned up rake task
+    * generate correct task under variety of conditions
+    * options are more consistent
+    * deprecated redundant options
+  * run 'bundle exec autotest' when Gemfile is present
+  * support ERB in .rspec options files (Justin Ko)
+  * depend on bundler for development tasks (Myron Marsten)
+  * add example_group_finished to formatters and reporter (Roman Chernyatchik)
+
+* Bug fixes
+  * support paths with spaces when using autotest (Andreas Neuhaus)
+  * fix module_exec with ruby 1.8.6 (Myron Marsten)
+  * remove context method from top-level
+    * was conflicting with irb, for example
+  * errors in before(:all) are now reported correctly (Chad Humphries)
+
+* Removals
+  * removed -o --options-file command line option
+    * use ./.rspec and ~/.rspec

data/Rakefile

@@ -1,54 +1,14 @@
 require "bundler"
 Bundler.setup
+Bundler::GemHelper.install_tasks
 
-gem "jeweler", ">= 1.4.0"
 require "rake"
 require "yaml"
 
-$:.unshift File.expand_path("../lib", __FILE__)
-
 require "rake/rdoctask"
 require "rspec/core/rake_task"
-require "rspec/core/version"
 require "cucumber/rake/task"
 
-begin
-  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 groups"
-    gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
-    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.post_install_message = <<-EOM
-#{"*"*50}
-
-  Thank you for installing #{gem.summary}
-
-  Please be sure to look at Upgrade.markdown to see what might have changed
-  since the last release.
-
-#{"*"*50}
-EOM
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-namespace :gem do
-  desc "push to gemcutter"
-  task :push => :build do
-    system "gem push pkg/rspec-core-#{RSpec::Core::Version::STRING}.gem"
-  end
-end
-
 RSpec::Core::RakeTask.new(:spec)
 
 desc "Run all examples using rcov"
@@ -81,7 +41,7 @@ if RUBY_VERSION.to_f >= 1.9
     t.cucumber_opts = %w{--format progress}
   end
 
-  task :default => [:check_dependencies, :spec, :cucumber]
+  task :default => [:spec, :cucumber]
 else
   Cucumber::Rake::Task.new(:cucumber) do |t|
     t.rcov = true
@@ -90,7 +50,7 @@ else
     t.cucumber_opts = %w{--format progress}
   end
 
-  task :default => [:check_dependencies, :rcov, :cucumber]
+  task :default => [:rcov, :cucumber]
 end
 
 Rake::RDocTask.new do |rdoc|

data/bin/rspec

@@ -1,2 +1,3 @@
 #!/usr/bin/env ruby
-require 'rspec/autorun'
+require 'rspec/core'
+exit RSpec::Core::Runner.run(ARGV, $stderr, $stdout)

data/features/configuration/{options_file.feature → read_options_from_file.feature}

@@ -1,27 +1,16 @@
-Feature: spec/spec.opts
+Feature: read command line configuration options from files
 
-  For backwards compatibility with rspec-1, you can write command
-  line options in a spec/spec.opts file and it will be loaded
-  automatically.
+  RSpec will read command line configuration options from files in
+  two different locations:
+  
+    Local:  "./.rspec" (i.e. in the project's root directory)
+    Global: "~/.rspec" (i.e. in the user's home directory)
 
-  Options declared in spec/spec.opts will override configuration
-  set up in RSpec.configure blocks.
-
-  Scenario: color set in RSpec.configure
-    Given a file named "spec/example_spec.rb" with:
-      """
-      RSpec.configure {|c| c.color_enabled = true }
-
-      describe "color_enabled" do
-        context "when set with RSpec.configure" do
-          it "is true" do
-            RSpec.configuration.color_enabled?.should be_true
-          end
-        end
-      end
-      """
-    When I run "rspec ./spec/example_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+  Options declared in the local file override those in the global file, while
+  those declared in RSpec.configure will override any ".rspec" file.
+  
+  NOTE: For backwards compatibility with rspec-1, you can write command line
+  options in a "spec/spec.opts" file and it will be loaded automatically.
             
   Scenario: color set in .rspec
     Given a file named ".rspec" with:
@@ -33,7 +22,7 @@ Feature: spec/spec.opts
       describe "color_enabled" do
         context "when set with RSpec.configure" do
           it "is true" do
-            RSpec.configuration.color_enabled?.should be_true
+            RSpec.configuration.should be_color_enabled
           end
         end
       end
@@ -41,7 +30,7 @@ Feature: spec/spec.opts
     When I run "rspec ./spec/example_spec.rb"
     Then the output should contain "1 example, 0 failures"
 
-  Scenario: formatter set in both (RSpec.configure wins)
+  Scenario: formatter set in RSpec.configure overrides .rspec
     Given a file named ".rspec" with:
       """
       --format progress
@@ -64,4 +53,19 @@ Feature: spec/spec.opts
       """
     When I run "rspec ./spec/example_spec.rb"
     Then the output should contain "1 example, 0 failures"
-
+    
+  Scenario: using ERB in .rspec
+    Given a file named ".rspec" with:
+      """
+      --format <%= true ? 'documentation' : 'progress' %>
+      """
+    And a file named "spec/example_spec.rb" with:
+      """
+      describe "formatter" do
+        it "is set to documentation" do
+          RSpec.configuration.formatter.should be_an(RSpec::Core::Formatters::DocumentationFormatter)
+        end
+      end
+      """
+    When I run "rspec ./spec/example_spec.rb"
+    Then the output should contain "1 example, 0 failures"

data/features/example_groups/shared_example_group.feature

@@ -104,32 +104,36 @@ Feature: Shared example group
   Scenario: Passing parameters to a shared example group
     Given a file named "shared_example_group_params_spec.rb" with:
     """
-    shared_examples_for "a measurable object" do |measurement_method, measurement|
-      it "should return #{measurement} from ##{measurement_method}" do
-        subject.send(measurement_method).should == measurement
+    shared_examples_for "a measurable object" do |measurement, measurement_methods|
+      measurement_methods.each do |measurement_method|
+        it "should return #{measurement} from ##{measurement_method}" do
+          subject.send(measurement_method).should == measurement
+        end
       end
     end
 
     describe Array, "with 3 items" do
       subject { [1, 2, 3] }
-      it_should_behave_like "a measurable object", :size, 3
+      it_should_behave_like "a measurable object", 3, [:size, :length]
     end
 
     describe String, "of 6 characters" do
       subject { "FooBar" }
-      it_should_behave_like "a measurable object", :length, 6
+      it_should_behave_like "a measurable object", 6, [:size, :length]
     end
     """
     When I run "rspec shared_example_group_params_spec.rb --format documentation"
-    Then the output should contain "2 examples, 0 failures"
+    Then the output should contain "4 examples, 0 failures"
     And the output should contain:
       """
       Array with 3 items
         it should behave like a measurable object
           should return 3 from #size
+          should return 3 from #length
 
       String of 6 characters
         it should behave like a measurable object
+          should return 6 from #size
           should return 6 from #length
       """
 

data/features/hooks/before_and_after_hooks.feature

@@ -97,6 +97,44 @@ Feature: before and after hooks
     When I run "rspec ./before_all_spec.rb:15"
     Then the output should contain "1 example, 0 failures"
 
+  Scenario: failure in before(:all) block
+    Given a file named "before_all_spec.rb" with:
+      """
+      describe "an error in before(:all)" do
+        before(:all) do
+          raise "oops"
+        end
+
+        it "fails this example" do
+        end
+
+        it "fails this example, too" do
+        end
+
+        after(:all) do
+          puts "after all ran"
+        end
+      end
+      """
+    When I run "rspec ./before_all_spec.rb --format documentation"
+    Then the output should contain "2 examples, 2 failures"
+    And the output should contain:
+      """
+      an error in before(:all)
+        fails this example (FAILED - 1)
+        fails this example, too (FAILED - 2)
+      after all ran
+      """
+
+    When I run "rspec ./before_all_spec.rb:9 --format documentation"
+    Then the output should contain "1 example, 1 failure"
+    And the output should contain:
+      """
+      an error in before(:all)
+        fails this example, too (FAILED - 1)
+      after all ran
+      """
+
   Scenario: define before and after blocks in configuration
     Given a file named "befores_in_configuration_spec.rb" with:
       """

data/lib/autotest/rspec2.rb

@@ -38,11 +38,11 @@ class Autotest::Rspec2 < Autotest
 
   def make_test_cmd(files_to_test)
     files_to_test.empty? ? '' :
-      "#{ruby} #{require_rubygems}#{SPEC_PROGRAM} #{normalize(files_to_test).keys.flatten.join(' ')}"
+      "#{ruby} #{require_rubygems}#{SPEC_PROGRAM} #{normalize(files_to_test).keys.flatten.map { |f| "'#{f}'"}.join(' ')}"
   end
 
   def require_rubygems
-    defined?(:Gem) ? "-rrubygems " : ""
+    using_bundler? ? "" : defined?(:Gem) ? "-rrubygems " : ""
   end
 
   def normalize(files_to_test)
@@ -52,4 +52,12 @@ class Autotest::Rspec2 < Autotest
     end
   end
 
+  def ruby
+    using_bundler? ? "bundle exec" : super
+  end
+
+  def using_bundler?
+    File.exists?('./Gemfile')
+  end
+
 end

data/lib/rspec/core.rb

@@ -49,6 +49,10 @@ module RSpec
 
   end
 
+  class << self
+    attr_accessor :wants_to_quit
+  end
+
   def self.world
     @world ||= RSpec::Core::World.new
   end
@@ -60,6 +64,10 @@ module RSpec
   def self.configure
     yield configuration if block_given?
   end
+
+  def self.clear_remaining_example_groups
+    world.example_groups.clear
+  end
 end
 
 require 'rspec/core/backward_compatibility'

data/lib/rspec/core/configuration.rb

@@ -29,17 +29,23 @@ module RSpec
       add_setting :filter
       add_setting :exclusion_filter
       add_setting :filename_pattern, :default => '**/*_spec.rb'
-      add_setting :files_to_run, :default => []
-      add_setting :include_or_extend_modules, :default => []
+      add_setting :files_to_run
+      add_setting :include_or_extend_modules
       add_setting :formatter_class, :default => RSpec::Core::Formatters::ProgressFormatter
-      add_setting :backtrace_clean_patterns, :default => [
-        /\/lib\/ruby\//,
-        /bin\/rcov:/,
-        /vendor\/rails/,
-        /bin\/rspec/,
-        /bin\/spec/,
-        /lib\/rspec\/(core|expectations|matchers|mocks)/
-      ]
+      add_setting :backtrace_clean_patterns
+
+      def initialize
+        self.include_or_extend_modules = []
+        self.files_to_run = []
+        self.backtrace_clean_patterns = [
+          /\/lib\d*\/ruby\//,
+          /bin\/rcov:/,
+          /vendor\/rails/,
+          /bin\/rspec/,
+          /bin\/spec/,
+          /lib\/rspec\/(core|expectations|matchers|mocks)/
+        ]
+      end
 
       # :call-seq:
       #   add_setting(:name)

data/lib/rspec/core/configuration_options.rb

@@ -30,7 +30,6 @@ module RSpec
         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
@@ -77,10 +76,15 @@ module RSpec
       def parse_options_file(path)
         Parser.parse(args_from_options_file(path))
       end
-
+      
       def args_from_options_file(path)
         return [] unless File.exist?(path)
-        File.readlines(path).map {|l| l.split}.flatten
+        config_string = options_file_as_erb_string(path)
+        config_string.split(/\n+/).map {|l| l.split}.flatten
+      end
+      
+      def options_file_as_erb_string(path)
+        ERB.new(IO.read(path)).result(binding)
       end
 
       def local_options_file(options)

data/lib/rspec/core/example.rb

@@ -37,6 +37,7 @@ module RSpec
       end
 
       def run(example_group_instance, reporter)
+        return if RSpec.wants_to_quit
         @example_group_instance = example_group_instance
         @example_group_instance.example = self
 
@@ -73,6 +74,12 @@ module RSpec
         @exception ||= exception
       end
 
+      def fail_fast(reporter, exception)
+        start(reporter)
+        set_exception(exception)
+        finish(reporter)
+      end
+
     private
 
       def with_pending_capture(&block)

data/lib/rspec/core/example_group.rb

@@ -20,7 +20,6 @@ module RSpec
       end
 
       def self.inherited(klass)
-        RSpec::Core::Runner.autorun
         world.example_groups << klass if klass.superclass == ExampleGroup
       end
 
@@ -67,10 +66,12 @@ module RSpec
             shared_block = world.shared_example_groups[name]
             raise "Could not find shared example group named \#{name.inspect}" unless shared_block
 
-            describe("#{report_label || "it should behave like"} \#{name}") do
+            group = describe("#{report_label || "it should behave like"} \#{name}") do
               module_eval_with_args *args, &shared_block
               module_eval &customization_block if customization_block
             end
+            group.metadata[:shared_group_name] = name
+            group
           end
         END_RUBY
       end
@@ -202,19 +203,31 @@ module RSpec
       end
 
       def self.run(reporter)
+        if RSpec.wants_to_quit
+          RSpec.clear_remaining_example_groups if top_level?
+          return
+        end
         @reporter = reporter
         example_group_instance = new
         reporter.example_group_started(self)
+
         begin
           eval_before_alls(example_group_instance)
           result_for_this_group = run_examples(example_group_instance, reporter)
           results_for_descendants = children.map {|child| child.run(reporter)}.all?
           result_for_this_group && results_for_descendants
+        rescue Exception => ex
+          fail_filtered_examples(ex, reporter)
         ensure
           eval_after_alls(example_group_instance)
+          reporter.example_group_finished(self)
         end
       end
 
+      def self.fail_filtered_examples(exception, reporter)
+        filtered_examples.each { |example| example.fail_fast(reporter, exception) }
+      end
+
       def self.run_examples(instance, reporter)
         filtered_examples.map do |example|
           begin