rspec-core 2.0.0.beta.3 → 2.0.0.beta.4

data/Rakefile

@@ -23,6 +23,7 @@ begin
     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}
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.3
+2.0.0.beta.4

data/autotest/discover.rb

@@ -0,0 +1,2 @@
+Autotest.add_discovery { "rspec2" }
+ 

data/features/configuration/spec_opts.feature

@@ -22,7 +22,7 @@ Feature: spec/spec.opts
       describe "color_enabled" do
         context "when set with Rspec.configure" do
           it "is true" do
-            Rspec::Core.configuration.color_enabled?.should be_true
+            Rspec.configuration.color_enabled?.should be_true
           end
         end
       end
@@ -42,7 +42,7 @@ Feature: spec/spec.opts
       describe "color_enabled" do
         context "when set with Rspec.configure" do
           it "is true" do
-            Rspec::Core.configuration.color_enabled?.should be_true
+            Rspec.configuration.color_enabled?.should be_true
           end
         end
       end
@@ -68,7 +68,7 @@ Feature: spec/spec.opts
       describe "formatter" do
         context "when set with Rspec.configure and in spec.opts" do
           it "takes the value set in spec.opts" do
-            Rspec::Core.configuration.formatter.should be_an(Rspec::Core::Formatters::DocumentationFormatter)
+            Rspec.configuration.formatter.should be_an(Rspec::Core::Formatters::DocumentationFormatter)
           end
         end
       end

data/{features-pending → features}/formatters/custom_formatter.feature

@@ -4,11 +4,11 @@ Feature: custom formatters
   As an RSpec user
   I want to create my own custom output formatters
 
+  @wip
   Scenario: specdoc format
     Given a file named "custom_formatter.rb" with:
       """
-      require "rspec/expectations"
-      require "spec/runner/formatter/base_formatter"
+      require "rspec/runner/formatter/base_formatter"
 
       class CustomFormatter < Spec::Runner::Formatter::BaseFormatter
         def initialize(options, output)
@@ -28,5 +28,5 @@ Feature: custom formatters
       """
 
     When I run "rspec simple_example_spec.rb --require custom_formatter.rb --format CustomFormatter"
-    Then the exit code should be 0
-    And the stdout should match "example: my example"
+    Then I should see "example: my example"
+    And  the exit status should be 0

data/features/pending/pending_examples.feature

@@ -0,0 +1,68 @@
+@wip
+Feature: pending examples
+
+  Rspec offers three ways to indicate that an example is disabled pending
+  some action.
+
+  Scenario: pending implementation
+    Given a file named "example_without_block_spec.rb" with:
+      """
+      describe "an example" do
+        it "has not yet been implemented"
+      end
+      """
+    When I run "spec example_without_block_spec.rb"
+    Then the exit status should be 0
+    And I should see "1 example, 0 failures, 1 pending"
+    And I should see "Not Yet Implemented"
+    And I should see "example_without_block_spec.rb:2"
+
+  Scenario: pending any arbitary reason, with no block
+    Given a file named "pending_without_block_spec.rb" with:
+      """
+      describe "an example" do
+        it "is implemented but waiting" do
+          pending("something else getting finished")
+        end
+      end
+      """
+    When I run "spec pending_without_block_spec.rb"
+    Then the exit status should be 0
+    And I should see "1 example, 0 failures, 1 pending"
+    And I should see "(something else getting finished)"
+    And I should see "pending_without_block_spec.rb:2"
+
+  Scenario: pending any arbitary reason, with a block that fails
+    Given a file named "pending_with_failing_block_spec.rb" with:
+      """
+      describe "an example" do
+        it "is implemented but waiting" do
+          pending("something else getting finished") do
+            raise "this is the failure"
+          end
+        end
+      end
+      """
+    When I run "spec pending_with_failing_block_spec.rb"
+    Then the exit status should be 0
+    And I should see "1 example, 0 failures, 1 pending"
+    And I should see "(something else getting finished)"
+    And I should see "pending_with_failing_block_spec.rb:2"
+
+  Scenario: pending any arbitary reason, with a block that passes
+    Given a file named "pending_with_passing_block_spec.rb" with:
+      """
+      describe "an example" do
+        it "is implemented but waiting" do
+          pending("something else getting finished") do
+            true.should be(true)
+          end
+        end
+      end
+      """
+    When I run "spec pending_with_passing_block_spec.rb"
+    Then the exit status should not be 0
+    And I should see "1 example, 1 failure"
+    And I should see "FIXED"
+    And I should see "Expected pending 'something else getting finished' to fail. No Error was raised."
+    And I should see "pending_with_passing_block_spec.rb:3"

data/lib/autotest/rspec2.rb

@@ -0,0 +1,54 @@
+require 'autotest'
+
+Autotest.add_hook :initialize do |at|
+  at.clear_mappings
+  # watch out for Ruby bug (1.8.6): %r(/) != /\//
+  at.add_mapping(%r%^spec/.*_spec\.rb$%) { |filename, _|
+    filename
+  }
+  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
+    ["spec/#{m[1]}_spec.rb"]
+  }
+  at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) {
+    at.files_matching %r%^spec/.*_spec\.rb$%
+  }
+end
+
+class RspecCommandError < StandardError; end
+
+class Autotest::Rspec2 < Autotest
+  
+  SPEC_PROGRAM = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'rspec'))
+
+  def initialize
+    super
+    self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n\n?(.*?(\n\n\(.*?)?)\n\n/m
+    self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
+  end
+
+  def consolidate_failures(failed)
+    filters = new_hash_of_arrays
+    failed.each do |spec, trace|
+      if trace =~ /\n(\.\/)?(.*spec\.rb):[\d]+:/
+        filters[$2] << spec
+      end
+    end
+    return filters
+  end
+
+  def make_test_cmd(files_to_test)
+    files_to_test.empty? ? '' :
+      "#{ruby} #{SPEC_PROGRAM} #{normalize(files_to_test).keys.flatten.join(' ')} #{add_options_if_present}"
+  end
+
+  def normalize(files_to_test)
+    files_to_test.keys.inject({}) do |result, filename|
+      result[File.expand_path(filename)] = []
+      result
+    end
+  end
+
+  def add_options_if_present # :nodoc:
+    File.exist?("spec/spec.opts") ? "-O #{File.join('spec','spec.opts')} " : ""
+  end
+end

data/lib/rspec/core.rb

@@ -23,7 +23,8 @@ module Rspec
     end
 
     def self.configuration
-      @configuration ||= Rspec::Core::Configuration.new
+      Rspec.deprecate('Rspec::Core.configuration', 'Rspec.configuration', '2.0.0')
+      Rspec.configuration
     end
 
     def self.configure
@@ -37,8 +38,12 @@ module Rspec
 
   end
 
+  def self.configuration
+    @configuration ||= Rspec::Core::Configuration.new
+  end
+
   def self.configure
-    yield Core.configuration if block_given?
+    yield configuration if block_given?
   end
 end
 

data/lib/rspec/core/example_group.rb

@@ -46,8 +46,12 @@ module Rspec
       alias_example_to :pending, :pending => true
 
       def self.it_should_behave_like(*names)
-        Rspec::Core.world.shared_example_groups.each do |name, block|
-          module_eval(&block) if names.include?(name)
+        names.each do |name|
+          begin
+            module_eval &Rspec::Core.world.shared_example_groups[name]
+          rescue ArgumentError
+            raise "Could not find shared example group named #{name.inspect}"
+          end
         end
       end
 
@@ -118,7 +122,7 @@ module Rspec
       def self._build(klass, given_caller, args, &example_group_block)
         args << {} unless args.last.is_a?(Hash)
         args.last.update(:example_group_block => example_group_block, :caller => given_caller)
-        args.unshift Rspec::Core.configuration unless args.first.is_a?(Rspec::Core::Configuration)
+        args.unshift Rspec.configuration unless args.first.is_a?(Rspec::Core::Configuration)
         klass.set_it_up(*args) 
         klass.module_eval(&example_group_block) if example_group_block
         klass

data/lib/rspec/core/formatters/base_formatter.rb

@@ -15,15 +15,15 @@ module Rspec
         end
 
         def configuration
-          Rspec::Core.configuration
+          Rspec.configuration
         end
 
         def output
-          Rspec::Core.configuration.output
+          Rspec.configuration.output
         end
 
         def profile_examples?
-          Rspec::Core.configuration.profile_examples
+          Rspec.configuration.profile_examples
         end
 
         def color_enabled?

data/lib/rspec/core/mocking/with_rr.rb

@@ -1,6 +1,6 @@
 require 'rr'
 
-Rspec::Core.configuration.backtrace_clean_patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
+Rspec.configuration.backtrace_clean_patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
 
 module Rspec
   module Core

data/lib/rspec/core/runner.rb

@@ -14,7 +14,7 @@ module Rspec
       end
 
       def configuration
-        Rspec::Core.configuration
+        Rspec.configuration
       end
 
       def reporter

data/lib/rspec/core/world.rb

@@ -9,11 +9,11 @@ module Rspec
       end
 
       def filter
-        Rspec::Core.configuration.filter
+        Rspec.configuration.filter
       end
 
       def exclusion_filter
-        Rspec::Core.configuration.exclusion_filter
+        Rspec.configuration.exclusion_filter
       end
 
       def shared_example_groups
@@ -26,13 +26,13 @@ module Rspec
         if filter || exclusion_filter
           @example_groups_to_run = filter_example_groups
 
-          if @example_groups_to_run.size == 0 && Rspec::Core.configuration.run_all_when_everything_filtered?
-            Rspec::Core.configuration.puts "No examples were matched by #{filter.inspect}, running all"
+          if @example_groups_to_run.size == 0 && Rspec.configuration.run_all_when_everything_filtered?
+            Rspec.configuration.puts "No examples were matched by #{filter.inspect}, running all"
             # reset the behaviour list to all example groups, and add back all examples
             @example_groups_to_run = @example_groups
             @example_groups.each { |b| b.examples_to_run.replace(b.examples) }
           else
-            Rspec::Core.configuration.puts "Run filtered using #{filter.inspect}"          
+            Rspec.configuration.puts "Run filtered using #{filter.inspect}"          
           end
         else
           @example_groups_to_run = @example_groups

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.3"
+  s.version = "2.0.0.beta.4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-03-15}
   s.description = %q{Rspec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec", "spec"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "TODO.markdown",
      "Upgrade.markdown",
      "VERSION",
+     "autotest/discover.rb",
      "bin/rspec",
      "bin/spec",
      "cucumber.yml",
@@ -76,20 +77,13 @@ Gem::Specification.new do |s|
      "example_specs/passing/yielding_example.rb",
      "example_specs/ruby1.9.compatibility/access_to_constants_spec.rb",
      "example_specs/spec_helper.rb",
-     "features-pending/formatters/custom_formatter.feature",
-     "features-pending/heckle/heckle.feature",
-     "features-pending/interop/examples_and_tests_together.feature",
-     "features-pending/interop/rspec_output.feature",
-     "features-pending/interop/test_but_not_test_unit.feature",
-     "features-pending/interop/test_case_with_should_methods.feature",
-     "features-pending/mocks/stub_implementation.feature",
-     "features-pending/pending/pending_examples.feature",
      "features/command_line/example_name_option.feature",
      "features/command_line/line_number_appended_to_path.feature",
      "features/command_line/line_number_option.feature",
      "features/configuration/spec_opts.feature",
      "features/example_groups/describe_aliases.feature",
      "features/example_groups/nested_groups.feature",
+     "features/formatters/custom_formatter.feature",
      "features/hooks/around_hook.feature",
      "features/hooks/before_and_after_hooks.feature",
      "features/hooks/described_class.feature",
@@ -98,9 +92,11 @@ Gem::Specification.new do |s|
      "features/mock_framework_integration/use_mocha.feature",
      "features/mock_framework_integration/use_rr.feature",
      "features/mock_framework_integration/use_rspec.feature",
+     "features/pending/pending_examples.feature",
      "features/subject/explicit_subject.feature",
      "features/subject/implicit_subject.feature",
      "features/support/env.rb",
+     "lib/autotest/rspec2.rb",
      "lib/rspec/autorun.rb",
      "lib/rspec/core.rb",
      "lib/rspec/core/around_proxy.rb",
@@ -135,6 +131,8 @@ Gem::Specification.new do |s|
      "lib/rspec/core/world.rb",
      "rspec-core.gemspec",
      "script/console",
+     "spec/autotest/failed_results_re_spec.rb",
+     "spec/autotest/rspec_spec.rb",
      "spec/rspec/core/command_line_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
@@ -159,12 +157,13 @@ Gem::Specification.new do |s|
      "spec/rspec/core_spec.rb",
      "spec/ruby_forker.rb",
      "spec/spec_helper.rb",
+     "spec/support/matchers.rb",
      "specs.watchr"
   ]
   s.homepage = %q{http://github.com/rspec/core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.3
+  Thank you for installing rspec-core-2.0.0.beta.4
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -176,9 +175,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-core-2.0.0.beta.3}
+  s.summary = %q{rspec-core-2.0.0.beta.4}
   s.test_files = [
-    "spec/rspec/core/command_line_options_spec.rb",
+    "spec/autotest/failed_results_re_spec.rb",
+     "spec/autotest/rspec_spec.rb",
+     "spec/rspec/core/command_line_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
      "spec/rspec/core/example_group_subject_spec.rb",
@@ -201,7 +202,8 @@ Gem::Specification.new do |s|
      "spec/rspec/core/world_spec.rb",
      "spec/rspec/core_spec.rb",
      "spec/ruby_forker.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/support/matchers.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -209,18 +211,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.3"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.3"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.4"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
+      s.add_development_dependency(%q<autotest>, [">= 4.2.9"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.3"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.3"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.4"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
+      s.add_dependency(%q<autotest>, [">= 4.2.9"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.3"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.3"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.4"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
+    s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end
 end
 

data/spec/autotest/failed_results_re_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe "failed_results_re" do
+  it "should match a failure" do
+    re = Autotest::Rspec2.new.failed_results_re
+    re =~ "1)\n'this example' FAILED\nreason\n/path.rb:37:\n\n"
+    $1.should == "this example"
+    $2.should == "reason\n/path.rb:37:"
+  end
+
+  it "should match a failure when matcher outputs multiple lines" do
+    re = Autotest::Rspec2.new.failed_results_re
+    re =~ "1)\n'other example' FAILED\n\nreason line 1\nreason line 2\n\n(additional info)\n/path.rb:37:\n\n"
+    $1.should == "other example"
+    $2.should == "reason line 1\nreason line 2\n\n(additional info)\n/path.rb:37:"
+  end
+
+  it "should match an Error" do
+    re = Autotest::Rspec2.new.failed_results_re
+    re =~ "1)\nRuntimeError in 'this example'\nreason\n/path.rb:37:\n\n"
+    $1.should == "this example"
+    $2.should == "reason\n/path.rb:37:"
+  end
+
+  it "should match an Error that doesn't end in Error" do
+    re = Autotest::Rspec2.new.failed_results_re
+    re =~ "1)\nInvalidArgument in 'this example'\nreason\n/path.rb:37:\n\n"
+    $1.should == "this example"
+    $2.should == "reason\n/path.rb:37:"
+  end
+end