rspec-formatter-webkit 2.1.3 → 2.1.4

data/History.rdoc

@@ -0,0 +1,26 @@
+== v2.1.4 [2011-11-01] Michael Granger <ged@FaerieMUD.org>
+
+Updates for Ruby 1.9.3-p0 and RSpec 2.7.x.
+
+
+== v2.1.3 [2011-02-16] Michael Granger <ged@FaerieMUD.org>
+
+Remove use of deprecated Config.datadir.
+
+
+== v2.1.2 [2011-02-09] Michael Granger <ged@FaerieMUD.org>
+
+Trying the dependency fix again.
+
+
+== v2.1.1 [2011-01-26] Michael Granger <ged@FaerieMUD.org>
+
+Adjust dependency on rspec to be less paranoid.
+
+
+== v2.1.0 [2010-12-21] Michael Granger <ged@FaerieMUD.org>
+
+* Converted to Hoe
+* Renamed from 'rspec-formatter-webkit' to better match gem-naming convention
+* Updated for RSpec 2.3.0.
+

data/Manifest.txt

@@ -0,0 +1,48 @@
+History.rdoc
+LICENSE
+Manifest.txt
+README.rdoc
+Rakefile
+data/rspec-formatter-webkit/css/textmate-rspec.css
+data/rspec-formatter-webkit/images/clock.png
+data/rspec-formatter-webkit/images/cross_circle.png
+data/rspec-formatter-webkit/images/cross_circle_frame.png
+data/rspec-formatter-webkit/images/cross_octagon.png
+data/rspec-formatter-webkit/images/cross_octagon_frame.png
+data/rspec-formatter-webkit/images/cross_shield.png
+data/rspec-formatter-webkit/images/exclamation.png
+data/rspec-formatter-webkit/images/exclamation_frame.png
+data/rspec-formatter-webkit/images/exclamation_shield.png
+data/rspec-formatter-webkit/images/exclamation_small.png
+data/rspec-formatter-webkit/images/plus_circle.png
+data/rspec-formatter-webkit/images/plus_circle_frame.png
+data/rspec-formatter-webkit/images/question.png
+data/rspec-formatter-webkit/images/question_frame.png
+data/rspec-formatter-webkit/images/question_shield.png
+data/rspec-formatter-webkit/images/question_small.png
+data/rspec-formatter-webkit/images/tick.png
+data/rspec-formatter-webkit/images/tick_circle.png
+data/rspec-formatter-webkit/images/tick_circle_frame.png
+data/rspec-formatter-webkit/images/tick_shield.png
+data/rspec-formatter-webkit/images/tick_small.png
+data/rspec-formatter-webkit/images/tick_small_circle.png
+data/rspec-formatter-webkit/images/ticket.png
+data/rspec-formatter-webkit/images/ticket_arrow.png
+data/rspec-formatter-webkit/images/ticket_exclamation.png
+data/rspec-formatter-webkit/images/ticket_minus.png
+data/rspec-formatter-webkit/images/ticket_pencil.png
+data/rspec-formatter-webkit/images/ticket_plus.png
+data/rspec-formatter-webkit/images/ticket_small.png
+data/rspec-formatter-webkit/js/jquery-1.4.2.min.js
+data/rspec-formatter-webkit/js/textmate-rspec.js
+data/rspec-formatter-webkit/templates/failed.rhtml
+data/rspec-formatter-webkit/templates/footer.rhtml
+data/rspec-formatter-webkit/templates/header.rhtml
+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
+docs/tmrspec-example.png
+docs/tmrspecopts-shellvar.png
+lib/rspec/core/formatters/web_kit.rb
+lib/rspec/core/formatters/webkit.rb

data/README.rdoc

@@ -0,0 +1,41 @@
+= A WebKit RSpec Formatter
+
+http://deveiate.org/webkit-rspec-formatter.html
+
+
+== 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
+fun.
+
+Test output looks like this:
+
+http://deveiate.org/images/tmrspec-example.png
+
+== Installation
+
+To get started, install the `rspec-formatter-webkit` gem:
+
+    $ gem install rspec-formatter-webkit
+
+If you're running specs in Textmate via {the RSpec
+bundle}[http://github.com/rspec/rspec-tmbundle], you can use the webkit
+formatter by opening Textmate's 'Advanced' Preferences and adding a
+`TM_RSPEC_OPTS` Shell Variable with the value `--format
+RSpec::Core::Formatters::WebKit`:
+
+http://deveiate.org/images/tmrspecopts-shellvar.png
+
+That's it!
+
+
+== 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.
+
+Patches/suggestions welcomed.
+

data/Rakefile

@@ -9,44 +9,40 @@ end
 require 'rake/clean'
 
 Hoe.plugin :mercurial
-Hoe.plugin :yard
 Hoe.plugin :signing
 
 Hoe.plugins.delete :rubyforge
 
 hoespec = Hoe.spec 'rspec-formatter-webkit' do
-	self.readme_file = 'README.md'
-	self.history_file = 'History.md'
+	self.readme_file = 'README.rdoc'
+	self.history_file = 'History.rdoc'
+	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
-	self.extra_deps.push *{
-		'rspec' => '~> 2.5',
-	}
+	self.dependency 'rspec-core', '~> 2.7'
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.spec_extras[:post_install_message] = %{
 
-		You can use this formatter from TextMate (if you're using RSpec 2.3.0 
-		or later) bysetting the TM_RSPEC_OPTS shell variable (in the 
-		'Advanced' preference pane) to:
+		You can use this formatter from TextMate by setting the TM_RSPEC_OPTS 
+		shell variable (in the 'Advanced' preference pane) to:
 
 		    --format RSpec::Core::Formatters::WebKit
 
 		Have fun!
 
 	}.gsub( /^\t+/m, '' )
-	self.spec_extras[:signing_key] = '/Volumes/Keys/ged-private_gem_key.pem'
 
 	self.require_ruby_version( '>=1.8.7' )
-
 	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
 
 ENV['VERSION'] ||= hoespec.spec.version.to_s
 
+# Ensure history is updated before checking in
+task 'hg:precheckin' => [ :check_history ]
 
 task :legacy_gem do
 	Dir.chdir( 'legacy' ) do

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

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'pp'
-require 'rbconfig'
 require 'erb'
 require 'pathname'
 
@@ -13,22 +12,21 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 	include ERB::Util
 
 	# Version constant
-	VERSION = '2.1.3'
+	VERSION = '2.1.4'
 
 	# Look up the datadir falling back to a relative path (mostly for prerelease testing)
-	DEFAULT_DATADIR = Pathname( Gem.datadir('rspec-formatter-webkit') )
-	if DEFAULT_DATADIR.exist?
-		BASE_PATH = DEFAULT_DATADIR
-	else
-		BASE_PATH = Pathname( __FILE__ ).dirname.parent.parent.parent.parent +
-		 	'data/rspec-formatter-webkit'
+	DATADIR = begin
+		dir = Gem.datadir('rspec-formatter-webkit') ||
+		      Pathname( __FILE__ ).dirname.parent.parent.parent.parent +
+		           'data/rspec-formatter-webkit'
+		Pathname( dir )
 	end
 
 	# The base HREF used in the header to map stuff to the datadir
-	BASE_HREF        = "file://#{BASE_PATH}/"
+	BASE_HREF        = "file://#{DATADIR}/"
 
 	# The directory to grab ERb templates out of
-	TEMPLATE_DIR     = BASE_PATH + 'templates'
+	TEMPLATE_DIR     = DATADIR + 'templates'
 
 	# The page part templates
 	HEADER_TEMPLATE          = TEMPLATE_DIR + 'header.rhtml'
@@ -38,6 +36,8 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 	PENDFIX_EXAMPLE_TEMPLATE = TEMPLATE_DIR + 'pending-fixed.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))?/}
 
 	### Create a new formatter
 	def initialize( output ) # :notnew:
@@ -170,7 +170,7 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 	### 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 =~ %r{r?spec/mate|textmate-command}
+		return nil if line =~ BACKTRACE_EXCLUDE_PATTERN
 		return h( line.strip ).gsub( /([^:]*\.rb):(\d*)/ ) do
 			"<a href=\"txmt://open?url=file://#{File.expand_path($1)}&amp;line=#{$2}\">#{$1}:#{$2}</a> "
 		end
@@ -182,7 +182,9 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 	### failure.
 	def extra_failure_content( exception )
 		return '' unless exception
-		snippet = @snippet_extractor.snippet( 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
 
@@ -215,7 +217,6 @@ class RSpec::Core::Formatters::WebKit < RSpec::Core::Formatters::BaseTextFormatt
 
 
 	### Load the ERB template at +templatepath+ and return it.
-	### @param [Pathname] templatepath  the fully-qualified path to the template file
 	def load_template( templatepath )
 		return ERB.new( templatepath.read, nil, '%<>' ).freeze
 	end

metadata

@@ -1,123 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rspec-formatter-webkit
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 2.1.4
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 3
-  version: 2.1.3
 platform: ruby
-authors: 
+authors:
 - Michael Granger
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
+cert_chain:
+- ! '-----BEGIN CERTIFICATE-----
+
   MIIDLDCCAhSgAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQwwCgYDVQQDDANnZWQx
+
   FzAVBgoJkiaJk/IsZAEZFgdfYWVyaWVfMRMwEQYKCZImiZPyLGQBGRYDb3JnMB4X
+
   DTEwMDkxNjE0NDg1MVoXDTExMDkxNjE0NDg1MVowPDEMMAoGA1UEAwwDZ2VkMRcw
+
   FQYKCZImiZPyLGQBGRYHX2FlcmllXzETMBEGCgmSJomT8ixkARkWA29yZzCCASIw
+
   DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy//BFxC1f/cPSnwtJBWoFiFrir
+
   h7RicI+joq/ocVXQqI4TDWPyF/8tqkvt+rD99X9qs2YeR8CU/YiIpLWrQOYST70J
+
   vDn7Uvhb2muFVqq6+vobeTkILBEO6pionWDG8jSbo3qKm1RjKJDwg9p4wNKhPuu8
+
   KGue/BFb67KflqyApPmPeb3Vdd9clspzqeFqp7cUBMEpFS6LWxy4Gk+qvFFJBJLB
+
   BUHE/LZVJMVzfpC5Uq+QmY7B+FH/QqNndn3tOHgsPadLTNimuB1sCuL1a4z3Pepd
+
   TeLBEFmEao5Dk3K/Q8o8vlbIB/jBDTUx6Djbgxw77909x6gI9doU4LD5XMcCAwEA
+
   AaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJeoGkOr9l4B
+
   +saMkW/ZXT4UeSvVMA0GCSqGSIb3DQEBBQUAA4IBAQBG2KObvYI2eHyyBUJSJ3jN
+
   vEnU3d60znAXbrSd2qb3r1lY1EPDD3bcy0MggCfGdg3Xu54z21oqyIdk8uGtWBPL
+
   HIa9EgfFGSUEgvcIvaYqiN4jTUtidfEFw+Ltjs8AP9gWgSIYS6Gr38V0WGFFNzIH
+
   aOD2wmu9oo/RffW4hS/8GuvfMzcw7CQ355wFR4KB/nyze+EsZ1Y5DerCAagMVuDQ
+
   U0BLmWDFzPGGWlPeQCrYHCr+AcJz+NRnaHCKLZdSKj/RHuTOt+gblRex8FAh8NeA
+
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
+
   -----END CERTIFICATE-----
 
-date: 2011-02-16 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+'
+date: 2011-11-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: &70188297033940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.7'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe-mercurial
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70188297033940
+- !ruby/object:Gem::Dependency
+  name: hoe-mercurial
+  requirement: &70188297033160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
-        version: 1.2.1
+      - !ruby/object:Gem::Version
+        version: 1.3.1
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe-yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70188297033160
+- !ruby/object:Gem::Dependency
+  name: hoe-highline
+  requirement: &70188297031980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
-        version: 0.1.2
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70188297031980
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &70188297030460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 9
-        - 0
-        version: 2.9.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
   type: :development
-  version_requirements: *id004
-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 fun.
-  
+  prerelease: false
+  version_requirements: *70188297030460
+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
+
+  fun.
+
+
   Test output looks like this:
-  
-  ![Example Output](http://deveiate.org/images/tmrspec-example.png)
-email: 
+
+
+  http://deveiate.org/images/tmrspec-example.png'
+email:
 - ged@FaerieMUD.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- History.md
-files: 
+extra_rdoc_files:
+- Manifest.txt
+- History.rdoc
+- README.rdoc
+files:
+- History.rdoc
 - LICENSE
-- README.md
+- Manifest.txt
+- README.rdoc
 - Rakefile
 - data/rspec-formatter-webkit/css/textmate-rspec.css
 - data/rspec-formatter-webkit/images/clock.png
@@ -162,54 +162,34 @@ files:
 - docs/tmrspecopts-shellvar.png
 - lib/rspec/core/formatters/web_kit.rb
 - lib/rspec/core/formatters/webkit.rb
-- History.md
-has_rdoc: true
 homepage: http://deveiate.org/webkit-rspec-formatter.html
-licenses: 
+licenses:
 - BSD
-post_install_message: |+
-  
-  
-  You can use this formatter from TextMate (if you're using RSpec 2.3.0 
-  or later) bysetting the TM_RSPEC_OPTS shell variable (in the 
-  'Advanced' preference pane) to:
-  
-      --format RSpec::Core::Formatters::WebKit
-  
-  Have fun!
-  
-rdoc_options: 
-- --title
-- RspecFormatterWebkit Documentation
-- --quiet
-require_paths: 
+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
+- README.rdoc
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rspec-formatter-webkit
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: 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 fun
+summary: 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 fun
 test_files: []
-

data/History.md

@@ -1,21 +0,0 @@
-## 2.1.3 [2011-02-16] Michael Granger <ged@FaerieMUD.org>
-
-Remove use of deprecated Config.datadir.
-
-
-## 2.1.2 [2011-02-09] Michael Granger <ged@FaerieMUD.org>
-
-Trying the dependency fix again.
-
-
-## 2.1.1 [2011-01-26] Michael Granger <ged@FaerieMUD.org>
-
-Adjust dependency on rspec to be less paranoid.
-
-
-## 2.1.0 [2010-12-21] Michael Granger <ged@FaerieMUD.org>
-
-* Converted to Hoe
-* Renamed from 'rspec-formatter-webkit' to better match gem-naming convention
-* Updated for RSpec 2.3.0.
-

data/README.md

@@ -1,30 +0,0 @@
-# A WebKit RSpec Formatter
-
-http://deveiate.org/webkit-rspec-formatter.html
-
-## 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 fun.
-
-Test output looks like this:
-
-![Example Output](http://deveiate.org/images/tmrspec-example.png)
-
-## Installation
-
-To get started, install the `rspec-formatter-webkit` gem:
-
-    $ gem install rspec-formatter-webkit
-
-If you're running specs in Textmate via [the RSpec bundle](http://github.com/rspec/rspec-tmbundle), you can use the webkit formatter by opening Textmate's 'Advanced' Preferences and adding a `TM_RSPEC_OPTS` Shell Variable with the value `--format RSpec::Core::Formatters::WebKit`:
-
-![Setting TM_RSPEC_OPTS](http://deveiate.org/images/tmrspecopts-shellvar.png)
-
-That's it!
-
-## 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. 
-
-Patches/suggestions welcomed.
-