rcov 0.8.1.2.0 → 0.9.3

data/test/{test_FileStatistics.rb → file_statistics_test.rb}

@@ -1,8 +1,6 @@
+require File.dirname(__FILE__) + '/test_helper'
 
-require 'test/unit'
-require 'rcov'
-
-class Test_FileStatistics < Test::Unit::TestCase
+class TestFileStatistics < Test::Unit::TestCase
   def test_trailing_end_is_inferred
     verify_everything_marked "trailing end", <<-EOF
       1 class X
@@ -41,7 +39,7 @@ class Test_FileStatistics < Test::Unit::TestCase
       0   else
       1     c
       0   end
-      0   case 
+      0   case
       2   when bar =~ /foo/
       1     puts "bar"
       0   else
@@ -82,10 +80,10 @@ class Test_FileStatistics < Test::Unit::TestCase
     assert_in_delta(0.375, sf.code_coverage, 0.01)
     assert_equal(8, sf.num_code_lines)
     assert_equal(13, sf.num_lines)
-    assert_equal([true, :inferred, true, false, false, false, false, false, 
+    assert_equal([true, :inferred, true, false, false, false, false, false,
                  false, false, false, false, true], sf.coverage.to_a)
   end
-  
+
   def test_merge
     lines, coverage, counts = code_info_from_string <<-EOF
       1 a = 1
@@ -238,11 +236,11 @@ class Test_FileStatistics < Test::Unit::TestCase
   def test_heredocs_with_interpolation_alone_in_method
     verify_everything_marked "lonely heredocs with interpolation", <<-'EOS'
       1 def to_s
-      0  <<-EOF               
+      0  <<-EOF
       1    #{name}
-      0    #{street}          
-      0    #{city}, #{state}  
-      0    #{zip}             
+      0    #{street}
+      0    #{city}, #{state}
+      0    #{zip}
       0  EOF
       0 end
     EOS
@@ -251,13 +249,13 @@ class Test_FileStatistics < Test::Unit::TestCase
   def test_handle_multiline_expressions
     verify_everything_marked "expression", <<-EOF
       1 puts 1, 2.
-      0           abs + 
+      0           abs +
       0           1 -
       0           1 *
-      0           1 /  
+      0           1 /
       0           1, 1 <
-      0           2, 3 > 
-      0           4 % 
+      0           2, 3 >
+      0           4 %
       0           3 &&
       0           true ||
       0           foo <<
@@ -322,15 +320,15 @@ class Test_FileStatistics < Test::Unit::TestCase
       1    @review.save
     EOF
   end
-  
+
   def test_handle_multiline_expression_1st_line_ends_in_block_header
     # excerpt taken from mongrel/handlers.rb
     verify_everything_marked "multiline with block starting on 1st", <<-EOF
     1 uris = listener.classifier.handler_map
-    0 results << table("handlers", uris.map {|uri,handlers| 
-    1  [uri, 
-    0    "<pre>" + 
-    1    handlers.map {|h| h.class.to_s }.join("\n") + 
+    0 results << table("handlers", uris.map {|uri,handlers|
+    1  [uri,
+    0    "<pre>" +
+    1    handlers.map {|h| h.class.to_s }.join("\n") +
     0    "</pre>"
     0  ]
     1 })
@@ -341,22 +339,22 @@ class Test_FileStatistics < Test::Unit::TestCase
     verify_everything_marked "multiline with }) delimiter, forward", <<-EOF
       1 assert(@c.config == {
       0 'host' => 'myhost.tld',
-      0 'port' => 1234 
+      0 'port' => 1234
       0 })
     EOF
     verify_everything_marked "multiline with }) delimiter, backwards", <<-EOF
       0 assert(@c.config == {
       0 'host' => 'myhost.tld',
-      0 'port' => 1234 
+      0 'port' => 1234
       1 })
     EOF
   end
-  
+
   STRING_DELIMITER_PAIRS = [
-    %w-%{ }-, %w-%q{ }-, %w-%Q{ }-, %w{%[ ]}, %w{%q[ ]}, 
+    %w-%{ }-, %w-%q{ }-, %w-%Q{ }-, %w{%[ ]}, %w{%q[ ]},
     %w{%( )}, %w{%Q( )}, %w{%Q[ ]}, %w{%q! !}, %w{%! !},
   ]
-  
+
   def test_multiline_strings_basic
     STRING_DELIMITER_PAIRS.each do |s_delim, e_delim|
       verify_everything_marked "multiline strings, basic #{s_delim}", <<-EOF
@@ -373,7 +371,7 @@ class Test_FileStatistics < Test::Unit::TestCase
         0 ON_OFF        = 'on|off'
       EOF
 
-      verify_marked_exactly "multiline strings, #{s_delim}, interpolation", 
+      verify_marked_exactly "multiline strings, #{s_delim}, interpolation",
                             [0], <<-EOF
         1 PATTERN_TEXT = #{s_delim}  \#{#{s_delim} foo #{e_delim}} \\#{e_delim} baz #{e_delim}
         0 NUMBERS       = 'one|two|three|four|five'
@@ -381,7 +379,7 @@ class Test_FileStatistics < Test::Unit::TestCase
       EOF
     end
   end
-  
+
   def test_multiline_strings_escaped_delimiter
     STRING_DELIMITER_PAIRS.each do |s_delim, e_delim|
       verify_everything_marked "multiline, escaped #{s_delim}", <<-EOF
@@ -395,9 +393,9 @@ class Test_FileStatistics < Test::Unit::TestCase
 
   def test_handle_multiline_expressions_with_heredocs
     verify_everything_marked "multiline and heredocs", <<-EOF
-      1 puts <<EOF + 
+      1 puts <<EOF +
       0 testing
-      0 one two three   
+      0 one two three
       0 EOF
       0 somevar
     EOF
@@ -439,7 +437,7 @@ class Test_FileStatistics < Test::Unit::TestCase
 
     sf = Rcov::FileStatistics.new(testname, lines, counts)
     is_code_arr.each_with_index do |val,i|
-      assert_equal(val, sf.is_code?(i), 
+      assert_equal(val, sf.is_code?(i),
                    "Unable to detect =begin comments properly: #{lines[i].inspect}")
     end
   end
@@ -450,15 +448,15 @@ class Test_FileStatistics < Test::Unit::TestCase
     sf = Rcov::FileStatistics.new(testname, lines, counts)
     lines.size.times do |i|
       if marked_indices.include? i
-        assert(sf.coverage[i], "Test #{testname}; " + 
+        assert(sf.coverage[i], "Test #{testname}; " +
                "line should have been marked: #{lines[i].inspect}.")
       else
-        assert(!sf.coverage[i], "Test #{testname}; " + 
+        assert(!sf.coverage[i], "Test #{testname}; " +
                "line should not have been marked: #{lines[i].inspect}.")
       end
     end
   end
-  
+
   def verify_everything_marked(testname, str)
     verify_marked_exactly(testname, (0...str.size).to_a, str)
   end
@@ -466,8 +464,8 @@ class Test_FileStatistics < Test::Unit::TestCase
 
   def code_info_from_string(str)
     str = str.gsub(/^\s*/,"")
-    [ str.map{|line| line.sub(/^\d+ /, "") },
-      str.map{|line| line[/^\d+/].to_i > 0}, 
-      str.map{|line| line[/^\d+/].to_i } ]
+    [ str.lines.map{|line| line.sub(/^\d+ /, "") },
+      str.lines.map{|line| line[/^\d+/].to_i > 0},
+      str.lines.map{|line| line[/^\d+/].to_i } ]
   end
 end

data/test/{test_functional.rb → functional_test.rb}

@@ -1,6 +1,4 @@
-require 'test/unit'
-require 'pathname'
-require 'fileutils'
+require File.dirname(__FILE__) + '/test_helper'
 
 =begin
 Updating functional testdata automatically is DANGEROUS, so I do manually.
@@ -20,18 +18,19 @@ $rcov --no-html --gcc -D --include-file=sample --exclude=rcov sample_05.rb > exp
 $rcov --no-html -D --include-file=sample --exclude=rcov sample_05.rb > expected_coverage/diff.out
 $rcov --no-html --no-color -D --include-file=sample --exclude=rcov sample_05.rb > expected_coverage/diff-no-color.out
 $rcov --no-html --gcc --include-file=sample --exclude=rcov sample_05.rb > expected_coverage/diff-gcc-all.out
-  
+
 =end
 
 class TestFunctional < Test::Unit::TestCase
   @@dir = Pathname(__FILE__).expand_path.dirname
 
   def strip_variable_sections(str)
-    str.sub(/Generated on.+$/, '').sub(/Generated using the.+$/, '')
+    str.sub(/Generated on.+$/, '').sub(/Generated using the.+$/, '').squeeze("\n")
   end
 
   def cmp(file)
     content = lambda{|dir| strip_variable_sections(File.read(@@dir+dir+file))}
+
     assert_equal(content["expected_coverage"], content["actual_coverage"])
   end
 
@@ -39,67 +38,54 @@ class TestFunctional < Test::Unit::TestCase
     Dir.chdir(@@dir, &block)
   end
 
-  def run_rcov(opts, script="sample_04.rb", opts_tail="")
+  def run_rcov(opts, script="assets/sample_04.rb", opts_tail="")
     rcov = @@dir+"../bin/rcov"
     ruby_opts = "-I../lib:../ext/rcovrt"
+    ruby = "ruby"
+    ruby = "jruby" if RUBY_PLATFORM =~ /java/
     with_testdir do
-      `cd #{@@dir}; ruby #{ruby_opts} #{rcov} #{opts} -o actual_coverage #{script} #{opts_tail}`
+      `cd #{@@dir}; #{ruby} #{ruby_opts} #{rcov} #{opts} -o actual_coverage #{script} #{opts_tail}`
       yield if block_given?
     end
   end
 
   def test_annotation
     run_rcov("-a") do
-      cmp "sample_04_rb.rb"
-      cmp "sample_03_rb.rb"
-    end
-  end
-
-  def test_html
-    run_rcov("") do
-      cmp "sample_04_rb.html"
-      cmp "sample_03_rb.html"
+      cmp "../assets/sample_04.rb"
+      cmp "../assets/sample_03.rb"
     end
   end
 
   @@selection = "--include-file=sample --exclude=rcov"
   def test_text_gcc
-    run_rcov("--gcc #{@@selection}",
-             "sample_04.rb",
-             "> actual_coverage/gcc-text.out") do
+    run_rcov("--gcc #{@@selection}", "assets/sample_04.rb", "> actual_coverage/gcc-text.out") do
       cmp "gcc-text.out"
     end
   end
 
   def test_diff
-    with_testdir { FileUtils.cp "sample_05-old.rb", "sample_05.rb" }
-    run_rcov("--no-html --gcc #{@@selection} --save=coverage.info", "sample_05.rb",
-             "> actual_coverage/diff-gcc-original.out") do
+    with_testdir { FileUtils.cp "assets/sample_05-old.rb", "assets/sample_05.rb" }
+
+    run_rcov("--no-html --gcc #{@@selection} --save=coverage.info", "assets/sample_05.rb", "> actual_coverage/diff-gcc-original.out") do
       cmp "diff-gcc-original.out"
     end
 
-    with_testdir { FileUtils.cp "sample_05-new.rb", "sample_05.rb" }
-    run_rcov("--no-html -D --gcc #{@@selection}", "sample_05.rb",
-             "> actual_coverage/diff-gcc-diff.out") do
+    with_testdir { FileUtils.cp "assets/sample_05-new.rb", "assets/sample_05.rb" }
+    run_rcov("--no-html -D --gcc #{@@selection}", "assets/sample_05.rb", "> actual_coverage/diff-gcc-diff.out") do
       cmp "diff-gcc-diff.out"
     end
 
-    run_rcov("--no-html -D #{@@selection}", "sample_05.rb",
-             "> actual_coverage/diff.out") do
+    run_rcov("--no-html -D #{@@selection}", "assets/sample_05.rb", "> actual_coverage/diff.out") do
       cmp "diff.out"
     end
 
-    run_rcov("--no-html --no-color -D #{@@selection}", "sample_05.rb",
-             "> actual_coverage/diff-no-color.out") do
+    run_rcov("--no-html --no-color -D #{@@selection}", "assets/sample_05.rb", "> actual_coverage/diff-no-color.out") do
       cmp "diff-no-color.out"
     end
 
-    run_rcov("--no-html --gcc #{@@selection}", "sample_05.rb",
-             "> actual_coverage/diff-gcc-all.out") do
+    run_rcov("--no-html --gcc #{@@selection}", "assets/sample_05.rb", "> actual_coverage/diff-gcc-all.out") do
       cmp "diff-gcc-all.out"
-    end
-
-    
+    end  
   end
-
+  
 end

metadata

@@ -1,93 +1,115 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
-specification_version: 1
 name: rcov
 version: !ruby/object:Gem::Version 
-  version: 0.8.1.2.0
-date: 2007-11-22 00:00:00 +01:00
-summary: Code coverage analysis tool for Ruby
-require_paths: 
-- lib
-email: mfp@acm.org
-homepage: http://eigenclass.org/hiki.rb?rcov
-rubyforge_project: 
-description: rcov is a code coverage tool for Ruby. It is commonly used for viewing overall test unit coverage of target code.  It features fast execution (20-300 times faster than previous tools), multiple analysis modes, XHTML and several kinds of text reports, easy automation with Rake via a RcovTask, fairly accurate coverage information through code linkage inference using simple heuristics, colorblind-friendliness...
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.9.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
+- Relevance
+- Chad Humphries (spicycode)
+- Aaron Bedra (abedra)
+- Jay McGaffigan
 - Mauricio Fernandez
+autorequire: 
+bindir: bin
+cert_chain: 
+date: 2009-05-12 00:00:00 -04:00
+default_executable: rcov
+dependencies: []
+
+description: rcov is a code coverage tool for Ruby. It is commonly used for viewing overall test unit coverage of target code.  It features fast execution (20-300 times faster than previous tools), multiple analysis modes, XHTML and several kinds of text reports, easy automation with Rake via a RcovTask, fairly accurate coverage information through code linkage inference using simple heuristics, colorblind-friendliness...
+email: opensource@thinkrelevance.com
+executables: 
+- rcov
+extensions: 
+- ext/rcovrt/extconf.rb
+extra_rdoc_files: []
+
 files: 
 - bin/rcov
 - lib/rcov.rb
 - lib/rcov/lowlevel.rb
 - lib/rcov/version.rb
-- lib/rcov/rant.rb
-- lib/rcov/report.rb
 - lib/rcov/rcovtask.rb
+- lib/rcov/formatters.rb
+- lib/rcov/call_site_analyzer.rb
+- lib/rcov/code_coverage_analyzer.rb
+- lib/rcov/coverage_info.rb
+- lib/rcov/differential_analyzer.rb
+- lib/rcov/file_statistics.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
+- lib/rcov/formatters/text_summary.rb
+- lib/rcov/formatters/failure_report.rb
+- lib/rcov/templates/index.html.erb
+- lib/rcov/templates/detail.html.erb
+- lib/rcov/templates/screen.css
+- lib/rcov/templates/print.css
+- lib/rcov/templates/rcov.js
+- lib/rcov/templates/jquery-1.3.2.min.js
+- lib/rcov/templates/jquery.tablesorter.min.js
 - ext/rcovrt/extconf.rb
-- ext/rcovrt/rcovrt.c
-- ext/rcovrt/callsite.c
-- LEGAL
+- ext/rcovrt/1.8/rcovrt.c
+- ext/rcovrt/1.9/rcovrt.c
+- ext/rcovrt/1.8/callsite.c
+- ext/rcovrt/1.9/callsite.c
 - LICENSE
 - Rakefile
-- Rantfile
-- README.rake
-- README.rant
-- README.emacs
-- README.en
-- README.vim
-- README.API
+- doc/readme_for_rake.markdown
+- doc/readme_for_vim.markdown
+- doc/readme_for_emacs.markdown
+- doc/readme_for_api.markdown
 - THANKS
-- test/test_functional.rb
-- test/test_FileStatistics.rb
-- test/sample_03.rb
-- test/sample_05-new.rb
-- test/test_CodeCoverageAnalyzer.rb
-- test/sample_04.rb
-- test/sample_02.rb
-- test/sample_05-old.rb
-- test/sample_01.rb
+- test/functional_test.rb
+- test/file_statistics_test.rb
+- test/assets/sample_03.rb
+- test/assets/sample_05-new.rb
+- test/code_coverage_analyzer_test.rb
+- test/assets/sample_04.rb
+- test/assets/sample_02.rb
+- test/assets/sample_05-old.rb
+- test/assets/sample_01.rb
 - test/turn_off_rcovrt.rb
-- test/test_CallSiteAnalyzer.rb
-- test/sample_05.rb
-- mingw-rbconfig.rb
-- rcov.vim
-- rcov.el
+- test/call_site_analyzer_test.rb
+- test/assets/sample_05.rb
+- editor-extensions/rcov.vim
+- editor-extensions/rcov.el
 - setup.rb
 - BLURB
-- CHANGES
-test_files: 
-- test/test_functional.rb
-- test/test_FileStatistics.rb
-- test/test_CodeCoverageAnalyzer.rb
-- test/test_CallSiteAnalyzer.rb
+has_rdoc: true
+homepage: http://github.com/relevance/rcov
+licenses: []
+
+post_install_message: 
 rdoc_options: 
-- --main
-- README.API
 - --title
 - rcov code coverage tool
-extra_rdoc_files: 
-- README.API
-- README.rake
-- README.rant
-- README.vim
-executables: 
-- rcov
-extensions: 
-- ext/rcovrt/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 1
+summary: Code coverage analysis tool for Ruby
+test_files: 
+- test/functional_test.rb
+- test/file_statistics_test.rb
+- test/code_coverage_analyzer_test.rb
+- test/call_site_analyzer_test.rb