rspec 1.1.11 → 1.1.12

data/lib/spec/runner/backtrace_tweaker.rb

@@ -9,9 +9,11 @@ module Spec
     class NoisyBacktraceTweaker < BacktraceTweaker
       def tweak_backtrace(error)
         return if error.backtrace.nil?
-        error.backtrace.each do |line|
+        tweaked = error.backtrace.collect do |line|
           clean_up_double_slashes(line)
+          line
         end
+        error.set_backtrace(tweaked)
       end
     end
 
@@ -40,7 +42,7 @@ module Spec
       
       def tweak_backtrace(error)
         return if error.backtrace.nil?
-        error.backtrace.collect! do |message|
+        tweaked = error.backtrace.collect do |message|
           clean_up_double_slashes(message)
           kept_lines = message.split("\n").select do |line|
             IGNORE_PATTERNS.each do |ignore|
@@ -49,7 +51,7 @@ module Spec
           end
           kept_lines.empty?? nil : kept_lines.join("\n")
         end
-        error.backtrace.compact!
+        error.set_backtrace(tweaked.select {|line| line})
       end
     end
   end

data/lib/spec/runner/class_and_arguments_parser.rb

@@ -1,16 +1,14 @@
 module Spec
   module Runner
     class ClassAndArgumentsParser
-      class << self
-        def parse(s)
-          if s =~ /([a-zA-Z_]+(?:::[a-zA-Z_]+)*):?(.*)/
-            arg = $2 == "" ? nil : $2
-            [$1, arg]
-          else
-            raise "Couldn't parse #{s.inspect}"
-          end
+      def self.parse(s)
+        if s =~ /([a-zA-Z_]+(?:::[a-zA-Z_]+)*):?(.*)/
+          arg = $2 == "" ? nil : $2
+          [$1, arg]
+        else
+          raise "Couldn't parse #{s.inspect}"
         end
       end
     end
   end
-end
+end

data/lib/spec/runner/command_line.rb

@@ -3,14 +3,12 @@ require 'spec/runner/option_parser'
 module Spec
   module Runner
     class CommandLine
-      class << self
-        def run(tmp_options=Spec::Runner.options)
-          orig_options = Spec::Runner.options
-          Spec::Runner.use tmp_options
-          tmp_options.run_examples
-        ensure
-          Spec::Runner.use orig_options
-        end
+      def self.run(tmp_options=Spec::Runner.options)
+        orig_options = Spec::Runner.options
+        Spec::Runner.use tmp_options
+        tmp_options.run_examples
+      ensure
+        Spec::Runner.use orig_options
       end
     end
   end

data/lib/spec/{example → runner}/configuration.rb

@@ -1,5 +1,5 @@
 module Spec
-  module Example
+  module Runner
     class Configuration
       # Chooses what mock framework to use. Example:
       #
@@ -47,44 +47,48 @@ module Spec
       #   include(My::Helpers, :type => :key)
       #
       # Declares modules to be included in multiple example groups
-      # (<tt>describe</tt> blocks). With no :type, the modules listed will be
-      # included in all example groups. Use :type to restrict the inclusion to
-      # a subset of example groups. The value assigned to :type should be a
-      # key that maps to a class that is either a subclass of
-      # Spec::Example::ExampleGroup or extends Spec::Example::ExampleGroupMethods
-      # and includes Spec::Example::ExampleMethods
+      # (<tt>describe</tt> blocks). With no <tt>:type</tt>, the modules listed
+      # will be included in all example groups.
       #
-      #   config.include(My::Pony, My::Horse, :type => :farm)
+      # Use <tt>:type</tt> to restrict
+      # the inclusion to a subset of example groups. The value assigned to
+      # <tt>:type</tt> should be a key that maps to a class that is either a
+      # subclass of Spec::Example::ExampleGroup or extends
+      # Spec::Example::ExampleGroupMethods and includes
+      # Spec::Example::ExampleMethods.
+      #
+      # For example, the rspec-rails gem/plugin extends Test::Unit::TestCase
+      # with Spec::Example::ExampleGroupMethods and includes
+      # Spec::Example::ExampleMethods in it. So if you have a module of helper
+      # methods for controller examples, you could do this:
+      #
+      #   config.include(ControllerExampleHelpers, :type => :controller)
       #
       # Only example groups that have that type will get the modules included:
       #
-      #   describe "Downtown", :type => :city do
-      #     # Will *not* get My::Pony and My::Horse included
+      #   describe Account, :type => :model do
+      #     # Will *not* include ControllerExampleHelpers
       #   end
       #
-      #   describe "Old Mac Donald", :type => :farm do
-      #     # *Will* get My::Pony and My::Horse included
+      #   describe AccountsController, :type => :controller do
+      #     # *Will* include ControllerExampleHelpers
       #   end
       #
       def include(*args)
         include_or_extend(:include, *args)
       end
       
+      # :call-seq:
+      #   extend(Some::Helpers)
+      #   extend(Some::Helpers, More::Helpers)
+      #   extend(My::Helpers, :type => :key)
+      #
+      # Works just like #include, but extends the example groups
+      # with the modules rather than including them.
       def extend(*args)
         include_or_extend(:extend, *args)
       end
       
-      def include_or_extend(*args)
-        action = args.shift
-        args << {} unless Hash === args.last
-        modules, options = args_and_options(*args)
-        required_example_group = get_type_from_options(options)
-        required_example_group = required_example_group.to_sym if required_example_group
-        modules.each do |mod|
-          ExampleGroupFactory.get(required_example_group).send(action, mod)
-        end
-      end
-
       # Defines global predicate matchers. Example:
       #
       #   config.predicate_matchers[:swim] = :can_swim?
@@ -100,11 +104,7 @@ module Spec
       # Prepends a global <tt>before</tt> block to all example groups.
       # See #append_before for filtering semantics.
       def prepend_before(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.prepend_before(scope, &proc)
+        add_callback(:prepend_before, *args, &proc)
       end
       
       # Appends a global <tt>before</tt> block to all example groups.
@@ -119,40 +119,39 @@ module Spec
       #   config.prepend_before(:type => :farm)
       #
       def append_before(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.append_before(scope, &proc)
+        add_callback(:append_before, *args, &proc)
       end
       alias_method :before, :append_before
 
       # Prepends a global <tt>after</tt> block to all example groups.
       # See #append_before for filtering semantics.
       def prepend_after(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.prepend_after(scope, &proc)
+        add_callback(:prepend_after, *args, &proc)
       end
       alias_method :after, :prepend_after
       
       # Appends a global <tt>after</tt> block to all example groups.
       # See #append_before for filtering semantics.
       def append_after(*args, &proc)
-        scope, options = scope_and_options(*args)
-        example_group = ExampleGroupFactory.get(
-          get_type_from_options(options)
-        )
-        example_group.append_after(scope, &proc)
+        add_callback(:append_after, *args, &proc)
       end
 
     private
+    
+      def include_or_extend(action, *args)
+        modules, options = Spec::Example.args_and_options(*args)
+        [get_type_from_options(options)].flatten.each do |required_example_group|
+          required_example_group = required_example_group.to_sym if required_example_group
+          modules.each do |mod|
+            Spec::Example::ExampleGroupFactory.get(required_example_group).__send__(action, mod)
+          end
+        end
+      end
 
-      def scope_and_options(*args)
-        args, options = args_and_options(*args)
-        scope = (args[0] || :each), options
+      def add_callback(sym, *args, &proc)
+        scope, options = Spec::Example.scope_and_options(*args)
+        example_group = Spec::Example::ExampleGroupFactory.get(get_type_from_options(options))
+        example_group.__send__(sym, scope, &proc)
       end
 
       def get_type_from_options(options)
@@ -160,7 +159,7 @@ module Spec
       end
     
       def mock_framework_path(framework_name)
-        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "plugins", "mock_frameworks", framework_name))
+        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "adapters", "mock_frameworks", framework_name))
       end
     end
   end

data/lib/spec/runner/example_group_runner.rb

@@ -10,6 +10,7 @@ module Spec
         # responsibility of the ExampleGroupRunner. Some implementations (like)
         # the one using DRb may choose *not* to load files, but instead tell
         # someone else to do it over the wire.
+        $KCODE = 'u' if RUBY_VERSION < '1.9'
         files.each do |file|
           load file
         end
@@ -19,7 +20,7 @@ module Spec
         prepare
         success = true
         example_groups.each do |example_group|
-          success = success & example_group.run
+          success = success & example_group.run(@options)
         end
         return success
       ensure
@@ -53,7 +54,17 @@ module Spec
         @options.number_of_examples
       end
     end
-    # TODO: BT - Deprecate BehaviourRunner?
-    BehaviourRunner = ExampleGroupRunner
+    
+    class BehaviourRunner < ExampleGroupRunner
+      def initialize(options)
+        Kernel.warn <<-WARNING
+DEPRECATED: The BeheviourRunner class is deprecated and will
+be removed from rspec-1.2.
+
+Use ExampleGroupRunner instead.
+WARNING
+        super
+      end
+    end
   end
-end
+end

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

@@ -14,6 +14,7 @@ module Spec
         def initialize(options, where)
           super
           if where.is_a?(String)
+            FileUtils.mkdir_p(File.dirname(where))
             @output = File.open(where, 'w')
           else
             @output = where
@@ -22,7 +23,7 @@ module Spec
         end
         
         def example_pending(example, message, pending_caller)
-          @pending_examples << [example.__full_description, message, pending_caller]
+          @pending_examples << [example.full_description, message, pending_caller]
         end
         
         def dump_failure(counter, failure)
@@ -69,8 +70,8 @@ module Spec
             @output.puts
             @output.puts "Pending:"
             @pending_examples.each do |pending_example|
-              @output.puts "#{pending_example[0]} (#{pending_example[1]})" 
-              @output.puts "  Called from #{pending_example[2]}"
+              @output.puts "\n#{pending_example[0]} (#{pending_example[1]})"
+              @output.puts "#{pending_example[2]}\n"
             end
           end
           @output.flush

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

@@ -154,14 +154,6 @@ module Spec
     font-size: 80%;
   }
   </style>
-</head>
-<body>
-EOF
-        end
-
-        def report_header
-          <<-EOF
-<div class="rspec-report">
   <script type="text/javascript">
     // <![CDATA[
 #{global_scripts}
@@ -170,9 +162,19 @@ EOF
   <style type="text/css">
 #{global_styles}
   </style>
+</head>
+<body>
+EOF
+        end
+
+        def report_header
+          <<-EOF
+<div class="rspec-report">
 
 <div id="rspec-header">
-  <h1>RSpec Results</h1>
+  <div id="label">
+    <h1>RSpec Results</h1>
+  </div>
 
   <div id="summary">
     <p id="totals">&nbsp;</p>
@@ -212,7 +214,7 @@ EOF
         def global_styles
           <<-EOF
 #rspec-header {
-  background: #65C400; color: #fff;
+  background: #65C400; color: #fff; height: 42px;
 }
 
 .rspec-report h1 {
@@ -220,15 +222,16 @@ EOF
   padding: 10px;
   font-family: "Lucida Grande", Helvetica, sans-serif;
   font-size: 1.8em;
+  float: left;
 }
 
 #summary {
   margin: 0; padding: 5px 10px;
   font-family: "Lucida Grande", Helvetica, sans-serif;
   text-align: right;
-  position: absolute;
   top: 0px;
   right: 0px;
+  float:right;
 }
 
 #summary p {

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

@@ -16,7 +16,7 @@ module Spec
           current_nested_example_groups = described_example_group_chain
           current_nested_example_groups.each_with_index do |nested_example_group, i|
             unless nested_example_group == previous_nested_example_groups[i]
-              output.puts "#{'  ' * i}#{nested_example_group.description_args}"
+              output.puts "#{'  ' * i}#{nested_example_group.description_args.join}"
             end
           end
 
@@ -52,7 +52,7 @@ module Spec
 
         def described_example_group_chain
           example_group_chain = []
-          example_group.__send__(:each_ancestor_example_group_class) do |example_group_class|
+          example_group.__send__(:example_group_hierarchy).each do |example_group_class|
             unless example_group_class.description_args.empty?
               example_group_chain << example_group_class
             end

data/lib/spec/runner/heckle_runner.rb

@@ -1,72 +1,74 @@
-begin
-  require 'rubygems'
-  require 'heckle'
-rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
+unless Spec::Ruby.version.to_f == 1.9
+  begin
+    require 'rubygems'
+    require 'heckle'
+  rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
 
-module Spec
-  module Runner
-    # Creates a new Heckler configured to heckle all methods in the classes
-    # whose name matches +filter+
-    class HeckleRunner
-      def initialize(filter, heckle_class=Heckler)
-        @filter = filter
-        @heckle_class = heckle_class
-      end
-      
-      # Runs all the example groups held by +rspec_options+ once for each of the
-      # methods in the matched classes.
-      def heckle_with
-        if @filter =~ /(.*)[#\.](.*)/
-          heckle_method($1, $2)
-        else
-          heckle_class_or_module(@filter)
+  module Spec
+    module Runner
+      # Creates a new Heckler configured to heckle all methods in the classes
+      # whose name matches +filter+
+      class HeckleRunner
+        def initialize(filter, heckle_class=Heckler)
+          @filter = filter
+          @heckle_class = heckle_class
         end
-      end
       
-      def heckle_method(class_name, method_name)
-        verify_constant(class_name)
-        heckle = @heckle_class.new(class_name, method_name, Spec::Runner.options)
-        heckle.validate
-      end
+        # Runs all the example groups held by +rspec_options+ once for each of the
+        # methods in the matched classes.
+        def heckle_with
+          if @filter =~ /(.*)[#\.](.*)/
+            heckle_method($1, $2)
+          else
+            heckle_class_or_module(@filter)
+          end
+        end
       
-      def heckle_class_or_module(class_or_module_name)
-        verify_constant(class_or_module_name)
-        pattern = /^#{class_or_module_name}/
-        classes = []
-        ObjectSpace.each_object(Class) do |klass|
-          classes << klass if klass.name =~ pattern
+        def heckle_method(class_name, method_name)
+          verify_constant(class_name)
+          heckle = @heckle_class.new(class_name, method_name, Spec::Runner.options)
+          heckle.validate
         end
+      
+        def heckle_class_or_module(class_or_module_name)
+          verify_constant(class_or_module_name)
+          pattern = /^#{class_or_module_name}/
+          classes = []
+          ObjectSpace.each_object(Class) do |klass|
+            classes << klass if klass.name =~ pattern
+          end
         
-        classes.each do |klass|
-          klass.instance_methods(false).each do |method_name|
-            heckle = @heckle_class.new(klass.name, method_name, Spec::Runner.options)
-            heckle.validate
+          classes.each do |klass|
+            klass.instance_methods(false).each do |method_name|
+              heckle = @heckle_class.new(klass.name, method_name, Spec::Runner.options)
+              heckle.validate
+            end
           end
         end
-      end
       
-      def verify_constant(name)
-        begin
-          # This is defined in Heckle
-          name.to_class
-        rescue
-          raise "Heckling failed - \"#{name}\" is not a known class or module"
+        def verify_constant(name)
+          begin
+            # This is defined in Heckle
+            name.to_class
+          rescue
+            raise "Heckling failed - \"#{name}\" is not a known class or module"
+          end
         end
       end
-    end
     
-    #Supports Heckle 1.2 and prior (earlier versions used Heckle::Base)
-    class Heckler < (Heckle.const_defined?(:Base) ? Heckle::Base : Heckle)
-      def initialize(klass_name, method_name, rspec_options)
-        super(klass_name, method_name)
-        @rspec_options = rspec_options
-      end
+      #Supports Heckle 1.2 and prior (earlier versions used Heckle::Base)
+      class Heckler < (Heckle.const_defined?(:Base) ? Heckle::Base : Heckle)
+        def initialize(klass_name, method_name, rspec_options)
+          super(klass_name, method_name)
+          @rspec_options = rspec_options
+        end
 
-      def tests_pass?
-        success = @rspec_options.run_examples
-        success
-      end
+        def tests_pass?
+          success = @rspec_options.run_examples
+          success
+        end
 
+      end
     end
   end
-end
+end