rspec-core 2.0.0.beta.1 → 2.0.0.beta.2

data/README.markdown

@@ -1,50 +1,68 @@
-# RSpec Core
+# Rspec Core
 
-rspec-core includes the runner, output formatters, and the `rspec` command.
+Rspec is an automated testing framework for Ruby, designed for use in Behaviour
+Driven Development and Test Driven Development.
 
-rspec-core is currently in alpha release. While you are welcome to track, fork,
-explore, etc, we're too early in the process to start fielding pull requests
-and or issues from outside the core development team, so please don't waste
-your time until this notice changes.
+rspec-core includes the Rspec runner, output formatters, and the `rspec`
+command.
 
 ## Install
 
     [sudo] gem install rspec --prerelease
 
-This will install rspec, rspec-core, rspec-expectations and rspec-mocks.
+This will install the rspec, rspec-core, rspec-expectations and rspec-mocks
+gems.
 
-## Known Issues
+## Get Started
 
-### Ruby-1.9
+Start with a simple example of behavior you expect from your system. Do
+this before you write any code:
 
-Due to changes in scoping rules in 1.9, classes defined inside example groups
-are not visible to the examples. For example:
-
-    describe "something" do
-      class Foo
-      end
-
-      it "does something" do
-        Foo.new
+    # in spec/calculator_spec.rb
+    describe Calculator, "add" do
+      it "returns the sum of its arguments" do
+        Calculator.new.add(1, 2).should eq(3)
       end
     end
 
-This runs without incident in ruby-1.8, but raises an `uninitialized constant`
-error in ruby-1.9. We had solved this in rspec-1.x, but rspec-2 has a slightly
-different object model, so this has (for the moment) reared its ugly head. We'll
-certainly resolve this before rspec-core-2.0.0 (final) is released. 
+Run this with the rspec command, and watch it fail:
 
-You can, of course, fully qualify the declaration and everything works fine:
+    $ rspec spec/calculator_spec.rb
+    ./spec/calculator_spec.rb:1: uninitialized constant Calculator
 
-    describe "something" do
-      class ::Foo
-      end
+Implement the simplest solution:
 
-      it "does something" do
-        Foo.new
+    # in lib/calculator.rb
+    class Calculator
+      def add(a,b)
+        a + b
       end
     end
 
+Be sure to require the implementation file in the spec:
+
+    # in spec/calculator_spec.rb
+    # - Rspec adds ./lib to the $LOAD_PATH, so you can
+    #   just require "calculator" directly
+    require "calculator"
+
+Now run the spec again, and watch it pass:
+    
+    $ rspec spec/calculator_spec.rb
+    .
+
+    Finished in 0.000315 seconds
+    1 example, 0 failures
+
+Use the documentation formatter to see the resulting spec:
+
+    $ rspec spec/calculator_spec.rb --format doc
+    Calculator add
+      returns the sum of its arguments
+
+    Finished in 0.000379 seconds
+    1 example, 0 failures
+
 #### Also see
 
 * [http://github.com/rspec/rspec](http://github.com/rspec/rspec)

data/Rakefile

@@ -59,20 +59,20 @@ task :clobber do
 end
 
 if RUBY_VERSION.to_f >= 1.9
-  Cucumber::Rake::Task.new :features do |t|
+  Cucumber::Rake::Task.new(:cucumber) do |t|
     t.cucumber_opts = %w{--format progress}
   end
 
-  task :default => [:check_dependencies, :spec, :features]
+  task :default => [:check_dependencies, :spec, :cucumber]
 else
-  Cucumber::Rake::Task.new :features do |t|
+  Cucumber::Rake::Task.new(:cucumber) do |t|
     t.rcov = true
     t.rcov_opts =  %[-Ilib -Ispec --exclude "mocks,expectations,gems/*,features,spec/ruby_forker,spec/rspec,spec/resources,spec/lib,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*"]
     t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
     t.cucumber_opts = %w{--format progress}
   end
 
-  task :default => [:check_dependencies, :rcov, :features]
+  task :default => [:check_dependencies, :rcov, :cucumber]
 end
 
 Rake::RDocTask.new do |rdoc|

data/Upgrade.markdown

@@ -0,0 +1,94 @@
+# Upgrade to rspec-core-2.0
+
+## What's changed
+
+### Rspec namespace
+
+The root namespace is now `Rspec` instead of `Spec`, and the root directory
+under `lib` is `rspec` instead of `spec`.
+
+### Configuration
+
+Typically in `spec/spec_helper.rb`, configuration is now done like this:
+
+    Rspec.configure do |c|
+      # ....
+    end
+
+### rspec commmand
+
+The command to run specs is now `rspec` instead of `spec`.
+
+    rspec ./spec
+
+## What's new
+
+### Runner
+
+The new runner for rspec-2 comes from Micronaut.
+
+### Metadata!
+
+In rspec-2, every example and example group comes with metadata information
+like the file and line number on which it was declared, the arguments passed to
+`describe` and `it`, etc.  This metadata can be appended to through a hash
+argument passed to `describe` or `it`, allowing us to pre and post-process
+each example in a variety of ways.
+
+The most obvious use is for filtering the run. For example:
+
+    # in spec/spec_helper.rb
+    Rspec.configure do |c|
+      c.filter_run :focus => true
+    end
+
+    # in any spec file
+    describe "something" do
+      it "does something", :focus => true do
+        # ....
+      end
+    end
+
+When you run the `rspec` command, rspec will run only the examples that have
+`:focus => true` in the hash. 
+
+You can also add `run_all_when_everything_filtered` to the config:
+
+    Rspec.configure do |c|
+      c.filter_run :focus => true
+      c.run_all_when_everything_filtered = true
+    end
+
+Now if there are no examples tagged with `:focus => true`, all examples
+will be run. This makes it really easy to focus on one example for a
+while, but then go back to running all of the examples by removing that
+argument from `it`. Works with `describe` too, in which case it runs
+all of the examples in that group.
+
+The configuration will accept a lambda, which provides a lot of flexibility
+in filtering examples. Say, for example, you have a spec for functionality that
+behaves slightly differently in Ruby 1.8 and Ruby 1.9. We have that in
+rspec-core, and here's how we're getting the right stuff to run under the
+right version:
+
+    # in spec/spec_helper.rb
+    Rspec.configure do |c|
+      c.exclusion_filter = { :ruby => lambda {|version|
+        !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
+      }}
+    end
+
+    # in any spec file
+    describe "something" do
+      it "does something", :ruby => 1.8 do
+        # ....
+      end
+
+      it "does something", :ruby => 1.9 do
+        # ....
+      end
+    end
+
+In this case, we're using `exclusion_filter` instead of `filter_run` or
+`filter`, which indicate _inclusion_ filters. So each of those examples is
+excluded if we're _not_ running the version of Ruby they work with.

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.1
+2.0.0.beta.2

data/example_specs/spec_helper.rb

@@ -2,10 +2,9 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 $LOAD_PATH << File.expand_path('../../../rspec-expectations/lib', __FILE__)
 $LOAD_PATH << File.expand_path('../../../rspec-mocks/lib', __FILE__)
 require 'rspec/expectations'
-require 'rspec/autorun'
+require 'rspec/core'
 
 Rspec.configure do |c|
   c.mock_with :rspec
-  c.include Rspec::Matchers
 end
 

data/lib/rspec/autorun.rb

@@ -1,2 +1,2 @@
 require 'rspec/core'
-Rspec::Core.configuration.autorun!
+Rspec::Core::Runner.autorun

data/lib/rspec/core.rb

@@ -7,7 +7,6 @@ require 'rspec/core/configuration'
 require 'rspec/core/command_line_options'
 require 'rspec/core/runner'
 require 'rspec/core/example'
-require 'rspec/core/metadata'
 require 'rspec/core/kernel_extensions'
 require 'rspec/core/shared_example_group'
 require 'rspec/core/example_group_subject'

data/lib/rspec/core/configuration.rb

@@ -1,26 +1,18 @@
 module Rspec
   module Core
     class Configuration
-      # All of the defined advice in the configuration (before/after/around)
-      attr_reader :advice
+      # Control what examples are run by filtering 
+      attr_accessor :filter
 
-      # Allows you to control what examples are ran by filtering 
-      attr_reader :filter
+      # Control what examples are not run by filtering 
+      attr_accessor :exclusion_filter
 
-      attr_reader :exclusion_filter
-
-      # Modules that will be included or extended based on given filters
-      attr_reader :include_or_extend_modules
-
-      # Run all examples if the run is filtered, and no examples were found.  Normally this is what you want -
-      # when using focused examples for instance.  Defaults to true
-      attr_accessor :run_all_when_everything_filtered
-
-      attr_reader :options
+      # Run all examples if the run is filtered, and no examples were found.
+      attr_writer :run_all_when_everything_filtered
 
       def initialize
         @run_all_when_everything_filtered = false
-        @advice = { 
+        @hooks = { 
           :before => { :each => [], :all => [], :suite => [] }, 
           :after => { :each => [], :all => [], :suite => [] } 
         }
@@ -47,15 +39,15 @@ module Rspec
       end
       
       def cleaned_from_backtrace?(line)
-        options[:backtrace_clean_patterns].any? { |regex| line =~ regex }
+        @options[:backtrace_clean_patterns].any? { |regex| line =~ regex }
       end
 
       def backtrace_clean_patterns
-        options[:backtrace_clean_patterns]
+        @options[:backtrace_clean_patterns]
       end
 
       def mock_framework=(use_me_to_mock)
-        options[:mock_framework] = use_me_to_mock
+        @options[:mock_framework] = use_me_to_mock
         
         mock_framework_class = case use_me_to_mock.to_s
         when /rspec/i
@@ -75,24 +67,24 @@ module Rspec
           Rspec::Core::Mocking::WithAbsolutelyNothing
         end 
         
-        options[:mock_framework_class] = mock_framework_class
+        @options[:mock_framework_class] = mock_framework_class
         Rspec::Core::ExampleGroup.send(:include, mock_framework_class)
       end
       
       def mock_framework
-        options[:mock_framework]
+        @options[:mock_framework]
       end
 
       def filename_pattern
-        options[:filename_pattern]
+        @options[:filename_pattern]
       end
 
       def filename_pattern=(new_pattern)
-        options[:filename_pattern] = new_pattern
+        @options[:filename_pattern] = new_pattern
       end 
 
       def color_enabled=(on_or_off)
-        options[:color_enabled] = on_or_off
+        @options[:color_enabled] = on_or_off
       end
 
       def full_backtrace=(bool)
@@ -118,7 +110,7 @@ EOM
       end
 
       def color_enabled?
-        options[:color_enabled]
+        @options[:color_enabled]
       end
 
       def line_number=(line_number)
@@ -131,15 +123,15 @@ EOM
       
       # Enable profiling of example run - defaults to false
       def profile_examples
-        options[:profile_examples]
+        @options[:profile_examples]
       end
       
       def profile_examples=(on_or_off)
-        options[:profile_examples] = on_or_off
+        @options[:profile_examples] = on_or_off
       end
      
       def formatter_class
-        options[:formatter_class]
+        @options[:formatter_class]
       end
      
       def formatter=(formatter_to_use)
@@ -151,7 +143,7 @@ EOM
         else 
           raise ArgumentError, "Formatter '#{formatter_to_use}' unknown - maybe you meant 'documentation' or 'progress'?."
         end
-        options[:formatter_class] = formatter_class
+        @options[:formatter_class] = formatter_class
       end
         
       def formatter
@@ -159,11 +151,11 @@ EOM
       end
       
       def files_to_run
-        options[:files_to_run]
+        @options[:files_to_run]
       end
       
       def files_or_directories_to_run=(*files)
-        options[:files_to_run] = files.flatten.inject([]) do |result, file|
+        @options[:files_to_run] = files.flatten.inject([]) do |result, file|
           if File.directory?(file)
             filename_pattern.split(",").each do |pattern|
               result += Dir["#{file}/#{pattern.strip}"]
@@ -183,10 +175,6 @@ EOM
         Rspec::Core::ExampleGroup.alias_example_to(new_name, extra_options)
       end
 
-      def autorun!
-        Rspec::Core::Runner.autorun
-      end
-
       def filter_run(options={})
         @filter = options unless @filter and @filter[:line_number] || @filter[:full_description]
       end
@@ -209,29 +197,29 @@ EOM
       end
 
       def include(mod, options={})
-        include_or_extend_modules << [:include, mod, options]
+        @include_or_extend_modules << [:include, mod, options]
       end
 
       def extend(mod, options={})
-        include_or_extend_modules << [:extend, mod, options]
+        @include_or_extend_modules << [:extend, mod, options]
       end
 
       def find_modules(group)
-        include_or_extend_modules.select do |include_or_extend, mod, filters|
+        @include_or_extend_modules.select do |include_or_extend, mod, filters|
           group.all_apply?(filters)
         end
       end
 
       def before(each_or_all=:each, options={}, &block)
-        advice[:before][each_or_all] << [options, block]
+        @hooks[:before][each_or_all] << [options, block]
       end
 
       def after(each_or_all=:each, options={}, &block)
-        advice[:after][each_or_all] << [options, block]
+        @hooks[:after][each_or_all] << [options, block]
       end
 
-      def find_advice(desired_advice_type, desired_each_or_all, group)
-        advice[desired_advice_type][desired_each_or_all].select do |filters, block|
+      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

data/lib/rspec/core/example_group.rb

@@ -1,18 +1,19 @@
-require 'rspec/core/advice'
+require 'rspec/core/hooks'
 require 'rspec/core/example_group_subject'
+require 'rspec/core/let'
 require 'rspec/core/metadata'
 
 module Rspec
   module Core
     class ExampleGroup
-      extend Advice
+      extend  Hooks
       include ExampleGroupSubject
+      include Let
 
       attr_accessor :running_example
 
       def self.inherited(klass)
-        super(klass)
-        Rspec::Core.configuration.autorun!
+        Rspec::Core::Runner.autorun
         Rspec::Core.world.example_groups << klass
       end
 
@@ -83,8 +84,8 @@ module Rspec
         @metadata 
       end
 
-      def self.name(friendly=true)
-        friendly ? metadata[:example_group][:name] : super()
+      def self.display_name
+        metadata[:example_group][:name]
       end
 
       def self.description
@@ -155,26 +156,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
-        configuration.find_advice(:before, :all, self).each { |blk| running_example.instance_eval(&blk) }
+        configuration.find_hook(: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)
-        configuration.find_advice(:before, :each, self).each { |blk| running_example.instance_eval(&blk) }
+        configuration.find_hook(: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) }
-        configuration.find_advice(:after, :all, self).each { |blk| running_example.instance_eval(&blk) }
+        configuration.find_hook(: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) } }
-        configuration.find_advice(:after, :each, self).each { |blk| running_example.instance_eval(&blk) }
+        configuration.find_hook(:after, :each, self).each { |blk| running_example.instance_eval(&blk) }
       end
 
       def self.run(reporter)
@@ -201,12 +202,6 @@ module Rspec
         self == Rspec::Core::ExampleGroup ? 'Rspec::Core::ExampleGroup' : name
       end
 
-      def self.let(name, &block)
-        define_method(name) do
-          __memoized[name] ||= instance_eval(&block)
-        end
-      end
-
       def self.all_apply?(filters)
         metadata.all_apply?(filters)
       end
@@ -215,10 +210,6 @@ module Rspec
         self.class.describes
       end
 
-      def __memoized
-        @__memoized ||= {}
-      end
-
       def __reset__
         instance_variables.each { |ivar| remove_instance_variable(ivar) }
         __memoized.clear

data/lib/rspec/core/example_group_subject.rb

@@ -3,9 +3,9 @@ module Rspec
     module ExampleGroupSubject
       
       def self.included(kls)
-        kls.extend ClassMethods
-        kls.send :alias_method, :__should_for_example_group__,     :should
-        kls.send :alias_method, :__should_not_for_example_group__, :should_not
+        kls.extend   ClassMethods
+        kls.__send__ :alias_method, :__should_for_example_group__,     :should
+        kls.__send__ :alias_method, :__should_not_for_example_group__, :should_not
       end
       
       def subject

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

@@ -17,7 +17,7 @@ module Rspec
           described_example_group_chain.each_with_index do |nested_example_group, i|
             unless nested_example_group == @previous_nested_example_groups[i]
               at_root_level = (i == 0)
-              desc_or_name = at_root_level ? nested_example_group.name : nested_example_group.description
+              desc_or_name = at_root_level ? nested_example_group.display_name : nested_example_group.description
               output.puts if at_root_level
               output.puts "#{'  ' * i}#{desc_or_name}"
             end
@@ -79,4 +79,4 @@ module Rspec
 
   end
 
-end
+end

data/lib/rspec/core/{advice.rb → hooks.rb}

@@ -1,6 +1,6 @@
 module Rspec
   module Core
-    module Advice
+    module Hooks
       def before_blocks
         @before_blocks ||= { :all => [], :each => [] }
       end

data/lib/rspec/core/let.rb

@@ -0,0 +1,28 @@
+module Rspec
+  module Core
+
+    module Let
+
+      module ClassMethods
+        def let(name, &block)
+          define_method(name) do
+            __memoized[name] ||= instance_eval(&block)
+          end
+        end
+      end
+
+      module InstanceMethods
+        def __memoized
+          @__memoized ||= {}
+        end
+      end
+
+      def self.included(mod)
+        mod.extend ClassMethods
+        mod.__send__ :include, InstanceMethods
+      end
+
+    end
+
+  end
+end

data/spec/rspec/core/configuration_spec.rb

@@ -164,10 +164,10 @@ module Rspec::Core
 
     end
 
-    describe "run_all_when_everything_filtered" do
+    describe "run_all_when_everything_filtered?" do
 
       it "defaults to false" do
-        config.run_all_when_everything_filtered.should == false
+        config.run_all_when_everything_filtered?.should == false
       end
 
       it "can be queried with question method" do
@@ -213,7 +213,7 @@ module Rspec::Core
     describe "full_backtrace=" do
       it "clears the backtrace clean patterns" do
         config.full_backtrace = true
-        config.options[:backtrace_clean_patterns].should == []
+        config.backtrace_clean_patterns.should == []
       end
     end
 

data/spec/rspec/core/example_group_spec.rb

@@ -1,5 +1,15 @@
 require 'spec_helper'
 
+class SelfObserver
+  def self.cache
+    @cache ||= []
+  end
+
+  def initialize
+    self.class.cache << self
+  end
+end
+
 module Rspec::Core
 
   describe ExampleGroup do
@@ -16,25 +26,25 @@ module Rspec::Core
 
     end
 
-    describe '#name' do
+    describe '#display_name' do
 
       it "uses the first parameter as name" do
-        ExampleGroup.create("my favorite pony") { }.name.should == 'my favorite pony'
+        ExampleGroup.create("my favorite pony") { }.display_name.should == 'my favorite pony'
       end
 
       it "accepts a constant as the first parameter" do
-        ExampleGroup.create(Object) { }.name.should == 'Object'
+        ExampleGroup.create(Object) { }.display_name.should == 'Object'
       end
 
       it "concats nested names" do
         group = ExampleGroup.create(Object, 'test') {}
-        group.name.should == 'Object test'
+        group.display_name.should == 'Object test'
 
         nested_group_one = group.describe('nested one') { }
-        nested_group_one.name.should == 'Object test nested one'
+        nested_group_one.display_name.should == 'Object test nested one'
 
         nested_group_two = nested_group_one.describe('nested two') { }
-        nested_group_two.name.should == 'Object test nested one nested two'
+        nested_group_two.display_name.should == 'Object test nested one nested two'
       end
 
     end
@@ -290,13 +300,12 @@ module Rspec::Core
         @before_all_top_level.should == 'before_all_top_level'
       end
 
-      it "should be able to access the before all ivars in the before_all_ivars hash" do
-        with_ruby('1.8') do
-          running_example.example_group.before_all_ivars.should include('@before_all_top_level' => 'before_all_top_level')
-        end
-        with_ruby('1.9') do
-          running_example.example_group.before_all_ivars.should include(:@before_all_top_level => 'before_all_top_level')
-        end
+      it "should be able to access the before all ivars in the before_all_ivars hash", :ruby => 1.8 do
+        running_example.example_group.before_all_ivars.should include('@before_all_top_level' => 'before_all_top_level')
+      end
+
+      it "should be able to access the before all ivars in the before_all_ivars hash", :ruby => 1.9 do
+        running_example.example_group.before_all_ivars.should include(:@before_all_top_level => 'before_all_top_level')
       end
 
       describe "but now I am nested" do
@@ -356,28 +365,19 @@ module Rspec::Core
     end
 
     describe "#around" do
-      class Thing
-        def self.cache
-          @cache ||= []
-        end
-
-        def initialize
-          self.class.cache << self
-        end
-      end
 
       around(:each) do |example|
-        Thing.new
+        SelfObserver.new
         example.run
-        Thing.cache.clear
+        SelfObserver.cache.clear
       end
 
-      it "has 1 Thing (1)" do
-        Thing.cache.length.should == 1
+      it "has 1 SelfObserver (1)" do
+        SelfObserver.cache.length.should == 1
       end
 
-      it "has 1 Thing (2)" do
-        Thing.cache.length.should == 1
+      it "has 1 SelfObserver (2)" do
+        SelfObserver.cache.length.should == 1
       end
     end
   end

data/spec/rspec/core/example_group_subject_spec.rb

@@ -31,7 +31,7 @@ module Rspec::Core
       
     end
     
-     describe "explicit subject" do
+    describe "explicit subject" do
       describe "defined in a top level group" do
         it "replaces the implicit subject in that group" do
           group = ExampleGroup.create(Array)
@@ -41,19 +41,20 @@ module Rspec::Core
       end
 
       describe "defined in a top level group" do
-        before do
-          @group = ExampleGroup.create
-          @group.subject{ [4,5,6] }
+        let(:group) do
+          ExampleGroup.create do
+            subject{ [4,5,6] }
+          end
         end
 
         it "is available in a nested group (subclass)" do
-          nested = @group.describe("I'm nested!") { }
-          nested.subject.call.should == [4,5,6]
+          nested_group = group.describe("I'm nested!") { }
+          nested_group.subject.call.should == [4,5,6]
         end
 
         it "is available in a doubly nested group (subclass)" do
-          nested_group = @group.describe("Nesting level 1") { }
-          doubly_nested_group = nested_group.describe("Nesting level 1") { }
+          nested_group = group.describe("Nesting level 1") { }
+          doubly_nested_group = nested_group.describe("Nesting level 2") { }
           doubly_nested_group.subject.call.should == [4,5,6]
         end
       end

data/spec/rspec/core/shared_example_group_spec.rb

@@ -41,7 +41,7 @@ module Rspec::Core
         Rspec::Core.world.shared_example_groups.replace(original_shared_example_groups)
       end
 
-      it "should make any shared example_group available at the correct level" do
+      it "should make any shared example_group available at the correct level", :ruby => 1.8 do
         group = ExampleGroup.create('fake group')
         block = lambda {
           def self.class_helper; end
@@ -49,14 +49,20 @@ module Rspec::Core
         }
         Rspec::Core.world.stub(:shared_example_groups).and_return({ :shared_example_group => block })
         group.it_should_behave_like :shared_example_group
-        with_ruby(1.8) do
-          group.instance_methods.should include('extra_helper')
-          group.singleton_methods.should include('class_helper')
-        end
-        with_ruby(1.9) do
-          group.instance_methods.should include(:extra_helper)
-          group.singleton_methods.should include(:class_helper)
-        end
+        group.instance_methods.should  include('extra_helper')
+        group.singleton_methods.should include('class_helper')
+      end
+
+      it "should make any shared example_group available at the correct level", :ruby => 1.9 do
+        group = ExampleGroup.create('fake group')
+        block = lambda {
+          def self.class_helper; end
+          def extra_helper; end
+        }
+        Rspec::Core.world.stub(:shared_example_groups).and_return({ :shared_example_group => block })
+        group.it_should_behave_like :shared_example_group
+        group.instance_methods.should include(:extra_helper)
+        group.singleton_methods.should include(:class_helper)
       end
 
       it "should raise when named shared example_group can not be found" 
@@ -82,8 +88,8 @@ module Rspec::Core
 
       it "adds examples to from two shared groups" do
         cleanup_shared_example_groups do
-          group = ExampleGroup.create("example_group") do |g|
-            g.it("i was already here") {}
+          group = ExampleGroup.create("example_group") do
+            it("i was already here") {}
           end
 
           group.examples.size.should == 1

data/spec/spec_helper.rb

@@ -8,10 +8,6 @@ require 'rspec/mocks'
 
 Rspec::Core::ExampleGroup.send(:include, Rspec::Matchers)
 
-def with_ruby(version)
-  yield if RUBY_VERSION.to_s =~ Regexp.compile("^#{version}")
-end
-
 module Rspec
   module Core
     module Matchers
@@ -40,7 +36,8 @@ end
 
 Rspec.configure do |c|
   c.mock_framework = :rspec
-  c.filter_run :focused => true
-  c.run_all_when_everything_filtered = true
   c.color_enabled = !in_editor?
+  c.exclusion_filter = { :ruby => lambda {|version|
+    !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
+  }}
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 1
-  version: 2.0.0.beta.1
+  - 2
+  version: 2.0.0.beta.2
 platform: ruby
 authors: 
 - Chad Humphries
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -06:00
+date: 2010-03-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 1
-        version: 2.0.0.beta.1
+        - 2
+        version: 2.0.0.beta.2
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 1
-        version: 2.0.0.beta.1
+        - 2
+        version: 2.0.0.beta.2
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,6 @@ dependencies:
 description: Rspec runner and example group classes
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: 
-- autospec
 - rspec
 - spec
 extensions: []
@@ -84,8 +83,8 @@ files:
 - README.markdown
 - Rakefile
 - TODO.markdown
+- Upgrade.markdown
 - VERSION
-- bin/autospec
 - bin/rspec
 - bin/spec
 - cucumber.yml
@@ -128,7 +127,6 @@ files:
 - example_specs/passing/predicate_example.rb
 - example_specs/passing/shared_example_group_example.rb
 - example_specs/passing/shared_stack_examples.rb
-- example_specs/passing/simple_matcher_example.rb
 - example_specs/passing/spec_helper.rb
 - example_specs/passing/stack.rb
 - example_specs/passing/stack_spec.rb
@@ -172,7 +170,6 @@ files:
 - features/support/env.rb
 - lib/rspec/autorun.rb
 - lib/rspec/core.rb
-- lib/rspec/core/advice.rb
 - lib/rspec/core/around_proxy.rb
 - lib/rspec/core/backward_compatibility.rb
 - lib/rspec/core/command_line_options.rb
@@ -186,7 +183,9 @@ files:
 - lib/rspec/core/formatters/base_text_formatter.rb
 - lib/rspec/core/formatters/documentation_formatter.rb
 - lib/rspec/core/formatters/progress_formatter.rb
+- lib/rspec/core/hooks.rb
 - lib/rspec/core/kernel_extensions.rb
+- lib/rspec/core/let.rb
 - lib/rspec/core/load_path.rb
 - lib/rspec/core/metadata.rb
 - lib/rspec/core/mocking/with_absolutely_nothing.rb
@@ -234,7 +233,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.0.beta.1
+    Thank you for installing rspec-core-2.0.0.beta.2
   
     This is beta software. If you are looking
     for a supported production release, please
@@ -268,7 +267,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.beta.1
+summary: rspec-core-2.0.0.beta.2
 test_files: 
 - spec/rspec/core/command_line_options_spec.rb
 - spec/rspec/core/configuration_spec.rb

data/bin/autospec

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-ENV['RSPEC'] = 'true'     # allows autotest to discover rspec
-ENV['AUTOTEST'] = 'true'  # allows autotest to run w/ color on linux
-system (RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV

data/example_specs/passing/simple_matcher_example.rb

@@ -1,31 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "arrays" do
-  def contain_same_elements_as(expected)
-    simple_matcher "array with same elements in any order as #{expected.inspect}" do |actual|
-      if actual.size == expected.size
-        a, e = actual.dup, expected.dup
-        until e.empty? do
-          if i = a.index(e.pop) then a.delete_at(i) end
-        end
-        a.empty?
-      else
-        false
-      end
-    end
-  end
-  
-  describe "can be matched by their contents disregarding order" do
-    subject { [1,2,2,3] }
-    it { should contain_same_elements_as([1,2,2,3]) }
-    it { should contain_same_elements_as([2,3,2,1]) }
-    it { should_not contain_same_elements_as([3,3,2,1]) }
-  end
-  
-  describe "fail the match with different contents" do
-    subject { [1,2,3] }
-    it { should_not contain_same_elements_as([2,3,4])}
-    it { should_not contain_same_elements_as([1,2,2,3])}
-    it { should_not contain_same_elements_as([1,2])}
-  end
-end