rcov 0.8.0.2 → 0.8.1.0

data/BLURB

@@ -1,8 +1,6 @@
 
 Source code, additional information, screenshots... available at 
-    http://eigenclass.org/hiki.rb?rcov
-Release information:
-    http://eigenclass.org/hiki.rb?rcov-0.8.0
+    http://eigenclass.org/hiki/rcov
 
 If you're on win32, you can also find a pre-built rcovrt.so (which makes
 code coverage analysis >100 times faster) in the above-mentioned pages.

data/CHANGES

@@ -1,6 +1,23 @@
 
 User-visible changes.
 
+Since 0.8.0 (2007-02-28)
+========================
+Features
+--------
+* you can use an existent data file to generate coverage reports without
+  having to execute your code again
+* --spec-only: only consider cover code executed inside a spec
+  (tested with RSpec 1.0.5, 1.0.8)
+* --charset can be used to specify the charset in the Content-Type declaration
+
+Bugfixes
+--------
+* workaround for bugs in Safari, IE (self-closing anchors break colorization)
+* workaround for bugs in REXML shipped with 1.8.6-p110
+* rethrow exceptions generated by traced scripts
+* compatibility with Ruby < 1.8.5
+
 Since 0.7.0 (2006-08-04)
 ========================
 Features

data/Rakefile

@@ -87,7 +87,7 @@ Rake::RDocTask.new("rdoc") { |rdoc|
 
 require 'rcov/version'
 
-PKG_REVISION = ".2"
+PKG_REVISION = ".0"
 PKG_FILES = FileList[
 "bin/rcov",
 "lib/**/*.rb",

data/THANKS

@@ -63,6 +63,28 @@ rubikitch:
 * testing, refactoring...
 * many other things, see darcs changes
 
-
 Zed A. Shaw:
 * reported and fixed segfault triggered by rspec
+
+Lee Marlow:
+* patch allowing to run rcov against a data file with no input code
+
+Kurt Stephens:
+* patch to rethrow any exceptions generated by the traced scripts after
+  report generation; notably SystemExit, allowing to use the exit code from
+  test runners under rake.
+
+Brian Candler:
+* found compatibility issues with the REXML lib included in ruby-1.8.6-p110
+  and provided a workaround
+
+Mat Schaffer:
+* reported missing line colorization on Safari and probably other browsers,
+  owing to self-closing <a> not being handled properly despite being valid
+  XHTML 1.0.
+
+Sam Granieri:
+* tested workaround for REXML bug
+
+Kosmas Schütz, Daniel Berger, François Beausoleil, Bil Kleb:
+* provided information about the ruby-1.8.6-p11[01] REXML problems

data/bin/rcov

@@ -45,6 +45,7 @@ options.include = []
 options.html = true
 options.comments_run_by_default = false
 options.test_unit_only = false
+options.spec_only = false
 options.sort = :name
 options.sort_reverse = false
 options.output_threshold = 101
@@ -59,6 +60,7 @@ options.report_cov_bug_for = nil
 options.aggregate_file = nil
 options.gcc_output = false
 options.show_validator_links = true
+options.charset = nil
 
 EXTRA_HELP = <<-EOF
 
@@ -99,9 +101,13 @@ EOF
         options.comments_run_by_default = comments_run_p
     end
     opts.on("--test-unit-only",
-            "Only trace code executed in TestCases.") do
+            "Only trace code executed inside TestCases.") do
         options.test_unit_only = true
     end
+    opts.on("--spec-only",
+            "Only trace code executed inside RSpec specs.") do
+        options.spec_only = true
+    end
     opts.on("-n", "--no-color", "Create colorblind-safe output.") do
         options.color = false
     end
@@ -230,6 +236,10 @@ EOF
         end
         options.output_threshold = threshold
     end
+    opts.on("--charset CHARSET",
+            "Charset used in Content-Type declaration of HTML reports.") do |c|
+        options.charset = c
+    end
     opts.on("--[no-]validator-links", "Add link to W3C's validation services.",
            "(default: true)") do |show_validator_links|
         options.show_validator_links = show_validator_links
@@ -300,7 +310,7 @@ rescue OptionParser::InvalidOption, OptionParser::InvalidArgument,
     exit(-1)
 end
 options.destdir ||= "coverage"
-unless ARGV[0]
+unless ARGV[0] or options.aggregate_file && File.file?(options.aggregate_file)
     puts opts
     exit
 end
@@ -365,7 +375,8 @@ make_formatter = lambda do |klass|
               :diff_cmd => options.diff_cmd,
               :comments_run_by_default => options.comments_run_by_default,
               :gcc_output => options.gcc_output,
-              :validator_links => options.show_validator_links
+              :validator_links => options.show_validator_links,
+              :charset => options.charset
              )
 end
 
@@ -398,6 +409,11 @@ end
 $rcov_code_coverage_analyzer ||= Rcov::CodeCoverageAnalyzer.new
 
 # must be registered before test/unit puts its own
+
+
+# The exception to rethrow after reporting has been handled.
+$__rcov_exit_exception = nil
+
 END {
     $rcov_code_coverage_analyzer.remove_hook
     $rcov_callsite_analyzer.remove_hook if $rcov_callsite_analyzer
@@ -468,6 +484,8 @@ You can solve this by doing one or more of the following:
   documentation or README.rake in the source distribution).
 EOF
     end
+
+    raise $__rcov_exit_exception if $__rcov_exit_exception
 }
 
 if options.test_unit_only
@@ -501,11 +519,20 @@ if options.test_unit_only
             end
         end
     end
+elsif options.spec_only
+    require 'spec'
+    class Spec::DSL::Example
+        oldrun = instance_method(:run)
+        define_method(:run) do |*args|
+            $rcov_code_coverage_analyzer.run_hooked { oldrun.bind(self).call(*args) }
+        end
+    end
 else
     $rcov_code_coverage_analyzer.install_hook
 end
 
 #{{{ Load scripts
+begin
 pending_scripts = ARGV.clone
 ARGV.replace extra_args
 until pending_scripts.empty?
@@ -515,7 +542,9 @@ until pending_scripts.empty?
     end
     load prog
 end
-
+rescue Object => err
+  $__rcov_exit_exception = err
+end
 
 # xx-0.1.0-1 follows
 __END__

data/lib/rcov.rb

@@ -590,6 +590,18 @@ class CodeCoverageAnalyzer < DifferentialAnalyzer
     refine_coverage_info(@script_lines__[filename], raw_data[filename])
   end
 
+  # Data for the first file matching the given regexp.
+  # See #data.
+  def data_matching(filename_re)
+    raw_data = raw_data_relative
+    update_script_lines__
+
+    match = raw_data.keys.sort.grep(filename_re).first
+    return nil unless match
+
+    refine_coverage_info(@script_lines__[match], raw_data[match])
+  end
+
   # Execute the code in the given block, monitoring it in order to gather
   # information about which code was executed.
   def run_hooked; super end

data/lib/rcov/report.rb

@@ -4,6 +4,28 @@
 require 'pathname'
 module Rcov
 
+# Try to fix bug in the REXML shipped with Ruby 1.8.6
+# This affects Mac OSX 10.5.1 users and motivates endless bug reports.
+if RUBY_VERSION == "1.8.6" && defined? REXML
+    class REXML::Document
+        def write( output=$stdout, indent=-1, trans=false, ie_hack=false )
+            if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
+                output = Output.new( output, xml_decl.encoding )
+            end
+            formatter = if indent > -1
+                if trans
+                    REXML::Formatters::Transitive.new( indent, ie_hack )
+                else
+                    REXML::Formatters::Pretty.new( indent, ie_hack )
+                end
+            else
+                REXML::Formatters::Default.new( ie_hack )
+            end
+            formatter.write( self, output )
+        end
+    end
+end
+
 class Formatter # :nodoc:
     require 'pathname'
     ignore_files = [
@@ -226,7 +248,17 @@ class FullTextReport < Formatter # :nodoc:
             puts "=" * 80
             puts filename
             puts "=" * 80
-            SCRIPT_LINES__[filename].each_with_index do |line, i|
+            lines = SCRIPT_LINES__[filename]
+            unless lines
+                # try to get the source code from the global code coverage
+                # analyzer
+                re = /#{Regexp.escape(filename)}\z/
+                if $rcov_code_coverage_analyzer and 
+                    (data = $rcov_code_coverage_analyzer.data_matching(re))
+                    lines = data[0]
+                end
+            end
+            (lines || []).each_with_index do |line, i|
                 case @textmode
                 when :counts
                     puts "%-70s| %6d" % [line.chomp[0,70], fileinfo.counts[i]]
@@ -616,7 +648,7 @@ EOS
 
     DEFAULT_OPTS = {:color => false, :fsr => 30, :destdir => "coverage",
                     :callsites => false, :cross_references => false,
-                    :validator_links => true 
+                    :validator_links => true, :charset => nil
                    }
     def initialize(opts = {})
         options = DEFAULT_OPTS.clone.update(opts)
@@ -628,6 +660,7 @@ EOS
         @do_cross_references = options[:cross_references]
         @span_class_index = 0
         @show_validator_links = options[:validator_links]
+        @charset = options[:charset]
     end
 
     def execute
@@ -699,7 +732,7 @@ EOS
                              [f.code_coverage, "coverage_code"]].each do |value, css_class|
                                 value *= 100
                                 td_ { 
-                                    table_(:cellpadding => 0, :cellspacing => 0, :align => "right") { 
+                                    table_(:cellpadding => "0", :cellspacing => "0", :align => "right") { 
                                         tr_ { 
                                             td_ {
                                                  tt_(:class => css_class) { "%3.1f%%" % value } 
@@ -707,11 +740,11 @@ EOS
                                             }
                                             ivalue = value.round
                                             td_ {
-                                                table_(:class => "percent_graph", :cellpadding => 0,
-                                                   :cellspacing => 0, :width => 100) {
+                                                table_(:class => "percent_graph", :cellpadding => "0",
+                                                   :cellspacing => "0", :width => "100") {
                                                     tr_ {
-                                                        td_(:class => "covered", :width => ivalue)
-                                                        td_(:class => "uncovered", :width => (100-ivalue))
+                                                        td_(:class => "covered", :width => ivalue.to_s)
+                                                        td_(:class => "uncovered", :width => (100-ivalue).to_s)
                                                     }
                                                 }
                                             }
@@ -740,6 +773,10 @@ EOS
         title = default_title
         output = xhtml_ { html_ {
             head_ {
+                if @charset
+                    meta_("http-equiv".to_sym => "Content-Type",
+                          :content => "text/html;charset=#{@charset}")
+                end
                 title_{ title }
                 style_(:type => "text/css") { t_{ "body { background-color: #{default_color}; }" }  }
                 style_(:type => "text/css") { CSS_PROLOG }
@@ -763,7 +800,7 @@ EOS
                     p_ {
                         a_(:href => "http://validator.w3.org/check/referer") {
                             img_(:src => "http://www.w3.org/Icons/valid-xhtml11",
-                                 :alt => "Valid XHTML 1.1!", :height => 31, :width => 88)
+                                 :alt => "Valid XHTML 1.1!", :height => "31", :width => "88")
                         }
                         a_(:href => "http://jigsaw.w3.org/css-validator/check/referer") {
                             img_(:style => "border:0;width:88px;height:31px",
@@ -801,7 +838,7 @@ EOS
                     end_of_span = "</span>"
                 end
             end
-            result += %[<a name="line#{i+1}" />] + (format_line % (i+1)) + 
+            result += %[<a name="line#{i+1}"></a>] + (format_line % (i+1)) + 
                 " " + create_cross_refs(file.name, i+1, CGI.escapeHTML(line)) + "\n"
             last = spanclass
         end
@@ -877,6 +914,10 @@ EOS
         do_ctable = output_color_table?
         output = xhtml_ { html_ {
             head_ { 
+                if @charset
+                    meta_("http-equiv".to_sym => "Content-Type",
+                          :content => "text/html;charset=#{@charset}")
+                end
                 title_{ title } 
                 style_(:type => "text/css") { t_{ "body { background-color: #{default_color}; }" }  }
                 style_(:type => "text/css") { CSS_PROLOG }
@@ -910,7 +951,7 @@ EOS
                     p_ {
                         a_(:href => "http://validator.w3.org/check/referer") {
                             img_(:src => "http://www.w3.org/Icons/valid-xhtml10",
-                                 :alt => "Valid XHTML 1.0!", :height => 31, :width => 88)
+                                 :alt => "Valid XHTML 1.0!", :height => "31", :width => "88")
                         }
                         a_(:href => "http://jigsaw.w3.org/css-validator/check/referer") {
                             img_(:style => "border:0;width:88px;height:31px",
@@ -1080,8 +1121,8 @@ class RubyAnnotation < Formatter # :nodoc:
         return linetext unless @callsite_analyzer && @do_callsites
         ref_blocks = []
         _get_defsites(ref_blocks, filename, lineno, linetext, ">>") do |ref|
-            ref.file.sub!(%r!^./!, '')
             if ref.file
+                ref.file.sub!(%r!^./!, '')
                 where = "at #{mangle_filename(ref.file)}:#{ref.line}"
             else
                 where = "(C extension/core)"

data/lib/rcov/version.rb

@@ -4,10 +4,10 @@
 
 module Rcov
 
-VERSION = "0.8.0"
-RELEASE_DATE = "2007-02-28"
+VERSION = "0.8.1"
+RELEASE_DATE = "2007-11-19"
 RCOVRT_ABI = [2,0,0]
-UPSTREAM_URL = "http://eigenclass.org/hiki.rb?rcov"
+UPSTREAM_URL = "http://eigenclass.org/hiki/rcov"
 
 end
 # vi: set sw=2:

data/test/test_functional.rb

@@ -26,12 +26,12 @@ $rcov --no-html --gcc --include-file=sample --exclude=rcov sample_05.rb > expect
 class TestFunctional < Test::Unit::TestCase
   @@dir = Pathname(__FILE__).expand_path.dirname
 
-  def strip_time(str)
-    str.sub(/Generated on.+$/, '')
+  def strip_variable_sections(str)
+    str.sub(/Generated on.+$/, '').sub(/Generated using the.+$/, '')
   end
 
   def cmp(file)
-    content = lambda{|dir| strip_time(File.read(@@dir+dir+file))}
+    content = lambda{|dir| strip_variable_sections(File.read(@@dir+dir+file))}
     assert_equal(content["expected_coverage"], content["actual_coverage"])
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: rcov
 version: !ruby/object:Gem::Version 
-  version: 0.8.0.2
-date: 2007-02-28 00:00:00 +01:00
+  version: 0.8.1.0
+date: 2007-11-19 00:00:00 +01:00
 summary: Code coverage analysis tool for Ruby
 require_paths: 
 - lib
@@ -31,11 +31,11 @@ authors:
 files: 
 - bin/rcov
 - lib/rcov.rb
-- lib/rcov/rcovtask.rb
-- lib/rcov/version.rb
 - lib/rcov/lowlevel.rb
+- lib/rcov/version.rb
 - lib/rcov/rant.rb
 - lib/rcov/report.rb
+- lib/rcov/rcovtask.rb
 - ext/rcovrt/extconf.rb
 - ext/rcovrt/rcovrt.c
 - ext/rcovrt/callsite.c
@@ -43,25 +43,25 @@ files:
 - LICENSE
 - Rakefile
 - Rantfile
-- README.en
 - README.rake
-- README.API
-- README.vim
 - README.rant
 - README.emacs
+- README.en
+- README.vim
+- README.API
 - THANKS
-- test/sample_02.rb
-- test/sample_01.rb
+- test/test_functional.rb
+- test/test_FileStatistics.rb
 - test/sample_03.rb
-- test/sample_04.rb
+- test/sample_05-new.rb
 - test/test_CodeCoverageAnalyzer.rb
-- test/test_FileStatistics.rb
+- test/sample_04.rb
+- test/sample_02.rb
+- test/sample_05-old.rb
+- test/sample_01.rb
 - test/turn_off_rcovrt.rb
 - test/test_CallSiteAnalyzer.rb
 - test/sample_05.rb
-- test/test_functional.rb
-- test/sample_05-new.rb
-- test/sample_05-old.rb
 - mingw-rbconfig.rb
 - rcov.vim
 - rcov.el
@@ -69,10 +69,10 @@ files:
 - BLURB
 - CHANGES
 test_files: 
-- test/test_CodeCoverageAnalyzer.rb
+- test/test_functional.rb
 - test/test_FileStatistics.rb
+- test/test_CodeCoverageAnalyzer.rb
 - test/test_CallSiteAnalyzer.rb
-- test/test_functional.rb
 rdoc_options: 
 - --main
 - README.API