relevance-rcov 0.8.3.1 → 0.8.3.2

data/lib/rcov/formatters/base_formatter.rb

@@ -1,127 +1,3 @@
-require "erb"
-
-class Document
-
-  attr_accessor :local_variables 
-
-  def initialize(template_file, locals={})
-    template_path = File.expand_path("#{File.dirname(__FILE__)}/../templates/#{template_file}")
-    @template = ERB.new(File.read(template_path))
-    @local_variables = locals
-    @path_relativizer = Hash.new{|h,base|
-      # TODO: Waaaahhhhh?
-      h[base] = Pathname.new(base).cleanpath.to_s.gsub(%r{^\w:[/\\]}, "").gsub(/\./, "_").gsub(/[\\\/]/, "-") + ".html"
-    }
-  end
-  
-  def render
-    @template.result(get_binding)
-  end
-
-  def relative_filename(path)
-    @path_relativizer[path]
-  end
-
-  #def create_cross_refs(filename, lineno, linetext)
-    #form = formatter
-    #return linetext unless @callsite_analyzer && @do_callsites
-
-    #ref_blocks = []
-    #form.send(:_get_defsites, ref_blocks, filename, lineno, "Calls", linetext) do |ref|
-      #if ref.file
-          #where = "at #{formatter.normalize_filename(ref.file)}:#{ref.line}"
-      #else
-          #where = "(C extension/core)"
-      #end
-      #CGI.escapeHTML("%7d   %s" % [ref.count, "#{ref.klass}##{ref.mid} " + where])
-    #end
-
-    #form.send(:_get_callsites, ref_blocks, filename, lineno, "Called by", linetext) do |ref|
-      #r = "%7d   %s" % [ref.count, "#{formatter.normalize_filename(ref.file||'C code')}:#{ref.line} " + "in '#{ref.klass}##{ref.mid}'"]
-      #CGI.escapeHTML(r)
-    #end
-
-    #create_cross_reference_block(linetext, ref_blocks)
-  #end
-
-  #def create_cross_reference_block(linetext, ref_blocks)
-      #return linetext if ref_blocks.empty?
-      #ret = ""
-      #@cross_ref_idx ||= 0
-      #@known_files ||= formatter.sorted_file_pairs.map{|fname, finfo| formatter.normalize_filename(fname)}
-      #ret << %[<a class="crossref-toggle" href="#" onclick="toggleCode('XREF-#{@cross_ref_idx+=1}'); return false;">#{linetext}</a>]
-      #ret << %[<span class="cross-ref" id="XREF-#{@cross_ref_idx}">]
-      #ret << "\n"
-      #ref_blocks.each do |refs, toplabel, label_proc|
-          #unless !toplabel || toplabel.empty?
-              #ret << %!<span class="cross-ref-title">#{toplabel}</span>\n!
-          #end
-          #refs.each do |dst|
-              #dstfile = formatter.normalize_filename(dst.file) if dst.file
-              #dstline = dst.line
-              #label = label_proc.call(dst)
-              #if dst.file && @known_files.include?(dstfile)
-                  #ret << %[<a href="#{formatter.mangle_filename(dstfile)}#line#{dstline}">#{label}</a>]
-              #else
-                  #ret << label
-              #end
-              #ret << "\n"
-          #end
-      #end
-      #ret << "</span>"
-  #end
-
-  def line_css(line_number)
-    case file.coverage[line_number]
-    when true
-      "marked"
-    when :inferred
-      "inferred"
-    else
-      "uncovered"
-    end
-  end
-
-
- #def format_lines(file)
-      #result = ""
-      #last = nil
-      #end_of_span = ""
-      #format_line = "%#{file.num_lines.to_s.size}d"
-      #file.num_lines.times do |i|
-          #line = file.lines[i].chomp
-          #marked = file.coverage[i]
-          #count = file.counts[i]
-          #spanclass = span_class(file, marked, count)
-          #if spanclass != last
-              #result += end_of_span
-              #case spanclass
-              #when nil
-                  #end_of_span = ""
-              #else
-                  #result += %[<span class="#{spanclass}">]
-                  #end_of_span = "</span>"
-              #end
-          #end
-          #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
-      #result += end_of_span
-      #"<pre>#{result}</pre>"
-  #end
-
-
-  def method_missing(key, *args)
-    local_variables.has_key?(key) ? local_variables[key] : super
-  end
-
-  def get_binding
-    binding 
-  end
-
-end
-
 module Rcov
   
   class BaseFormatter # :nodoc:

data/lib/rcov/formatters/html_coverage.rb

@@ -72,8 +72,7 @@ module Rcov
 
       def create_index(destname)
           files = [SummaryFileInfo.new(self)] + each_file_pair_sorted.map{|k,v| v}
-
-          doc = Document.new('index.html.erb', :title => 'C0 Coverage Information - RCov', 
+          doc = Rcov::Formatters::HtmlErbTemplate.new('index.html.erb', :title => 'C0 Coverage Information - RCov', 
                                                :generated_on => Time.now,
                                                :rcov => Rcov,
                                                :formatter => self,
@@ -85,7 +84,7 @@ module Rcov
 
      
       def create_file(destfile, fileinfo)
-          doc = Document.new('detail.html.erb', :title => fileinfo.name, 
+          doc = Rcov::Formatters::HtmlErbTemplate.new('detail.html.erb', :title => fileinfo.name, 
                                                 :generated_on => Time.now,
                                                 :rcov => Rcov,
                                                 :formatter => self,

data/lib/rcov/formatters/html_erb_template.rb

@@ -0,0 +1,128 @@
+module Rcov
+  module Formatters
+
+    class HtmlErbTemplate
+      attr_accessor :local_variables 
+
+      def initialize(template_file, locals={})
+        require "erb"
+
+        template_path = File.expand_path("#{File.dirname(__FILE__)}/../templates/#{template_file}")
+        @template = ERB.new(File.read(template_path))
+        @local_variables = locals
+        @path_relativizer = Hash.new{|h,base|
+          # TODO: Waaaahhhhh?
+          h[base] = Pathname.new(base).cleanpath.to_s.gsub(%r{^\w:[/\\]}, "").gsub(/\./, "_").gsub(/[\\\/]/, "-") + ".html"
+        }
+      end
+
+      def render
+        @template.result(get_binding)
+      end
+
+      def relative_filename(path)
+        @path_relativizer[path]
+      end
+
+      #def create_cross_refs(filename, lineno, linetext)
+      #form = formatter
+      #return linetext unless @callsite_analyzer && @do_callsites
+
+      #ref_blocks = []
+      #form.send(:_get_defsites, ref_blocks, filename, lineno, "Calls", linetext) do |ref|
+      #if ref.file
+      #where = "at #{formatter.normalize_filename(ref.file)}:#{ref.line}"
+      #else
+      #where = "(C extension/core)"
+      #end
+      #CGI.escapeHTML("%7d   %s" % [ref.count, "#{ref.klass}##{ref.mid} " + where])
+      #end
+
+      #form.send(:_get_callsites, ref_blocks, filename, lineno, "Called by", linetext) do |ref|
+      #r = "%7d   %s" % [ref.count, "#{formatter.normalize_filename(ref.file||'C code')}:#{ref.line} " + "in '#{ref.klass}##{ref.mid}'"]
+      #CGI.escapeHTML(r)
+      #end
+
+      #create_cross_reference_block(linetext, ref_blocks)
+      #end
+
+      #def create_cross_reference_block(linetext, ref_blocks)
+      #return linetext if ref_blocks.empty?
+      #ret = ""
+      #@cross_ref_idx ||= 0
+      #@known_files ||= formatter.sorted_file_pairs.map{|fname, finfo| formatter.normalize_filename(fname)}
+      #ret << %[<a class="crossref-toggle" href="#" onclick="toggleCode('XREF-#{@cross_ref_idx+=1}'); return false;">#{linetext}</a>]
+      #ret << %[<span class="cross-ref" id="XREF-#{@cross_ref_idx}">]
+      #ret << "\n"
+      #ref_blocks.each do |refs, toplabel, label_proc|
+      #unless !toplabel || toplabel.empty?
+      #ret << %!<span class="cross-ref-title">#{toplabel}</span>\n!
+      #end
+      #refs.each do |dst|
+      #dstfile = formatter.normalize_filename(dst.file) if dst.file
+      #dstline = dst.line
+      #label = label_proc.call(dst)
+      #if dst.file && @known_files.include?(dstfile)
+      #ret << %[<a href="#{formatter.mangle_filename(dstfile)}#line#{dstline}">#{label}</a>]
+      #else
+      #ret << label
+      #end
+      #ret << "\n"
+      #end
+      #end
+      #ret << "</span>"
+      #end
+
+      def line_css(line_number)
+        case file.coverage[line_number]
+        when true
+          "marked"
+        when :inferred
+          "inferred"
+        else
+          "uncovered"
+        end
+      end
+
+
+      #def format_lines(file)
+      #result = ""
+      #last = nil
+      #end_of_span = ""
+      #format_line = "%#{file.num_lines.to_s.size}d"
+      #file.num_lines.times do |i|
+      #line = file.lines[i].chomp
+      #marked = file.coverage[i]
+      #count = file.counts[i]
+      #spanclass = span_class(file, marked, count)
+      #if spanclass != last
+      #result += end_of_span
+      #case spanclass
+      #when nil
+      #end_of_span = ""
+      #else
+      #result += %[<span class="#{spanclass}">]
+      #end_of_span = "</span>"
+      #end
+      #end
+      #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
+      #result += end_of_span
+      #"<pre>#{result}</pre>"
+      #end
+
+
+      def method_missing(key, *args)
+        local_variables.has_key?(key) ? local_variables[key] : super
+      end
+
+      def get_binding
+        binding 
+      end
+
+    end
+
+  end
+end

data/lib/rcov/formatters.rb

@@ -1,3 +1,4 @@
+require 'rcov/formatters/html_erb_template'
 require 'rcov/formatters/base_formatter'
 require 'rcov/formatters/text_summary'
 require 'rcov/formatters/text_report'

data/lib/rcov/templates/detail.html.erb

@@ -3,31 +3,7 @@
   <head>
     <title><%= title %></title>
     <link href="screen.css" media="screen" rel="stylesheet" type="text/css" />
-    <script type='text/javascript'>
-    // <![CDATA[
-      function toggleCode( id ) {
-        if ( document.getElementById )
-          elem = document.getElementById( id );
-        else if ( document.all )
-          elem = eval( "document.all." + id );
-        else
-          return false;
-
-        elemStyle = elem.style;
-
-        if ( elemStyle.display != "block" ) {
-          elemStyle.display = "block"
-        } else {
-          elemStyle.display = "none"
-        }
-
-        return true;
-      }
-
-      // Make cross-references hidden by default
-      document.writeln( "<style type=\"text/css\">span.cross-ref { display: none }</style>" )
-      // ]]>
-    </script>
+    <script type="text/javascript" src="rcov.js"></script>
   </head>
   <body>
     <h3><%= title %></h3>

data/lib/rcov/templates/index.html.erb

@@ -3,31 +3,7 @@
   <head>
     <title><%= title %></title>
     <link href="screen.css" media="screen" rel="stylesheet" type="text/css" />
-    <script type='text/javascript'>
-    // <![CDATA[
-      function toggleCode( id ) {
-        if ( document.getElementById )
-          elem = document.getElementById( id );
-        else if ( document.all )
-          elem = eval( "document.all." + id );
-        else
-          return false;
-
-        elemStyle = elem.style;
-
-        if ( elemStyle.display != "block" ) {
-          elemStyle.display = "block"
-        } else {
-          elemStyle.display = "none"
-        }
-
-        return true;
-      }
-
-      // Make cross-references hidden by default
-      document.writeln( "<style type=\"text/css\">span.cross-ref { display: none }</style>" )
-      // ]]>
-    </script>
+    <script type="text/javascript" src="rcov.js"></script>
   </head>
   <body>
     <h3><%= title %></h3>

data/lib/rcov/version.rb

@@ -3,10 +3,9 @@
 # See LEGAL and LICENSE for licensing information.
 
 module Rcov
-  VERSION = "0.8.3.1"
-  RELEASE_DATE = "2009-05-08"
+  VERSION = "0.8.3.2"
+  RELEASE_DATE = "2009-05-12"
   RCOVRT_ABI = [2,0,0]
   UPSTREAM_URL = "http://github.com/relevance/rcov"
-  ROOF_POSITION = 'raised'
 
 end

data/lib/rcov.rb

@@ -1006,6 +1006,4 @@ class CallSiteAnalyzer < DifferentialAnalyzer
 
 end
 
-end # Rcov
-
-# vi: set sw=2:
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: relevance-rcov
 version: !ruby/object:Gem::Version 
-  version: 0.8.3.1
+  version: 0.8.3.2
 platform: ruby
 authors: 
 - Relevance
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2009-05-08 00:00:00 -07:00
+date: 2009-05-12 00:00:00 -07:00
 default_executable: rcov
 dependencies: []
 
@@ -29,11 +29,11 @@ files:
 - lib/rcov.rb
 - lib/rcov/lowlevel.rb
 - lib/rcov/version.rb
-- lib/rcov/report.rb
 - lib/rcov/rcovtask.rb
 - lib/rcov/formatters.rb
 - lib/rcov/formatters/base_formatter.rb
 - lib/rcov/formatters/full_text_report.rb
+- lib/rcov/formatters/html_erb_template.rb
 - lib/rcov/formatters/html_coverage.rb
 - lib/rcov/formatters/text_coverage_diff.rb
 - lib/rcov/formatters/text_report.rb
@@ -70,7 +70,6 @@ files:
 - editor-extensions/rcov.el
 - setup.rb
 - BLURB
-- CHANGES
 has_rdoc: true
 homepage: http://github.com/relevance/rcov
 post_install_message: 

data/CHANGES

@@ -1,177 +0,0 @@
-
-User-visible changes.
-
-Since 0.8.1.1 (2007-11-20)
-==========================
-Bugfixes
---------
-* REXML from 1.8.6-p11[01] is more broken than anticipated; more invasive
-  workarounds. Tested on 1.8.6-p110 and 1.8.5. Note that code using REXML to
-  generate XML will behave differently under rcov in 1.8.6-p11[01] (to begin
-  with, it won't crash in REXML::Document#write).
-
-Since 0.8.1 (2007-11-19)
-========================
-Bugfixes
---------
-* REXML workaround incorrectly applied to 1.8.6 < p110
-* --spec-only should work with RSpec trunk and detect when it cannot work
-
-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
---------
-* --annotate mode, which dumps annotated source code which can be used to
-  follow the control flow (very useful when reading third-party code)
-* --gcc option to display uncovered lines in GCC error format
-* superior Emacs support: running rcov, jumping to uncovered code, navigate
-  through cross-referenced annotated code
-* --[no-]validator-links
-
-Bugfixes
---------
-* differential code coverage reports work with filenames containing special
-  characters
-* fixed recent segfaults happening with rspec
-* more care name mangling
-
-Minor enhancements
-------------------
-* relevant summary values are identified using separate CSS classes 
-  (microformat-style)
-
-Since 0.6.0 (2006-06-12)
-========================
-Features
---------
-* coverage/callsite data from multiple runs can be aggregated (--aggregate) 
-
-Bugfixes
---------
-* the SCRIPT_LINES__ workaround works better
-* fixed silly bug in coverage data acquisition (line after the correct one
-  marked in some situations)
-* avoid problems with repeated path separators in default ignore list, based
-  on rbconfig's data
-
-
-Minor enhancements
-------------------
-
-Since 0.5.0 (2006-05-30)
-========================
-Features
---------
-* differential coverage report: --text-coverage-diff (-D) and --save
-  Tells you when you've added new code that was not covered by the tests and
-  when code that used to be covered isn't anymore. Integration with vim
-  (contributions for other editors/IDEs welcome).
-* fully cross-referenced reports, indicating where methods are called from
-  and which methods were called for each line (--xrefs)
-* cross-referenced report generation is now over 4 times faster for
-  applications with deep call stacks (such as Rails apps)
-
-Bugfixes
---------
-* comments at EOF are marked now
-* better handling of multiline hashes/arrays
-* better handling of end/}: support chained method calls and more expressions
-  on the same line
-* better handling of heredocs with interpolation
-
-Minor enhancements
-------------------
-* more readable --text-coverage
-* set whether comments are "run" by default instead of attaching them to
-  the following block of code (--[no-]comments)
-* --report-cov-bug can be used to report bugs in the coverage analysis 
-
-Since 0.4.0 (2006-05-22)
-========================
-Features
---------
-* ability to create cross-referenced reports, indicating where methods are
-  called from (--callsites)
-* more refinements in the heuristics: now several kinds of multi-line quoted
-  strings are handled properly
-* --include-file to specify files not to be ignored in the report(s)
-* implemented a task generator for Rant
-
-Bugfixes
---------
-* corrected the LOC counts in the XHTML summaries
-* pure-Ruby tracing module works again; was broken in 0.4.0
-* RcovTask#ruby_opts fixed; they were being passed to rcov instead of ruby
-* solved the DOCTYPE issue (it'd get put at the end of the file under some
-  Ruby versions)
-
-Minor enhancements
-------------------
-* slightly more readable XHTML reports, esp. for IE
-* text reports fit in 79 columns so they look OK with cmd.exe
-* try to guide the user when all files were considered "uninteresting" by rcov
-* the output_dir is preserved in RcovTasks when the user specifies --profile
-  via the RCOVOPTS env. var.
-
-Since 0.3.0 (2006-05-05)
-========================
-
-Features
---------
-* easy automation via Rake using the bundled Rcov::RcovTask
-* better heuristics: supports heredocs at last, including variants your editor
-  is probably unable to handle, and =begin/=end comments
-* --rails option to ignore files under vendor/, enviroment/ and config/
-* parts of the runtime exposed and documented for external use
-* new color scheme, with alternating shades of the base colors
-* -w to set $VERBOSE=true (turns on warnings)
-* --text-report and --text-summary
-* --sort and --sort-reverse for the summaries and reports
-* --threshold and --only-uncovered
-* --replace-progname
-
-Backwards incompatible changes
-------------------------------
-* renamed --text to --text-counts and --rich-text to --text-coverage: they
-  were misnamed to begin with
-* changed the meaning of -t and -T (--text-summary and --text-report)
-* $0 is not changed by default for each loaded file anymore; the old 
-  behavior (modulo a small bugfix) can be reproduced with --replace-progname
-
-Since 0.2.0 (2006-02-25)
-========================
-
-Features
---------
-* --exclude-only
-* consolidate multiple references to the same underlying .rb file
-  (much needed for Rails)
-* --test-unit-only
-
-Fixes
------
-* consider and/op operators
-* honor --no-color in (rich) text mode 
-* output valid XHTML indices
-
-Since 0.1.0
-===========
-Tons. Better output, MUCH faster (two orders of magnitude), better command
-line...

data/lib/rcov/report.rb

@@ -1,8 +0,0 @@
-# rcov Copyright (c) 2004-2006 Mauricio Fernandez <mfp@acm.org>
-# See LEGAL and LICENSE for additional licensing information.
-
-require 'pathname'
-
-module Rcov
-    
-end