rspec 0.5.0 → 0.5.1

data/lib/spec/runner/backtrace_tweaker.rb

@@ -5,10 +5,10 @@ module Spec
         return if error.backtrace.nil?
         tweaked_backtrace = []
         error.backtrace.each do |line|
-          if line.include?('__instance_exec')
-            line = line.split(':in')[0] + ":in `#{spec_name}'"
-          end
-          tweaked_backtrace.push line
+          line = line.split(':in')[0] + ":in `#{spec_name}'" if line.include?('__instance_exec')
+          line = nil if line.include? '/lib/spec/api/helper/should_base.rb'
+          line = nil if line.include? '/lib/spec/api/helper/should_negator.rb' unless line.nil?
+          tweaked_backtrace.push line unless line.nil?
         end
         error.set_backtrace tweaked_backtrace
       end

data/lib/spec/runner/context.rb

@@ -15,10 +15,11 @@ module Spec
         instance_exec(&context_block)
         @@context_runner.add_context(self) unless @@context_runner.nil?
         ContextRunner.standalone(self) if @@context_runner.nil?
+        @calling_line = caller(0)[2].split(":in")[0]
       end
 
       def run(reporter)
-        reporter.add_context(@name)
+        reporter.add_context(@name, @calling_line)
         @specifications.each do |specification|
           specification.run(reporter, @setup_block, @teardown_block)
         end

data/lib/spec/runner/context_runner.rb

@@ -5,13 +5,13 @@ module Spec
     class ContextRunner
       
       def self.standalone context
-        context_runner = ContextRunner.new(ARGV)
+        context_runner = ContextRunner.new(ARGV, true)
         context_runner.add_context context
         context_runner.run
       end
  
-      def initialize(args)
-        options = OptionParser.parse(args)
+      def initialize(args, standalone=false, err=$stderr)
+        options = OptionParser.parse(args, standalone, err)
         @contexts = []
         @out = options.out
         @out = File.open(@out, 'w') if @out.is_a? String

data/lib/spec/runner/option_parser.rb

@@ -4,14 +4,14 @@ module Spec
   module Runner
     class OptionParser
 
-      def self.parse(args)
+      def self.parse(args, standalone=false, err=$stderr)
         options = OpenStruct.new
         options.out = $stdout
         options.verbose = false;
         options.doc = false;
 
         opts = ::OptionParser.new do |opts|
-          opts.banner = "Usage: specdoc [options] FILE|DIRECTORY"
+          opts.banner = "Usage: spec [options] (FILE|DIRECTORY)+"
           opts.separator ""
 
           opts.on("-o", "--of [FILE]", "Set the output file (defaults to STDOUT)") do |outfile|
@@ -28,12 +28,16 @@ module Spec
           end
 
           opts.on_tail("-h", "--help", "Show this message") do
-            puts opts
-            exit
+            err.puts opts
+            exit if err == $stderr
           end
 
         end
         opts.parse!(args)
+        if args.empty?
+          err.puts opts unless standalone
+          exit if err == $stderr unless standalone
+        end
         options
       end
     end

data/lib/spec/runner/simple_text_reporter.rb

@@ -6,23 +6,24 @@ module Spec
         @context_names = []
         @errors = []
         @spec_names = []
+        @failures = []
         @verbose = verbose
         @backtrace_tweaker = backtrace_tweaker
       end
   
-      def add_context(name)
+      def add_context(name, calling_line=nil)
         @output << "\n" if @context_names.empty? unless @verbose
         @output << "\n#{name}\n" if @verbose
-        @context_names << name
+        @context_names << [name, calling_line]
       end
       
-      def add_spec(name, errors=[])
+      def add_spec(name, calling_line, errors=[])
         if errors.empty?
           spec_passed(name)
         else
           errors.each { |error| @backtrace_tweaker.tweak_backtrace(error, name) }
           # only show the first one (there might be more)
-          spec_failed(name, errors[0])
+          spec_failed(name, calling_line, errors[0])
         end
       end
       
@@ -35,11 +36,9 @@ module Spec
       end
   
       def dump
-        unless @verbose
-          @output << "\n"
-          dump_failures
-          @output << "\n\n" unless @errors.empty?
-        end
+        @output << "\n"
+        dump_failures
+        @output << "\n\n" unless @errors.empty?
         @output << "\n" if @errors.empty?
         @output << "Finished in " << (duration).to_s << " seconds\n\n"
         @output << "#{@context_names.length} context#{'s' unless @context_names.length == 1 }, "
@@ -51,11 +50,13 @@ module Spec
       def dump_failures
         return if @errors.empty?
         @output << "\n"
-        @errors.inject(1) do |index, error|
+        @failures.inject(1) do |index, failure|
           @output << "\n\n" if index > 1
-          @output << index.to_s << ") " 
-          @output << "#{error.message} (#{error.class.name})\n"
-          dump_backtrace(error.backtrace)
+          @output << index.to_s << ")\n"
+          @output << "#{failure.error.message} (#{failure.error.class.name})\n"
+          @output << "Context: #{failure.context_name} [#{failure.context_line}]\n"
+          @output << "Specification: #{failure.spec_name} [#{failure.spec_line}]\n"
+          dump_backtrace(failure.error.backtrace)
           index + 1
         end
       end
@@ -77,16 +78,25 @@ module Spec
           @output << '.' unless @verbose
         end
 
-        def spec_failed(name, error)
+        def spec_failed(name, calling_line, error)
           @spec_names << name
           @errors << error
-          if @verbose
-            @output << "- #{name} (FAILED)\n#{error.message} (#{error.class.name})\n#{error.backtrace.join("\n")}\n"
-          else
-            @output << 'F'
-          end
+          @failures << Failure.new(@context_names.last[0], @context_names.last[1], name, calling_line, error)
+          @output << "- #{name} (FAILED - #{@failures.length})\n" if @verbose
+          @output << 'F' unless @verbose
         end
 
     end
+    
+    class Failure
+      attr_reader :context_name, :context_line, :spec_name, :spec_line, :error
+      def initialize(context_name, context_line, spec_name, spec_line, error)
+        @context_name = context_name
+        @context_line = context_line
+        @spec_name = spec_name
+        @spec_line = spec_line
+        @error = error
+      end
+    end
   end
 end

data/lib/spec/runner/specification.rb

@@ -7,6 +7,7 @@ module Spec
         @block = block
         @mocks = []
         @errors = []
+        @calling_line = caller(0)[2].split(":in")[0]
       end
     
       def run(reporter=nil, setup_block=nil, teardown_block=nil)
@@ -27,7 +28,7 @@ module Spec
           @errors << e
         end
 
-        reporter.add_spec(@name, @errors) unless reporter.nil?
+        reporter.add_spec(@name, @calling_line, @errors) unless reporter.nil?
       end
     
       def run_docs(reporter)

data/lib/spec/version.rb

@@ -2,7 +2,7 @@ module Spec
   module VERSION
     MAJOR = 0
     MINOR = 5
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
 

data/test/rake/rcov_testtask.rb

@@ -0,0 +1,45 @@
+module Rake
+  class TestTask < TaskLib
+    def define
+      lib_path = @libs.join(File::PATH_SEPARATOR)
+      desc "Run tests" + (@name==:test ? "" : " for #{@name}")
+      task @name do
+        run_code = ''
+        RakeFileUtils.verbose(@verbose) do
+          run_code =
+            case @loader
+            when :direct
+              "-e 'ARGV.each{|f| load f}'"
+            when :testrb
+              "-S testrb #{fix}"
+            when :rake
+              rake_loader
+            end
+          @ruby_opts.unshift( "-I#{lib_path}" )
+          @ruby_opts.unshift( "--exclude test.*.rb")
+          @ruby_opts.unshift( "-w" ) if @warning
+          rcov @ruby_opts.join(" ") +
+            " \"#{run_code}\" " +
+            file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
+            " #{option_list}"
+        end
+      end
+    self
+    end
+  end
+end
+
+module FileUtils
+  def rcov(*args,&block)
+    if Hash === args.last
+      options = args.pop
+    else
+      options = {}
+    end
+    if args.length > 1 then
+      sh(*(['rcov'] + args + [options]), &block)
+    else
+      sh("rcov #{args}", options, &block)
+    end
+  end
+end

data/test/spec/api/helper/arbitrary_predicate_test.rb

@@ -3,6 +3,31 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Spec
   module Api
     module Helper
+    
+      class XxxMock
+        def initialize(return_val)
+          @return_val = return_val
+          @xxx_called = false
+        end
+        
+        def xxx?
+          @xxx_called = true
+          @return_val
+        end
+        
+        def yyy?(a, b, c)
+          a.should.be 1
+          b.should.be 2
+          c.should.be 3
+          @xxx_called = true
+          @return_val
+        end
+        
+        def __verify
+          @xxx_called.should.be true
+        end
+      end
+    
       class ArbitraryPredicateTest < Test::Unit::TestCase
 
         # should.be.xxx
@@ -14,26 +39,23 @@ module Spec
       	end
 
       	def test_should_be_xxx_should_raise_when_sending_xxx_to_target_returns_false
-      		mock = Mock.new("xxx? returns false")
-      		mock.should_receive(:xxx?).once.with_no_args.and_return(false)
-      	  assert_raise(ExpectationNotMetError) do
+      		mock = XxxMock.new(false)
+      		assert_raise(ExpectationNotMetError) do
             mock.should.be.xxx
           end
       		mock.__verify
         end
 
       	def test_should_be_xxx_should_raise_when_sending_xxx_to_target_returns_nil
-      		mock = Mock.new("xxx? returns nil")
-      		mock.should_receive(:xxx?).once.with_no_args.and_return(nil)
-      	  assert_raise(ExpectationNotMetError) do
+      		mock = XxxMock.new(nil)
+      		assert_raise(ExpectationNotMetError) do
             mock.should.be.xxx
           end
       		mock.__verify
         end
 
       	def test_should_be_xxx_should_not_raise_when_sending_xxx_to_target_returns_true
-      		mock = Mock.new("xxx? returns true")
-      		mock.should_receive(:xxx?).once.with_no_args.and_return(true)
+      		mock = XxxMock.new(true)
       	  assert_nothing_raised do
             mock.should.be.xxx
           end
@@ -41,8 +63,7 @@ module Spec
         end
 
       	def test_should_be_xxx_should_not_raise_when_sending_xxx_to_target_returns_something_other_than_true_false_or_nil
-      		mock = Mock.new("xxx? returns 5")
-      		mock.should_receive(:xxx?).once.with_no_args.and_return(5)
+      		mock = XxxMock.new(5)
       	  assert_nothing_raised do
             mock.should.be.xxx
           end
@@ -52,10 +73,9 @@ module Spec
       	# should.be.xxx(args)
 	
         def test_should_be_xxx_with_args_passes_args_properly
-       		mock = Mock.new("xxx?(1 2 3) returns true")
-      		mock.should_receive(:xxx?).once.with(1, 2, 3).and_return(true)
+       		mock = XxxMock.new(true)
       	  assert_nothing_raised do
-            mock.should.be.xxx(1, 2, 3)
+            mock.should.be.yyy(1, 2, 3)
           end
       		mock.__verify
         end
@@ -69,8 +89,7 @@ module Spec
       	end
 
       	def test_should_not_be_xxx_should_raise_when_sending_xxx_to_target_returns_true
-      		mock = Mock.new("xxx? returns true")
-      		mock.should_receive(:xxx?).once.with_no_args.and_return(true)
+      		mock = XxxMock.new(true)
       	  assert_raise(ExpectationNotMetError) do
             mock.should.not.be.xxx
           end
@@ -78,8 +97,7 @@ module Spec
         end
 
       	def test_should_not_be_xxx_shouldnt_raise_when_sending_xxx_to_target_returns_nil
-      		mock = Mock.new("xxx? returns nil")
-      		mock.should_receive(:xxx?).once.with_no_args.and_return(nil)
+      		mock = XxxMock.new(nil)
       	  assert_nothing_raised do
             mock.should.not.be.xxx
           end
@@ -87,8 +105,7 @@ module Spec
         end
 
       	def test_should_not_be_xxx_shouldnt_raise_when_sending_xxx_to_target_returns_false
-      		mock = Mock.new("xxx? returns false")
-      		mock.should_receive(:xxx?).once.with_no_args.and_return(false)
+      		mock = XxxMock.new(false)
       	  assert_nothing_raised do
             mock.should.not.be.xxx
           end
@@ -96,8 +113,7 @@ module Spec
         end
 
       	def test_should_not_be_xxx_should_raise_when_sending_xxx_to_target_returns_something_other_than_true_false_or_nil
-      		mock = Mock.new("xxx? returns 5")
-      		mock.should_receive(:xxx?).once.with_no_args.and_return(5)
+      		mock = XxxMock.new(5)
       	  assert_raise(ExpectationNotMetError) do
             mock.should.not.be.xxx
           end
@@ -107,10 +123,9 @@ module Spec
       	# should.be.xxx(args)
 	
         def test_should_not_be_xxx_with_args_passes_args_properly
-       		mock = Mock.new("xxx?(1 2 3) returns false")
-      		mock.should_receive(:xxx?).once.with(1, 2, 3).and_return(false)
+       		mock = XxxMock.new(false)
       	  assert_nothing_raised do
-            mock.should.not.be.xxx(1, 2, 3)
+            mock.should.not.be.yyy(1, 2, 3)
           end
       		mock.__verify
         end

data/test/spec/api/helper/equality_test.rb

@@ -40,6 +40,25 @@ module Spec
           end
         end
 
+        def test_should_be_close_good_cases
+          assert_nothing_raised do
+            3.5.should.be.close 3.5, 0.5
+            3.5.should.be.close 3.1, 0.5
+            3.5.should.be.close 3.01, 0.5
+            3.5.should.be.close 3.9, 0.5
+            3.5.should.be.close 3.99, 0.5
+          end
+        end
+        
+        def test_should_be_close_failing_cases
+          assert_raise(ExpectationNotMetError) do
+            3.5.should.be.close 3.0, 0.5
+            3.5.should.be.close 2.0, 0.5
+            3.5.should.be.close 4.0, 0.5
+            3.5.should.be.close 5.0, 0.5
+          end
+        end
+
       end
     end
   end

data/test/spec/api/helper/should_have_test.rb

@@ -0,0 +1,183 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+module Spec
+  module Api
+    module Helper
+      class ShouldHaveTest < Test::Unit::TestCase
+        
+        def setup
+          @owner = CollectionOwner.new
+          (1..3).each do |n|
+            @owner.add_to_collection_with_length_method n
+            @owner.add_to_collection_with_size_method n
+          end
+        end
+        
+        def test_should_raise_when_expecting_less_than_actual_length
+          assert_raise(ExpectationNotMetError) do
+            @owner.should.have(2).items_in_collection_with_length_method
+          end
+        end
+
+        def test_should_raise_when_expecting_more_than_actual_length
+          assert_raise(ExpectationNotMetError) do
+            @owner.should.have(4).items_in_collection_with_length_method
+          end
+        end
+
+        def test_should_not_raise_when_expecting_actual_length
+          assert_nothing_raised do
+            @owner.should.have(3).items_in_collection_with_length_method
+          end
+        end
+
+        
+        def test_should_raise_when_expecting_less_than_actual_size
+          assert_raise(ExpectationNotMetError) do
+            @owner.should.have(2).items_in_collection_with_size_method
+          end
+        end
+
+        def test_should_raise_when_expecting_more_than_actual_size
+          assert_raise(ExpectationNotMetError) do
+            @owner.should.have(4).items_in_collection_with_size_method
+          end
+        end
+
+        def test_should_not_raise_when_expecting_actual_size
+          assert_nothing_raised do
+            @owner.should.have(3).items_in_collection_with_size_method
+          end
+        end
+      end
+      
+      class ShouldHaveAtLeastTest < Test::Unit::TestCase
+        
+        def setup
+          @owner = CollectionOwner.new
+          (1..3).each do |n|
+            @owner.add_to_collection_with_length_method n
+            @owner.add_to_collection_with_size_method n
+          end
+        end
+        
+        def test_should_not_raise_when_expecting_less_than_actual_length
+          assert_nothing_raised do
+            @owner.should.have.at.least(2).items_in_collection_with_length_method
+          end
+        end
+
+        def test_should_raise_when_expecting_more_than_actual_length
+          assert_raise(ExpectationNotMetError) do
+            @owner.should.have.at.least(4).items_in_collection_with_length_method
+          end
+        end
+
+        def test_should_not_raise_when_expecting_actual_length
+          assert_nothing_raised do
+            @owner.should.have.at.least(3).items_in_collection_with_length_method
+          end
+        end
+
+        
+        def test_should_not_raise_when_expecting_less_than_actual_size
+          assert_nothing_raised do
+            @owner.should.have.at.least(2).items_in_collection_with_size_method
+          end
+        end
+
+        def test_should_raise_when_expecting_more_than_actual_size
+          assert_raise(ExpectationNotMetError) do
+            @owner.should.have.at.least(4).items_in_collection_with_size_method
+          end
+        end
+
+        def test_should_not_raise_when_expecting_actual_size
+          assert_nothing_raised do
+            @owner.should.have.at.least(3).items_in_collection_with_size_method
+          end
+        end
+        
+      end
+      
+      class ShouldHaveAtMostTest < Test::Unit::TestCase
+        
+        def setup
+          @owner = CollectionOwner.new
+          (1..3).each do |n|
+            @owner.add_to_collection_with_length_method n
+            @owner.add_to_collection_with_size_method n
+          end
+        end
+        
+        def test_should_raise_when_expecting_less_than_actual_length
+          assert_raise(ExpectationNotMetError) do
+            @owner.should.have.at.most(2).items_in_collection_with_length_method
+          end
+        end
+
+        def test_should_not_raise_when_expecting_more_than_actual_length
+          assert_nothing_raised do
+            @owner.should.have.at.most(4).items_in_collection_with_length_method
+          end
+        end
+
+        def test_should_not_raise_when_expecting_actual_length
+          assert_nothing_raised do
+            @owner.should.have.at.most(3).items_in_collection_with_length_method
+          end
+        end
+
+        
+        def test_should_raise_when_expecting_less_than_actual_size
+          assert_raise(ExpectationNotMetError) do
+            @owner.should.have.at.most(2).items_in_collection_with_size_method
+          end
+        end
+
+        def test_should_not_raise_when_expecting_more_than_actual_size
+          assert_nothing_raised do
+            @owner.should.have.at.most(4).items_in_collection_with_size_method
+          end
+        end
+
+        def test_should_not_raise_when_expecting_actual_size
+          assert_nothing_raised do
+            @owner.should.have.at.most(3).items_in_collection_with_size_method
+          end
+        end
+        
+      end
+      
+      class CollectionWithSizeMethod
+        def initialize; @list = []; end
+        def size; @list.size; end
+        def push(item); @list.push(item); end
+      end
+
+      class CollectionWithLengthMethod
+        def initialize; @list = []; end
+        def length; @list.size; end
+        def push(item); @list.push(item); end
+      end
+
+      class CollectionOwner
+        attr_reader :items_in_collection_with_size_method, :items_in_collection_with_length_method
+
+        def initialize
+          @items_in_collection_with_size_method = CollectionWithSizeMethod.new
+          @items_in_collection_with_length_method = CollectionWithLengthMethod.new
+        end
+
+        def add_to_collection_with_size_method(item)
+          @items_in_collection_with_size_method.push(item)
+        end
+
+        def add_to_collection_with_length_method(item)
+          @items_in_collection_with_length_method.push(item)
+        end
+      end
+      
+    end
+  end
+end