rspec-core 2.0.0.a6 → 2.0.0.a7

data/Rakefile

@@ -1,9 +1,8 @@
-require 'rubygems'
 gem "jeweler", ">= 1.4.0"
 require 'rake'
 require 'yaml'
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__),'lib'))
+$:.unshift File.expand_path('../lib', __FILE__)
 
 require 'rake/rdoctask'
 require 'rspec/core/rake_task'
@@ -15,7 +14,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "rspec-core"
     gem.version = Rspec::Core::Version::STRING
-    gem.summary = Rspec::Core::Version::SUMMARY
+    gem.summary = "rspec-core-#{Rspec::Core::Version::STRING}"
     gem.description = 'Rspec runner and example group classes'
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
     gem.homepage = "http://github.com/rspec/core"

data/VERSION

@@ -0,0 +1 @@
+2.0.0.a7

data/features-pending/formatters/custom_formatter.feature

@@ -7,7 +7,9 @@ Feature: custom formatters
   Scenario: specdoc format
     Given a file named "custom_formatter.rb" with:
       """
-      require 'spec/runner/formatter/base_formatter'
+      require "rspec/expectations"
+      require "spec/runner/formatter/base_formatter"
+
       class CustomFormatter < Spec::Runner::Formatter::BaseFormatter
         def initialize(options, output)
           @output = output
@@ -18,13 +20,13 @@ Feature: custom formatters
       end
       """
     And a file named "simple_example_spec.rb" with:
-    """
+      """
       describe "my group" do
         specify "my example" do
         end
       end
-    """
+      """
 
-    When I run "spec simple_example_spec.rb --require custom_formatter.rb --format CustomFormatter"
+    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"

data/features/command_line/line_number_option.feature

@@ -6,6 +6,8 @@ Feature: line number option
   Scenario: standard examples
     Given a file named "example_spec.rb" with:
       """
+      require "rspec/expectations"
+
       describe 9 do
 
         it "should be > 8" do
@@ -18,7 +20,7 @@ Feature: line number option
         
       end
       """
-    When I run "spec example_spec.rb --line 3 --format doc"
+    When I run "spec example_spec.rb --line 5 --format doc"
     Then the stdout should match "1 example, 0 failures"
     Then the stdout should match "should be > 8"
     But the stdout should not match "should be < 10"
@@ -26,6 +28,8 @@ Feature: line number option
   Scenario: one liner
     Given a file named "example_spec.rb" with:
       """
+      require "rspec/expectations"
+
       describe 9 do
 
         it { should be > 8 }
@@ -34,7 +38,7 @@ Feature: line number option
         
       end
       """
-    When I run "spec example_spec.rb --line 3 --format doc"
+    When I run "spec example_spec.rb --line 5 --format doc"
     Then the stdout should match "1 example, 0 failures"
     Then the stdout should match "should be > 8"
     But the stdout should not match "should be < 10"

data/features/configuration/spec_opts.feature

@@ -13,9 +13,8 @@ Feature: spec/spec.opts
   Scenario: color set in Rspec.configure
     Given a file named "spec/spec_helper.rb" with:
       """
-      Rspec.configure do |c|
-        c.color_enabled = true
-      end
+      require "rspec/expectations"
+      Rspec.configure {|c| c.color_enabled = true }
       """
     And a file named "spec/example_spec.rb" with:
       """
@@ -38,6 +37,8 @@ Feature: spec/spec.opts
       """
     And a file named "spec/example_spec.rb" with:
       """
+      require "rspec/expectations"
+
       describe "color_enabled" do
         context "when set with Rspec.configure" do
           it "is true" do
@@ -49,20 +50,21 @@ Feature: spec/spec.opts
     When I run "rspec spec/example_spec.rb"
     Then the stdout should match "1 example, 0 failures"
             
+  @wip
   Scenario: formatter set in both (spec.opts wins)
     Given a file named "spec/spec.opts" with:
       """
       --formatter documentation
       """
-
     And a file named "spec/spec_helper.rb" with:
       """
-      Rspec.configure do |c|
-        c.formatter = 'pretty'
-      end
+      require "rspec/expectations"
+      Rspec.configure {|c| c.formatter = 'progress'}
       """
     And a file named "spec/example_spec.rb" with:
       """
+      require "spec_helper"
+
       describe "formatter" do
         context "when set with Rspec.configure and in spec.opts" do
           it "takes the value set in spec.opts" do

data/features/example_groups/describe_aliases.feature

@@ -7,7 +7,9 @@ Feature: Nested example groups
   Scenario: Using context
     Given a file named "context_instead_of_describe_spec.rb" with:
     """
-    context "Using context" do
+    require "rspec/expectations"
+
+    describe "Using context" do
       context "with nested context" do
         it "should do this" do
           true.should be_true

data/features/hooks/before_and_after_hooks.feature

@@ -31,6 +31,8 @@ Feature: before and after hooks
   Scenario: define before(:each) block in example group
     Given a file named "before_each_in_example_group_spec.rb" with:
       """
+      require "rspec/expectations"
+
       class Thing
         def widgets
           @widgets ||= []
@@ -63,6 +65,8 @@ Feature: before and after hooks
   Scenario: define before(:all) block in example group
     Given a file named "before_all_in_example_group_spec.rb" with:
       """
+      require "rspec/expectations"
+
       class Thing
         def widgets
           @widgets ||= []
@@ -96,6 +100,8 @@ Feature: before and after hooks
   Scenario: define before and after blocks in configuration
     Given a file named "befores_in_configuration_spec.rb" with:
       """
+      require "rspec/expectations"
+
       Rspec.configure do |config|
         config.before(:suite) do
           $before_suite = "before suite"
@@ -133,6 +139,8 @@ Feature: before and after hooks
   Scenario: before/after blocks are run in order
     Given a file named "ensure_block_order_spec.rb" with:
       """
+      require "rspec/expectations"
+
       Rspec.configure do |config|
         config.before(:suite) do
           puts "before suite"

data/features/support/env.rb

@@ -62,9 +62,6 @@ class RspecWorld
 $LOAD_PATH.unshift(File.expand_path('../../../lib', __FILE__))
 $LOAD_PATH.unshift(File.expand_path('../../../../rspec-expectations/lib', __FILE__))
 $LOAD_PATH.unshift(File.expand_path('../../../../rspec-mocks/lib', __FILE__))
-require 'rspec/core'
-require 'rspec/expectations'
-Rspec::Core::ExampleGroup.__send__(:include, Rspec::Matchers)
 CONTENT
       end
       cmd = "-rrubygems -rload_paths.rb #{rspec_libs} #{args}"

data/lib/rspec/core/command_line_options.rb

@@ -51,6 +51,10 @@ module Rspec
             options[:full_backtrace] = true
           end
 
+          opts.on('-d', '--debug', 'Enable debugging') do |o|
+            options[:debug] = true
+          end
+
           opts.on_tail('-h', '--help', "You're looking at it.") do 
             puts opts
             exit

data/lib/rspec/core/configuration.rb

@@ -99,6 +99,24 @@ module Rspec
         @options[:backtrace_clean_patterns].clear
       end
 
+      def debug=(bool)
+        return unless bool
+        begin
+          require 'ruby-debug'
+        rescue LoadError
+          raise <<-EOM
+
+#{'*'*50}
+You must install ruby-debug to run rspec with the --debug option.
+
+If you have ruby-debug installed as a ruby gem, then you need to either
+require 'rubygems' or configure the RUBYOPT environment variable with
+the value 'rubygems'.
+#{'*'*50}
+EOM
+        end
+      end
+
       def color_enabled?
         options[:color_enabled]
       end
@@ -148,7 +166,7 @@ module Rspec
         options[:files_to_run] = files.flatten.inject([]) do |result, file|
           if File.directory?(file)
             filename_pattern.split(",").each do |pattern|
-              result += Dir[File.expand_path("#{file}/#{pattern.strip}")]
+              result += Dir["#{file}/#{pattern.strip}"]
             end
           else
             path, line_number = file.split(':')

data/lib/rspec/core/example_group.rb

@@ -11,7 +11,7 @@ module Rspec
       attr_accessor :running_example
 
       def self.inherited(klass)
-        super
+        super(klass)
         Rspec::Core.configuration.autorun!
         Rspec::Core.world.example_groups << klass
       end
@@ -62,10 +62,15 @@ module Rspec
         self.superclass.respond_to?(:metadata) ? self.superclass.metadata : nil
       end
 
+      def self.configuration
+        @configuration
+      end
+
       def self.set_it_up(*args)
+        @configuration = args.shift
         @metadata = Rspec::Core::Metadata.process(superclass_metadata, *args)
 
-        Rspec::Core.configuration.find_modules(self).each do |include_or_extend, mod, opts|
+        configuration.find_modules(self).each do |include_or_extend, mod, opts|
           if include_or_extend == :extend
             send(:extend, mod) unless extended_modules.include?(mod)
           else
@@ -116,6 +121,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)
         klass.set_it_up(*args) 
         klass.module_eval(&example_group_block) if example_group_block
         klass
@@ -153,26 +159,26 @@ module Rspec
         if superclass.respond_to?(:before_all_ivars)
           superclass.before_all_ivars.each { |ivar, val| running_example.instance_variable_set(ivar, val) }
         end
-        Rspec::Core.configuration.find_advice(:before, :all, self).each { |blk| running_example.instance_eval(&blk) }
+        configuration.find_advice(:before, :all, self).each { |blk| running_example.instance_eval(&blk) }
 
         before_alls.each { |blk| running_example.instance_eval(&blk) }
         running_example.instance_variables.each { |ivar| before_all_ivars[ivar] = running_example.instance_variable_get(ivar) }
       end
 
       def self.eval_before_eachs(running_example)
-        Rspec::Core.configuration.find_advice(:before, :each, self).each { |blk| running_example.instance_eval(&blk) }
+        configuration.find_advice(:before, :each, self).each { |blk| running_example.instance_eval(&blk) }
         before_ancestors.each { |ancestor| ancestor.before_eachs.each { |blk| running_example.instance_eval(&blk) } }
       end
 
       def self.eval_after_alls(running_example)
         after_alls.each { |blk| running_example.instance_eval(&blk) }
-        Rspec::Core.configuration.find_advice(:after, :all, self).each { |blk| running_example.instance_eval(&blk) }
+        configuration.find_advice(:after, :all, self).each { |blk| running_example.instance_eval(&blk) }
         before_all_ivars.keys.each { |ivar| before_all_ivars[ivar] = running_example.instance_variable_get(ivar) }
       end
 
       def self.eval_after_eachs(running_example)
         after_ancestors.each { |ancestor| ancestor.after_eachs.each { |blk| running_example.instance_eval(&blk) } }
-        Rspec::Core.configuration.find_advice(:after, :each, self).each { |blk| running_example.instance_eval(&blk) }
+        configuration.find_advice(:after, :each, self).each { |blk| running_example.instance_eval(&blk) }
       end
 
       def self.run(reporter)

data/lib/rspec/core/kernel_extensions.rb

@@ -2,6 +2,14 @@ module Rspec
   module Core
     module KernelExtensions
 
+      unless respond_to?(:debugger)
+        # Start a debugging session if ruby-debug is loaded with the -u/--debugger option
+        def debugger(steps=1)
+          # If not then just comment and proceed
+          $stderr.puts "debugger statement ignored, use -d or --debug option on rspec to enable debugging"
+        end
+      end
+
       def describe(*args, &example_group_block)
         args << {} unless args.last.is_a?(Hash)
         args.last.update :caller => caller(1)

data/lib/rspec/core/rake_task.rb

@@ -45,7 +45,7 @@ module Rspec
         @fail_on_error = true
 
         yield self if block_given?
-        @pattern ||= 'spec/**/*_spec.rb'
+        @pattern ||= './spec/**/*_spec.rb'
         define
       end
 

data/lib/rspec/core/version.rb

@@ -1,16 +1,7 @@
 module Rspec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      unless defined?(MAJOR)
-        MAJOR  = 2
-        MINOR  = 0
-        TINY   = 0
-        PRE    = 'a6'
-
-        STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
-
-        SUMMARY = "rspec-core " + STRING
-      end
+      STRING = File.read(File.expand_path('../../../../VERSION', __FILE__))
     end
   end
 end

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.a6"
+  s.version = "2.0.0.a7"
 
   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-02-15}
+  s.date = %q{2010-02-20}
   s.default_executable = %q{rspec}
   s.description = %q{Rspec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "README.markdown",
      "Rakefile",
      "TODO.markdown",
+     "VERSION",
      "bin/rspec",
      "cucumber.yml",
      "example_specs/failing/README.txt",
@@ -97,12 +98,9 @@ Gem::Specification.new do |s|
      "features/configuration/spec_opts.feature",
      "features/example_groups/describe_aliases.feature",
      "features/example_groups/nested_groups.feature",
-     "features/expectations/customized_message.feature",
      "features/hooks/around_hook.feature",
      "features/hooks/before_and_after_hooks.feature",
      "features/hooks/halt.feature",
-     "features/matchers/define_matcher.feature",
-     "features/matchers/define_matcher_outside_rspec.feature",
      "features/mock_framework_integration/use_flexmock.feature",
      "features/mock_framework_integration/use_mocha.feature",
      "features/mock_framework_integration/use_rr.feature",
@@ -178,7 +176,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{rspec-core 2.0.0.a6}
+  s.summary = %q{rspec-core-2.0.0.a7}
   s.test_files = [
     "spec/rspec/core/command_line_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
@@ -211,17 +209,17 @@ 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.a6"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a6"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.a7"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.a7"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a6"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a6"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a7"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a7"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a6"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a6"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.a7"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.a7"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
   end
 end

data/spec/rspec/core/command_line_options_spec.rb

@@ -121,5 +121,12 @@ describe Rspec::Core::CommandLineOptions do
     end
   end
 
+  describe "--debug (-d)" do
+    it "sets debug on config" do
+      options_from_args("--debug").should include(:debug => true)
+      options_from_args("-d").should include(:debug => true)
+    end
+  end
+
 end
 

data/spec/rspec/core/configuration_spec.rb

@@ -1,220 +1,236 @@
 require 'spec_helper'
 
-describe Rspec::Core::Configuration do
+module Rspec::Core
 
-  context "setting the mock framework" do
+  describe Configuration do
 
-    it "requires and includes the rspec adapter when the mock_framework is :rspec" do
-      config = Rspec::Core::Configuration.new
-      config.should_receive(:require).with('rspec/core/mocking/with_rspec')
-      Rspec::Core::ExampleGroup.should_receive(:send)
-      config.mock_framework = :rspec
-    end
-
-    it "supports mock_with for backward compatibility with rspec-1.x" do
-      config = Rspec::Core::Configuration.new
-      config.stub!(:require)
-      Rspec::Core::ExampleGroup.stub!(:send)
-      config.mock_with :rspec
-    end
-    
-    it "includes the null adapter when the mock_framework is not :rspec, :mocha, or :rr" do
-      config = Rspec::Core::Configuration.new
-      Rspec::Core::ExampleGroup.should_receive(:send).with(:include, Rspec::Core::Mocking::WithAbsolutelyNothing)
-      config.mock_framework = :crazy_new_mocking_framework_ive_not_yet_heard_of
-    end
-
-    pending "includes the rspec adapter when the mock_framework is not set" do
-      config = Rspec::Core::Configuration.new
-      Rspec::Core::ExampleGroup.stub!(:send)
-      config.mock_framework.should == :rspec
-    end
-    
-  end  
- 
-  context "setting the files to run" do
-
-    before do
-      @config = Rspec::Core::Configuration.new
-    end
-    
-    it "should load files not following pattern if named explicitly" do
-      file = File.expand_path(File.dirname(__FILE__) + "/resources/a_bar.rb")
-      @config.files_or_directories_to_run = file
-      @config.files_to_run.should include(file)
-    end
-
-    describe "with default --pattern" do
-
-      it "should load files named _spec.rb" do
-        dir = File.expand_path(File.dirname(__FILE__) + "/resources/")
-        @config.files_or_directories_to_run = dir
-        @config.files_to_run.should == ["#{dir}/a_spec.rb"]
-      end
-
-    end
+    let(:config) { Configuration.new }
 
-    describe "with explicit pattern (single)" do
+    context "setting the mock framework" do
 
-      before do
-        @config.filename_pattern = "**/*_foo.rb"
+      it "requires and includes the rspec adapter when the mock_framework is :rspec" do
+        config.should_receive(:require).with('rspec/core/mocking/with_rspec')
+        ExampleGroup.should_receive(:send)
+        config.mock_framework = :rspec
       end
 
-      it "should load files following pattern" do
-        file = File.expand_path(File.dirname(__FILE__) + "/resources/a_foo.rb")
-        @config.files_or_directories_to_run = file
-        @config.files_to_run.should include(file)
+      it "supports mock_with for backward compatibility with rspec-1.x" do
+        config.stub!(:require)
+        ExampleGroup.stub!(:send)
+        config.mock_with :rspec
       end
-
-      it "should load files in directories following pattern" do
-        dir = File.expand_path(File.dirname(__FILE__) + "/resources")
-        @config.files_or_directories_to_run = dir
-        @config.files_to_run.should include("#{dir}/a_foo.rb")
+      
+      it "includes the null adapter when the mock_framework is not :rspec, :mocha, or :rr" do
+        ExampleGroup.should_receive(:send).with(:include, Mocking::WithAbsolutelyNothing)
+        config.mock_framework = :crazy_new_mocking_framework_ive_not_yet_heard_of
       end
 
-      it "should not load files in directories not following pattern" do
-        dir = File.expand_path(File.dirname(__FILE__) + "/resources")
-        @config.files_or_directories_to_run = dir
-        @config.files_to_run.should_not include("#{dir}/a_bar.rb")
+      pending "includes the rspec adapter when the mock_framework is not set" do
+        ExampleGroup.stub!(:send)
+        config.mock_framework.should == :rspec
       end
       
-    end
+    end  
+   
+    context "setting the files to run" do
+
+      it "should load files not following pattern if named explicitly" do
+        file = "./spec/rspec/core/resources/a_bar.rb"
+        config.files_or_directories_to_run = file
+        config.files_to_run.should == [file]
+      end
 
-    context "with explicit pattern (comma,separated,values)" do
+      describe "with default --pattern" do
 
-      before do
-        @config.filename_pattern = "**/*_foo.rb,**/*_bar.rb"
-      end
+        it "should load files named _spec.rb" do
+          dir = "./spec/rspec/core/resources"
+          config.files_or_directories_to_run = dir
+          config.files_to_run.should == ["#{dir}/a_spec.rb"]
+        end
 
-      it "should support comma separated values" do
-        dir = File.expand_path(File.dirname(__FILE__) + "/resources")
-        @config.files_or_directories_to_run = dir
-        @config.files_to_run.should include("#{dir}/a_foo.rb")
-        @config.files_to_run.should include("#{dir}/a_bar.rb")
       end
 
-      it "should support comma separated values with spaces" do
-        dir = File.expand_path(File.dirname(__FILE__) + "/resources")
-        @config.files_or_directories_to_run = dir
-        @config.files_to_run.should include("#{dir}/a_foo.rb")
-        @config.files_to_run.should include("#{dir}/a_bar.rb")
+      describe "with explicit pattern (single)" do
+
+        before do
+          config.filename_pattern = "**/*_foo.rb"
+        end
+
+        it "should load files following pattern" do
+          file = File.expand_path(File.dirname(__FILE__) + "/resources/a_foo.rb")
+          config.files_or_directories_to_run = file
+          config.files_to_run.should include(file)
+        end
+
+        it "should load files in directories following pattern" do
+          dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+          config.files_or_directories_to_run = dir
+          config.files_to_run.should include("#{dir}/a_foo.rb")
+        end
+
+        it "should not load files in directories not following pattern" do
+          dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+          config.files_or_directories_to_run = dir
+          config.files_to_run.should_not include("#{dir}/a_bar.rb")
+        end
+        
       end
 
-    end
+      context "with explicit pattern (comma,separated,values)" do
+
+        before do
+          config.filename_pattern = "**/*_foo.rb,**/*_bar.rb"
+        end
+
+        it "should support comma separated values" do
+          dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+          config.files_or_directories_to_run = dir
+          config.files_to_run.should include("#{dir}/a_foo.rb")
+          config.files_to_run.should include("#{dir}/a_bar.rb")
+        end
 
-    context "with line number" do
+        it "should support comma separated values with spaces" do
+          dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+          config.files_or_directories_to_run = dir
+          config.files_to_run.should include("#{dir}/a_foo.rb")
+          config.files_to_run.should include("#{dir}/a_bar.rb")
+        end
 
-      it "assigns the line number as the filter" do
-        @config.files_or_directories_to_run = "path/to/a_spec.rb:37"
-        @config.filter.should == {:line_number => 37}
       end
 
-    end
+      context "with line number" do
 
-    context "with full_description" do
+        it "assigns the line number as the filter" do
+          config.files_or_directories_to_run = "path/to/a_spec.rb:37"
+          config.filter.should == {:line_number => 37}
+        end
 
-      it "assigns the example name as the filter on description" do
-        @config.full_description = "foo"
-        @config.filter.should == {:full_description => /foo/}
       end
 
-    end
+      context "with full_description" do
 
-  end
-  
-  describe "include" do
+        it "assigns the example name as the filter on description" do
+          config.full_description = "foo"
+          config.filter.should == {:full_description => /foo/}
+        end
 
-    module InstanceLevelMethods
-      def you_call_this_a_blt?
-        "egad man, where's the mayo?!?!?"
       end
-    end
 
-    it "should include the given module into each matching example group" do
-      Rspec::Core.configuration.include(InstanceLevelMethods, :magic_key => :include)
-      
-      group = Rspec::Core::ExampleGroup.create('does like, stuff and junk', :magic_key => :include) { }
-      group.should_not respond_to(:you_call_this_a_blt?)
-      group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
     end
+    
+    describe "include" do
 
-  end
-
-  describe "extend" do
+      module InstanceLevelMethods
+        def you_call_this_a_blt?
+          "egad man, where's the mayo?!?!?"
+        end
+      end
 
-    module ThatThingISentYou
+      context "with no filter" do
+        it "includes the given module into each example group" do
+          config.include(InstanceLevelMethods)
+          
+          group = ExampleGroup.create(config, 'does like, stuff and junk', :magic_key => :include) { }
+          group.should_not respond_to(:you_call_this_a_blt?)
+          group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
+        end
+        
+      end
 
-      def that_thing
+      context "with a filter" do
+        it "includes the given module into each matching example group" do
+          config.include(InstanceLevelMethods, :magic_key => :include)
+          
+          group = ExampleGroup.create(config, 'does like, stuff and junk', :magic_key => :include) { }
+          group.should_not respond_to(:you_call_this_a_blt?)
+          group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
+        end
       end
 
     end
 
-    it "should extend the given module into each matching example group" do
-      Rspec::Core.configuration.extend(ThatThingISentYou, :magic_key => :extend)      
-      group = Rspec::Core::ExampleGroup.create(ThatThingISentYou, :magic_key => :extend) { }
-      group.should respond_to(:that_thing)
-    end
+    describe "extend" do
 
-  end
+      module ThatThingISentYou
+        def that_thing
+        end
+      end
 
-  describe "run_all_when_everything_filtered" do
+      it "should extend the given module into each matching example group" do
+        config.extend(ThatThingISentYou, :magic_key => :extend)      
+        group = ExampleGroup.create(config, ThatThingISentYou, :magic_key => :extend) { }
+        group.should respond_to(:that_thing)
+      end
 
-    it "defaults to false" do
-      Rspec::Core::Configuration.new.run_all_when_everything_filtered.should == false
     end
 
-    it "can be queried with question method" do
-      config = Rspec::Core::Configuration.new
-      config.run_all_when_everything_filtered = true
-      config.run_all_when_everything_filtered?.should == true
-    end
-  end
-  
-  describe 'formatter=' do
-
-    it "sets formatter_to_use based on name" do
-      config = Rspec::Core::Configuration.new
-      config.formatter = :documentation
-      config.formatter.should be_an_instance_of(Rspec::Core::Formatters::DocumentationFormatter)
-      config.formatter = 'documentation'
-      config.formatter.should be_an_instance_of(Rspec::Core::Formatters::DocumentationFormatter)
+    describe "run_all_when_everything_filtered" do
+
+      it "defaults to false" do
+        config.run_all_when_everything_filtered.should == false
+      end
+
+      it "can be queried with question method" do
+        config.run_all_when_everything_filtered = true
+        config.run_all_when_everything_filtered?.should == true
+      end
     end
     
-    it "raises ArgumentError if formatter is unknown" do
-      config = Rspec::Core::Configuration.new
-      lambda { config.formatter = :progresss }.should raise_error(ArgumentError)
+    describe 'formatter=' do
+
+      it "sets formatter_to_use based on name" do
+        config.formatter = :documentation
+        config.formatter.should be_an_instance_of(Formatters::DocumentationFormatter)
+        config.formatter = 'documentation'
+        config.formatter.should be_an_instance_of(Formatters::DocumentationFormatter)
+      end
+      
+      it "raises ArgumentError if formatter is unknown" do
+        lambda { config.formatter = :progresss }.should raise_error(ArgumentError)
+      end
+      
     end
-    
-  end
 
-  describe "line_number=" do
-    it "sets the line number" do
-      config = Rspec::Core::Configuration.new
-      config.line_number = '37'
-      config.filter.should == {:line_number => 37}
+    describe "line_number=" do
+      it "sets the line number" do
+        config.line_number = '37'
+        config.filter.should == {:line_number => 37}
+      end
+      
+      it "overrides :focused" do
+        config.filter_run :focused => true
+        config.line_number = '37'
+        config.filter.should == {:line_number => 37}
+      end
+      
+      it "prevents :focused" do
+        config.line_number = '37'
+        config.filter_run :focused => true
+        config.filter.should == {:line_number => 37}
+      end
     end
-    
-    it "overrides :focused" do
-      config = Rspec::Core::Configuration.new
-      config.filter_run :focused => true
-      config.line_number = '37'
-      config.filter.should == {:line_number => 37}
+
+    describe "full_backtrace=" do
+      it "clears the backtrace clean patterns" do
+        config.full_backtrace = true
+        config.options[:backtrace_clean_patterns].should == []
+      end
     end
-    
-    it "prevents :focused" do
-      config = Rspec::Core::Configuration.new
-      config.line_number = '37'
-      config.filter_run :focused => true
-      config.filter.should == {:line_number => 37}
+
+    describe "debug=true" do
+      it "requires 'ruby-debug'" do
+        config.should_receive(:require).with('ruby-debug')
+        config.debug = true
+      end
     end
-  end
 
-  describe "full_backtrace=" do
-    it "clears the backtrace clean patterns" do
-      config = Rspec::Core::Configuration.new
-      config.full_backtrace = true
-      config.options[:backtrace_clean_patterns].should == []
+    describe "debug=false" do
+      it "does not require 'ruby-debug'" do
+        config.should_not_receive(:require).with('ruby-debug')
+        config.debug = false
+      end
     end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'rspec/core'
 
-require 'rubygems'
 $LOAD_PATH << File.expand_path('../../../rspec-expectations/lib', __FILE__)
 $LOAD_PATH << File.expand_path('../../../rspec-mocks/lib', __FILE__)
 require 'rspec/expectations'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a6
+  version: 2.0.0.a7
 platform: ruby
 authors: 
 - Chad Humphries
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -04:00
+date: 2010-02-20 00:00:00 -06:00
 default_executable: rspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a6
+        version: 2.0.0.a7
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec-mocks
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a6
+        version: 2.0.0.a7
     version: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -59,6 +59,7 @@ files:
 - README.markdown
 - Rakefile
 - TODO.markdown
+- VERSION
 - bin/rspec
 - cucumber.yml
 - example_specs/failing/README.txt
@@ -131,12 +132,9 @@ files:
 - features/configuration/spec_opts.feature
 - features/example_groups/describe_aliases.feature
 - features/example_groups/nested_groups.feature
-- features/expectations/customized_message.feature
 - features/hooks/around_hook.feature
 - features/hooks/before_and_after_hooks.feature
 - features/hooks/halt.feature
-- features/matchers/define_matcher.feature
-- features/matchers/define_matcher_outside_rspec.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
 - features/mock_framework_integration/use_rr.feature
@@ -233,7 +231,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: rspec-core 2.0.0.a6
+summary: rspec-core-2.0.0.a7
 test_files: 
 - spec/rspec/core/command_line_options_spec.rb
 - spec/rspec/core/configuration_spec.rb

data/features/expectations/customized_message.feature

@@ -1,54 +0,0 @@
-Feature: customized message
-
-  In order to get the feedback I want
-  As an RSpec user
-  I want to customize the failure message per example
-  
-  Scenario: one additional method
-    Given a file named "node_spec.rb" with:
-      """
-      class Node
-        def initialize(state=:waiting)
-          @state = state
-        end
-        def state
-          @state
-        end
-        def waiting?
-          @state == :waiting
-        end
-        def started?
-          @state == :started
-        end
-        def start
-          @state = :started
-        end
-      end
-
-      describe "a new Node" do
-        it "should be waiting" do
-          node = Node.new(:started) #start w/ started to trigger failure
-          node.should be_waiting, "node.state: #{node.state} (first example)"
-        end
-
-        it "should not be started" do
-          node = Node.new(:started) #start w/ started to trigger failure
-          node.should_not be_started, "node.state: #{node.state} (second example)"
-        end
-      end
-
-      describe "node.start" do
-        it "should change the state" do
-          node = Node.new(:started) #start w/ started to trigger failure
-          lambda {node.start}.should change{node.state}, "expected a change"
-        end
-      end
-
-      """
-    When I run "rspec node_spec.rb --format n"
-    Then the stdout should match "3 examples, 3 failures"
-    And  the stdout should not match "to return true, got false"
-    And  the stdout should not match "to return false, got true"
-    And  the stdout should match "node.state: started (first example)"
-    And  the stdout should match "node.state: started (second example)"
-    And  the stdout should match "expected a change"

data/features/matchers/define_matcher.feature

@@ -1,193 +0,0 @@
-Feature: define matcher
-
-  In order to express my domain clearly in my code examples
-  As an RSpec user
-  I want a shortcut to define custom matchers
-
-  Scenario: define a matcher with default messages
-    Given a file named "matcher_with_default_message_spec.rb" with:
-      """
-      require 'rspec/expectations'
-
-      Rspec::Matchers.define :be_a_multiple_of do |expected|
-        match do |actual|
-          actual % expected == 0
-        end
-      end
-
-      describe 9 do
-        it {should be_a_multiple_of(3)}
-      end
-
-      describe 9 do
-        it {should_not be_a_multiple_of(4)}
-      end
-
-      # fail intentionally to generate expected output
-      describe 9 do
-        it {should be_a_multiple_of(4)}
-      end
-
-      # fail intentionally to generate expected output
-      describe 9 do
-        it {should_not be_a_multiple_of(3)}
-      end
-
-      """
-    When I run "rspec matcher_with_default_message_spec.rb --format specdoc"
-    Then the exit code should be 256
-
-    And the stdout should match "should be a multiple of 3"
-    And the stdout should match "should not be a multiple of 4"
-    And the stdout should match "Failure/Error: it {should be_a_multiple_of(4)}"
-    And the stdout should match "Failure/Error: it {should_not be_a_multiple_of(3)}"
-
-    And the stdout should match "4 examples, 2 failures"
-    And the stdout should match "expected 9 to be a multiple of 4"
-    And the stdout should match "expected 9 not to be a multiple of 3"
-
-  Scenario: overriding the failure_message_for_should
-    Given a file named "matcher_with_failure_message_spec.rb" with:
-      """
-      require 'rspec/expectations'
-
-      Rspec::Matchers.define :be_a_multiple_of do |expected|
-        match do |actual|
-          actual % expected == 0
-        end
-        failure_message_for_should do |actual|
-          "expected that #{actual} would be a multiple of #{expected}"
-        end
-      end
-
-      # fail intentionally to generate expected output
-      describe 9 do
-        it {should be_a_multiple_of(4)}
-      end
-      """
-    When I run "rspec matcher_with_failure_message_spec.rb"
-    Then the exit code should be 256
-    And the stdout should match "1 example, 1 failure"
-    And the stdout should match "expected that 9 would be a multiple of 4"
-
-  Scenario: overriding the failure_message_for_should_not
-    Given a file named "matcher_with_failure_for_message_spec.rb" with:
-      """
-      require 'rspec/expectations'
-
-      Rspec::Matchers.define :be_a_multiple_of do |expected|
-        match do |actual|
-          actual % expected == 0
-        end
-        failure_message_for_should_not do |actual|
-          "expected that #{actual} would not be a multiple of #{expected}"
-        end
-      end
-
-      # fail intentionally to generate expected output
-      describe 9 do
-        it {should_not be_a_multiple_of(3)}
-      end
-      """
-    When I run "rspec matcher_with_failure_for_message_spec.rb"
-    Then the exit code should be 256
-    And the stdout should match "1 example, 1 failure"
-    And the stdout should match "expected that 9 would not be a multiple of 3"
-
-  Scenario: overriding the description
-    Given a file named "matcher_overriding_description_spec.rb" with:
-      """
-      require 'rspec/expectations'
-
-      Rspec::Matchers.define :be_a_multiple_of do |expected|
-        match do |actual|
-          actual % expected == 0
-        end
-        description do
-          "be multiple of #{expected}"
-        end
-      end
-
-      describe 9 do
-        it {should be_a_multiple_of(3)}
-      end
-
-      describe 9 do
-        it {should_not be_a_multiple_of(4)}
-      end
-      """
-    When I run "rspec matcher_overriding_description_spec.rb --format specdoc"
-    Then the exit code should be 0
-    And the stdout should match "2 examples, 0 failures"
-    And the stdout should match "should be multiple of 3"
-    And the stdout should match "should not be multiple of 4"
-
-  Scenario: with no args
-    Given a file named "matcher_with_no_args_spec.rb" with:
-      """
-      require 'rspec/expectations'
-
-      Rspec::Matchers.define :have_7_fingers do
-        match do |thing|
-          thing.fingers.length == 7
-        end
-      end
-
-      class Thing
-        def fingers; (1..7).collect {"finger"}; end
-      end
-
-      describe Thing do
-        it {should have_7_fingers}
-      end
-      """
-    When I run "rspec matcher_with_no_args_spec.rb --format specdoc"
-    Then the exit code should be 0
-    And the stdout should match "1 example, 0 failures"
-    And the stdout should match "should have 7 fingers"
-
-  Scenario: with multiple args
-    Given a file named "matcher_with_multiple_args_spec.rb" with:
-      """
-      require 'rspec/expectations'
-
-      Rspec::Matchers.define :be_the_sum_of do |a,b,c,d|
-        match do |sum|
-          a + b + c + d == sum
-        end
-      end
-
-      describe 10 do
-        it {should be_the_sum_of(1,2,3,4)}
-      end
-      """
-    When I run "rspec matcher_with_multiple_args_spec.rb --format specdoc"
-    Then the exit code should be 0
-    And the stdout should match "1 example, 0 failures"
-    And the stdout should match "should be the sum of 1, 2, 3, and 4"
-    
-  Scenario: with helper methods
-    Given a file named "matcher_with_internal_helper_spec.rb" with:
-      """
-      require 'rspec/expectations'
-
-      Rspec::Matchers.define :have_same_elements_as do |sample|
-        match do |actual|
-          similar?(sample, actual)
-        end
-
-        def similar?(a, b)
-          a.sort == b.sort
-        end
-      end
-
-      describe "these two arrays" do
-        specify "should be similar" do
-          [1,2,3].should have_same_elements_as([2,3,1])
-        end
-      end
-      """
-    When I run "rspec matcher_with_internal_helper_spec.rb"
-    Then the exit code should be 0
-    And the stdout should match "1 example, 0 failures"
-

data/features/matchers/define_matcher_outside_rspec.feature

@@ -1,38 +0,0 @@
-Feature: define matcher outside rspec
-
-  In order to express my domain clearly in my code examples
-  As a non-rspec user
-  I want a shortcut to define custom matchers
-
-  Scenario: define a matcher with default messages
-    Given a file named "test_multiples.rb" with:
-      """
-      require 'test/unit'
-      require 'rspec/expectations'
-      
-      Rspec::Matchers.define :be_a_multiple_of do |expected|
-        match do |actual|
-          actual % expected == 0
-        end
-      end
-      
-      class Test::Unit::TestCase
-        include Rspec::Matchers
-      end
-      
-      class TestMultiples < Test::Unit::TestCase
-      
-        def test_9_should_be_a_multiple_of_3
-          9.should be_a_multiple_of(3)
-        end
-
-        def test_9_should_be_a_multiple_of_4
-          9.should be_a_multiple_of(4)
-        end
-        
-      end
-      """
-    When I run "ruby test_multiples.rb"
-    Then the exit code should be 256
-    And the stdout should match "expected 9 to be a multiple of 4"
-    And the stdout should match "2 tests, 0 assertions, 0 failures, 1 errors"