==== //src/ZenTest/dev/lib/unit_diff.rb#19 - /Users/wilson/work/zss/src/ZenTest/dev/lib/unit_diff.rb ====
@@ -82,16 +82,10 @@
         output.puts input.gets # the rest of "Finished in..."
         output.puts
        next
-      when /^\s*$/ then
+      when /^\s*$/, /^\(?\s*\d+\) (Failure|Error):/, /^\d+\)/ then
         print_lines = false
-        type = nil
         current = []
         data << current
-      when /^\(?\s*\d+\) (Failure|Error):/ then
-        print_lines = false # if line =~ /Failure|Error/
-        type = $1
-        current = []
-        data << current
       when /^Finished in \d/ then
         print_lines = false
       end
@@ -111,6 +105,7 @@
     header = []
     expect = []
     butwas = []
+    footer = []
     found = false
     state = :header
 
@@ -118,19 +113,43 @@
       case state
       when :header then
         header << result.shift
-        state = :expect if result.first =~ /^</
+        state = :expect if result.first =~ /^<|^Expected/
       when :expect then
-        state = :butwas if result.first.sub!(/ expected but was/, '')
-        expect << result.shift
+        if result.first =~ /^Expected (.*?) to equal (.*?):$/ then
+          expect << $1
+          butwas << $2
+          state = :footer
+          result.shift
+        elsif result.first =~ /^Expected (.*?)$/ then
+          expect << "#{$1}\n"
+          result.shift
+        elsif result.first =~ /^to equal / then
+          state = :mspec_butwas
+          bw = result.shift.sub(/^to equal (.*):?$/, '\1')
+          butwas << bw
+        else
+          state = :butwas if result.first.sub!(/ expected but was/, '')
+          expect << result.shift
+        end
       when :butwas then
         butwas = result[0..-1]
         result.clear
+      when :mspec_butwas then
+        if result.first =~ /^\s+\S+ at /
+          state = :footer
+        else
+          butwas << result.shift
+        end
+      when :footer then
+        butwas.last.sub!(/:$/, '')
+        footer = result.map {|l| l.chomp }
+        result.clear
       else
         raise "unknown state #{state}"
       end
     end
 
-    return header, expect, nil if butwas.empty?
+    return header, expect, nil, footer if butwas.empty?
 
     expect.last.chomp!
     expect.first.sub!(/^<\"/, '')
@@ -141,7 +160,7 @@
     butwas.first.sub!( /^<\"/, '')
     butwas.last.sub!(/\">$/, '')
 
-    return header, expect, butwas
+    return header, expect, butwas, footer
   end
 
   ##
@@ -164,12 +183,12 @@
       first = []
       second = []
 
-      if result.first !~ /Failure/ then
+      if result.first =~ /Error/ then
         output.push result.join('')
         next
       end
 
-      prefix, expect, butwas = parse_diff(result)
+      prefix, expect, butwas, result_footer = parse_diff(result)
 
       output.push prefix.compact.map {|line| line.strip}.join("\n")
 
@@ -188,7 +207,7 @@
             if result.empty? then
               output.push "[no difference--suspect ==]"
             else
-              output.push result.split("\n")
+              output.push result.map { |line| line.chomp }
             end
 
             if $k then
@@ -200,6 +219,7 @@
           end
         end
 
+        output.push result_footer
         output.push ''
       else
         output.push expect.join('')
==== //src/ZenTest/dev/test/test_unit_diff.rb#11 - /Users/wilson/work/zss/src/ZenTest/dev/test/test_unit_diff.rb ====
@@ -25,6 +25,85 @@
     util_unit_diff(header, input, expected, :parse_input)
   end
 
+  def test_input_mini_rspec
+    header = <<-HEADER
+Started
+.......F
+Finished in 0.1 seconds
+
+    HEADER
+
+    failure = <<-FAILURE
+1)
+The unless expression should fail FAILED
+Expected nil to equal "baz":
+    FAILURE
+
+    backtrace = <<-BACKTRACE
+      PositiveExpectation#== at spec/mini_rspec.rb:217
+          main.__script__ {} at spec/language/unless_spec.rb:49
+                   Proc#call at kernel/core/proc.rb:127
+               SpecRunner#it at spec/mini_rspec.rb:368
+                     main.it at spec/mini_rspec.rb:412
+          main.__script__ {} at spec/language/unless_spec.rb:48
+                   Proc#call at kernel/core/proc.rb:127
+         SpecRunner#describe at spec/mini_rspec.rb:378
+               main.describe at spec/mini_rspec.rb:408
+             main.__script__ at spec/language/unless_spec.rb:3
+    CompiledMethod#as_script at kernel/bootstrap/primitives.rb:41
+                   main.load at kernel/core/compile.rb:150
+          main.__script__ {} at last_mspec.rb:11
+               Array#each {} at kernel/core/array.rb:545
+       Integer(Fixnum)#times at kernel/core/integer.rb:15
+                  Array#each at kernel/core/array.rb:545
+             main.__script__ at last_mspec.rb:16
+    CompiledMethod#as_script at kernel/bootstrap/primitives.rb:41
+                   main.load at kernel/core/compile.rb:150
+             main.__script__ at kernel/loader.rb:145
+    BACKTRACE
+
+    footer = "\n8 examples, 1 failures\n"
+    input = header + failure + backtrace + footer
+
+    expected_backtrace = backtrace.split("\n").map {|l| "#{l}\n"}
+    expected = [[["1)\n", "The unless expression should fail FAILED\n",
+      "Expected nil to equal \"baz\":\n",
+      *expected_backtrace]],
+      ["\n", "8 examples, 1 failures\n"]]
+    util_unit_diff(header, input, expected, :parse_input)
+  end
+
+  def test_input_mini_rspec_multiline
+    header = <<-HEADER
+Started
+.......F
+Finished in 0.1 seconds
+
+    HEADER
+
+failure = <<-FAILURE
+1)
+Compiler compiles a case without an argument FAILED
+Expected #<TestGenerator [[:push, :false], [:gif, #<Label 5>], [:push_literal, "foo"], [:string_dup], [:goto, #<Label 19>], [:set_label, #<Label 5>], [:push, :nil], [:gif, #<Label 10>], [:push_literal, "foo"], [:string_dup], [:goto, #<Label 19>], [:set_label, #<Label 10>], [:push, 2], [:push, 1], [:send, :==, 1, false], [:gif, #<Label 17>], [:push_literal, "bar"], [:string_dup], [:goto, #<Label 19>], [:set_label, #<Label 17>], [:push_literal, "baz"], [:string_dup], [:set_label, #<Label 19>]]
+to equal #<TestGenerator [[:push, false], [:gif, #<Label 5>], [:push, "foo"], [:string_dup], [:goto, #<Label 6>], [:set_label, #<Label 5>], [:push, nil], [:set_label, #<Label 6>], [:pop], [:push, nil], [:gif, #<Label 12>], [:push, "foo"], [:string_dup], [:goto, #<Label 13>], [:set_label, #<Label 12>], [:push, nil], [:set_label, #<Label 13>], [:pop], [:push, 2], [:push, 1], [:send, :==, 1], [:gif, #<Label 21>], [:push, "bar"], [:string_dup], [:goto, #<Label 23>], [:set_label, #<Label 21>], [:push_literal, "baz"], [:string_dup], [:set_label, #<Label 23>], [:sret]]:
+      FAILURE
+
+backtrace = <<-BACKTRACE
+      PositiveExpectation#== at spec/mini_rspec.rb:216
+                    main.gen at ./compiler2/spec/helper.rb:125
+          main.__script__ {} at compiler2/spec/control_spec.rb:448
+    BACKTRACE
+
+    footer = "\n8 examples, 1 failures\n"
+    input = header + failure + backtrace + footer
+
+    expected_backtrace = backtrace.split("\n").map {|l| "#{l}\n"}
+    expected_failure = failure.split("\n").map {|l| "#{l}\n"}
+    expected = [[[*(expected_failure + expected_backtrace)]],
+      ["\n", "8 examples, 1 failures\n"]]
+    util_unit_diff(header, input, expected, :parse_input)
+  end
+
   def test_unit_diff_empty # simulates broken pipe at the least
     input = ""
     expected = ""
@@ -38,7 +117,7 @@
              "<\"<body>\">.\n"
             ]
 
-    expected = [["  1) Failure:\n", "test_test1(TestBlah) [./blah.rb:25]:\n"], ["<html>"], ["<body>"]]
+    expected = [["  1) Failure:\n", "test_test1(TestBlah) [./blah.rb:25]:\n"], ["<html>"], ["<body>"], []]
 
     assert_equal expected, @diff.parse_diff(input)
   end
@@ -50,7 +129,7 @@
              "<\"line4\\nline5\\nline6\\n\">.\n"
             ]
 
-    expected = [["  1) Failure:\n", "test_test1(TestBlah) [./blah.rb:25]:\n"], ["line1\\nline2\\nline3\\n"], ["line4\\nline5\\nline6\\n"]]
+    expected = [["  1) Failure:\n", "test_test1(TestBlah) [./blah.rb:25]:\n"], ["line1\\nline2\\nline3\\n"], ["line4\\nline5\\nline6\\n"], []]
 
     assert_equal expected, @diff.parse_diff(input)
   end
@@ -65,7 +144,8 @@
     expected = [["  2) Failure:\n",
                  "test_test2(TestBlah) [./blah.rb:29]:\n"],
                 ["line1"],
-                ["line2\\nline3\\n\\n"]
+                ["line2\\nline3\\n\\n"],
+                []
                ]
 
     assert_equal expected, @diff.parse_diff(input)
@@ -77,7 +157,7 @@
              "Unknown expected data.\n",
              "<false> is not true.\n"]
 
-    expected = [[" 13) Failure:\n", "test_case_stmt(TestRubyToRubyC) [./r2ctestcase.rb:1198]:\n", "Unknown expected data.\n"], ["<false> is not true.\n"], nil]
+    expected = [[" 13) Failure:\n", "test_case_stmt(TestRubyToRubyC) [./r2ctestcase.rb:1198]:\n", "Unknown expected data.\n"], ["<false> is not true.\n"], nil, []]
 
     assert_equal expected, @diff.parse_diff(input)
   end
@@ -90,7 +170,7 @@
     expected = [["1) Failure:\n",
                  "test_util_capture(AssertionsTest) [test/test_zentest_assertions.rb:53]:\n"],
                 ["out"],
-                ["out"]]
+                ["out"], []]
 
     assert_equal expected, @diff.parse_diff(input)
   end
@@ -103,7 +183,34 @@
     expected = [["1) Failure:\n",
                  "test_util_capture(AssertionsTest) [test/test_zentest_assertions.rb:53]:\n"],
                 ["out"],
-                ["out\\n"]]
+                ["out\\n"], []]
+
+    assert_equal expected, @diff.parse_diff(input)
+  end
+
+  def test_parse_diff_mini_rspec
+    input = ["1)\n", "The unless expression should fail FAILED\n",
+      "Expected nil to equal \"baz\":\n",
+      "    PositiveExpectation#== at spec/mini_rspec.rb:217\n"]
+
+    expected = [["1)\n", "The unless expression should fail FAILED\n"],
+      ["nil"],
+      ["\"baz\""],
+      ["    PositiveExpectation#== at spec/mini_rspec.rb:217"]]
+
+    assert_equal expected, @diff.parse_diff(input)
+  end
+
+  def test_parse_diff_mini_rspec_multiline
+    input = ["1)\n", "The unless expression should fail FAILED\n",
+    "Expected #<TestGenerator [[:push, :true],\n", "  [:dup]\n", "]\n",
+    "to equal #<TestGenerator [[:pop],\n", "  [:dup]\n", "]:\n",
+    "    PositiveExpectation#== at spec/mini_rspec.rb:217\n"]
+
+    expected = [["1)\n", "The unless expression should fail FAILED\n"],
+      ["#<TestGenerator [[:push, :true],\n", "  [:dup]\n", "]"],
+      ["#<TestGenerator [[:pop],\n", "  [:dup]\n", "]"],
+      ["    PositiveExpectation#== at spec/mini_rspec.rb:217"]]
 
     assert_equal expected, @diff.parse_diff(input)
   end
@@ -160,7 +267,7 @@
   def util_unit_diff(header, input, expected, msg=:unit_diff)
     output = StringIO.new("")
     actual = @diff.send(msg, StringIO.new(input), output)
-    assert_equal header, output.string
+    assert_equal header, output.string, "header output"
     assert_equal expected, actual
   end
 end