[DRE-commits] [ruby-rspec-instafail] 26/126: Resolved conflicts

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository ruby-rspec-instafail.

commit 050e0bc53b4d3b9fe9f2846796f9580058ab0fc8
Author: Matt Willhite <matthew.willhite at gmail.com>
Date:   Mon Oct 25 21:33:58 2010 -0700

    Resolved conflicts
---
 Readme.md              | 11 ++++++++---
 lib/rspec/instafail.rb | 21 ++++++++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Readme.md b/Readme.md
index bb1a93a..741b536 100644
--- a/Readme.md
+++ b/Readme.md
@@ -35,8 +35,13 @@ As plugin:
     --require vendor/plugins/rspec-instafail/lib/rspec/instafail
     --format RSpec::Instafail
 
-Author
-======
+Authors
+=======
+
+### [Contributors](http://github.com/grosser/rspec-instafail/contributors)
+ - [Matthew Willhite](http://github.com/miwillhite)
+
+
 [Michael Grosser](http://pragmatig.wordpress.com)  
 grosser.michael at gmail.com  
-Hereby placed under public domain, do what you want, just do not hold me accountable...
\ No newline at end of file
+Hereby placed under public domain, do what you want, just do not hold me accountable...
diff --git a/lib/rspec/instafail.rb b/lib/rspec/instafail.rb
index f9eec5b..efce10b 100644
--- a/lib/rspec/instafail.rb
+++ b/lib/rspec/instafail.rb
@@ -4,11 +4,26 @@ module RSpec
     require 'spec/runner/formatter/progress_bar_formatter'
     class Instafail < Spec::Runner::Formatter::ProgressBarFormatter
       def example_failed(example, counter, failure)
+        short_padding = '  '
+        padding = '     '
+
         output.puts
-        output.puts red("#{counter}: #{example_group.description} #{example.description}")
-        output.puts " -> #{failure.exception}"
+        output.puts red("#{short_padding}#{counter}) #{example_group.description} #{example.description}")
+        output.puts "#{padding}#{red(failure.exception)}"
+
+        format_backtrace(failure.exception.backtrace).each do |backtrace_info|
+          output.puts insta_gray("#{padding}# #{backtrace_info.strip}")
+        end
+
         output.flush
       end
+
+      private
+
+      # there is a gray() that returns nil, so we use our own...
+      def insta_gray(text)
+        colour(text, "\e[90m")
+      end
     end
     Instafail
   else
@@ -36,4 +51,4 @@ module RSpec
   end
 
   klass::VERSION = File.read( File.join(File.dirname(__FILE__),'..','..','VERSION') ).strip
-end
\ No newline at end of file
+end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rspec-instafail.git