relevance-rcov 0.8.5.2 → 0.8.6

data/lib/rcov/formatters/base_formatter.rb

@@ -1,12 +1,12 @@
 module Rcov
-  
   class BaseFormatter # :nodoc:
     require 'pathname'
     require 'mkmf'
     ignore_files = [/\A#{Regexp.escape(Pathname.new(::Config::CONFIG['libdir']).cleanpath.to_s)}/, /\btc_[^.]*.rb/, /_test\.rb\z/, /\btest\//, /\bvendor\//, /\A#{Regexp.escape(__FILE__)}\z/]
 
-    DEFAULT_OPTS = {:ignore => ignore_files, :sort => :name, :sort_reverse => false,
-      :output_threshold => 101, :dont_ignore => [], :callsite_analyzer => nil, :comments_run_by_default => false}
+    DEFAULT_OPTS = { :ignore => ignore_files, :sort => :name, :sort_reverse => false,
+                     :output_threshold => 101, :dont_ignore => [], :callsite_analyzer => nil, \
+                     :comments_run_by_default => false }
 
     def initialize(opts = {})
       options = DEFAULT_OPTS.clone.update(opts)
@@ -17,7 +17,7 @@ module Rcov
       @sort_criterium = case options[:sort]
       when :loc then lambda{|fname, finfo| finfo.num_code_lines}
       when :coverage then lambda{|fname, finfo| finfo.code_coverage}
-      else lambda{|fname, finfo| fname}
+      else lambda { |fname, finfo| fname }
       end
       @sort_reverse = options[:sort_reverse]
       @output_threshold = options[:output_threshold]
@@ -101,6 +101,7 @@ module Rcov
     end
 
     private
+    
     def cross_references_for(filename, lineno)
       return nil unless @callsite_analyzer
       @callsite_index ||= build_callsite_index
@@ -163,7 +164,5 @@ module Rcov
         ref_blocks << [refs, label, format_called_ref]
       end
     end
-
   end
-
 end

data/lib/rcov/formatters/full_text_report.rb

@@ -1,8 +1,7 @@
 module Rcov
-
   class FullTextReport < BaseFormatter # :nodoc:
     DEFAULT_OPTS = {:textmode => :coverage}
-  
+
     def initialize(opts = {})
       options = DEFAULT_OPTS.clone.update(opts)
       @textmode = options[:textmode]
@@ -16,7 +15,7 @@ module Rcov
         puts filename
         puts "=" * 80
         lines = SCRIPT_LINES__[filename]
-      
+
         unless lines
           # try to get the source code from the global code coverage
           # analyzer
@@ -26,9 +25,8 @@ module Rcov
             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]]
@@ -43,13 +41,8 @@ module Rcov
               puts "#{prefix}#{line}"
             end
           end
-        
         end
-      
       end
-    
     end
-  
   end
-  
 end

data/lib/rcov/formatters/html_coverage.rb

@@ -1,255 +1,244 @@
 module Rcov
-
   class HTMLCoverage < BaseFormatter # :nodoc:
-      require 'fileutils'
-
-      DEFAULT_OPTS = {:color => false, :fsr => 30, :destdir => "coverage",
-                      :callsites => false, :cross_references => false,
-                      :charset => nil }
-                     
-      def initialize(opts = {})
-        options = DEFAULT_OPTS.clone.update(opts)
-        super(options)
-        @dest = options[:destdir]
-        @color = options[:color]
-        @fsr = options[:fsr]
-        @do_callsites = options[:callsites]
-        @do_cross_references = options[:cross_references]
-        @span_class_index = 0
-        @charset = options[:charset]
-      end
-
-      def execute
-        return if @files.empty?
-        FileUtils.mkdir_p @dest
-        css_file = File.expand_path("#{File.dirname(__FILE__)}/../templates/screen.css")
-        FileUtils.cp(css_file, File.join(@dest, "screen.css"))
-
-        create_index(File.join(@dest, "index.html"))
-      
-        each_file_pair_sorted do |filename, fileinfo|
-          create_file(File.join(@dest, mangle_filename(filename)), fileinfo)
-        end
+    require 'fileutils'
+
+    DEFAULT_OPTS = {:color => false, :fsr => 30, :destdir => "coverage",
+                    :callsites => false, :cross_references => false,
+                    :charset => nil }
+
+    def initialize(opts = {})
+      options = DEFAULT_OPTS.clone.update(opts)
+      super(options)
+      @dest = options[:destdir]
+      @color = options[:color]
+      @fsr = options[:fsr]
+      @do_callsites = options[:callsites]
+      @do_cross_references = options[:cross_references]
+      @span_class_index = 0
+      @charset = options[:charset]
+    end
+
+    def execute
+      return if @files.empty?
+      FileUtils.mkdir_p @dest
+      css_file = File.expand_path("#{File.dirname(__FILE__)}/../templates/screen.css")
+      FileUtils.cp(css_file, File.join(@dest, "screen.css"))
+
+      create_index(File.join(@dest, "index.html"))
+
+      each_file_pair_sorted do |filename, fileinfo|
+        create_file(File.join(@dest, mangle_filename(filename)), fileinfo)
       end
+    end
 
-      private
+    private
 
-      class SummaryFileInfo  # :nodoc:
-        
-        def initialize(obj)
-          @o = obj 
-        end
-      
-        def num_lines
-          @o.num_lines
-        end
-      
-        def num_code_lines
-          @o.num_code_lines
-        end
-      
-        def code_coverage
-          @o.code_coverage
-        end
+    class SummaryFileInfo  # :nodoc:
+      def initialize(obj)
+        @o = obj 
+      end
 
-        def code_coverage_for_report
-          code_coverage * 100
-        end
+      def num_lines
+        @o.num_lines
+      end
 
-        def total_coverage
-          @o.total_coverage
-        end
+      def num_code_lines
+        @o.num_code_lines
+      end
 
-        def total_coverage_for_report
-          total_coverage * 100
-        end
-      
-        def name
-          "TOTAL" 
-        end
+      def code_coverage
+        @o.code_coverage
+      end
 
+      def code_coverage_for_report
+        code_coverage * 100
       end
 
-      def create_index(destname)
-          files = [SummaryFileInfo.new(self)] + each_file_pair_sorted.map{|k,v| v}
-          doc = Rcov::Formatters::HtmlErbTemplate.new('index.html.erb', :title => 'C0 Coverage Information - RCov', 
-                                               :generated_on => Time.now,
-                                               :rcov => Rcov,
-                                               :formatter => self,
-                                               :output_threshold => @output_threshold,
-                                               :files => files)
+      def total_coverage
+        @o.total_coverage
+      end
 
-          File.open(destname, "w")  { |f| f.puts doc.render }
+      def total_coverage_for_report
+        total_coverage * 100
       end
 
-     
-      def create_file(destfile, fileinfo)
-          doc = Rcov::Formatters::HtmlErbTemplate.new('detail.html.erb', :title => fileinfo.name, 
-                                                :generated_on => Time.now,
-                                                :rcov => Rcov,
-                                                :formatter => self,
-                                                :output_threshold => @output_threshold,
-                                                :fileinfo => fileinfo)
-          File.open(destfile, "w")  { |f| f.puts doc.render }
+      def name
+        "TOTAL" 
       end
+    end
+
+    def create_index(destname)
+        files = [SummaryFileInfo.new(self)] + each_file_pair_sorted.map{|k,v| v}
+        doc = Rcov::Formatters::HtmlErbTemplate.new('index.html.erb', :title => 'C0 Coverage Information - RCov', 
+                                                                      :generated_on => Time.now,
+                                                                      :rcov => Rcov,
+                                                                      :formatter => self,
+                                                                      :output_threshold => @output_threshold,
+                                                                      :files => files)
+        File.open(destname, "w") { |f| f.puts doc.render }
+    end
 
+    def create_file(destfile, fileinfo)
+        doc = Rcov::Formatters::HtmlErbTemplate.new('detail.html.erb', :title => fileinfo.name, 
+                                                                       :generated_on => Time.now,
+                                                                       :rcov => Rcov,
+                                                                       :formatter => self,
+                                                                       :output_threshold => @output_threshold,
+                                                                       :fileinfo => fileinfo)
+        File.open(destfile, "w")  { |f| f.puts doc.render }
+    end
   end
 
   class HTMLProfiling < HTMLCoverage # :nodoc:
+    DEFAULT_OPTS = {:destdir => "profiling"}
+    def initialize(opts = {})
+      options = DEFAULT_OPTS.clone.update(opts)
+      super(options)
+      @max_cache = {}
+      @median_cache = {}
+    end
 
-      DEFAULT_OPTS = {:destdir => "profiling"}
-      def initialize(opts = {})
-          options = DEFAULT_OPTS.clone.update(opts)
-          super(options)
-          @max_cache = {}
-          @median_cache = {}
-      end
+    def default_title
+      "Bogo-profile information"
+    end
 
-      def default_title
-          "Bogo-profile information"
+    def default_color
+      if @color
+        "rgb(179,205,255)"
+      else
+        "rgb(255, 255, 255)"
       end
+    end
 
-      def default_color
-          if @color
-              "rgb(179,205,255)"
-          else
-              "rgb(255, 255, 255)"
-          end
-      end
+    def output_color_table?
+      false
+    end
 
-      def output_color_table?
-          false
-      end
-
-      def span_class(sourceinfo, marked, count)
-          full_scale_range = @fsr # dB
-          nz_count = sourceinfo.counts.select{|x| x && x != 0}
-          nz_count << 1 # avoid div by 0
-          max = @max_cache[sourceinfo] ||= nz_count.max
-          #avg = @median_cache[sourceinfo] ||= 1.0 *
-          #    nz_count.inject{|a,b| a+b} / nz_count.size
-          median = @median_cache[sourceinfo] ||= 1.0 * nz_count.sort[nz_count.size/2]
-          max ||= 2
-          max = 2 if max == 1
-          if marked == true
-              count = 1 if !count || count == 0
-              idx = 50 + 1.0 * (500/full_scale_range) * Math.log(count/median) / Math.log(10)
-              idx = idx.to_i
-              idx = 0 if idx < 0
-              idx = 100 if idx > 100
-              "run#{idx}"
-          else
-              nil
-          end
+    def span_class(sourceinfo, marked, count)
+      full_scale_range = @fsr # dB
+      nz_count = sourceinfo.counts.select{|x| x && x != 0}
+      nz_count << 1 # avoid div by 0
+      max = @max_cache[sourceinfo] ||= nz_count.max
+      #avg = @median_cache[sourceinfo] ||= 1.0 *
+      #    nz_count.inject{|a,b| a+b} / nz_count.size
+      median = @median_cache[sourceinfo] ||= 1.0 * nz_count.sort[nz_count.size/2]
+      max ||= 2
+      max = 2 if max == 1
+      if marked == true
+        count = 1 if !count || count == 0
+        idx = 50 + 1.0 * (500/full_scale_range) * Math.log(count/median) / Math.log(10)
+        idx = idx.to_i
+        idx = 0 if idx < 0
+        idx = 100 if idx > 100
+        "run#{idx}"
+      else
+        nil
       end
-    
+    end
   end
 
   class RubyAnnotation < BaseFormatter # :nodoc:
-      DEFAULT_OPTS = { :destdir => "coverage" }
-      def initialize(opts = {})
-          options = DEFAULT_OPTS.clone.update(opts)
-          super(options)
-          @dest = options[:destdir]
-          @do_callsites = true
-          @do_cross_references = true
-
-          @mangle_filename = Hash.new{|h,base|
-              h[base] = Pathname.new(base).cleanpath.to_s.gsub(%r{^\w:[/\\]}, "").gsub(/\./, "_").gsub(/[\\\/]/, "-") + ".rb"
-          }
-      end
-
-      def execute
-          return if @files.empty?
-          FileUtils.mkdir_p @dest
-          each_file_pair_sorted do |filename, fileinfo|
-              create_file(File.join(@dest, mangle_filename(filename)), fileinfo)
-          end
+    DEFAULT_OPTS = { :destdir => "coverage" }
+    def initialize(opts = {})
+      options = DEFAULT_OPTS.clone.update(opts)
+      super(options)
+      @dest = options[:destdir]
+      @do_callsites = true
+      @do_cross_references = true
+
+      @mangle_filename = Hash.new{ |h,base|
+        h[base] = Pathname.new(base).cleanpath.to_s.gsub(%r{^\w:[/\\]}, "").gsub(/\./, "_").gsub(/[\\\/]/, "-") + ".rb"
+      }
+    end
+
+    def execute
+      return if @files.empty?
+      FileUtils.mkdir_p @dest
+      each_file_pair_sorted do |filename, fileinfo|
+        create_file(File.join(@dest, mangle_filename(filename)), fileinfo)
       end
+    end
 
-      private
+    private
 
-      def format_lines(file)
-          result = ""
-          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]
-              result << create_cross_refs(file.name, i+1, line, marked) + "\n"
-          end
-          result
+    def format_lines(file)
+      result = ""
+      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]
+        result << create_cross_refs(file.name, i+1, line, marked) + "\n"
       end
+      result
+    end
 
-  def create_cross_refs(filename, lineno, linetext, marked)
+    def create_cross_refs(filename, lineno, linetext, marked)
       return linetext unless @callsite_analyzer && @do_callsites
       ref_blocks = []
       _get_defsites(ref_blocks, filename, lineno, linetext, ">>") do |ref|
-          if ref.file
-              ref.file.sub!(%r!^./!, '')
-              where = "at #{mangle_filename(ref.file)}:#{ref.line}"
-          else
-              where = "(C extension/core)"
-          end
-          "#{ref.klass}##{ref.mid} " + where + ""
+        if ref.file
+          ref.file.sub!(%r!^./!, '')
+          where = "at #{mangle_filename(ref.file)}:#{ref.line}"
+        else
+          where = "(C extension/core)"
+        end
+        "#{ref.klass}##{ref.mid} " + where + ""
       end
       _get_callsites(ref_blocks, filename, lineno, linetext, "<<") do |ref| # "
-          ref.file.sub!(%r!^./!, '')
-          "#{mangle_filename(ref.file||'C code')}:#{ref.line} " +
-              "in #{ref.klass}##{ref.mid}"
+        ref.file.sub!(%r!^./!, '')
+        "#{mangle_filename(ref.file||'C code')}:#{ref.line} " + "in #{ref.klass}##{ref.mid}"
       end
 
       create_cross_reference_block(linetext, ref_blocks, marked)
-  end
+    end
 
-  def create_cross_reference_block(linetext, ref_blocks, marked)
-    codelen = 75
-    if ref_blocks.empty?
+    def create_cross_reference_block(linetext, ref_blocks, marked)
+      codelen = 75
+      if ref_blocks.empty?
         if marked
-            return "%-#{codelen}s #o" % linetext
+          return "%-#{codelen}s #o" % linetext
         else
-            return linetext
+          return linetext
         end
-    end
-    ret = ""
-    @cross_ref_idx ||= 0
-    @known_files ||= sorted_file_pairs.map{|fname, finfo| normalize_filename(fname)}
-    ret << "%-#{codelen}s # " % linetext
-    ref_blocks.each do |refs, toplabel, label_proc|
+      end
+      ret = ""
+      @cross_ref_idx ||= 0
+      @known_files ||= sorted_file_pairs.map{|fname, finfo| normalize_filename(fname)}
+      ret << "%-#{codelen}s # " % linetext
+      ref_blocks.each do |refs, toplabel, label_proc|
         unless !toplabel || toplabel.empty?
-            ret << toplabel << " "
+          ret << toplabel << " "
         end
         refs.each do |dst|
-            dstfile = normalize_filename(dst.file) if dst.file
-            dstline = dst.line
-            label = label_proc.call(dst)
-            if dst.file && @known_files.include?(dstfile)
-                ret << "[[" << label << "]], "
-            else
-                ret << label << ", "
-            end
+          dstfile = normalize_filename(dst.file) if dst.file
+          dstline = dst.line
+          label = label_proc.call(dst)
+          if dst.file && @known_files.include?(dstfile)
+            ret << "[[" << label << "]], "
+          else
+            ret << label << ", "
+          end
         end
-    end
-
-    ret
-  end
-
-      def create_file(destfile, fileinfo)
-        #body = format_lines(fileinfo)
-        #File.open(destfile, "w") do |f|
-          #f.puts body
-          #f.puts footer(fileinfo)
-        #end
       end
+      ret
+    end
 
-      def footer(fileinfo)
-        s  = "# Total lines    : %d\n" % fileinfo.num_lines
-        s << "# Lines of code  : %d\n" % fileinfo.num_code_lines
-        s << "# Total coverage : %3.1f%%\n" % [ fileinfo.total_coverage*100 ]
-        s << "# Code coverage  : %3.1f%%\n\n" % [ fileinfo.code_coverage*100 ]
-        # prevents false positives on Emacs
-        s << "# Local " "Variables:\n" "# mode: " "rcov-xref\n" "# End:\n"
-      end
+    def create_file(destfile, fileinfo)
+      #body = format_lines(fileinfo)
+      #File.open(destfile, "w") do |f|
+        #f.puts body
+        #f.puts footer(fileinfo)
+      #end
     end
 
+    def footer(fileinfo)
+      s  = "# Total lines    : %d\n" % fileinfo.num_lines
+      s << "# Lines of code  : %d\n" % fileinfo.num_code_lines
+      s << "# Total coverage : %3.1f%%\n" % [ fileinfo.total_coverage*100 ]
+      s << "# Code coverage  : %3.1f%%\n\n" % [ fileinfo.code_coverage*100 ]
+      # prevents false positives on Emacs
+      s << "# Local " "Variables:\n" "# mode: " "rcov-xref\n" "# End:\n"
+    end
+  end
 end