rspec-formatter-webkit 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f53123d76b7e48e5111831b201e788fe23b87bb
-  data.tar.gz: 9a9bc34d45b4e8269d95869dd2ab3f7682b69986
+  metadata.gz: 7bef1df9eca5adfdaf5b8ad30caac871013580b9
+  data.tar.gz: 224c3eb4219434fd952c94a2933e501a8647a580
 SHA512:
-  metadata.gz: 827448bfcd12fd99a4389d4fef2f17d5d94004812a82ae0ceef069e82e8fbf4038867671cff6ffca63c8d637bb95d315cfae79e502a06ab017d85d60c4aa24ce
-  data.tar.gz: 916fc459bf7f0d00541933d7cbd596cd8991a409de3e655b777a7126b1aa6bd31df52133380e58075bab830c8499cbacee89a5f95b7ee896bfcfa026ba96d909
+  metadata.gz: d539813101c69d9c09f710c3dafc8512093b7eb2ad03f3dc759d04d435930dadc856cb56117a1668df0349245d3bdeba37731c51ccaba9a7bdcb9b2f8a0235ef
+  data.tar.gz: 552ad4de8ef3a283cb8bdeb965ae2eda83a39c00b15bbaaa501fc6741c29ce512a90e2decc04510db27ef984c209a88c1b5920c1e6a0210c3d8e6b73cdfe6e42

data/ChangeLog

@@ -1,5 +1,62 @@
+2015-02-20  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgignore, Gemfile, Rakefile, rspec-formatter-webkit.gemspec:
+	Update/check in the gemspec and Gemfile.
+	[c30cce13579a] [github/master, github/version_3, tip]
+
+	* History.rdoc, lib/rspec/core/formatters/webkit.rb:
+	Bump the minor version, update history.
+	[255dd1b2032c]
+
+	* LICENSE, README.rdoc:
+	Update copyright dates
+	[2a42400efa2a]
+
+	* .rvmrc, Gemfile, Rakefile:
+	Update to Ruby 2.2, RSpec 3.2.
+	[81800976779a]
+
+	* data/rspec-formatter-webkit/templates/pending-fixed.rhtml,
+	lib/rspec/core/formatters/webkit.rb:
+	Handle a few changes/idiosyncrasies in some versions of RSpec
+	[45fc9fe28daf]
+
+2014-06-10  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, data/rspec-formatter-webkit/templates/failed.rhtml, data
+	/rspec-formatter-webkit/templates/passed.rhtml, data/rspec-
+	formatter-webkit/templates/pending-fixed.rhtml, data/rspec-
+	formatter-webkit/templates/pending.rhtml:
+	Update templates for RSpec 3.
+	[845600981fbe]
+
+2014-06-05  Michael Granger  <ged@FaerieMUD.org>
+
+	* Gemfile, Rakefile, lib/rspec/core/formatters/webkit.rb:
+	Update for RSpec 3.0.0.
+	[33aa6f0fa4ec]
+
 2014-02-25  Michael Granger  <ged@FaerieMUD.org>
 
+	* Merged changes from default
+	[29747e7e68f9]
+
+	* README.rdoc:
+	Update the README
+	[d9e33863a314]
+
+	* .hgtags:
+	Added tag v2.4.0 for changeset c13df60f1d07
+	[9473701f91f7]
+
+	* .hgsigs:
+	Added signature for changeset 305c5b7f2ed0
+	[c13df60f1d07] [v2.4.0]
+
+	* .hoerc:
+	Add gemspec and Gemfile to the Hoe's ignorelist
+	[305c5b7f2ed0]
+
 	* data/rspec-formatter-webkit/css/textmate-rspec.css, data/rspec-
 	formatter-webkit/templates/deprecations.rhtml, data/rspec-formatter-
 	webkit/templates/error.rhtml, data/rspec-formatter-
@@ -9,7 +66,7 @@
 	webkit/templates/seed.rhtml, data/rspec-formatter-
 	webkit/templates/summary.rhtml, lib/rspec/core/formatters/webkit.rb:
 	Synched up with work done in the RSpec3 tmbundle
-	[8b6626a85d28] [tip]
+	[8b6626a85d28]
 
 	* History.rdoc:
 	Clarify history message
@@ -45,7 +102,7 @@
 
 	* .hgignore:
 	Ignore generated .gemspec file
-	[7869b76132c1] [github/master]
+	[7869b76132c1]
 
 	* .rvm.gems, .rvmrc:
 	Adding RVM config

data/History.rdoc

@@ -1,3 +1,9 @@
+== v2.5.0 [2015-02-20] Michael Granger <ged@FaerieMUD.org>
+
+- Update to Ruby 2.2, RSpec 3.2.
+- Handle a few changes/idiosyncrasies in some versions of RSpec
+
+
 == v2.4.0 [2014-02-24] Michael Granger <ged@FaerieMUD.org>
 
 - Fix backtrace links for newer 2.x RSpecs

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2010, Michael Granger
+Copyright (c) 2009-2015, Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Manifest.txt

@@ -36,6 +36,8 @@ data/rspec-formatter-webkit/images/ticket_plus.png
 data/rspec-formatter-webkit/images/ticket_small.png
 data/rspec-formatter-webkit/js/jquery-2.1.0.min.js
 data/rspec-formatter-webkit/js/textmate-rspec.js
+data/rspec-formatter-webkit/templates/deprecations.rhtml
+data/rspec-formatter-webkit/templates/error.rhtml
 data/rspec-formatter-webkit/templates/failed.rhtml
 data/rspec-formatter-webkit/templates/footer.rhtml
 data/rspec-formatter-webkit/templates/header.rhtml
@@ -43,6 +45,8 @@ data/rspec-formatter-webkit/templates/page.rhtml
 data/rspec-formatter-webkit/templates/passed.rhtml
 data/rspec-formatter-webkit/templates/pending-fixed.rhtml
 data/rspec-formatter-webkit/templates/pending.rhtml
+data/rspec-formatter-webkit/templates/seed.rhtml
+data/rspec-formatter-webkit/templates/summary.rhtml
 docs/tmrspec-example.png
 docs/tmrspecopts-shellvar.png
 lib/rspec/core/formatters/web_kit.rb

data/README.rdoc

@@ -47,52 +47,30 @@ example line:
 
     Thread.current['logger-output'] << %{<p>Some stuff happened.</p>}
 
-Each line that has such logging appended will appear with
-an asterisk after it in the output.
+Each line that has such logging appended will appear with an asterisk after it
+in the output.
 
 ==== Loggability
 
-If you're using Loggability for logging, the WebKit formatter has CSS rules
-for the output of its HTML formatter. You can inject logs into the spec output
-with the following helper methods:
+If you're using Loggability for logging, the WebKit formatter has CSS rules for
+the output of its HTML formatter, and includes a helper for injecting the logs
+generated for an example into the output. Just include the Loggability spec
+helper in your RSpec config:
 
-	### Reset the logging subsystem to its default state.
-	def reset_logging
-		Loggability.format_as( :color )
-		Loggability.output_to( $stderr )
-		Loggability.level = :fatal
-	end
+    require 'rspec'
+    require 'loggability/spechelpers'
 
-
-	### Alter the output of the default log formatter to be pretty in SpecMate output
-	def setup_logging( level=:fatal )
-
-		# Only do this when executing from a spec in TextMate or when
-		# HTML_LOGGING=1 is set in the environment
-		if ENV['HTML_LOGGING'] ||
-		  (ENV['TM_FILENAME'] && ENV['TM_FILENAME'] =~ /_spec\.rb/)
-			logarray = []
-			Thread.current['logger-output'] = logarray
-			Loggability.output_to( logarray )
-			Loggability.format_as( :html )
-			Loggability.level = :debug
-		else
-			Loggability.level = level
-		end
-	end
-
-Then, in your examples:
-
-    before( :all ) { setup_logging }
-    after( :all )  { reset_logging }
+    RSpec.configure do |config|
+        config.include( Loggability::SpecHelpers )
+    end
 
 
 == Miscellaneous
 
-It's also usable anywhere else the standard HTML formatter is, of course.
-Also, while it's specifically intended to be used under the Textmate HTML
-viewer that the RSpec bundle uses, the output should work fine under recent
-Gecko/Firefox-based viewers, as well.
+This formatter is also usable anywhere else the standard HTML formatter is, of
+course. Also, while it's specifically intended to be used under the Textmate
+HTML viewer that the RSpec bundle uses, the output should work fine under
+recent Gecko/Firefox-based viewers, as well. 
 
 Patches/suggestions welcomed.
 
@@ -112,7 +90,7 @@ This task will install any missing dependencies and generate the API documentati
 
 == License
 
-Copyright (c) 2009-2012, Michael Granger
+Copyright (c) 2009-2015, Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -12,7 +12,6 @@ require 'rake/clean'
 
 Hoe.plugin :mercurial
 Hoe.plugin :signing
-Hoe.plugin :bundler
 
 Hoe.plugins.delete :rubyforge
 
@@ -20,11 +19,12 @@ hoespec = Hoe.spec 'rspec-formatter-webkit' do
 	self.readme_file = 'README.rdoc'
 	self.history_file = 'History.rdoc'
 	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
+	self.license 'BSD'
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 	self.license 'Ruby'
 
-	self.dependency 'rspec-core', '~> 2.14'
+	self.dependency 'rspec-core', '~> 3.2'
 	self.dependency 'hoe-bundler', '~> 1.2', :development
 
 	self.spec_extras[:post_install_message] = %{
@@ -38,7 +38,7 @@ hoespec = Hoe.spec 'rspec-formatter-webkit' do
 
 	}.gsub( /^\t+/m, '' )
 
-	self.require_ruby_version( '>=1.9.3' )
+	self.require_ruby_version( '>=2.0.0' )
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags )
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 end
@@ -46,7 +46,7 @@ end
 ENV['VERSION'] ||= hoespec.spec.version.to_s
 
 # Ensure history is updated before checking in
-task 'hg:precheckin' => [ :check_history, 'Gemfile' ]
+task 'hg:precheckin' => [ :check_history, :gemspec ]
 
 task :legacy_gem do
 	Dir.chdir( 'legacy' ) do
@@ -56,13 +56,9 @@ end
 CLEAN.include( 'legacy/pkg' )
 
 
-file 'Gemfile'
-task 'Gemfile' => ['bundler:gemfile']
-
-
 task :gemspec => GEMSPEC
 
-desc "generate a gemspec from your Hoe.spec"
+desc "Refresh the .gemspec"
 file GEMSPEC => 'Rakefile' do |task|
 	spec = hoespec.spec.dup
 	spec.files.delete( '.gemtest' )
@@ -72,5 +68,5 @@ file GEMSPEC => 'Rakefile' do |task|
 		fh.write( spec.to_ruby )
 	end
 end
-
+CLOBBER.include( '*.gemspec' )
 

data/data/rspec-formatter-webkit/css/textmate-rspec.css

@@ -72,16 +72,31 @@ pre, code {
 	margin-top: 120px;
 }
 
-#summary {
+#summary, #deprecation-warnings {
 	margin: 0;
 	padding: 1em 3em;
 	background-color: rgb(101, 111, 130);
 	color: white;
 }
-#summary p {
+#summary p, #deprecation-warnings p {
 	margin: 0;
 }
 
+#seed {
+    position: absolute;
+    top: 1.5em;
+    right: 4em;
+    color: white;
+    text-shadow: black 0 1px 3px;
+}
+
+#error {
+    margin: 2em;
+    background: #ffeeee;
+    border: 1px solid black;
+    padding: 1em;
+}
+
 .rspec-graph-legend-item {
     display: inline-block;
     font-weight: bold;
@@ -343,3 +358,30 @@ div.log-message.fatal .log-name,
 div.fatal-log-message .log-name {
 	color:  white;
 }
+
+
+/* Deprecations */
+
+dl.deprecations a {
+}
+
+dl.deprecations dt,
+dl.deprecations dd {
+    background: #ccc;
+    padding: 2px 20px;
+}
+dl.deprecations dt {
+    background-image: url(../images/ticket.png);
+    background-repeat: no-repeat;
+    background-position: 2px 2px;
+    color: #333;
+    border-top: 1px solid #ACACAC;
+}
+dl.deprecations dd {
+    font-size: 80%;
+    background: #ccc;
+    color: #666;
+    margin: 0;
+}
+
+

data/data/rspec-formatter-webkit/templates/deprecations.rhtml

@@ -0,0 +1,19 @@
+    <div id="deprecation-warnings">
+        <p><strong><%= deprecations.size %> Deprecation Warnings</strong></p>
+        <dl class="deprecations">
+% deprecations.each do |dep|
+%   if dep.deprecated
+            <dt><%= h dep.message || dep.deprecated %></dt> 
+%     if dep.replacement
+            <dd class="replacement">Use <%= h dep.replacement %> instead.</dd>
+%     end
+            <dd class="call-site">at <%= link_backtrace_line dep.call_site %></dd>
+%   elsif dep.message =~ /^-+\n(.*?)\(Used from (.*)\)\n-+/m
+%     desc, call_site = $1, $2
+            <dt><%= h desc.gsub(/\n/, ' ') %></dt>
+            <dd class="call-site">at <%= link_backtrace_line call_site %></dd>
+%   end
+% end
+
+        </dl>
+    </div>

data/data/rspec-formatter-webkit/templates/error.rhtml

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en"> 
+<head> 
+    <title>RSpec results</title> 
+
+    <meta charset="utf-8">
+    <meta http-equiv="Expires" content="-1"> 
+    <meta http-equiv="Pragma" content="no-cache"> 
+
+    <base href="<%= BASE_HREF %>">
+
+    <link rel="stylesheet" href="css/textmate-rspec.css">
+</head> 
+<body> 
+
+    <div id="error">
+        <h1>Internal Error</h1>
+    
+        <p>Sorry, there was a problem running RSpec.</p>
+    
+        <div class="error-details">
+        <%= message.split($/).map {|line| h line }.join('<br>') %>
+        </div>
+    </div>
+
+</body>
+</html>

data/data/rspec-formatter-webkit/templates/failed.rhtml

@@ -1,23 +1,17 @@
 
 <dd class="spec failed">
     <span class="spec-name"><%= h(example.description) %></span>
-    <span class="spec-time"><%= h("%0.5fs" % [example.execution_result[:run_time]]) %></span>
+    <span class="spec-time"><%= h("%0.5fs" % [example.execution_result.run_time]) %></span>
     <div class="failure" id="failure-<%= counter %>">
 
-        <div class="message">Failure/Error: 
-            <code><%= h read_failed_line(exception, example).strip.gsub(/\n/, '<br />') %><br />
-%        exception.message.split("\n").each do |line|
-                <%= h line %><br />
-%        end
-%        if group = find_shared_group( example )
-                Shared Example Group: "<%= h group.metadata[:shared_group_name] %>" called from 
-                "<%= backtrace_line(group.metadata[:example_group][:location]) %>
-%        end
-            </code>
-        </div>
+        <div class="message"><code>
+%     notification.message_lines.each do |line|
+           <%= h line %><br />
+%     end
+        </code></div>
 
         <div class="backtrace"><p><code>
-%     format_backtrace(exception.backtrace, example).each do |backtrace_info|
+%     format_backtrace(notification).each do |backtrace_info|
             <span class="backtrace-frame"><%= backtrace_info %></span><br />
 %     end
         </code></p></div>

data/data/rspec-formatter-webkit/templates/footer.rhtml

@@ -1,9 +1,3 @@
-	</div> 
-
-	<div id="summary">
-		<p><%= example_count %> examples run in <span class="duration"><%= duration %>
-			 seconds</span>. <%= failure_count %> failed, <%= pending_count %> are pending.</p>
-	</div>
 	
 </body> 
 </html>

data/data/rspec-formatter-webkit/templates/header.rhtml

@@ -1,29 +1,31 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
+<!DOCTYPE html>
+<html lang="en"> 
 <head> 
 	<title>RSpec results</title> 
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
+
+  <meta charset="utf-8">
 	<meta http-equiv="Expires" content="-1" /> 
 	<meta http-equiv="Pragma" content="no-cache" /> 
 
 	<base href="<%= BASE_HREF %>" />
 
 	<link rel="stylesheet" href="css/textmate-rspec.css" type="text/css" media="screen" 
-		title="no title" charset="utf-8" />
+		charset="utf-8" />
 
 	<script type="text/javascript" charset="utf-8" src="js/jquery-2.1.0.min.js"></script>
-	<script defer="defer" type="text/javascript" charset="utf-8" src="js/textmate-rspec.js"></script> 
+	<script type="text/javascript" charset="utf-8" src="js/textmate-rspec.js"></script> 
 </head> 
 <body> 
 	<div class="rspec-report"> 
  
+ 	 <!-- RSpec version: <%= RSpec::Core::Version::STRING %> -->
+ 
 		<div id="rspec-header"> 
 			<div id="rspec-title-section">
 		    <h1>RSpec Results:</h1> 
-				<span id="rspec-summary-stats">Running (<span id="spec-count"><%= example_count %></span> 
-					examples)...</span>
+				<span id="rspec-summary-stats">
+					Running (<span id="spec-count"><%= notification.count %></span> examples)...
+				</span>
 			</div>
 			
 		  <div id="rspec-summary"> 

data/data/rspec-formatter-webkit/templates/passed.rhtml

@@ -1,6 +1,6 @@
 <dd class="spec passed">
     <span class="spec-name"><%= h(example.description) %></span>
-    <span class="spec-time"><%= h("%0.5fs" % [example.execution_result[:run_time]]) %></span>
+    <span class="spec-time"><%= h("%0.5fs" % [example.execution_result.run_time]) %></span>
 
 % unless log_messages.nil? || log_messages.empty?
     <div class="log-messages">

data/data/rspec-formatter-webkit/templates/pending-fixed.rhtml

@@ -1,17 +1,17 @@
 
 <dd class="spec pending-fixed">
     <span class="spec-name"><%= h(example.description) %></span>
-    <span class="spec-time"><%= h("%0.5fs" % [example.execution_result[:run_time]]) %></span>
+    <span class="spec-time"><%= h("%0.5fs" % [example.execution_result.run_time]) %></span>
 
     <div class="failure" id="failure-<%= counter %>">
 
         <div class="message">Expected pending 
-            <code><%= h(example.metadata[:execution_result][:pending_message]) %></code>
+            <code><%= h(example.execution_result.pending_message) %></code>
             to fail. No Error was raised.
         </div>
 
         <div class="backtrace"><p><code>
-%     format_backtrace(exception.backtrace, example).each do |backtrace_info|
+%     format_backtrace(notification).each do |backtrace_info|
             <span class="backtrace-frame"><%= backtrace_info %></span><br />
 %     end
         </code></p></div>

data/data/rspec-formatter-webkit/templates/pending.rhtml

@@ -2,9 +2,9 @@
 <dd class="spec pending">
     <span class="spec-name"><%= h(example.description) %></span>
     <span class="pending-message">
-        (Pending <%= example.execution_result[:pending_message] %>)
+        (Pending <%= example.execution_result.pending_message %>)
     </span>
-    <span class="spec-time"><%= h("%0.5fs" % [example.execution_result[:run_time]]) %></span>
+    <span class="spec-time"><%= h("%0.5fs" % [example.execution_result.run_time]) %></span>
 
 % unless log_messages.nil? || log_messages.empty?
     <div class="log-messages">

data/data/rspec-formatter-webkit/templates/seed.rhtml

@@ -0,0 +1,3 @@
+<div id="seed">
+    <strong>Random seed:</strong> <code><%= notification.seed %></code>
+</div>

data/data/rspec-formatter-webkit/templates/summary.rhtml

@@ -0,0 +1,9 @@
+	</div> <!-- closes rspec-details -->
+
+	<div id="summary">
+		<p><%= summary.example_count %> examples run in 
+            <span class="duration"><%= summary.duration %>
+			seconds</span>. <%= summary.failure_count %> failed, 
+            <%= summary.pending_count %> are pending.</p>
+	</div>
+	

data/lib/rspec/core/formatters/webkit.rb

@@ -3,18 +3,29 @@
 require 'pp'
 require 'erb'
 require 'pathname'
+require 'set'
+
+gem 'rspec', '> 2.99'
 
 require 'rspec'
 require 'rspec/core/formatters/base_text_formatter'
 require 'rspec/core/formatters/snippet_extractor'
 require 'rspec/core/pending'
 
+# Work around a bug in the null colorizer.
+module NullColorizerFix
+	def wrap( line, _ )
+		line
+	end
+end
+RSpec::Core::Notifications::NullColorizer.extend( NullColorizerFix )
+
 
-class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatter
+class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseFormatter
 	include ERB::Util
 
 	# Version constant
-	VERSION = '2.4.0'
+	VERSION = '2.5.0'
 
 	# Look up the datadir falling back to a relative path (mostly for prerelease testing)
 	DATADIR = begin
@@ -36,8 +47,12 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 	FAILED_EXAMPLE_TEMPLATE  = TEMPLATE_DIR + 'failed.rhtml'
 	PENDING_EXAMPLE_TEMPLATE = TEMPLATE_DIR + 'pending.rhtml'
 	PENDFIX_EXAMPLE_TEMPLATE = TEMPLATE_DIR + 'pending-fixed.rhtml'
+	SUMMARY_TEMPLATE         = TEMPLATE_DIR + 'summary.rhtml'
+	DEPRECATIONS_TEMPLATE    = TEMPLATE_DIR + 'deprecations.rhtml'
+	SEED_TEMPLATE            = TEMPLATE_DIR + 'seed.rhtml'
 	FOOTER_TEMPLATE          = TEMPLATE_DIR + 'footer.rhtml'
 
+
 	# Pattern to match for excluding lines from backtraces
 	BACKTRACE_EXCLUDE_PATTERN = %r{spec/mate|textmate-command|rspec(-(core|expectations|mocks))?/}
 
@@ -49,11 +64,26 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 	end
 
 
+	# Register this formatter with RSpec
+	RSpec::Core::Formatters.register self,
+		:start,
+		:example_group_started,
+		:start_dump,
+		:example_started,
+		:example_passed,
+		:example_failed,
+		:example_pending,
+		:dump_summary,
+		:deprecation,
+		:deprecation_summary,
+		:seed,
+		:close
+
+
 	### Create a new formatter
 	def initialize( output ) # :notnew:
 		super
 		@previous_nesting_depth = 0
-		@example_number = 0
 		@failcounter = 0
 		@snippet_extractor = RSpec::Core::Formatters::SnippetExtractor.new
 		@example_templates = {
@@ -63,6 +93,12 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 			:pending_fixed => self.load_template(PENDFIX_EXAMPLE_TEMPLATE),
 		}
 
+		@deprecation_stream = []
+		@summary_stream     = []
+		@failed_examples    = []
+
+		@deprecations = Set.new
+
 		Thread.current['logger-output'] = []
 	end
 
@@ -72,22 +108,40 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 	######
 
 	# Attributes made readable for ERb
-	attr_reader :example_group_number, :example_number, :example_count
+	attr_reader :example_count
 
 	# The counter for failed example IDs
 	attr_accessor :failcounter
 
+	# The Set of deprecation notifications
+	attr_reader :deprecations
+
+	# The Array of failed examples
+	attr_reader :failed_examples
+
+
+	### Fetch any log messages added to the thread-local Array
+	def log_messages
+		return Thread.current[ 'logger-output' ] ||= []
+	end
+
+
+	#
+	# Formatter notification callbacks
+	#
 
 	### Start the page by rendering the header.
-	def start( example_count )
-		@output.puts self.render_header( example_count )
+	def start( notification )
+		super
+		@output.puts self.render_header( notification )
 		@output.flush
 	end
 
 
 	### Callback called by each example group when it's entered --
-	def example_group_started( example_group )
+	def example_group_started( notification )
 		super
+		example_group = notification.group
 		nesting_depth = example_group.ancestors.length
 
 		# Close the previous example groups if this one isn't a
@@ -115,17 +169,10 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 			]
 		@output.flush
 	end
-	alias_method :add_example_group, :example_group_started
-
-
-	### Fetch any log messages added to the thread-local Array
-	def log_messages
-		return Thread.current[ 'logger-output' ] || []
-	end
 
 
 	### Callback -- called when the examples are finished.
-	def start_dump
+	def start_dump( notification )
 		@previous_nesting_depth.downto( 1 ) do |i|
 			@output.puts "  </dl>",
 			             "</section>"
@@ -137,15 +184,14 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 
 
 	### Callback -- called when an example is entered
-	def example_started( example )
-		@example_number += 1
-		Thread.current[ 'logger-output' ] ||= []
-		Thread.current[ 'logger-output' ].clear
+	def example_started( notification )
+		self.log_messages.clear
 	end
 
 
 	### Callback -- called when an example is exited with no failures.
-	def example_passed( example )
+	def example_passed( notification )
+		example = notification.example
 		status = 'passed'
 		@output.puts( @example_templates[:passed].result(binding()) )
 		@output.flush
@@ -153,11 +199,13 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 
 
 	### Callback -- called when an example is exited with a failure.
-	def example_failed( example )
-		super
+	def example_failed( notification )
+		example   = notification.example
 
-		counter   = self.failcounter += 1
-		exception = example.metadata[:execution_result][:exception]
+		self.failed_examples << example
+		counter   = self.failed_examples.size
+
+		exception = notification.exception
 		extra     = self.extra_failure_content( exception )
 		template  = if exception.is_a?( PENDING_FIXED_EXCEPTION )
 			then @example_templates[:pending_fixed]
@@ -170,22 +218,73 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 
 
 	### Callback -- called when an example is exited via a 'pending'.
-	def example_pending( example )
+	def example_pending( notification )
+		example = notification.example
 		status = 'pending'
 		@output.puts( @example_templates[:pending].result(binding()) )
 		@output.flush
 	end
 
 
-	### Format backtrace lines to include a textmate link to the file/line in question.
-	def backtrace_line( line )
-		return nil unless line = super
-		return nil if line =~ BACKTRACE_EXCLUDE_PATTERN
-		return line.strip.gsub( /(?<filename>[^:]*\.rb):(?<line>\d*)/ ) do
+	### Output the content generated at the end of the run.
+	def dump_summary( summary )
+		html = self.render_summary( summary )
+		@output.puts( html )
+		@output.flush
+	end
+
+
+	### Callback -- Add a deprecation warning.
+	def deprecation( notification )
+		@deprecations.add( notification )
+	end
+
+
+	### Callback -- Called at the end with a summary of any deprecations encountered
+	### during the run.
+	def deprecation_summary( notification )
+		html = self.render_deprecations
+		@output.puts( html )
+		@output.flush
+	end
+
+
+	### Callback -- called with the random seed if the test suite is run with random ordering.
+	def seed( notification )
+		return unless notification.seed_used?
+		html = self.render_seed( notification )
+		@output.puts( html )
+	end
+
+
+	### Callback -- called at the very end.
+	def close( notification )
+		footer = self.render_footer( notification )
+		@output.puts( footer )
+		@output.flush
+	end
+
+
+	#
+	# Utility methods
+	#
+
+	### Overriden to add txmt: links to the file paths in the backtrace.
+	def format_backtrace( notification )
+		lines = notification.formatted_backtrace
+		return lines.map do |line|
+			link_backtrace_line( line )
+		end
+	end
+
+
+	### Link the filename and line number in the given +line+ from a backtrace.
+	def link_backtrace_line( line )
+		return line.strip.sub( /(?<filename>[^:]*\.rb):(?<line>\d*)(?<rest>.*)/ ) do
 			match = $~
 			fullpath = File.expand_path( match[:filename] )
-			%|<a href="txmt://open?url=file://%s&amp;line=%s">%s:%s</a>| %
-				[ fullpath, match[:line], match[:filename], match[:line] ]
+			%|<a href="txmt://open?url=file://%s&amp;line=%s">%s:%s</a>%s| %
+				[ fullpath, match[:line], match[:filename], match[:line], h(match[:rest]) ]
 		end
 	end
 
@@ -195,35 +294,57 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 	### failure.
 	def extra_failure_content( exception )
 		return '' unless exception
-		backtrace = exception.backtrace.find {|line| line !~ BACKTRACE_EXCLUDE_PATTERN }
-		# $stderr.puts "Using backtrace line %p to extract snippet" % [ backtrace ]
-		snippet = @snippet_extractor.snippet([ backtrace ])
-		return "    <pre class=\"ruby\"><code>#{snippet}</code></pre>"
-	end
 
+		backtrace = exception.backtrace.map do |line|
+			RSpec.configuration.backtrace_formatter.backtrace_line( line )
+		end.compact
 
-	### Returns content to be output when a failure occurs during the run; overridden to
-	### do nothing, as failures are handled by #example_failed.
-	def dump_failures( *unused )
+		snippet = @snippet_extractor.snippet( backtrace )
+		return "    <pre class=\"ruby\"><code>#{snippet}</code></pre>"
 	end
 
 
-	### Output the content generated at the end of the run.
-	def dump_summary( duration, example_count, failure_count, pending_count )
-		@output.puts self.render_footer( duration, example_count, failure_count, pending_count )
-		@output.flush
+	### Find the innermost shared example group for the given +example+.
+	def find_shared_group( example )
+		groups = example.example_group.parent_groups + [example.example_group]
+		return groups.find {|group| group.metadata[:shared_group_name]}
 	end
 
 
+	#
+	# Template methods
+	#
+
 	### Render the header template in the context of the receiver.
-	def render_header( example_count )
+	def render_header( notification )
 		template = self.load_template( HEADER_TEMPLATE )
 		return template.result( binding() )
 	end
 
 
+	### Render the summary template in the context of the receiver.
+	def render_summary( summary )
+		template = self.load_template( SUMMARY_TEMPLATE )
+		return template.result( binding() )
+	end
+
+
+	### Render the deprecation summary template in the context of the receiver.
+	def render_deprecations
+		template = self.load_template( DEPRECATIONS_TEMPLATE )
+		return template.result( binding() )
+	end
+
+
+	### Render the seed template in the context of the receiver.
+	def render_seed( notification )
+		template = self.load_template( SEED_TEMPLATE )
+		return template.result( binding() )
+	end
+
+
 	### Render the footer template in the context of the receiver.
-	def render_footer( duration, example_count, failure_count, pending_count )
+	def render_footer( notification )
 		template = self.load_template( FOOTER_TEMPLATE )
 		return template.result( binding() )
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-formatter-webkit
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Michael Granger
@@ -12,7 +12,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTMwMjI3MTY0ODU4WhcNMTQwMjI3MTY0ODU4WjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTQwMzE5MDQzNTI2WhcNMTUwMzE5MDQzNTI2WjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
   +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
@@ -23,99 +23,113 @@ cert_chain:
   AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
   qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
   BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  Vlcfyq6GwyE8i0QuFPCeVOwJaneSvcwx316DApjy9/tt2YD2HomLbtpXtji5QXor
-  ON6oln4tWBIB3Klbr3szq5oR3Rc1D02SaBTalxSndp4M6UkW9hRFu5jn98pDB4fq
-  5l8wMMU0Xdmqx1VYvysVAjVFVC/W4NNvlmg+2mEgSVZP5K6Tc9qDh3eMQInoYw6h
-  t1YA6RsUJHp5vGQyhP1x34YpLAaly8icbns/8PqOf7Osn9ztmg8bOMJCeb32eQLj
-  6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
-  /YSusaiDXHKU2O3Akc3htA==
+  TuL1Bzl6TBs1YEzEubFHb9XAPgehWzzUudjDKzTRd+uyZmxnomBqTCQjT5ucNRph
+  3jZ6bhLNooLQxTjIuHodeGcEMHZdt4Yi7SyPmw5Nry12z6wrDp+5aGps3HsE5WsQ
+  Zq2EuyEOc96g31uoIvjNdieKs+1kE+K+dJDjtw+wTH2i63P7r6N/NfPPXpxsFquo
+  wcYRRrHdR7GhdJeT+V8Q8Bi5bglCUGdx+8scMgkkePc98k9osQHypbACmzO+Bqkv
+  c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
+  ggcrPfcYeTwWlfZPu2LrBg==
   -----END CERTIFICATE-----
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: hoe-deveiate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.13'
 description: |-
   This is a formatter for RSpec 2 that takes advantage of features in
   WebKit[http://webkit.org/] to make the output from RSpec in Textmate more
@@ -171,6 +185,8 @@ files:
 - data/rspec-formatter-webkit/images/ticket_small.png
 - data/rspec-formatter-webkit/js/jquery-2.1.0.min.js
 - data/rspec-formatter-webkit/js/textmate-rspec.js
+- data/rspec-formatter-webkit/templates/deprecations.rhtml
+- data/rspec-formatter-webkit/templates/error.rhtml
 - data/rspec-formatter-webkit/templates/failed.rhtml
 - data/rspec-formatter-webkit/templates/footer.rhtml
 - data/rspec-formatter-webkit/templates/header.rhtml
@@ -178,35 +194,38 @@ files:
 - data/rspec-formatter-webkit/templates/passed.rhtml
 - data/rspec-formatter-webkit/templates/pending-fixed.rhtml
 - data/rspec-formatter-webkit/templates/pending.rhtml
+- data/rspec-formatter-webkit/templates/seed.rhtml
+- data/rspec-formatter-webkit/templates/summary.rhtml
 - docs/tmrspec-example.png
 - docs/tmrspecopts-shellvar.png
 - lib/rspec/core/formatters/web_kit.rb
 - lib/rspec/core/formatters/webkit.rb
 homepage: http://deveiate.org/webkit-rspec-formatter.html
 licenses:
+- BSD
 - Ruby
 metadata: {}
 post_install_message: "\n\nYou can use this formatter from TextMate by setting the
   TM_RSPEC_OPTS \nshell variable (in the 'Advanced' preference pane) to:\n\n    --format
   RSpec::Core::Formatters::WebKit\n\nHave fun!\n\n"
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rspec-formatter-webkit
-rubygems_version: 2.2.1
+rubyforge_project: 
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: This is a formatter for RSpec 2 that takes advantage of features in WebKit[http://webkit.org/]