rspec-core 2.0.0.beta.8 → 2.0.0.beta.9

data/lib/rspec/core/ruby_project.rb

@@ -4,7 +4,7 @@
 
 require 'pathname'
 
-module Rspec
+module RSpec
   module Core
     module RubyProject
       def add_to_load_path(*dirs)

data/lib/rspec/core/runner.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Core
     class Runner
 
@@ -13,18 +13,23 @@ module Rspec
       end
 
       def configuration
-        Rspec.configuration
+        RSpec.configuration
       end
 
       def reporter
         configuration.formatter
       end
 
+      def inclusion_filter
+        RSpec.configuration.filter
+      end
+
       def run(args = [])
         configure(args)
-        
+        RSpec.world.announce_inclusion_filter
+
         reporter.report(example_count) do |reporter|
-          example_groups.run_all(reporter)
+          example_groups.run_examples(reporter)
         end
         
         example_groups.success?
@@ -33,21 +38,21 @@ module Rspec
     private
 
       def configure(args)
-        Rspec::Core::ConfigurationOptions.new(args).apply_to(configuration)
+        RSpec::Core::ConfigurationOptions.new(args).apply_to(configuration)
         configuration.require_files_to_run
         configuration.configure_mock_framework
       end
 
       def example_count
-        Rspec::Core.world.total_examples_to_run
+        RSpec.world.example_count
       end
 
       def example_groups
-        Rspec::Core.world.example_groups_to_run.extend(ExampleGroups)
+        RSpec.world.example_groups.extend(ExampleGroups)
       end
 
       module ExampleGroups
-        def run_all(reporter)
+        def run_examples(reporter)
           @success = self.inject(true) {|success, group| success &= group.run(reporter)}
         end
 

data/lib/rspec/core/shared_example_group.rb

@@ -1,19 +1,25 @@
-module Rspec
+module RSpec
   module Core
     module SharedExampleGroup
       
       def share_examples_for(name, &block)
         ensure_shared_example_group_name_not_taken(name)
-        Rspec::Core.world.shared_example_groups[name] = block
+        RSpec.world.shared_example_groups[name] = block
       end
 
       def share_as(name, &block)
         if Object.const_defined?(name)
-          raise NameError, "The first argument (#{name}) to share_as must be a legal name for a constant not already in use."
+          mod = Object.const_get(name)
+          raise_name_error unless mod.created_from_caller(caller)
         end
         
         mod = Module.new do
           @shared_block = block
+          @caller_line = caller.last
+
+          def self.created_from_caller(other_caller)
+            @caller_line == other_caller.last
+          end
 
           def self.included(kls)
             kls.module_eval(&@shared_block)
@@ -21,15 +27,19 @@ module Rspec
         end
 
         shared_const = Object.const_set(name, mod)
-        Rspec::Core.world.shared_example_groups[shared_const] = block
+        RSpec.world.shared_example_groups[shared_const] = block
       end
 
       alias :shared_examples_for :share_examples_for
 
     private
 
+      def raise_name_error
+        raise NameError, "The first argument (#{name}) to share_as must be a legal name for a constant not already in use."
+      end
+
       def ensure_shared_example_group_name_not_taken(name)
-        if Rspec::Core.world.shared_example_groups.has_key?(name)
+        if RSpec.world.shared_example_groups.has_key?(name)
           raise ArgumentError.new("Shared example group '#{name}' already exists")
         end
       end
@@ -38,4 +48,4 @@ module Rspec
   end
 end
 
-include Rspec::Core::SharedExampleGroup
+include RSpec::Core::SharedExampleGroup

data/lib/rspec/core/subject.rb

@@ -1,17 +1,17 @@
-module Rspec
+module RSpec
   module Core
     module Subject
-      
+
       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
       end
-      
+
       def subject
-        @subject ||= instance_eval(&self.class.subject)
+        attribute_of_subject || original_subject
       end
-      
+
       # When +should+ is called with no explicit receiver, the call is
       # delegated to the object returned by +subject+. Combined with
       # an implicit subject (see +subject+), this supports very concise
@@ -37,7 +37,7 @@ module Rspec
       def should_not(matcher=nil, message=nil)
         self == subject ? self.__should_not_for_example_group__(matcher) : subject.should_not(matcher,message)
       end
-      
+
       module ClassMethods
         # Defines an explicit subject for an example group which can then be the
         # implicit receiver (through delegation) of calls to +should+.
@@ -54,7 +54,7 @@ module Rspec
         def subject(&block)
           block ? @explicit_subject_block = block : explicit_subject || implicit_subject
         end
-      
+
         attr_reader :explicit_subject_block # :nodoc:
 
       private
@@ -72,6 +72,22 @@ module Rspec
           Class === described ? proc { described.new } : proc { described }
         end
       end
+
+    private
+
+      def original_subject
+        @original_subject ||= instance_eval(&self.class.subject)
+      end
+
+      def attribute_of_subject
+        original_subject.send(running_example.description) if using_attribute? 
+      end
+
+      def using_attribute?
+        running_example.in_block? &&
+        running_example.metadata[:attribute_of_subject]
+      end
+
     end
   end
 end

data/lib/rspec/core/version.rb

@@ -1,4 +1,4 @@
-module Rspec # :nodoc:
+module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
       STRING = File.readlines(File.expand_path('../../../../VERSION', __FILE__)).first

data/lib/rspec/core/world.rb

@@ -1,58 +1,43 @@
-module Rspec
+module RSpec
   module Core
     class World
 
-      attr_reader :example_groups
+      attr_reader :example_groups, :filtered_examples
 
       def initialize
         @example_groups = []
+        @filtered_examples = Hash.new { |hash,group|
+          hash[group] = begin
+            examples = group.examples.dup
+            examples = apply_exclusion_filters(examples, exclusion_filter) if exclusion_filter
+            examples = apply_inclusion_filters(examples, inclusion_filter) if inclusion_filter
+            examples.uniq
+          end
+        }
       end
 
-      def inclusion_filter
-        Rspec.configuration.filter
+      def configuration
+        RSpec.configuration
       end
 
-      def exclusion_filter
-        Rspec.configuration.exclusion_filter
-      end
-
-      def shared_example_groups
-        @shared_example_groups ||= {}
+      def inclusion_filter
+        configuration.filter
       end
 
-      def example_groups_to_run
-        @example_groups_to_run ||= begin
-          if inclusion_filter || exclusion_filter
-            if Rspec.configuration.run_all_when_everything_filtered? && filtered_example_groups.empty?
-              Rspec.configuration.puts "No examples were matched by #{inclusion_filter.inspect}, running all"
-              all_example_groups
-            else
-              Rspec.configuration.puts "Run filtered using #{inclusion_filter.inspect}"          
-              filtered_example_groups
-            end
-          else
-            all_example_groups
-          end      
-        end
+      def exclusion_filter
+        configuration.exclusion_filter
       end
 
-      def all_example_groups
-        @example_groups.each { |g| g.examples_to_run.replace(g.examples) }
+      def find_modules(group)
+        configuration.find_modules(group)
       end
 
-      def total_examples_to_run
-        @total_examples_to_run ||= example_groups_to_run.inject(0) { |sum, g| sum += g.examples_to_run.size }
+      def shared_example_groups
+        @shared_example_groups ||= {}
       end
 
-      def filtered_example_groups
-        @filtered_example_groups ||= example_groups.select do |example_group|
-          examples = example_group.examples
-          examples = apply_exclusion_filters(examples, exclusion_filter) if exclusion_filter
-          examples = apply_inclusion_filters(examples, inclusion_filter) if inclusion_filter
-          examples.uniq!
-          example_group.examples_to_run.replace(examples)
-          !examples.empty?
-        end
+      def example_count
+        example_groups.collect {|g| g.descendents}.flatten.inject(0) { |sum, g| sum += g.filtered_examples.size }
       end
 
       def apply_inclusion_filters(examples, conditions={})
@@ -65,12 +50,34 @@ module Rspec
         examples.reject &all_apply?(conditions)
       end
 
-      def preceding_example_or_group_line(filter_line) 
+      def preceding_declaration_line(filter_line) 
         declaration_line_numbers.inject(nil) do |highest_prior_declaration_line, line|
           line <= filter_line ? line : highest_prior_declaration_line
         end
       end
+
+      def announce_inclusion_filter
+        if inclusion_filter
+          if RSpec.configuration.run_all_when_everything_filtered? && RSpec.world.example_count == 0
+            RSpec.configuration.puts "No examples were matched by #{inclusion_filter.inspect}, running all"
+            RSpec.configuration.clear_inclusion_filter
+            filtered_examples.clear
+          else
+            RSpec.configuration.puts "Run filtered using #{inclusion_filter.inspect}"          
+          end
+        end      
+      end
       
+      def run_hook(hook, scope, group, example)
+        find_hook(hook, scope, group).each { |blk| example.instance_eval(&blk) }
+      end
+
+      def find_hook(hook, scope, group)
+        RSpec.configuration.hooks[hook][scope].select do |filters, block|
+          group.all_apply?(filters)
+        end.map { |filters, block| block }
+      end
+
     private
 
       def all_apply?(conditions)

data/rspec-core.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.8"
+  s.version = "2.0.0.beta.9"
 
   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-04-27}
-  s.description = %q{Rspec runner and example group classes}
+  s.date = %q{2010-05-27}
+  s.description = %q{RSpec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec", "spec"]
   s.extra_rdoc_files = [
@@ -75,15 +75,18 @@ Gem::Specification.new do |s|
      "example_specs/passing/stack_spec.rb",
      "example_specs/passing/stack_spec_with_nested_example_groups.rb",
      "example_specs/passing/stubbing_example.rb",
+     "example_specs/passing/subject_example.rb",
      "example_specs/passing/yielding_example.rb",
      "example_specs/ruby1.9.compatibility/access_to_constants_spec.rb",
      "example_specs/spec_helper.rb",
      "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/custom_options.feature",
      "features/configuration/options_file.feature",
      "features/example_groups/describe_aliases.feature",
      "features/example_groups/nested_groups.feature",
+     "features/filtering/inclusion_filters.feature",
      "features/formatters/custom_formatter.feature",
      "features/hooks/around_hook.feature",
      "features/hooks/before_and_after_hooks.feature",
@@ -124,6 +127,7 @@ Gem::Specification.new do |s|
      "lib/rspec/core/mocking/with_mocha.rb",
      "lib/rspec/core/mocking/with_rr.rb",
      "lib/rspec/core/mocking/with_rspec.rb",
+     "lib/rspec/core/object_extensions.rb",
      "lib/rspec/core/pending.rb",
      "lib/rspec/core/rake_task.rb",
      "lib/rspec/core/ruby_project.rb",
@@ -138,6 +142,7 @@ Gem::Specification.new do |s|
      "spec/autotest/rspec_spec.rb",
      "spec/rspec/core/configuration_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
+     "spec/rspec/core/deprecations_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
      "spec/rspec/core/example_spec.rb",
      "spec/rspec/core/formatters/base_formatter_spec.rb",
@@ -168,7 +173,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.8
+  Thank you for installing rspec-core-2.0.0.beta.9
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -180,12 +185,13 @@ 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.8}
+  s.summary = %q{rspec-core-2.0.0.beta.9}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
      "spec/rspec/core/configuration_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
+     "spec/rspec/core/deprecations_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
      "spec/rspec/core/example_spec.rb",
      "spec/rspec/core/formatters/base_formatter_spec.rb",
@@ -218,19 +224,19 @@ 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.8"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.8"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.9"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.9"])
       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.8"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.8"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.9"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.9"])
       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.8"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.8"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.9"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.9"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/autotest/failed_results_re_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "failed_results_re" do
+describe "failed_results_re for autotest" 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"

data/spec/rspec/core/configuration_options_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 require 'ostruct'
 
-describe Rspec::Core::ConfigurationOptions do
+describe RSpec::Core::ConfigurationOptions do
   
   def options_from_args(*args)
-    Rspec::Core::ConfigurationOptions.new(args).parse_command_line_options
+    RSpec::Core::ConfigurationOptions.new(args).parse_command_line_options
   end
 
   describe 'color_enabled' do
@@ -77,6 +77,16 @@ describe Rspec::Core::ConfigurationOptions do
       options_from_args("dir", "spec/file1_spec.rb", "spec/file2_spec.rb").should include(:files_or_directories_to_run => ["dir", "spec/file1_spec.rb", "spec/file2_spec.rb"])
     end
 
+    it "provides no files or directories if spec directory does not exist" do
+      FileTest.stub(:directory?).with("spec").and_return false
+      options_from_args().should include(:files_or_directories_to_run => [])
+    end
+
+    it "parses dir and files from 'spec/file1_spec.rb, spec/file2_spec.rb'" do
+      options_from_args("dir", "spec/file1_spec.rb", "spec/file2_spec.rb").should include(:files_or_directories_to_run => ["dir", "spec/file1_spec.rb", "spec/file2_spec.rb"])
+      
+    end
+
   end
 
   describe "--backtrace (-b)" do
@@ -100,7 +110,7 @@ describe Rspec::Core::ConfigurationOptions do
       File.stub(:exist?) { true }
       File.stub(:readlines) { ["--formatter", "doc"] }
 
-      cli_options = Rspec::Core::ConfigurationOptions.new([])
+      cli_options = RSpec::Core::ConfigurationOptions.new([])
       cli_options.apply_to(config)
       config.formatter.should == 'doc'
     end
@@ -109,7 +119,7 @@ describe Rspec::Core::ConfigurationOptions do
       File.stub(:exist?) { true }
       File.stub(:readlines) { ["--formatter doc"] }
 
-      cli_options = Rspec::Core::ConfigurationOptions.new([])
+      cli_options = RSpec::Core::ConfigurationOptions.new([])
       cli_options.apply_to(config)
       config.formatter.should == 'doc'
     end
@@ -126,7 +136,7 @@ describe Rspec::Core::ConfigurationOptions do
           raise "Unexpected path: #{path}"
         end
       end
-      cli_options = Rspec::Core::ConfigurationOptions.new(["--no-color"])
+      cli_options = RSpec::Core::ConfigurationOptions.new(["--no-color"])
 
       cli_options.apply_to(config)
 
@@ -147,7 +157,7 @@ describe Rspec::Core::ConfigurationOptions do
           raise "Unexpected path: #{path}"
         end
       end
-      cli_options = Rspec::Core::ConfigurationOptions.new([])
+      cli_options = RSpec::Core::ConfigurationOptions.new([])
 
       cli_options.apply_to(config)
 
@@ -155,7 +165,7 @@ describe Rspec::Core::ConfigurationOptions do
     end
 
     it "prefers CLI options over file options" do
-      config_options = Rspec::Core::ConfigurationOptions.new(['--formatter', 'progress'])
+      config_options = RSpec::Core::ConfigurationOptions.new(['--formatter', 'progress'])
       config_options.stub(:parse_options_file).and_return(:formatter => 'documentation')
 
       config_options.apply_to(config)