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

data/lib/rspec/core/formatters.rb

@@ -4,7 +4,7 @@ require 'rspec/core/formatters/base_text_formatter'
 require 'rspec/core/formatters/documentation_formatter'
 require 'rspec/core/formatters/progress_formatter'
 
-module Rspec
+module RSpec
 
   module Core
 

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

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Core
     module Formatters
 
@@ -18,11 +18,11 @@ module Rspec
         end
 
         def pending_examples
-          @pending_examples ||= ::Rspec::Core.world.find(examples, :execution_result => { :status => 'pending' })
+          @pending_examples ||= ::RSpec.world.find(examples, :execution_result => { :status => 'pending' })
         end
 
         def failed_examples
-          @failed_examples ||= ::Rspec::Core.world.find(examples, :execution_result => { :status => 'failed' })
+          @failed_examples ||= ::RSpec.world.find(examples, :execution_result => { :status => 'failed' })
         end
 
         def report(count)
@@ -109,7 +109,7 @@ module Rspec
       protected
 
         def configuration
-          Rspec.configuration
+          RSpec.configuration
         end
 
         def backtrace_line(line)

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

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
 
   module Core
 
@@ -11,14 +11,14 @@ module Rspec
           failed_examples.each_with_index do |failed_example, index|
             exception = failed_example.execution_result[:exception_encountered]
             padding = '    '
-            if exception.is_a?(Rspec::Core::PendingExampleFixedError)
+            if exception.is_a?(RSpec::Core::PendingExampleFixedError)
               output.puts "#{index.next}) #{failed_example} FIXED"
               output.puts "#{padding}Expected pending '#{failed_example.metadata[:execution_result][:pending_message]}' to fail. No Error was raised."
             else
               output.puts "#{index.next}) #{failed_example}"
               output.puts "#{padding}Failure/Error: #{read_failed_line(exception, failed_example).strip}"
               exception.message.split("\n").each do |line|
-                output.puts "#{padding}#{colorise(line, exception).strip}"
+                output.puts "#{padding}#{colorise(line, exception)}"
               end
             end
 

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

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
 
   module Core
 
@@ -44,15 +44,12 @@ module Rspec
         end
 
         def failure_output(example, exception)
-          expectation_not_met = exception.is_a?(::Rspec::Expectations::ExpectationNotMetError)
-
-          message = if expectation_not_met
-            "#{current_indentation}#{example.description} (FAILED)"
-          else
-            "#{current_indentation}#{example.description} (ERROR)"
-          end
+          red("#{current_indentation}#{example.description} (FAILED - #{next_failure_index})")
+        end
 
-          expectation_not_met ? red(message) : magenta(message)
+        def next_failure_index
+          @next_failure_index ||= 0
+          @next_failure_index += 1
         end
 
         def passed_output(example)

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

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
 
   module Core
 
@@ -8,14 +8,15 @@ module Rspec
         SUB_SECOND_PRECISION = 5
         DEFAULT_PRECISION = 2
         
-        def format_seconds(float, precision = nil)
+        def format_seconds(float)
           precision ||= (float < 1) ? SUB_SECOND_PRECISION : DEFAULT_PRECISION
           formatted = sprintf("%.#{precision}f", float)
           strip_trailing_zeroes(formatted)
         end
         
         def strip_trailing_zeroes(string)
-          string.sub(/[^1-9]+$/, '')
+          stripped = string.sub(/[^1-9]+$/, '')
+          stripped.empty? ? "0" : stripped
         end
         
       end
@@ -24,4 +25,4 @@ module Rspec
     
   end
   
-end
+end

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

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
 
   module Core
 

data/lib/rspec/core/hooks.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Core
     module Hooks
       def before_blocks

data/lib/rspec/core/kernel_extensions.rb

@@ -1,25 +1,5 @@
-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)
-        Rspec::Core::ExampleGroup.describe(*args, &example_group_block)
-      end
-
-      alias :context :describe
-
-    end
+module Kernel
+  def debugger(*args)
+    $stderr.puts "debugger statement ignored, use -d or --debug option on rspec to enable debugging"
   end
 end
-
-include Rspec::Core::KernelExtensions

data/lib/rspec/core/let.rb

@@ -1,15 +1,84 @@
-module Rspec
+module RSpec
   module Core
-
     module Let
 
       module ClassMethods
+        # Generates a method whose return value is memoized
+        # after the first call. 
+        #
+        # == Examples
+        #
+        #  describe Thing do
+        #    let(:thing) { Thing.new }
+        #
+        #    it "does something" do
+        #      # first invocation, executes block, memoizes and returns result
+        #      thing.do_something 
+        #
+        #      # second invocation, returns the memoized value
+        #      thing.should be_something
+        #    end
+        #  end
         def let(name, &block)
           define_method(name) do
             __memoized[name] ||= instance_eval(&block)
           end
         end
 
+        # Just like <tt>let()</tt>, except the block is invoked
+        # by an implicit <tt>before</tt> hook. This serves a dual
+        # purpose of setting up state and providing a memoized
+        # reference to that state.
+        #
+        # == Examples
+        #
+        #  class Thing
+        #    def self.count
+        #      @count ||= 0
+        #    end
+        #    
+        #    def self.count=(val)
+        #      @count += val
+        #    end
+        #
+        #    def self.reset_count
+        #      @count = 0
+        #    end
+        #
+        #    def initialize
+        #      self.class.count += 1
+        #    end
+        #  end
+        #
+        #  describe Thing do
+        #    after(:each) { Thing.reset_count }
+        #
+        #    context "using let" do
+        #      let(:thing) { Thing.new }
+        #
+        #      it "is not invoked implicitly" do
+        #        Thing.count.should == 0
+        #      end
+        #
+        #      it "can be invoked explicitly" do
+        #        thing
+        #        Thing.count.should == 1
+        #      end
+        #    end
+        #
+        #    context "using let!" do
+        #      let!(:thing) { Thing.new }
+        #
+        #      it "is invoked implicitly" do
+        #        Thing.count.should == 1
+        #      end
+        #      
+        #      it "returns memoized version on first invocation" do
+        #        thing
+        #        Thing.count.should == 1
+        #      end
+        #    end
+        #  end
         def let!(name, &block)
           let(name, &block)
           before { __send__(name) } 
@@ -17,17 +86,16 @@ module Rspec
       end
 
       module InstanceMethods
-        def __memoized
+        def __memoized # :nodoc:
           @__memoized ||= {}
         end
       end
 
-      def self.included(mod)
+      def self.included(mod) # :nodoc:
         mod.extend ClassMethods
         mod.__send__ :include, InstanceMethods
       end
 
     end
-
   end
 end

data/lib/rspec/core/load_path.rb

@@ -1,3 +1,3 @@
 require 'rspec/core/ruby_project'
 
-Rspec::Core::RubyProject.add_to_load_path('lib', 'spec')
+RSpec::Core::RubyProject.add_to_load_path('lib', 'spec')

data/lib/rspec/core/metadata.rb

@@ -1,11 +1,15 @@
-module Rspec
+module RSpec
   module Core
     class Metadata < Hash
 
       def initialize(superclass_metadata=nil)
         @superclass_metadata = superclass_metadata
-        update(@superclass_metadata) if @superclass_metadata
-        store(:example_group, {})
+        if @superclass_metadata
+          update(@superclass_metadata)
+          example_group = {:example_group => @superclass_metadata[:example_group]}
+        end
+
+        store(:example_group, example_group || {})
         store(:behaviour, self[:example_group])
         yield self if block_given?
       end
@@ -45,12 +49,12 @@ module Rspec
 #{"*"*50}
 :#{key} is not allowed
 
-Rspec reserves some hash keys for its own internal use, 
+RSpec reserves some hash keys for its own internal use, 
 including :#{key}, which is used on:
 
   #{caller(0)[4]}.
 
-Here are all of Rspec's reserved hash keys:
+Here are all of RSpec's reserved hash keys:
 
   #{RESERVED_KEYS.join("\n  ")}
 #{"*"*50}
@@ -83,6 +87,15 @@ EOM
         end
       end
 
+      def relevant_line_numbers(metadata)
+        line_numbers = [metadata[:line_number]]
+        if metadata[:example_group]
+          line_numbers + relevant_line_numbers(metadata[:example_group])
+        else
+          line_numbers
+        end
+      end
+
       def apply_condition(filter_on, filter, metadata=nil)
         metadata ||= self
         case filter
@@ -94,8 +107,7 @@ EOM
           filter.call(metadata[filter_on]) rescue false
         when Fixnum
           if filter_on == :line_number
-            [metadata[:line_number], metadata[:example_group][:line_number]].
-              include?(world.preceding_example_or_group_line(filter))
+            relevant_line_numbers(metadata).include?(world.preceding_declaration_line(filter))
           else
             metadata[filter_on] == filter
           end
@@ -107,7 +119,7 @@ EOM
     private
 
       def world
-        Rspec::Core.world
+        RSpec.world
       end
 
       def superclass_metadata

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

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Core
     module MockFrameworkAdapter
 

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

@@ -5,7 +5,7 @@
 
 require 'flexmock/rspec'
 
-module Rspec
+module RSpec
   module Core
     module MockFrameworkAdapter
 

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

@@ -1,7 +1,7 @@
 require 'mocha/standalone'
 require 'mocha/object'
 
-module Rspec
+module RSpec
   module Core
     module MockFrameworkAdapter
 

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

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

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

@@ -1,13 +1,13 @@
 require 'rspec/mocks/framework'
 require 'rspec/mocks/extensions'
 
-module Rspec
+module RSpec
   module Core
     module MockFrameworkAdapter
 
-      include Rspec::Mocks::ExampleMethods
+      include RSpec::Mocks::ExampleMethods
       def _setup_mocks
-        $rspec_mocks ||= Rspec::Mocks::Space.new
+        $rspec_mocks ||= RSpec::Mocks::Space.new
       end
       def _verify_mocks
         $rspec_mocks.verify_all

data/lib/rspec/core/object_extensions.rb

@@ -0,0 +1,15 @@
+module RSpec
+  module Core
+    module ObjectExtensions
+      def describe(*args, &example_group_block)
+        args << {} unless args.last.is_a?(Hash)
+        args.last.update :caller => caller(1)
+        RSpec::Core::ExampleGroup.describe(*args, &example_group_block)
+      end
+
+      alias :context :describe
+    end
+  end
+end
+
+include RSpec::Core::ObjectExtensions

data/lib/rspec/core/pending.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Core
     module Pending
       def pending(message = 'No reason given')
@@ -10,7 +10,7 @@ module Rspec
             running_example.metadata[:pending] = false
           rescue Exception => e
           end
-          raise Rspec::Core::PendingExampleFixedError.new if result
+          raise RSpec::Core::PendingExampleFixedError.new if result
         end
         throw :pending_declared_in_example, message
       end

data/lib/rspec/core/rake_task.rb

@@ -3,7 +3,7 @@
 require 'rake'
 require 'rake/tasklib'
 
-module Rspec
+module RSpec
   module Core
 
     class RakeTask < ::Rake::TaskLib
@@ -51,7 +51,7 @@ module Rspec
 
       def define # :nodoc:
         actual_name = Hash === name ? name.keys.first : name
-        desc("Run Rspec code examples") unless ::Rake.application.last_comment
+        desc("Run RSpec code examples") unless ::Rake.application.last_comment
 
         task name do
           RakeFileUtils.send(:verbose, verbose) do