rspec 1.2.8 → 1.2.9

data/lib/spec/mocks/framework.rb

@@ -4,7 +4,7 @@
 
 require 'spec/mocks/methods'
 require 'spec/mocks/argument_matchers'
-require 'spec/mocks/spec_methods'
+require 'spec/mocks/example_methods'
 require 'spec/mocks/proxy'
 require 'spec/mocks/mock'
 require 'spec/mocks/argument_expectation'

data/lib/spec/mocks/methods.rb

@@ -25,6 +25,21 @@ module Spec
 
       alias_method :unstub, :unstub!
 
+      # :call-seq:
+      #   object.stub_chain(:first, :second, :third).and_return(:this)
+      #
+      # Supports stubbing a chain of methods. Each argument represents
+      # a method name to stub, and each one returns a proxy object that
+      # can accept more stubs, until the last, which returns whatever
+      # is passed to +and_return_.
+      #
+      # == Examples
+      #   
+      #   # with this in an example ...
+      #   article = double('article')
+      #   Article.stub_chain(:authored_by, :published, :recent).and_return([article])
+      #   # then this will return an Array with the article double in it:
+      #   Article.authored_by(params[:author_id]).published.recent
       def stub_chain(*methods)
         if methods.length > 1
           if matching_stub = __mock_proxy.find_matching_method_stub(methods[0])

data/lib/spec/mocks/mock.rb

@@ -7,14 +7,14 @@ module Spec
       # 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='mock', stubs_and_options={})
+      def initialize(name=nil, stubs_and_options={})
         if name.is_a?(Hash) && stubs_and_options.empty?
           stubs_and_options = name
-          build_name_from_options stubs_and_options
+          @name = nil
         else
           @name = name
         end
-        @options = parse_options(stubs_and_options)
+        @options = extract_options(stubs_and_options)
         assign_stubs(stubs_and_options)
       end
 
@@ -46,8 +46,19 @@ module Spec
         end
       end
 
-      def parse_options(options)
-        options.has_key?(:null_object) ? {:null_object => options.delete(:null_object)} : {}
+      def extract_options(stubs_and_options)
+        options = {}
+        extract_option(stubs_and_options, options, :null_object)
+        extract_option(stubs_and_options, options, :__declared_as, 'Mock')
+        options
+      end
+      
+      def extract_option(source, target, key, default=nil)
+        if source[key]
+          target[key] = source.delete(key)
+        elsif default
+          target[key] = default
+        end
       end
 
       def assign_stubs(stubs)
@@ -55,11 +66,6 @@ module Spec
           stub!(message).and_return(response)
         end
       end
-
-      def build_name_from_options(options)
-        vals = options.inject([]) {|coll, pair| coll << "#{pair.first}: #{pair.last.inspect}"}
-        @name = '{' + vals.join(', ') + '}'
-      end
     end
   end
 end

data/lib/spec/mocks/proxy.rb

@@ -18,7 +18,7 @@ module Spec
       def initialize(target, name=nil, options={})
         @target = target
         @name = name
-        @error_generator = ErrorGenerator.new target, name
+        @error_generator = ErrorGenerator.new target, name, options
         @expectation_ordering = OrderGroup.new @error_generator
         @expectations = []
         @messages_received = []

data/lib/spec/rake/spectask.rb

@@ -118,14 +118,14 @@ module Spec
       # Use verbose output. If this is set to true, the task will print
       # the executed spec command to stdout. Defaults to false.
       attr_accessor :verbose
-      
+
       # Explicitly define the path to the ruby binary, or its proxy (e.g. multiruby)
       attr_accessor :ruby_cmd
 
       # Defines a new task, using the name +name+.
       def initialize(name=:spec)
         @name = name
-        @libs = [File.expand_path(File.dirname(__FILE__) + '/../../../lib')]
+        @libs = ['lib']
         @pattern = nil
         @spec_files = nil
         @spec_opts = []
@@ -142,7 +142,7 @@ module Spec
       end
 
       def define # :nodoc:
-        spec_script = File.expand_path(File.dirname(__FILE__) + '/../../../bin/spec')
+        spec_script = File.expand_path(File.join(File.dirname(__FILE__),"..","..","..","bin","spec"))
 
         lib_path = libs.join(File::PATH_SEPARATOR)
         actual_name = Hash === name ? name.keys.first : name

data/lib/spec/runner/backtrace_tweaker.rb

@@ -1,33 +1,53 @@
 module Spec
   module Runner
     class BacktraceTweaker
+      def initialize(*patterns)
+        @ignore_patterns = []
+      end
+
       def clean_up_double_slashes(line)
         line.gsub!('//','/')
       end
-    end
 
-    class NoisyBacktraceTweaker < BacktraceTweaker
+      def ignore_patterns(*patterns)
+        # do nothing. Only QuietBacktraceTweaker ignores patterns.
+      end
+
+      def ignored_patterns
+        []
+      end
+
       def tweak_backtrace(error)
         return if error.backtrace.nil?
-        tweaked = error.backtrace.collect do |line|
-          clean_up_double_slashes(line)
-          line
+        tweaked = error.backtrace.collect do |message|
+          clean_up_double_slashes(message)
+          kept_lines = message.split("\n").select do |line|
+            ignored_patterns.each do |ignore|
+              break if line =~ ignore
+            end
+          end
+          kept_lines.empty?? nil : kept_lines.join("\n")
         end
-        error.set_backtrace(tweaked)
+        error.set_backtrace(tweaked.select {|line| line})
       end
     end
 
+    class NoisyBacktraceTweaker < BacktraceTweaker
+    end
+
     # Tweaks raised Exceptions to mask noisy (unneeded) parts of the backtrace
     class QuietBacktraceTweaker < BacktraceTweaker
       unless defined?(IGNORE_PATTERNS)
-        root_dir = File.expand_path(File.join(__FILE__, '..', '..', '..', '..'))
-        spec_files = Dir["#{root_dir}/lib/*"].map do |path| 
-          subpath = path[root_dir.length..-1]
+        spec_files = Dir["lib/*"].map do |path| 
+          subpath = path[1..-1]
           /#{subpath}/
         end
         IGNORE_PATTERNS = spec_files + [
+          /\/rspec-[^\/]*\/lib\/spec\//,
+          /\/spork-[^\/]*\/lib\/spork\//,
           /\/lib\/ruby\//,
           /bin\/spec:/,
+          /bin\/spork:/,
           /bin\/rcov:/,
           /lib\/rspec-rails/,
           /vendor\/rails/,
@@ -39,19 +59,18 @@ module Spec
           /spec_server/
         ]
       end
-      
-      def tweak_backtrace(error)
-        return if error.backtrace.nil?
-        tweaked = error.backtrace.collect do |message|
-          clean_up_double_slashes(message)
-          kept_lines = message.split("\n").select do |line|
-            IGNORE_PATTERNS.each do |ignore|
-              break if line =~ ignore
-            end
-          end
-          kept_lines.empty?? nil : kept_lines.join("\n")
-        end
-        error.set_backtrace(tweaked.select {|line| line})
+
+      def initialize(*patterns)
+        super
+        ignore_patterns(*patterns)
+      end
+
+      def ignore_patterns(*patterns)
+        @ignore_patterns += patterns.flatten.map { |pattern| Regexp.new(pattern) }
+      end
+
+      def ignored_patterns
+        IGNORE_PATTERNS + @ignore_patterns
       end
     end
   end

data/lib/spec/runner/configuration.rb

@@ -137,6 +137,23 @@ module Spec
       def predicate_matchers
         @predicate_matchers ||= Spec::HashWithDeprecationNotice.new("predicate_matchers", "the new Matcher DSL")
       end
+
+      # Adds patterns to the list of patterns ignored in the backtrace when a
+      # failure is output by rspec. Example:
+      #
+      #   config.ignore_backtrace_patterns /spork/, /shoulda/, "/some/weird/path/"
+      #
+      # When quiet backtraces are turned on (default), this will exclude any
+      # lines that match any of the Regexps and Strings passed.
+      #
+      def ignore_backtrace_patterns(*patterns)
+        @ignored_backtrace_patterns ||= []
+        @ignored_backtrace_patterns += patterns
+      end
+
+      def ignored_backtrace_patterns # :nodoc:
+        @ignored_backtrace_patterns ||= []
+      end
       
     private
     
@@ -161,7 +178,7 @@ module Spec
       end
     
       def mock_framework_path(framework_name)
-        File.expand_path(File.join(File.dirname(__FILE__), "/../adapters/mock_frameworks/#{framework_name}"))
+        "spec/adapters/mock_frameworks/#{framework_name}"
       end
 
       def scope_and_options(*args) # :nodoc:

data/lib/spec/runner/differs/default.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "/load-diff-lcs")
+require 'spec/runner/differs/load-diff-lcs'
 require 'pp'
 
 module Spec

data/lib/spec/runner/drb_command_line.rb

@@ -8,8 +8,11 @@ module Spec
       # CommandLine - making it possible for clients to use both interchangeably.
       def self.run(options)
         begin
-          # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
-          DRb.start_service("druby://localhost:0")
+          begin; \
+            DRb.start_service("druby://localhost:0"); \
+          rescue SocketError; \
+            DRb.start_service("druby://:0"); \
+          end
           spec_server = DRbObject.new_with_uri("druby://127.0.0.1:8989")
           spec_server.run(options.argv, options.error_stream, options.output_stream)
           true

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

@@ -102,7 +102,7 @@ module Spec
         end
         
         def autospec?
-          !!@options.autospec
+          !!@options.autospec || ENV.has_key?("AUTOTEST")
         end
         
         def backtrace_line(line)
@@ -110,13 +110,18 @@ module Spec
         end
 
         def colour(text, colour_code)
-          return text unless ENV['RSPEC_COLOR'] || (colour? & (autospec? || output_to_tty?))
+          return text if output_to_file?
+          return text unless ENV['RSPEC_COLOR'] || (colour? & (autospec? || output_to_tty?)) 
           "#{colour_code}#{text}\e[0m"
         end
 
+        def output_to_file?
+          File === @output
+        end
+        
         def output_to_tty?
           begin
-            @output.tty? || ENV.has_key?("AUTOTEST")
+            @output.tty?
           rescue NoMethodError
             false
           end

data/lib/spec/runner/option_parser.rb

@@ -117,18 +117,18 @@ module Spec
         on("--autospec")                {@options.autospec = true}
         on_tail(*OPTIONS[:help])        {parse_help}
       end
-      
+
       def order!(argv, &blk)
         @argv = argv.dup
-        @argv = (@argv.empty? & self.class.spec_command?) ? ['--help'] : @argv 
-        
+        @argv = (@argv.empty? & self.class.spec_command?) ? ['--help'] : @argv
+
         # Parse options file first
         parse_file_options(:options_file, :parse_options_file)
-        
+
         @options.argv = @argv.dup
-        return if parse_file_options(:generate_options, :write_generated_options)
+        return if parse_file_options(:generate_options, :write_options_file)
         return if parse_drb
-        
+
         super(@argv) do |file|
           if file =~ /^(.+):(\d+)$/
             file = $1
@@ -141,7 +141,7 @@ module Spec
 
         @options
       end
-      
+
     protected
 
       def invoke_requires(requires)
@@ -149,11 +149,6 @@ module Spec
           require file
         end
       end
-      
-      def parse_options_file(options_file)
-        option_file_args = IO.readlines(options_file).map {|l| l.chomp.split " "}.flatten
-        @argv.push(*option_file_args)
-      end
 
       def parse_file_options(option_name, action)
         # Remove the file option and the argument before handling the file
@@ -167,6 +162,12 @@ module Spec
           end
         end
         
+        if options_file.nil? &&
+           File.exist?('spec/spec.opts') &&
+           !@argv.any?{|a| a =~ /^\-/ }
+             options_file = 'spec/spec.opts'
+        end
+
         if options_file
           send(action, options_file)
           return true
@@ -174,8 +175,13 @@ module Spec
           return false
         end
       end
-      
-      def write_generated_options(options_file)
+
+      def parse_options_file(options_file)
+        option_file_args = File.readlines(options_file).map {|l| l.chomp.split " "}.flatten
+        @argv.push(*option_file_args)
+      end
+
+      def write_options_file(options_file)
         File.open(options_file, 'w') do |io|
           io.puts @argv.join("\n")
         end
@@ -207,7 +213,7 @@ module Spec
       def parse_help
         @out_stream.puts self
         exit if stdout?
-      end      
+      end
 
       def stdout?
         @out_stream == $stdout

data/lib/spec/runner/options.rb

@@ -28,7 +28,7 @@ module Spec
       }
 
       attr_accessor(
-        :autospec, # hack to tell 
+        :autospec, # hack to tell
         :filename_pattern,
         :backtrace_tweaker,
         :context_lines,
@@ -50,7 +50,7 @@ module Spec
         :argv
       )
       attr_reader :colour, :differ_class, :files, :examples, :example_groups
-      
+
       def initialize(error_stream, output_stream)
         @error_stream = error_stream
         @output_stream = output_stream
@@ -74,15 +74,15 @@ module Spec
         @files_loaded = false
         @out_used = nil
       end
-      
+
       def add_example_group(example_group)
         @example_groups << example_group
       end
-      
+
       def line_number_requested?
         !!line_number
       end
-      
+
       def example_line
         Spec::Runner::LineNumberQuery.new(self).example_line_for(files.first, line_number)
       end
@@ -96,6 +96,28 @@ module Spec
         require 'ruby-debug'
       end
 
+      def project_root # :nodoc:
+        require 'pathname'
+        @project_root ||= determine_project_root
+      end
+
+      def determine_project_root # :nodoc:
+        # This is borrowed (slightly modified) from Scott Taylors
+        # project_path project:
+        #   http://github.com/smtlaissezfaire/project_path
+        Pathname(File.expand_path('.')).ascend do |path|
+          if File.exists?(File.join(path, "spec"))
+            return path
+          end
+        end
+      end
+
+      def add_dir_from_project_root_to_load_path(dir, load_path=$LOAD_PATH) # :nodoc:
+        return if project_root.nil?
+        full_dir = File.join(project_root, dir)
+        load_path.unshift full_dir unless load_path.include?(full_dir)
+      end
+
       def run_examples
         require_ruby_debug if debug
         return true unless examples_should_be_run?
@@ -104,21 +126,23 @@ module Spec
           runner = custom_runner || ExampleGroupRunner.new(self)
 
           unless @files_loaded
+            ['spec','lib'].each do |dir|
+              add_dir_from_project_root_to_load_path(dir)
+            end
             runner.load_files(files_to_load)
             @files_loaded = true
           end
-          
+
           define_predicate_matchers
           plugin_mock_framework
+          ignore_backtrace_patterns
 
           # TODO - this has to happen after the files get loaded,
           # otherwise the before_suite_parts are not populated
           # from the configuration. There is no spec for this
           # directly, but features/before_and_after_blocks/before_and_after_blocks.story
           # will fail if this happens before the files are loaded.
-          before_suite_parts.each do |part|
-            part.call
-          end
+          before_suite_parts.each { |part| part.call }
 
           if example_groups.empty?
             true
@@ -135,11 +159,11 @@ module Spec
           end
         end
       end
-      
+
       def before_suite_parts
         Spec::Example::BeforeAndAfterHooks.before_suite_parts
       end
-      
+
       def after_suite_parts
         Spec::Example::BeforeAndAfterHooks.after_suite_parts
       end
@@ -151,7 +175,7 @@ module Spec
       def examples_should_not_be_run
         @examples_should_be_run = false
       end
-      
+
       def mock_framework
         # TODO - don't like this dependency - perhaps store this in here instead?
         Spec::Runner.configuration.mock_framework
@@ -204,7 +228,7 @@ module Spec
         @format_options ||= []
         @format_options << [format, where]
       end
-      
+
       def formatters
         @format_options ||= [['progress', @output_stream]]
         @formatters ||= load_formatters(@format_options, EXAMPLE_FORMATTERS)
@@ -221,7 +245,7 @@ module Spec
           formatter_type.new(formatter_options, where)
         end
       end
-      
+
       def formatter_options
         @formatter_options ||= OpenStruct.new(
           :colour   => colour,
@@ -230,10 +254,13 @@ module Spec
         )
       end
 
+      def which_heckle_runner
+        ([/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} || Spec::Ruby.version.to_f == 1.9) ? "spec/runner/heckle_runner_unsupported" : "spec/runner/heckle_runner"
+      end
+
       def load_heckle_runner(heckle)
         @format_options ||= [['silent', @output_stream]]
-        suffix = ([/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} || Spec::Ruby.version.to_f == 1.9) ? '_unsupported' : ''
-        require "spec/runner/heckle_runner#{suffix}"
+        require which_heckle_runner
         @heckle_runner = ::Spec::Runner::HeckleRunner.new(heckle)
       end
 
@@ -257,11 +284,11 @@ module Spec
         end
         result
       end
-      
+
       def dry_run?
         @dry_run == true
       end
-      
+
     protected
 
       def define_predicate_matchers
@@ -271,7 +298,7 @@ module Spec
           end
         end
       end
-      
+
       def plugin_mock_framework
         case mock_framework
         when Module
@@ -282,11 +309,15 @@ module Spec
         end
       end
 
+      def ignore_backtrace_patterns
+        @backtrace_tweaker.ignore_patterns Spec::Runner.configuration.ignored_backtrace_patterns
+      end
+
       def examples_should_be_run?
         return @examples_should_be_run unless @examples_should_be_run.nil?
         @examples_should_be_run = true
       end
-      
+
       def differ_class=(klass)
         return unless klass
         @differ_class = klass
@@ -310,7 +341,7 @@ module Spec
           if $_spec_spec ; raise e ; else exit(1) ; end
         end
       end
-      
+
       def custom_runner
         return nil unless custom_runner?
         klass_name, arg = ClassAndArgumentsParser.parse(user_input_for_runner)
@@ -321,13 +352,13 @@ module Spec
       def custom_runner?
         return user_input_for_runner ? true : false
       end
-      
+
       def heckle
         heckle_runner = self.heckle_runner
         self.heckle_runner = nil
         heckle_runner.heckle_with
       end
-      
+
       def sorted_files
         return sorter ? files.sort(&sorter) : files
       end