rspec 0.6.4 → 0.7.0

data/lib/spec/runner/formatter/rdoc_formatter.rb

@@ -3,18 +3,18 @@ module Spec
     module Formatter
       class RdocFormatter < BaseTextFormatter
         def add_context(name, first)
-          @output << "# #{name}\n"
-          @output.flush
+          @output.print "# #{name}\n"
+          STDOUT.flush
         end
   
         def spec_passed(name)
-          @output << "# * #{name}\n"
-          @output.flush
+          @output.print "# * #{name}\n"
+          STDOUT.flush
         end
 
         def spec_failed(name, counter, failure)
-          @output << "# * #{name} [#{counter} - FAILED]\n"
-          @output.flush
+          @output.print "# * #{name} [#{counter} - FAILED]\n"
+          STDOUT.flush
         end
       end
     end

data/lib/spec/runner/formatter/specdoc_formatter.rb

@@ -3,18 +3,19 @@ module Spec
     module Formatter
       class SpecdocFormatter < BaseTextFormatter      
         def add_context(name, first)
-          @output << "\n#{name}\n"
-          @output.flush
+          @output.puts
+          @output.puts name
+          STDOUT.flush
         end
       
         def spec_failed(name, counter, failure)
-          @output << "- #{name} (FAILED - #{counter})\n"
-          @output.flush
+          @output.print red("- #{name} (FAILED - #{counter})\n")
+          STDOUT.flush
         end
       
         def spec_passed(name)
-          @output << "- #{name}\n"
-          @output.flush
+          @output.print green("- #{name}\n")
+          STDOUT.flush
         end
       end
     end

data/lib/spec/runner/option_parser.rb

@@ -10,12 +10,19 @@ module Spec
 
         formatter = options.formatter_type.new(options.out, options.dry_run, options.colour)
         reporter = Reporter.new(formatter, options.backtrace_tweaker) 
+
+        # this doesn't really belong here.
+        # it should, but the way things are coupled, it doesn't
+        if options.differ_class
+          Spec::Expectations::Should::Base.differ = options.differ_class.new(options.diff_format, options.context_lines, options.colour)
+        end
+
         ContextRunner.new(reporter, standalone, options.dry_run, options.spec_name)
       end
 
       def self.parse(args, standalone, err, out)
         options = OpenStruct.new
-        options.out = out
+        options.out = out == STDOUT ? Kernel : out
         options.formatter_type = Formatter::ProgressBarFormatter
         options.backtrace_tweaker = QuietBacktraceTweaker.new
         options.spec_name = nil
@@ -24,8 +31,36 @@ module Spec
           opts.banner = "Usage: spec [options] (FILE|DIRECTORY|GLOB)+"
           opts.separator ""
 
-          opts.on("--diff", "Show unified diff of Strings that are expected to be equal when they are not") do
-            require 'spec/expectations/diff'
+          opts.on("-D", "--diff [FORMAT]", "Show diff of objects that are expected to be equal when they are not",
+                                           "Builtin formats: unified|u|context|c",
+                                           "You can also specify a custom differ class",
+                                           "(in which case you should also specify --require)") do |format|
+            require 'spec/expectations/diff'  # patches in diff extension
+
+            # TODO make context_lines settable
+            options.context_lines = 3
+
+            case format
+              when 'context', 'c'
+                options.diff_format  = :context
+              when 'unified', 'u', '', nil
+                options.diff_format  = :unified
+            end
+
+            if [:context,:unified].include? options.diff_format
+              require 'spec/expectations/differs/default'
+              options.differ_class = Spec::Expectations::Differs::Default
+            else
+              begin
+                options.diff_format  = :custom
+                options.differ_class = eval(format)
+              rescue NameError
+                err.puts "Couldn't find differ class #{format}"
+                err.puts "Make sure the --require option is specified *before* --diff"
+                exit if out == $stdout
+              end
+            end
+
           end
           
           opts.on("-c", "--colour", "--color", "Show coloured (red/green) output") do
@@ -59,7 +94,8 @@ module Spec
           end
 
           opts.on("-r", "--require FILE", "Require FILE before running specs",
-                                          "Useful for loading custom formatters or other extensions") do |req|
+                                          "Useful for loading custom formatters or other extensions",
+                                          "If this option is used it must come before the others") do |req|
             require req
           end
           
@@ -93,4 +129,4 @@ module Spec
       end
     end
   end
-end
+end

data/lib/spec/runner/reporter.rb

@@ -74,6 +74,8 @@ module Spec
       end
 
       class Failure
+        attr_reader :exception
+        
         def initialize(context_name, spec_name, exception)
           @context_name = context_name
           @spec_name = spec_name
@@ -81,21 +83,7 @@ module Spec
         end
 
         def header
-          "#{class_name} in '#{@context_name} #{@spec_name}'"
-        end
-
-        def message
-          @exception.message
-        end
-
-        def backtrace
-          @exception.backtrace.nil? ? "" : @exception.backtrace.join("\n")
-        end
-
-        private
-
-        def class_name
-          @exception.class.name #.split('::').last
+          "#{@exception.class.name} in '#{@context_name} #{@spec_name}'"
         end
 
       end

data/lib/spec/runner/spec_should_raise_handler.rb

@@ -0,0 +1,74 @@
+module Spec
+  module Runner
+    class SpecShouldRaiseHandler
+      def initialize(file_and_line_number, opts)
+        @file_and_line_number = file_and_line_number
+        @options = opts
+        @expected_error_class = determine_error_class(opts)
+        @expected_error_message = determine_error_message(opts)
+      end
+  
+      def determine_error_class(opts)
+        if candidate = opts[:should_raise]
+          if candidate.is_a?(Class)
+            return candidate
+          elsif candidate.is_a?(Array)
+            return candidate[0]
+          else
+            return Exception
+          end
+        end
+      end
+  
+      def determine_error_message(opts)
+        if candidate = opts[:should_raise]
+          if candidate.is_a?(Array)
+            return candidate[1]
+          end
+        end
+        return nil
+      end
+  
+      def build_message(exception=nil)
+        if @expected_error_message.nil?
+          message = "specify block expected #{@expected_error_class.to_s}"
+        else
+          message = "specify block expected #{@expected_error_class.new(@expected_error_message.to_s).inspect}"
+        end
+        message << " but raised #{exception.inspect}" if exception
+        message << " but nothing was raised" unless exception
+        message << "\n"
+        message << @file_and_line_number
+      end
+  
+      def error_matches?(error)
+        return false unless error.kind_of?(@expected_error_class)
+        unless @expected_error_message.nil?
+          if @expected_error_message.is_a?(Regexp)
+            return false unless error.message =~ @expected_error_message
+          else
+            return false unless error.message == @expected_error_message
+          end
+        end
+        return true
+      end
+
+      def handle(errors)
+        if @expected_error_class
+          if errors.empty?
+            errors << Spec::Expectations::ExpectationNotMetError.new(build_message)
+          else
+            error_to_remove = errors.detect do |error|
+              error_matches?(error)
+            end
+            if error_to_remove.nil?
+              errors.insert(0,Spec::Expectations::ExpectationNotMetError.new(build_message(errors[0])))
+            else
+              errors.delete(error_to_remove)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spec/runner/specification.rb

@@ -1,16 +1,25 @@
 module Spec
   module Runner
     class Specification
-
-      def initialize(name, &block)
+      
+      @@current_spec = nil
+    
+      def self.add_listener listener
+        @@current_spec.add_listener listener unless @@current_spec.nil?
+      end
+      
+      def initialize(name, opts={}, &block)
+        @from = caller(0)[3]
         @name = name
+        @options = opts
         @block = block
-        @mocks = []
+        @listeners = []
       end
 
       def run(reporter=nil, setup_block=nil, teardown_block=nil, dry_run=false, execution_context=nil)
-        reporter.spec_started(@name)
+        reporter.spec_started(@name) unless reporter.nil?
         return reporter.spec_finished(@name) if dry_run
+        @@current_spec = self
         execution_context = execution_context || ::Spec::Runner::ExecutionContext.new(self)
         errors = []
         begin
@@ -25,32 +34,42 @@ module Spec
         begin
           execution_context.instance_exec(&teardown_block) unless teardown_block.nil?
           teardown_ok = true
-          @mocks.each do |mock|
-            mock.__verify
-          end
         rescue => e
           errors << e
+        ensure
+          notify_after_teardown errors
+          @@current_spec = nil
         end
+        
+        SpecShouldRaiseHandler.new(@from, @options).handle(errors)
 
         reporter.spec_finished(@name, errors.first, failure_location(setup_ok, spec_ok, teardown_ok)) unless reporter.nil?
       end
 
-      def add_mock(mock)
-        @mocks << mock
-      end
-
       def matches_matcher?(matcher)
         matcher.matches? @name 
       end
-            
+
+      def add_listener listener
+        @listeners << listener
+      end
+
+      def notify_after_teardown errors
+        @listeners.each do |listener|
+          begin
+            listener.spec_finished(self) if listener.respond_to?(:spec_finished)
+          rescue => e
+            errors << e
+          end
+        end
+      end
+
       private
-      
       def failure_location(setup_ok, spec_ok, teardown_ok)
         return 'setup' unless setup_ok
         return @name unless spec_ok
         return 'teardown' unless teardown_ok
       end
-    
     end
   end
 end

data/lib/spec/version.rb

@@ -2,16 +2,19 @@ module Spec
   module VERSION
     unless defined? MAJOR
       MAJOR  = 0
-      MINOR  = 6
-      TINY   = 4
+      MINOR  = 7
+      TINY   = 0
+      # RANDOM_TOKEN: 0.846310547367564
+      REV    = "$LastChangedRevision: 1039 $".match(/LastChangedRevision: (\d+)/)[1]
 
       STRING = [MAJOR, MINOR, TINY].join('.')
+      FULL_VERSION = "#{STRING} (r#{REV})"
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')
 
       NAME   = "RSpec"
       URL    = "http://rspec.rubyforge.org/"  
     
-      DESCRIPTION = "#{NAME}-#{STRING} - BDD for Ruby\n#{URL}"
+      DESCRIPTION = "#{NAME}-#{FULL_VERSION} - BDD for Ruby\n#{URL}"
     end
   end
 end

data/vendor/watir/README.txt

@@ -7,7 +7,7 @@ for web applications that don't yet exist!
 
 Customers, QA people, testers and programmers can translate user story
 acceptance criteria to executable specs based on RSpec and Watir. Take
-a look at find_rspecs_home_page.txt (the story) with find_rspecs_home_page.rb
+a look at find_rspecs_home_page.txt (the story) and find_rspecs_home_page.rb
 (the associated spec).
 
 One of the great benefits of using Watir with RSpec as opposed to using

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.8.10
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
-date: 2006-10-01 00:00:00 -05:00
-summary: RSpec-0.6.4 - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.7.0
+date: 2006-11-05
+summary: RSpec-0.7.0 (r1039) - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -23,108 +23,75 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
       version: 0.0.0
   version: 
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
-- Steven Baker, Aslak Hellesoy, Dave Astels, David Chelimsky
+- - Steven Baker
+  - Aslak Hellesoy
+  - Dave Astels
+  - David Chelimsky
+  - Brian Takita
 files: 
 - CHANGES
 - EXAMPLES.rd
+- MIT-LICENSE
 - Rakefile
 - README
 - lib/spec.rb
+- lib/spec/callback.rb
 - lib/spec/expectations.rb
 - lib/spec/mocks.rb
 - lib/spec/runner.rb
 - lib/spec/version.rb
 - lib/spec/expectations/diff.rb
-- lib/spec/expectations/exceptions.rb
-- lib/spec/expectations/expectations.rb
-- lib/spec/expectations/have_helper.rb
-- lib/spec/expectations/helper.rb
-- lib/spec/expectations/should_base.rb
-- lib/spec/expectations/should_helper.rb
-- lib/spec/expectations/should_negator.rb
+- lib/spec/expectations/errors.rb
+- lib/spec/expectations/extensions.rb
+- lib/spec/expectations/should.rb
 - lib/spec/expectations/sugar.rb
+- lib/spec/expectations/differs/default.rb
+- lib/spec/expectations/extensions/inspect_for_expectation_not_met_error.rb
+- lib/spec/expectations/extensions/numeric.rb
+- lib/spec/expectations/extensions/object.rb
+- lib/spec/expectations/extensions/symbol.rb
+- lib/spec/expectations/should/base.rb
+- lib/spec/expectations/should/have.rb
+- lib/spec/expectations/should/not.rb
+- lib/spec/expectations/should/should.rb
 - lib/spec/mocks/argument_expectation.rb
-- lib/spec/mocks/exceptions.rb
+- lib/spec/mocks/error_generator.rb
+- lib/spec/mocks/errors.rb
 - lib/spec/mocks/message_expectation.rb
 - lib/spec/mocks/mock.rb
+- lib/spec/mocks/mock_handler.rb
+- lib/spec/mocks/mock_methods.rb
 - lib/spec/mocks/order_group.rb
-- lib/spec/rake/rcov_verify.rb
+- lib/spec/mocks/extensions/object.rb
 - lib/spec/rake/spectask.rb
+- lib/spec/rake/verify_rcov.rb
 - lib/spec/runner/backtrace_tweaker.rb
 - lib/spec/runner/context.rb
 - lib/spec/runner/context_eval.rb
 - lib/spec/runner/context_runner.rb
 - lib/spec/runner/execution_context.rb
 - lib/spec/runner/formatter.rb
-- lib/spec/runner/instance_exec.rb
-- lib/spec/runner/kernel_ext.rb
 - lib/spec/runner/option_parser.rb
 - lib/spec/runner/reporter.rb
 - lib/spec/runner/spec_matcher.rb
+- lib/spec/runner/spec_should_raise_handler.rb
 - lib/spec/runner/specification.rb
+- lib/spec/runner/extensions/kernel.rb
+- lib/spec/runner/extensions/object.rb
 - lib/spec/runner/formatter/base_text_formatter.rb
 - lib/spec/runner/formatter/html_formatter.rb
 - lib/spec/runner/formatter/progress_bar_formatter.rb
 - lib/spec/runner/formatter/rdoc_formatter.rb
 - lib/spec/runner/formatter/specdoc_formatter.rb
-- lib/spec/test_to_spec/ruby2ruby.rb
-- lib/spec/test_to_spec/sexp_transformer.rb
-- lib/spec/test_to_spec/test_case_ext.rb
-- lib/spec/test_to_spec/translation_test_runner.rb
-- test/test_classes.rb
-- test/test_helper.rb
-- test/spec/expectations/arbitrary_operator_test.rb
-- test/spec/expectations/arbitrary_predicate_test.rb
-- test/spec/expectations/containment_test.rb
-- test/spec/expectations/diff_test.rb
-- test/spec/expectations/identity_test.rb
-- test/spec/expectations/object_equality_test.rb
-- test/spec/expectations/raising_test.rb
-- test/spec/expectations/regex_matching_test.rb
-- test/spec/expectations/should_have_test.rb
-- test/spec/expectations/should_satisfy_test.rb
-- test/spec/expectations/sugar_test.rb
-- test/spec/expectations/supported_symbols_test.rb
-- test/spec/expectations/throwing_test.rb
-- test/spec/expectations/true_false_special_case_test.rb
-- test/spec/expectations/typing_test.rb
-- test/spec/mocks/mock_arg_constraints_test.rb
-- test/spec/mocks/mock_counts_test.rb
-- test/spec/mocks/mock_ordering_test.rb
-- test/spec/mocks/mock_test.rb
-- test/spec/mocks/null_object_test.rb
-- test/spec/runner/backtrace_tweaker_test.rb
-- test/spec/runner/context_matching_test.rb
-- test/spec/runner/context_runner_test.rb
-- test/spec/runner/context_test.rb
-- test/spec/runner/execution_context_test.rb
-- test/spec/runner/kernel_ext_test.rb
-- test/spec/runner/option_parser_test.rb
-- test/spec/runner/reporter_test.rb
-- test/spec/runner/spec_matcher_test.rb
-- test/spec/runner/specification_test.rb
-- test/spec/runner/formatter/failure_dump_test.rb
-- test/spec/runner/formatter/html_formatter_test.rb
-- test/spec/runner/formatter/progress_bar_formatter_test.rb
-- test/spec/runner/formatter/rdoc_formatter_test.rb
-- test/spec/runner/formatter/specdoc_formatter_test.rb
-- test/spec/test_to_spec/ruby_to_ruby_test.rb
-- test/spec/test_to_spec/sexp_transformer_assertion_test.rb
-- test/spec/test_to_spec/sexp_transformer_test.rb
-- test/spec/test_to_spec/test_case_ext_test.rb
-- test/spec/test_to_spec/testfiles/test_unit_api_spec.rb
-- test/spec/test_to_spec/testfiles/test_unit_api_test.rb
 - examples/custom_formatter.rb
 - examples/file_accessor.rb
 - examples/file_accessor_spec.rb
-- examples/helper_method_spec.rb
+- examples/helper_method_example.rb
 - examples/io_processor.rb
 - examples/io_processor_spec.rb
 - examples/mocking_example.rb
+- examples/partial_mock_example.rb
 - examples/predicate_example.rb
 - examples/stack.rb
 - examples/stack_spec.rb
@@ -151,7 +118,6 @@ extra_rdoc_files:
 - CHANGES
 executables: 
 - spec
-- test2spec
 extensions: []
 
 requirements: []