spree 0.5.1 → 0.6.0

data/vendor/plugins/rspec/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,17 +42,16 @@ module Spec
       
       def tweak_backtrace(error)
         return if error.backtrace.nil?
-        error.backtrace.collect! do |line|
-          clean_up_double_slashes(line)
-          IGNORE_PATTERNS.each do |ignore|
-            if line =~ ignore
-              line = nil
-              break
+        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
-          line
+          kept_lines.empty?? nil : kept_lines.join("\n")
         end
-        error.backtrace.compact!
+        error.set_backtrace(tweaked.select {|line| line})
       end
     end
   end

data/vendor/plugins/rspec/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/vendor/plugins/rspec/lib/spec/runner/command_line.rb

@@ -2,26 +2,13 @@ require 'spec/runner/option_parser'
 
 module Spec
   module Runner
-    # Facade to run specs without having to fork a new ruby process (using `spec ...`)
     class CommandLine
-      class << self
-        # Runs specs. +argv+ is the commandline args as per the spec commandline API, +err+
-        # and +out+ are the streams output will be written to.
-        def run(instance_rspec_options)
-          # NOTE - this call to init_rspec_options is not spec'd, but neither is any of this
-          # swapping of $rspec_options. That is all here to enable rspec to run against itself
-          # and maintain coverage in a single process. Therefore, DO NOT mess with this stuff
-          # unless you know what you are doing!
-          init_rspec_options(instance_rspec_options)
-          orig_rspec_options = rspec_options
-          begin
-            $rspec_options = instance_rspec_options
-            return $rspec_options.run_examples
-          ensure
-            ::Spec.run = true
-            $rspec_options = orig_rspec_options
-          end
-        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/vendor/plugins/rspec/lib/spec/runner/configuration.rb

@@ -0,0 +1,166 @@
+module Spec
+  module Runner
+    class Configuration
+      # Chooses what mock framework to use. Example:
+      #
+      #   Spec::Runner.configure do |config|
+      #     config.mock_with :rspec, :mocha, :flexmock, or :rr
+      #   end
+      #
+      # To use any other mock framework, you'll have to provide your own
+      # adapter. This is simply a module that responds to the following
+      # methods:
+      #
+      #   setup_mocks_for_rspec
+      #   verify_mocks_for_rspec
+      #   teardown_mocks_for_rspec.
+      #
+      # These are your hooks into the lifecycle of a given example. RSpec will
+      # call setup_mocks_for_rspec before running anything else in each
+      # Example. After executing the #after methods, RSpec will then call
+      # verify_mocks_for_rspec and teardown_mocks_for_rspec (this is
+      # guaranteed to run even if there are failures in
+      # verify_mocks_for_rspec).
+      #
+      # Once you've defined this module, you can pass that to mock_with:
+      #
+      #   Spec::Runner.configure do |config|
+      #     config.mock_with MyMockFrameworkAdapter
+      #   end
+      #
+      def mock_with(mock_framework)
+        @mock_framework = case mock_framework
+        when Symbol
+          mock_framework_path(mock_framework.to_s)
+        else
+          mock_framework
+        end
+      end
+      
+      def mock_framework # :nodoc:
+        @mock_framework ||= mock_framework_path("rspec")
+      end
+      
+      # :call-seq:
+      #   include(Some::Helpers)
+      #   include(Some::Helpers, More::Helpers)
+      #   include(My::Helpers, :type => :key)
+      #
+      # Declares modules to be included in multiple example groups
+      # (<tt>describe</tt> blocks). With no <tt>:type</tt>, the modules listed
+      # will be included in all example groups.
+      #
+      # 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 Account, :type => :model do
+      #     # Will *not* include ControllerExampleHelpers
+      #   end
+      #
+      #   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
+      
+      # Defines global predicate matchers. Example:
+      #
+      #   config.predicate_matchers[:swim] = :can_swim?
+      #
+      # This makes it possible to say:
+      #
+      #   person.should swim # passes if person.can_swim? returns true
+      #
+      def predicate_matchers
+        @predicate_matchers ||= {}
+      end
+      
+      # Prepends a global <tt>before</tt> block to all example groups.
+      # See #append_before for filtering semantics.
+      def prepend_before(*args, &proc)
+        add_callback(:prepend_before, *args, &proc)
+      end
+      
+      # Appends a global <tt>before</tt> block to all example groups.
+      #
+      # If you want to restrict the block to a subset of all the example
+      # groups then specify this in a Hash as the last argument:
+      #
+      #   config.prepend_before(:all, :type => :farm)
+      #
+      # or
+      #
+      #   config.prepend_before(:type => :farm)
+      #
+      def append_before(*args, &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)
+        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)
+        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 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)
+        options[:type] || options[:behaviour_type]
+      end
+    
+      def mock_framework_path(framework_name)
+        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "adapters", "mock_frameworks", framework_name))
+      end
+    end
+  end
+end

data/vendor/plugins/rspec/lib/spec/runner/example_group_runner.rb

@@ -15,11 +15,11 @@ module Spec
         end
       end
 
-      def run
+      def run(run_options)
         prepare
         success = true
         example_groups.each do |example_group|
-          success = success & example_group.run
+          success = success & example_group.run(run_options)
         end
         return success
       ensure

data/vendor/plugins/rspec/lib/spec/runner/formatter/base_formatter.rb

@@ -45,7 +45,9 @@ module Spec
         # been provided a block), or when an ExamplePendingError is raised.
         # +message+ is the message from the ExamplePendingError, if it exists, or the
         # default value of "Not Yet Implemented"
-        def example_pending(example, message)
+        # +pending_caller+ is the file and line number of the spec which
+        # has called the pending method
+        def example_pending(example, message, pending_caller)
         end
 
         # This method is invoked after all of the examples have executed. The next method

data/vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb

@@ -14,20 +14,16 @@ module Spec
         def initialize(options, where)
           super
           if where.is_a?(String)
+            FileUtils.mkdir_p(File.dirname(where))
             @output = File.open(where, 'w')
-          elsif where == STDOUT
-            @output = Kernel
-            def @output.flush
-              STDOUT.flush
-            end
           else
             @output = where
           end
           @pending_examples = []
         end
         
-        def example_pending(example, message)
-          @pending_examples << [example.__full_description, message]
+        def example_pending(example, message, pending_caller)
+          @pending_examples << [example.full_description, message, pending_caller]
         end
         
         def dump_failure(counter, failure)
@@ -74,14 +70,15 @@ module Spec
             @output.puts
             @output.puts "Pending:"
             @pending_examples.each do |pending_example|
-              @output.puts "#{pending_example[0]} (#{pending_example[1]})" 
+              @output.puts "\n#{pending_example[0]} (#{pending_example[1]})"
+              @output.puts "#{pending_example[2]}\n"
             end
           end
           @output.flush
         end
         
         def close
-          if IO === @output
+          if IO === @output && @output != $stdout
             @output.close 
           end
         end
@@ -112,7 +109,7 @@ module Spec
 
         def output_to_tty?
           begin
-            @output == Kernel || @output.tty?
+            @output.tty? || ENV.has_key?("AUTOTEST")
           rescue NoMethodError
             false
           end

data/vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb

@@ -85,7 +85,7 @@ module Spec
           @output.flush
         end
 
-        def example_pending(example, message)
+        def example_pending(example, message, pending_caller)
           @output.puts "    <script type=\"text/javascript\">makeYellow('rspec-header');</script>" unless @header_red
           @output.puts "    <script type=\"text/javascript\">makeYellow('example_group_#{example_group_number}');</script>" unless @example_group_red
           move_progress
@@ -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/vendor/plugins/rspec/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
 
@@ -40,7 +40,7 @@ module Spec
           output.flush
         end
 
-        def example_pending(example, message)
+        def example_pending(example, message, pending_caller)
           super
           output.puts yellow("#{current_indentation}#{example.description} (PENDING: #{message})")
           output.flush
@@ -52,9 +52,9 @@ module Spec
 
         def described_example_group_chain
           example_group_chain = []
-          example_group.send(:execute_in_class_hierarchy) do |parent_example_group|
-            if parent_example_group.description_args && !parent_example_group.description_args.empty?
-              example_group_chain << parent_example_group
+          example_group.__send__(:each_ancestor_example_group_class) do |example_group_class|
+            unless example_group_class.description_args.empty?
+              example_group_chain << example_group_class
             end
           end
           example_group_chain

data/vendor/plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb

@@ -14,9 +14,9 @@ module Spec
           @output.flush
         end
       
-        def example_pending(example, message)
+        def example_pending(example, message, pending_caller)
           super
-          @output.print yellow('P')
+          @output.print yellow('*')
           @output.flush
         end