rspec 0.5.3 → 0.5.4

data/lib/spec/api/mocks/mock.rb

@@ -0,0 +1,63 @@
+module Spec
+  module Api
+    class Mock
+      # Remove all methods so they can be mocked too
+      (public_instance_methods - ['__id__', '__send__', 'nil?']).each do |m|
+        undef_method m
+      end
+
+      # Creates a new mock with a +name+ (that will be used in error messages only)
+      # Options:
+      # * <tt>:null_object</tt> - if true, the mock object acts as a forgiving null object allowing any message to be sent to it.
+      def initialize(name, options={})
+        @name = name
+        @options = DEFAULT_OPTIONS.dup.merge(options)
+        @expectations = []
+        @expectation_ordering = OrderGroup.new
+      end
+      
+      def should
+        self
+      end
+
+      def receive(sym, &block)
+        expected_from = caller(1)[0]
+        expectation = MessageExpectation.new(@name, @expectation_ordering, expected_from, sym, block_given? ? block : nil)
+        @expectations << expectation
+        expectation
+      end
+
+      def __verify #:nodoc:
+        @expectations.each do |expectation|
+          expectation.verify_messages_received
+        end
+      end
+
+      def method_missing(sym, *args, &block)
+        if expectation = find_matching_expectation(sym, *args)
+          expectation.verify_message(args, block)
+        else
+          begin
+            # act as null object if method is missing and we ignore them. return value too!
+            @options[:null_object] ? self : super(sym, *args, &block)
+          rescue NoMethodError
+            arg_message = args.collect{|arg| "<#{arg}:#{arg.class.name}>"}.join(", ")
+            Kernel::raise Spec::Api::MockExpectationError, "Mock '#{@name}' received unexpected message '#{sym}' with [#{arg_message}]"
+          end
+        end
+      end
+
+    private
+
+      DEFAULT_OPTIONS = {
+        :null_object => false
+      }
+      
+      def find_matching_expectation(sym, *args)
+        expectation = @expectations.find {|expectation| expectation.matches(sym, args)}
+      end
+
+    end
+
+  end
+end

data/lib/spec/api/mocks/order_group.rb

@@ -0,0 +1,21 @@
+module Spec
+  module Api
+    class OrderGroup
+      def initialize
+        @ordering = Array.new
+      end
+      
+      def register(expectation)
+          @ordering << expectation
+      end
+      
+      def ready_for?(expectation)
+        return @ordering.first == expectation
+      end
+      
+      def consume(expectation)
+        @ordering.shift
+      end
+    end
+  end
+end

data/lib/spec/api/sugar.rb

@@ -0,0 +1,47 @@
+module Spec
+  module Api
+    # This module adds syntactic sugar that allows usage of should_* instead of should.*
+    module Sugar
+      alias_method :__orig_method_missing, :method_missing
+      def method_missing(sym, *args, &block)
+        if __is_sweetened? sym
+          object = self
+          calls = sym.to_s.split("_")
+          while calls.length > 1
+            call = calls.shift
+            object = object.__send__(call)
+            break if call == "be"
+          end
+          return object.__send__(calls.join("_"), *args, &block)
+        end
+        __orig_method_missing(sym, *args, &block)
+      end
+      
+      def __is_sweetened? sym
+        return true if sym.to_s =~ /^should_/
+      end
+    end
+    
+    module MessageExpectationSugar
+      def __is_sweetened? sym
+        return true if sym.to_s =~ /^and_|^at_|^any_|^once_/
+      end
+    end
+  end
+end
+
+class Object #:nodoc:
+  include Spec::Api::Sugar
+end
+
+class Spec::Api::Mock #:nodoc:
+  #NOTE: this resolves a bug caused by a conflict between Sugar#method_missing and Mock#method_missing, specifically
+  # when the mock is set null_object=>true. It would be nice to get rid of this.
+  def should_receive(sym, &block)
+    return receive(sym, &block)
+  end
+end
+
+class Spec::Api::MessageExpectation #:nodoc:
+  include Spec::Api::MessageExpectationSugar
+end

data/lib/spec/rake/rcov_verify.rb

@@ -0,0 +1,45 @@
+module RCov
+  # A task that can verify that the RCov coverage doesn't
+  # drop below a certain threshold.
+  class VerifyTask < Rake::TaskLib
+    # Name of the task. Defaults to :rcov_verify
+    attr_accessor :name
+    
+    # Path to the index.html file generated by RCov, which
+    # is the file containing the total coverage.
+    # Defaults to 'coverage/index.html'
+    attr_accessor :index_html
+    
+    # Whether or not to output details
+    attr_accessor :verbose
+    
+    # The threshold value (in percent) for coverage. If the 
+    # actual coverage is below this value, the task will raise an 
+    # exception
+    attr_accessor :threshold
+    
+    def initialize(name=:rcov_verify)
+      @name = name
+      @index_html = 'coverage/index.html'
+      @verbose = false
+      yield self if block_given?
+      raise "Threshold must be set" if @threshold.nil?
+      define
+    end
+    
+    def define
+      desc "Verify that rcov coverage is at least #{threshold}%"
+      task @name do
+        total_coverage = nil
+        File.open(index_html).each_line do |line|
+          if line =~ /<tt>(\d+\.\d+)%<\/tt>&nbsp;<\/td>/
+            total_coverage = eval($1)
+            break
+          end
+        end
+        puts "Coverage: #{total_coverage}% (threshold: #{threshold}%)" if verbose
+        raise "Coverage must be at least #{threshold}% but was #{total_coverage}%" if total_coverage < threshold
+      end
+    end
+  end
+end

data/lib/spec/rake/spectask.rb

@@ -9,33 +9,15 @@ require File.dirname(__FILE__) + '/../../spec'
 module Spec
 module Rake
 
-  # Create a task that runs a set of RSpec contexts.
+  # A task that runs a set of RSpec contexts.
   #
   # Example:
   #  
   #   Rake::SpecTask.new do |t|
   #     t.libs << "spec"
   #     t.spec_files = FileList['spec/**/*_spec.rb']
-  #     t.verbose = true
   #   end
   #
-  # If rake is invoked with a "SPEC=filename" command line option,
-  # then the list of spec files will be overridden to include only the
-  # filename specified on the command line.  This provides an easy way
-  # to run just one spec.
-  #
-  # If rake is invoked with a "SPECOPTS=options" command line option,
-  # then the given options are passed to the spec process after a
-  # '--'.  This allows Test::Unit options to be passed to the spec
-  # suite.
-  #
-  # Examples:
-  #
-  #   rake spec                           # run specs normally
-  #   rake spec SPEC=just_one_file.rb     # run just one spec file.
-  #   rake spec SPECOPTS="-v"             # run in verbose mode
-  #   rake spec SPECOPTS="--runner=fox"   # use the fox spec runner
-  #
   class SpecTask < ::Rake::TaskLib
 
     # Name of spec task. (default is :spec)
@@ -45,8 +27,8 @@ module Rake
     # specs. (default is 'lib')
     attr_accessor :libs
 
-    # True if verbose spec output desired. (default is false)
-    attr_accessor :verbose
+    # Options poassed to spec
+    attr_accessor :spec_opts
 
     # Test options passed to the spec suite.  An explicit
     # SPECOPTS=opts on the command line will override this. (default
@@ -60,15 +42,14 @@ module Rake
     # Glob pattern to match spec files. (default is 'spec/spec*.rb')
     attr_accessor :pattern
 
-    # Style of spec loader to use.  Options are:
-    #
-    # * :rake -- Rake provided spec loading script (default).
-    # * :specrb -- Ruby provided spec loading script.
-    # * :direct -- Load specs using command line loader.
-    # 
-    attr_accessor :loader
+    # Whether or not to use rcov (default is false)
+    # See http://eigenclass.org/hiki.rb?rcov
+    attr_accessor :rcov
 
-    # Array of commandline options to pass to ruby when running spec loader.
+    # Where output is written. Default is STDOUT.
+    attr_accessor :out
+
+    # Array of commandline options to pass to ruby (or rcov) when running specs.
     attr_accessor :ruby_opts
 
     # Explicitly define the list of spec files to be included in a
@@ -86,10 +67,11 @@ module Rake
       @pattern = nil
       @options = nil
       @spec_files = nil
-      @verbose = false
+      @spec_opts = []
       @warning = false
-      @loader = :rake
+      @rcov = false
       @ruby_opts = []
+      @out = nil
       yield self if block_given?
       @pattern = 'spec/**/*_spec.rb' if @pattern.nil? && @spec_files.nil?
       define
@@ -100,30 +82,24 @@ module Rake
       lib_path = @libs.join(File::PATH_SEPARATOR)
       desc "Run specs" + (@name==:spec ? "" : " for #{@name}")
       task @name do
-        run_code =
-          case @loader
-          when :direct
-            "-e 'ARGV.each{|f| load f}'"
-          when :rake
-            rake_loader
-          end
-
-        RakeFileUtils.verbose(@verbose) do
-          @ruby_opts.unshift( "-I#{lib_path}" )
-          @ruby_opts.unshift( "-w" ) if @warning
-          ruby @ruby_opts.join(" ") +
-            " \"#{run_code}\" " +
-            file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
-            " #{option_list}"
-        end
+        spec = File.dirname(__FILE__) + '/../../../bin/spec'
+        file_prefix = @rcov ? " -- " : ""
+        interpreter = @rcov ? "rcov" : "ruby"
+        redirect = @out.nil? ? "" : " > #{@out}"
+
+        @ruby_opts.unshift( "-I#{lib_path}" )
+        @ruby_opts.unshift( "-w" ) if @warning
+        @ruby_opts.unshift( '--exclude "lib\/spec\/.*"' ) if @rcov
+        run interpreter, @ruby_opts.join(" ") +
+          " \"#{spec}\" " +
+          " #{@spec_opts.join(' ')} " +
+          file_prefix +
+          file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
+          redirect
       end
       self
     end
 
-    def option_list # :nodoc:
-      ENV['SPECOPTS'] || @options || ""
-    end
-
     def file_list # :nodoc:
       if ENV['SPEC']
         FileList[ ENV['SPEC'] ]
@@ -135,11 +111,6 @@ module Rake
       end
     end
 
-    def rake_loader # :nodoc:
-      find_file('rake/rake_test_loader') or
-      fail "unable to find rake test loader"
-    end
-
     def find_file(fn) # :nodoc:
       $LOAD_PATH.each do |path|
       file_path = File.join(path, "#{fn}.rb")
@@ -147,6 +118,20 @@ module Rake
       end
       nil
     end
+
+    def run(interpreter, *args, &block)
+      if Hash === args.last
+        options = args.pop
+      else
+        options = {}
+      end
+      if args.length > 1 then
+        sh(*([interpreter] + args + [options]), &block)
+      else
+        sh("#{interpreter} #{args}", options, &block)
+      end
+    end
+
   end
 end
 end

data/lib/spec/runner.rb

@@ -5,5 +5,8 @@ require 'spec/runner/execution_context'
 require 'spec/runner/context_runner'
 require 'spec/runner/option_parser'
 require 'spec/runner/backtrace_tweaker'
+require 'spec/runner/reporter'
+require 'spec/runner/base_text_formatter'
+require 'spec/runner/progress_bar_formatter'
 require 'spec/runner/rdoc_formatter'
-require 'spec/runner/simple_text_reporter'
+require 'spec/runner/specdoc_formatter'

data/lib/spec/runner/backtrace_tweaker.rb

@@ -1,11 +1,32 @@
 module Spec
   module Runner
     class BacktraceTweaker
-      def tweak_backtrace error, spec_name
+      def tweak_instance_exec_line line, spec_name
+        line = line.split(':in')[0] + ":in `#{spec_name}'" if line.include?('__instance_exec')
+        line
+      end
+    end
+
+    # Tweaks raised Exceptions to mask noisy (unneeded) parts of the backtrace
+    class NoisyBacktraceTweaker < BacktraceTweaker
+      def tweak_backtrace(error, spec_name)
+        return if error.backtrace.nil?
+        error.backtrace.collect! do |line|
+          tweak_instance_exec_line line, spec_name
+        end
+        error.backtrace.compact!
+      end
+    end
+
+    # Tweaks raised Exceptions to mask noisy (unneeded) parts of the backtrace
+    class QuietBacktraceTweaker < BacktraceTweaker
+      def tweak_backtrace(error, spec_name)
         return if error.backtrace.nil?
         error.backtrace.collect! do |line|
-          line = line.split(':in')[0] + ":in `#{spec_name}'" if line.include?('__instance_exec')
-          line = nil if line =~ /\/lib\/spec\/api\/helper\/.+[helper|base|negator].rb/
+          line = tweak_instance_exec_line line, spec_name
+          line = nil if line =~ /\/lib\/spec\/api\//
+          line = nil if line =~ /\/lib\/spec\/runner\//
+          line = nil if line =~ /bin\/spec:/
           line
         end
         error.backtrace.compact!

data/lib/spec/runner/base_text_formatter.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Runner
+    class BaseTextFormatter
+      def initialize(output, dry_run=false)
+        @dry_run = dry_run
+        @output = output
+      end
+
+      def dump_failure(counter, failure)
+        @output << "\n"
+        @output << counter.to_s << ")\n"
+        @output << "#{failure.header}\n"
+        @output << "#{failure.message}\n"
+        @output << "#{failure.backtrace}\n"
+      end
+      
+      def dump_summary(duration, context_count, spec_count, failure_count)
+        return if @dry_run
+        @output << "\n"
+        @output << "Finished in " << (duration).to_s << " seconds\n\n"
+        @output << "#{context_count} context#{'s' unless context_count == 1}, "
+        @output << "#{spec_count} specification#{'s' unless spec_count == 1}, "
+        @output << "#{failure_count} failure#{'s' unless failure_count == 1}"
+        @output << "\n"
+      end
+    end
+  end
+end

data/lib/spec/runner/context.rb

@@ -1,33 +1,18 @@
 module Spec
   module Runner
     class Context
-      @@context_runner = nil
-      
-      def self.context_runner= runner
-        @@context_runner = runner
-      end
-      
       def initialize(name, &context_block)
         @setup_block = nil
         @teardown_block = nil
         @specifications = []
         @name = name
         instance_exec(&context_block)
-        ContextRunner.standalone(self) if @@context_runner.nil?
-        @@context_runner.add_context(self) unless @@context_runner.nil?
       end
 
-      def run(reporter)
-        reporter.add_context(@name)
-        @specifications.each do |specification|
-          specification.run(reporter, @setup_block, @teardown_block)
-        end
-      end
-      
-      def run_docs(reporter)
+      def run(reporter, dry_run=false)
         reporter.add_context(@name)
         @specifications.each do |specification|
-          specification.run_docs(reporter)
+          specification.run(reporter, @setup_block, @teardown_block, dry_run)
         end
       end
 
@@ -42,6 +27,24 @@ module Spec
       def specify(spec_name, &block)
         @specifications << Specification.new(spec_name, &block)
       end
+      
+      def number_of_specs
+        @specifications.length
+      end
+      
+      def matches? name
+        return false unless name =~ /^#{@name} /
+        @specifications.each do |spec|
+          return true if spec.matches? name[(@name.length + 1)..-1]
+        end
+        return false
+      end
+      
+      def isolate name
+        @specifications.reject! do |spec|
+          !spec.matches? name[(@name.length + 1)..-1]
+        end
+      end
     end
   end
-end
+end