# HG changeset patch
# User Mahlon E. Smith  <mahlon@martini.nu>
# Date 1328918923 28800
# Node ID ed72213b1788badc207aba49128b175dcd2c5a4e
# Parent  cd1f3381c1edd489c2c8edd82ee0603bd521ef70
Updates for rspec 2.8.

diff -r cd1f3381c1ed -r ed72213b1788 specky/doc/specky.txt
--- a/specky/doc/specky.txt	Fri Dec 24 20:01:10 2010 -0800
+++ b/specky/doc/specky.txt	Fri Feb 10 16:08:43 2012 -0800
@@ -106,6 +106,10 @@
 		-r ~/.vim/bundle/specky/ruby/specky_formatter
 		-f SpeckyFormatter
 
+	You can also use both of these methods, and use the
+	'SpeckyConsoleFormatter' class from your .rspec file, if it suits
+	your fancy.
+
 
 After that is taken care of, then just set up your keybindings in your
 .vimrc.  Here's what my config looks like. >
diff -r cd1f3381c1ed -r ed72213b1788 specky/ruby/specky_formatter.rb
--- a/specky/ruby/specky_formatter.rb	Fri Dec 24 20:01:10 2010 -0800
+++ b/specky/ruby/specky_formatter.rb	Fri Feb 10 16:08:43 2012 -0800
@@ -76,19 +76,26 @@
 	###
 	def dump_failures
 		self.out "\n" unless @failures.empty?
+		cwd = Regexp.new( Dir.pwd )
+		bt_regexp = /(.+?):(\d+)(|:\d+)/
 
 		@failures.each_with_index do |example, index|
 			desc      = example.metadata[ :full_description ]
 			exception = example.execution_result[ :exception ]
 			file = line = nil
 
-			if exception.backtrace.first =~ /(.*):(\d+)/
-				file, line = $1, $2.to_i
-			end
+			# remove files that are not in within the cwd.
+			#
+			# this isn't optimal, but it does stay within specky's notion of
+			# running it from within the project directory, and makes sure we don't
+			# inadvertently display code from rspec itself.
+			#
+			bt_file = exception.backtrace.find { |line| line =~ bt_regexp && line =~ cwd }
+			file, line = $1, $2.to_i if bt_file =~ bt_regexp
 			self.out "FAILURE - #%d)" % [ index + 1 ]
-			self.out "%s:%d" % [ file, line ]
+			self.out "%s:%d" % [ file, line ] if bt_file
 
-			if RSpec::Core::PendingExampleFixedError === exception
+			if exception.respond_to?( :pending_fixed? ) && exception.pending_fixed?
 				self.out "%s FIXED" % [ desc ]
 				self.out "Expected pending '%s' to fail.  No error was raised." % [
 					example.metadata[ :execution_result ][ :pending_message ]
@@ -108,7 +115,7 @@
 				end
 			end
 
-			self.out exception_source( file, line ) if file && line
+			self.out exception_source( file, line-1 ) if file && line
 		end
 	end
 
@@ -180,3 +187,25 @@
 	end
 end # SpeckyFormatter
 
+
+### Identical to the regular SpeckyFormatter, but it puts summary
+### information at the bottom of the screen instead of the top, and just
+### spits out rudamentary failure info.
+###
+class SpeckyFormatterConsole < SpeckyFormatter
+	def close
+		puts "Failures:" unless @failures.empty?
+		@failures.each do |test|
+			metadata = test.metadata
+			msg = "- %s\n  %s\n  %s:%d\n\n" % [
+				metadata[:full_description],
+				test.exception.message,
+				metadata[:file_path],
+				metadata[:line_number]
+			]
+			puts msg
+		end
+		output.puts @summary
+	end
+end
+