rspec-core 2.0.0.beta.22 → 2.6.4

data/lib/rspec/core/drb_command_line.rb

@@ -11,18 +11,12 @@ module RSpec
 
       def run(err, out)
         begin
-          begin
-            DRb.start_service("druby://localhost:0")
-          rescue SocketError, Errno::EADDRNOTAVAIL
-            DRb.start_service("druby://:0")
-          end
-          spec_server = DRbObject.new_with_uri("druby://127.0.0.1:#{drb_port}")
-          spec_server.run(@options.drb_argv, err, out)
-          true
-        rescue DRb::DRbConnError
-          err.puts "No DRb server is running. Running in local process instead ..."
-          false
+          DRb.start_service("druby://localhost:0")
+        rescue SocketError, Errno::EADDRNOTAVAIL
+          DRb.start_service("druby://:0")
         end
+        spec_server = DRbObject.new_with_uri("druby://127.0.0.1:#{drb_port}")
+        spec_server.run(@options.drb_argv, err, out)
       end
     end
   end

data/lib/rspec/core/dsl.rb

@@ -0,0 +1,11 @@
+module RSpec
+  module Core
+    module DSL
+      def describe(*args, &example_group_block)
+        RSpec::Core::ExampleGroup.describe(*args, &example_group_block).register
+      end
+    end
+  end
+end
+
+include RSpec::Core::DSL

data/lib/rspec/core/example.rb

@@ -2,7 +2,7 @@ module RSpec
   module Core
     class Example
 
-      attr_reader :metadata, :options
+      attr_reader :metadata, :options, :example_group_instance
 
       def self.delegate_to_metadata(*keys)
         keys.each do |key|
@@ -10,34 +10,31 @@ module RSpec
         end
       end
 
-      delegate_to_metadata :description, :full_description, :execution_result, :file_path, :pending
+      delegate_to_metadata :description, :full_description, :execution_result, :file_path, :pending, :location
 
       def initialize(example_group_class, desc, options, example_block=nil)
         @example_group_class, @options, @example_block = example_group_class, options, example_block
         @metadata  = @example_group_class.metadata.for_example(desc, options)
         @exception = nil
-        @pending_declared_in_example = @in_block = false
+        @pending_declared_in_example = false
       end
 
       def example_group
         @example_group_class
       end
 
-      def behaviour
-        RSpec.deprecate("behaviour", "example_group")
-        example_group
+      def around_hooks
+        @around_hooks ||= example_group.around_hooks_for(self)
       end
 
-      def in_block?
-        @in_block
+      def apply?(predicate, filters)
+        @metadata.apply?(predicate, filters) ||
+        @example_group_class.apply?(predicate, filters)
       end
 
-      def pending?
-        !!pending
-      end
+      alias_method :pending?, :pending
 
       def run(example_group_instance, reporter)
-        return if RSpec.wants_to_quit
         @example_group_instance = example_group_instance
         @example_group_instance.example = self
 
@@ -45,26 +42,32 @@ module RSpec
 
         begin
           unless pending
-            with_pending_capture do
-              with_around_hooks do
-                begin
-                  run_before_each
-                  @in_block = true
-                  @example_group_instance.instance_eval(&@example_block)
-                rescue Exception => e
-                  set_exception(e)
-                ensure
-                  @in_block = false
-                  run_after_each
-                end
+            with_around_hooks do
+              begin
+                run_before_each
+                @example_group_instance.instance_eval(&@example_block)
+              rescue Pending::PendingDeclaredInExample => e
+                @pending_declared_in_example = e.message
+              rescue Exception => e
+                set_exception(e)
+              ensure
+                run_after_each
               end
             end
           end
         rescue Exception => e
           set_exception(e)
         ensure
-          @example_group_instance.example = nil
-          assign_auto_description
+          @example_group_instance.instance_variables.each do |ivar|
+            @example_group_instance.instance_variable_set(ivar, nil)
+          end
+          @example_group_instance = nil
+
+          begin
+            assign_auto_description
+          rescue Exception => e
+            set_exception(e)
+          end
         end
 
         finish(reporter)
@@ -80,17 +83,31 @@ module RSpec
         finish(reporter)
       end
 
-    private
+      def self.procsy(metadata, &block)
+        Proc.new(&block).extend(Procsy).with(metadata)
+      end
+
+      module Procsy
+        attr_reader :metadata
 
-      def with_pending_capture(&block)
-        @pending_declared_in_example = catch(:pending_declared_in_example) do
-          block.call
-          throw :pending_declared_in_example, false
+        def self.extended(object)
+          def object.run; call; end
+        end
+
+        def with(metadata)
+          @metadata = metadata
+          self
         end
       end
 
-      def with_around_hooks(&wrapped_example)
-        @example_group_class.eval_around_eachs(@example_group_instance, wrapped_example).call
+    private
+
+      def with_around_hooks(&block)
+        if around_hooks.empty?
+          yield
+        else
+          @example_group_class.eval_around_eachs(self, Example.procsy(metadata, &block)).call
+        end
       end
 
       def start(reporter)
@@ -100,7 +117,7 @@ module RSpec
 
       def finish(reporter)
         if @exception
-          record_finished 'failed', :exception_encountered => @exception
+          record_finished 'failed', :exception => @exception
           reporter.example_failed self
           false
         elsif @pending_declared_in_example
@@ -125,20 +142,27 @@ module RSpec
 
       def run_before_each
         @example_group_instance.setup_mocks_for_rspec if @example_group_instance.respond_to?(:setup_mocks_for_rspec)
-        @example_group_class.eval_before_eachs(@example_group_instance)
+        @example_group_class.eval_before_eachs(self)
       end
 
       def run_after_each
-        @example_group_class.eval_after_eachs(@example_group_instance)
+        @example_group_class.eval_after_eachs(self)
         @example_group_instance.verify_mocks_for_rspec if @example_group_instance.respond_to?(:verify_mocks_for_rspec)
       ensure
         @example_group_instance.teardown_mocks_for_rspec if @example_group_instance.respond_to?(:teardown_mocks_for_rspec)
       end
 
       def assign_auto_description
-        if description.empty?
-          metadata[:description] = RSpec::Matchers.generated_description
-          RSpec::Matchers.clear_generated_description
+        if description.empty? and !pending?
+          if RSpec.configuration.expecting_with_rspec?
+            metadata[:description] = RSpec::Matchers.generated_description
+            RSpec::Matchers.clear_generated_description
+          else
+            raise NotImplementedError.new(
+              "Generated descriptions are only supported when you use rspec-expectations.  " +
+              "You must give every example an explicit description."
+            )
+          end
         end
       end
 

data/lib/rspec/core/example_group.rb

@@ -1,17 +1,20 @@
 module RSpec
   module Core
     class ExampleGroup
+      extend  MetadataHashBuilder::WithDeprecationWarning
       extend  Extensions::ModuleEvalWithArgs
-      include Extensions::InstanceEvalWithArgs
+      extend  Subject::ClassMethods
       extend  Hooks
-      include Subject
-      include Let
+
+      include Extensions::InstanceEvalWithArgs
+      include Subject::InstanceMethods
       include Pending
+      include Let
 
       attr_accessor :example
 
       def running_example
-        RSpec.deprecate('running_example', 'example')
+        RSpec.deprecate("running_example", "example")
         example
       end
 
@@ -19,8 +22,8 @@ module RSpec
         RSpec.world
       end
 
-      def self.inherited(klass)
-        world.example_groups << klass if klass.superclass == ExampleGroup
+      def self.register
+        world.register(self)
       end
 
       class << self
@@ -39,9 +42,9 @@ module RSpec
 
       def self.define_example_method(name, extra_options={})
         module_eval(<<-END_RUBY, __FILE__, __LINE__)
-          def self.#{name}(desc=nil, options={}, &block)
+          def self.#{name}(desc=nil, *args, &block)
+            options = build_metadata_hash_from(args)
             options.update(:pending => true) unless block
-            options.update(:caller => caller)
             options.update(#{extra_options.inspect})
             examples << RSpec::Core::Example.new(self, desc, options, block)
             examples.last
@@ -57,18 +60,20 @@ module RSpec
 
       alias_example_to :it
       alias_example_to :specify
-      alias_example_to :focused, :focused => true
+      alias_example_to :focused, :focused => true, :focus => true
+      alias_example_to :focus,   :focused => true, :focus => true
       alias_example_to :pending, :pending => true
+      alias_example_to :xit,     :pending => true
 
-      def self.define_shared_group_method(new_name, report_label=nil)
+      def self.define_nested_shared_group_method(new_name, report_label=nil)
         module_eval(<<-END_RUBY, __FILE__, __LINE__)
           def self.#{new_name}(name, *args, &customization_block)
             shared_block = world.shared_example_groups[name]
             raise "Could not find shared example group named \#{name.inspect}" unless shared_block
 
             group = describe("#{report_label || "it should behave like"} \#{name}") do
-              module_eval_with_args *args, &shared_block
-              module_eval &customization_block if customization_block
+              module_eval_with_args(*args, &shared_block)
+              module_eval(&customization_block) if customization_block
             end
             group.metadata[:shared_group_name] = name
             group
@@ -76,14 +81,22 @@ module RSpec
         END_RUBY
       end
 
-      define_shared_group_method :it_should_behave_like
+      define_nested_shared_group_method :it_should_behave_like
 
       class << self
-        alias_method :alias_it_should_behave_like_to, :define_shared_group_method
+        alias_method :alias_it_should_behave_like_to, :define_nested_shared_group_method
       end
 
       alias_it_should_behave_like_to :it_behaves_like, "behaves like"
 
+      def self.include_context(name)
+        module_eval(&world.shared_example_groups[name])
+      end
+
+      class << self
+        alias_method :include_examples, :include_context
+      end
+
       def self.examples
         @examples ||= []
       end
@@ -93,7 +106,7 @@ module RSpec
       end
 
       def self.descendant_filtered_examples
-        filtered_examples + children.collect{|c| c.descendant_filtered_examples}
+        @descendant_filtered_examples ||= filtered_examples + children.inject([]){|l,c| l + c.descendant_filtered_examples}
       end
 
       def self.metadata
@@ -101,7 +114,7 @@ module RSpec
       end
 
       def self.superclass_metadata
-        self.superclass.respond_to?(:metadata) ? self.superclass.metadata : nil
+        @superclass_metadata ||= self.superclass.respond_to?(:metadata) ? self.superclass.metadata : nil
       end
 
       def self.describe(*args, &example_group_block)
@@ -109,7 +122,6 @@ module RSpec
         @_subclass_count += 1
         args << {} unless args.last.is_a?(Hash)
         args.last.update(:example_group_block => example_group_block)
-        args.last.update(:caller => caller)
 
         # TODO 2010-05-05: Because we don't know if const_set is thread-safe
         child = const_set(
@@ -136,7 +148,7 @@ module RSpec
       end
 
       def self.descendants
-        [self] + children.collect {|c| c.descendants}.flatten
+        @_descendants ||= [self] + children.inject([]) {|list, c| list + c.descendants}
       end
 
       def self.ancestors
@@ -144,10 +156,30 @@ module RSpec
       end
 
       def self.top_level?
-        ancestors.size == 1
+        @top_level ||= superclass == ExampleGroup
+      end
+
+      def self.ensure_example_groups_are_configured
+        unless defined?(@@example_groups_configured)
+          RSpec.configuration.configure_mock_framework
+          RSpec.configuration.configure_expectation_framework
+          @@example_groups_configured = true
+        end
       end
 
       def self.set_it_up(*args)
+        # Ruby 1.9 has a bug that can lead to infinite recursion and a
+        # SystemStackError if you include a module in a superclass after
+        # including it in a subclass: https://gist.github.com/845896
+        # To prevent this, we must include any modules in RSpec::Core::ExampleGroup
+        # before users create example groups and have a chance to include
+        # the same module in a subclass of RSpec::Core::ExampleGroup.
+        # So we need to configure example groups here.
+        ensure_example_groups_are_configured
+
+        symbol_description = args.shift if args.first.is_a?(Symbol)
+        args << build_metadata_hash_from(args)
+        args.unshift(symbol_description) if symbol_description
         @metadata = RSpec::Core::Metadata.new(superclass_metadata).process(*args)
         world.configure_group(self)
       end
@@ -157,49 +189,65 @@ module RSpec
       end
 
       def self.store_before_all_ivars(example_group_instance)
+        return if example_group_instance.instance_variables.empty?
         example_group_instance.instance_variables.each { |ivar| 
           before_all_ivars[ivar] = example_group_instance.instance_variable_get(ivar)
         }
       end
 
       def self.assign_before_all_ivars(ivars, example_group_instance)
+        return if ivars.empty?
         ivars.each { |ivar, val| example_group_instance.instance_variable_set(ivar, val) }
       end
 
       def self.eval_before_alls(example_group_instance)
         return if descendant_filtered_examples.empty?
         assign_before_all_ivars(superclass.before_all_ivars, example_group_instance)
-        world.run_hook_filtered(:before, :all, self, example_group_instance) if top_level?
+        world.run_hook_filtered(:before, :all, self, example_group_instance)
         run_hook!(:before, :all, example_group_instance)
         store_before_all_ivars(example_group_instance)
       end
 
-      def self.eval_around_eachs(example_group_instance, wrapped_example)
-        around_hooks.reverse.inject(wrapped_example) do |wrapper, hook|
-          def wrapper.run; call; end
-          lambda { example_group_instance.instance_eval_with_args(wrapper, &hook) }
+      def self.eval_around_eachs(example, initial_procsy)
+        example.around_hooks.reverse.inject(initial_procsy) do |procsy, around_hook|
+          Example.procsy(procsy.metadata) do
+            example.example_group_instance.instance_eval_with_args(procsy, &around_hook)
+          end
         end
       end
 
-      def self.eval_before_eachs(example_group_instance)
-        world.run_hook_filtered(:before, :each, self, example_group_instance)
-        ancestors.reverse.each { |ancestor| ancestor.run_hook(:before, :each, example_group_instance) }
+      def self.eval_before_eachs(example)
+        world.run_hook_filtered(:before, :each, self, example.example_group_instance, example)
+        ancestors.reverse.each { |ancestor| ancestor.run_hook(:before, :each, example.example_group_instance) }
       end
 
-      def self.eval_after_eachs(example_group_instance)
-        ancestors.each { |ancestor| ancestor.run_hook(:after, :each, example_group_instance) }
-        world.run_hook_filtered(:after, :each, self, example_group_instance)
+      def self.eval_after_eachs(example)
+        ancestors.each { |ancestor| ancestor.run_hook(:after, :each, example.example_group_instance) }
+        world.run_hook_filtered(:after, :each, self, example.example_group_instance, example)
       end
 
       def self.eval_after_alls(example_group_instance)
         return if descendant_filtered_examples.empty?
         assign_before_all_ivars(before_all_ivars, example_group_instance)
-        run_hook!(:after, :all, example_group_instance)
-        world.run_hook_filtered(:after, :all, self, example_group_instance) if top_level?
+
+        begin
+          run_hook!(:after, :all, example_group_instance)
+        rescue => e
+          # TODO: come up with a better solution for this.
+          RSpec.configuration.reporter.message <<-EOS
+
+An error occurred in an after(:all) hook.
+  #{e.class}: #{e.message}
+  occurred at #{e.backtrace.first}
+
+        EOS
+        end
+
+        world.run_hook_filtered(:after, :all, self, example_group_instance)
       end
 
-      def self.around_hooks
-        (world.find_hook(:around, :each, self) + ancestors.reverse.map{|a| a.find_hook(:around, :each, self)}).flatten
+      def self.around_hooks_for(example)
+        world.find_hook(:around, :each, self, example) + ancestors.reverse.inject([]){|l,a| l + a.find_hook(:around, :each, self, example)}
       end
 
       def self.run(reporter)
@@ -207,47 +255,56 @@ module RSpec
           RSpec.clear_remaining_example_groups if top_level?
           return
         end
-        @reporter = reporter
-        example_group_instance = new
         reporter.example_group_started(self)
 
         begin
-          eval_before_alls(example_group_instance)
-          result_for_this_group = run_examples(example_group_instance, reporter)
+          eval_before_alls(new)
+          result_for_this_group = run_examples(reporter)
           results_for_descendants = children.map {|child| child.run(reporter)}.all?
           result_for_this_group && results_for_descendants
         rescue Exception => ex
           fail_filtered_examples(ex, reporter)
         ensure
-          eval_after_alls(example_group_instance)
+          eval_after_alls(new)
+          before_all_ivars.clear
           reporter.example_group_finished(self)
         end
       end
 
       def self.fail_filtered_examples(exception, reporter)
         filtered_examples.each { |example| example.fail_fast(reporter, exception) }
+
+        children.each do |child|
+          reporter.example_group_started(child)
+          child.fail_filtered_examples(exception, reporter)
+          reporter.example_group_finished(child)
+        end
+        false
       end
 
-      def self.run_examples(instance, reporter)
+      def self.fail_fast?
+        RSpec.configuration.fail_fast?
+      end
+
+      def self.run_examples(reporter)
         filtered_examples.map do |example|
-          begin
-            set_ivars(instance, before_all_ivars)
-            example.run(instance, reporter)
-          ensure
-            clear_ivars(instance)
-            clear_memoized(instance)
-          end
+          next if RSpec.wants_to_quit
+          instance = new
+          set_ivars(instance, before_all_ivars)
+          succeeded = example.run(instance, reporter)
+          RSpec.wants_to_quit = true if fail_fast? && !succeeded
+          succeeded
         end.all?
       end
 
-      def self.all_apply?(filters)
-        metadata.all_apply?(filters)
+      def self.apply?(predicate, filters)
+        metadata.apply?(predicate, filters)
       end
 
       def self.declaration_line_numbers
-        [metadata[:example_group][:line_number]] +
+        @declaration_line_numbers ||= [metadata[:example_group][:line_number]] +
           examples.collect {|e| e.metadata[:line_number]} +
-          children.collect {|c| c.declaration_line_numbers}.flatten
+          children.inject([]) {|l,c| l + c.declaration_line_numbers}
       end
 
       def self.top_level_description
@@ -258,14 +315,6 @@ module RSpec
         ivars.each {|name, value| instance.instance_variable_set(name, value)}
       end
 
-      def self.clear_ivars(instance)
-        instance.instance_variables.each { |ivar| instance.send(:remove_instance_variable, ivar) }
-      end
-
-      def self.clear_memoized(instance)
-        instance.__memoized.clear
-      end
-
       def described_class
         self.class.described_class
       end
@@ -274,6 +323,7 @@ module RSpec
         begin
           instance_eval(&hook)
         rescue Exception => e
+          raise unless example
           example.set_exception(e)
         end
       end

data/lib/rspec/core/expecting/with_rspec.rb

@@ -0,0 +1,9 @@
+require 'rspec/expectations'
+
+module RSpec
+  module Core
+    module ExpectationFrameworkAdapter
+      include RSpec::Matchers
+    end
+  end
+end

data/lib/rspec/core/expecting/with_stdlib.rb

@@ -0,0 +1,9 @@
+require 'test/unit/assertions'
+
+module RSpec
+  module Core
+    module ExpectationFrameworkAdapter
+      include Test::Unit::Assertions
+    end
+  end
+end

data/lib/rspec/core/extensions/kernel.rb

@@ -1,5 +1,5 @@
 module Kernel
   def debugger(*args)
-    RSpec.configuration.error_stream.puts "debugger statement ignored, use -d or --debug option to enable debugging\n#{caller(0)[1]}"
+    (RSpec.configuration.error_stream || $stderr).puts "\n***** debugger statement ignored, use -d or --debug option to enable debugging\n#{caller(0)[1]}"
   end unless respond_to?(:debugger)
 end

data/lib/rspec/core/extensions.rb

@@ -1,4 +1,3 @@
-require 'rspec/core/extensions/object'
 require 'rspec/core/extensions/kernel'
 require 'rspec/core/extensions/instance_eval_with_args'
 require 'rspec/core/extensions/module_eval_with_args'

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

@@ -1,3 +1,6 @@
+require 'rspec/core/formatters/helpers'
+require 'stringio'
+
 module RSpec
   module Core
     module Formatters
@@ -9,8 +12,15 @@ module RSpec
         attr_reader :example_count, :pending_count, :failure_count
         attr_reader :failed_examples, :pending_examples
 
+        def self.relative_path(line)
+          line = line.sub(File.expand_path("."), ".")
+          line = line.sub(/\A([^:]+:\d+)$/, '\\1')
+          return nil if line == '-e:1'
+          line
+        end
+
         def initialize(output)
-          @output = output
+          @output = output || StringIO.new
           @example_count = @pending_count = @failure_count = 0
           @examples = []
           @failed_examples = []
@@ -43,11 +53,6 @@ module RSpec
         def example_group_finished(example_group)
         end
 
-        def add_example_group(example_group)
-          RSpec.deprecate("add_example_group", "example_group_started")
-          example_group_started(example_group)
-        end
-
         def example_started(example)
           examples << example
         end
@@ -98,6 +103,11 @@ module RSpec
         def format_backtrace(backtrace, example)
           return "" unless backtrace
           return backtrace if example.metadata[:full_backtrace] == true
+
+          if at_exit_index = backtrace.index(RSpec::Core::Runner::AT_EXIT_HOOK_BACKTRACE_LINE)
+            backtrace = backtrace[0, at_exit_index]
+          end
+
           cleansed = backtrace.map { |line| backtrace_line(line) }.compact
           cleansed.empty? ? backtrace : cleansed
         end
@@ -110,26 +120,31 @@ module RSpec
 
         def backtrace_line(line)
           return nil if configuration.cleaned_from_backtrace?(line)
-          line = line.sub(File.expand_path("."), ".")
-          line = line.sub(/\A([^:]+:\d+)$/, '\\1')
-          return nil if line == '-e:1'
-          line
+          self.class.relative_path(line)
         end
 
         def read_failed_line(exception, example)
-          original_file = example.file_path.to_s.downcase
-          matching_line = exception.backtrace.detect { |line| line.match(/(.+?):(\d+)(|:\d+)/)[1].downcase == original_file.downcase }
-
-          return "Unable to find matching line from backtrace" if matching_line.nil?
+          unless matching_line = find_failed_line(exception.backtrace, example.file_path)
+            return "Unable to find matching line from backtrace"
+          end
 
           file_path, line_number = matching_line.match(/(.+?):(\d+)(|:\d+)/)[1..2]
+
           if File.exist?(file_path)
-            open(file_path, 'r') { |f| f.readlines[line_number.to_i - 1] }
+            File.readlines(file_path)[line_number.to_i - 1]
           else
             "Unable to find #{file_path} to read failed line"
           end
         end
 
+        def find_failed_line(backtrace, path)
+          backtrace.detect { |line|
+            match = line.match(/(.+?):(\d+)(|:\d+)/)
+            match && match[1].downcase == path.downcase
+          }
+
+        end
+
         def start_sync_output
           @old_sync, output.sync = output.sync, true if output_supports_sync
         end