rcov 0.5.0.1 → 0.6.0.1

data/lib/rcov/version.rb

@@ -4,9 +4,9 @@
 
 module Rcov
 
-VERSION = "0.5.0"
-RELEASE_DATE = "2006-05-30"
-RCOVRT_ABI = [1,0,0]
+VERSION = "0.6.0"
+RELEASE_DATE = "2006-06-12"
+RCOVRT_ABI = [2,0,0]
 UPSTREAM_URL = "http://eigenclass.org/hiki.rb?rcov"
 
 end

data/test/test_CallSiteAnalyzer.rb

@@ -14,8 +14,11 @@ class Test_CallSiteAnalyzer < Test::Unit::TestCase
   end
 
   def verify_callsites_equal(expected, actual)
-    callsites = expected.inject({}) do |s,(desc, count)| 
-      s[Rcov::CallSiteAnalyzer::CallSite.new(desc)] = count
+    callsites = expected.inject({}) do |s,(backtrace, count)| 
+      unless $".any?{|x| %r{\brcovrt\b} =~ x}
+        backtrace = backtrace.map{|_, mid, file, line| [nil, mid, file, line] }
+      end
+      s[Rcov::CallSiteAnalyzer::CallSite.new(backtrace)] = count
       s
     end
     assert_equal(callsites, actual)
@@ -71,32 +74,42 @@ class Test_CallSiteAnalyzer < Test::Unit::TestCase
     @a.run_hooked{ @o.f1 }
     assert(@a.analyzed_classes.include?("Rcov::Test::Temporary::Sample03"))
     assert_equal(%w[f1 f2], @a.analyzed_methods("Rcov::Test::Temporary::Sample03"))
-    verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 10}, 
+    verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1, "./test/sample_03.rb", 4]] => 10}, 
                  @a.callsites("Rcov::Test::Temporary::Sample03", "f2"))
-    verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 10}, 
+    verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1, "./test/sample_03.rb", 4]] => 10}, 
                  @a.callsites("Rcov::Test::Temporary::Sample03#f2"))
+    #verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 10}, 
+    #             @a.callsites("Rcov::Test::Temporary::Sample03", "f2"))
+    #verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 10}, 
+    #             @a.callsites("Rcov::Test::Temporary::Sample03#f2"))
   end
 
   def test_basic_callsite_recording_API
     @a.run_hooked{ @o.f1 }
     assert(@a.analyzed_classes.include?("Rcov::Test::Temporary::Sample03"))
     assert_equal(%w[f1 f2], @a.analyzed_methods("Rcov::Test::Temporary::Sample03"))
-    verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 10}, 
+    verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1, 
+                              "./test/sample_03.rb", 4]] => 10}, 
+                 @a.callsites("Rcov::Test::Temporary::Sample03", "f2"))
+    verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1, "./test/sample_03.rb", 4]] => 10}, 
                  @a.callsites("Rcov::Test::Temporary::Sample03", "f2"))
     callsites = @a.callsites("Rcov::Test::Temporary::Sample03", "f2")
     callsite = callsites.keys[0]
     assert_equal("./test/sample_03.rb", callsite.file)
     assert_equal(4, callsite.line)
-    assert_equal("f1", callsite.calling_method)
+    assert_equal(:f1, callsite.calling_method)
   end
   
+  
   def test_basic_callsite_recording_with_singleton_classes
     @a.run_hooked{ @o.class.g1 }
     assert(@a.analyzed_classes.include?("#<Class:Rcov::Test::Temporary::Sample03>"))
     assert_equal(%w[g1 g2], @a.analyzed_methods("#<Class:Rcov::Test::Temporary::Sample03>"))
-    verify_callsites_equal({["./test/sample_03.rb:15:in `g1'"] => 10}, 
+    verify_callsites_equal({[[class << Rcov::Test::Temporary::Sample03; self end, 
+                             :g1, "./test/sample_03.rb", 15]] => 10}, 
                  @a.callsites("Rcov::Test::Temporary::Sample03.g2"))
-    verify_callsites_equal({["./test/sample_03.rb:15:in `g1'"] => 10}, 
+    verify_callsites_equal({[[class << Rcov::Test::Temporary::Sample03; self end,
+                              :g1, "./test/sample_03.rb", 15]] => 10}, 
                  @a.callsites("#<Class:Rcov::Test::Temporary::Sample03>","g2"))
   end
 
@@ -105,19 +118,23 @@ class Test_CallSiteAnalyzer < Test::Unit::TestCase
     @a.run_hooked{ @o.f1 }
     assert(@a.analyzed_classes.include?("Rcov::Test::Temporary::Sample03"))
     assert_equal(%w[f1 f2], @a.analyzed_methods("Rcov::Test::Temporary::Sample03"))
-    verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 10}, 
+    verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1,
+                              "./test/sample_03.rb", 4]] => 10}, 
                  @a.callsites("Rcov::Test::Temporary::Sample03", "f2"))
 
     @a.run_hooked{ @o.f1 }
     assert(@a.analyzed_classes.include?("Rcov::Test::Temporary::Sample03"))
     assert_equal(%w[f1 f2], @a.analyzed_methods("Rcov::Test::Temporary::Sample03"))
-    verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 20}, 
+    verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1,
+                              "./test/sample_03.rb", 4]] => 20}, 
                  @a.callsites("Rcov::Test::Temporary::Sample03", "f2"))
     
     @a.run_hooked{ @o.f3 }
     assert_equal(%w[f1 f2 f3], @a.analyzed_methods("Rcov::Test::Temporary::Sample03"))
-    verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 120,
-                  ["./test/sample_03.rb:11:in `f3'"]=>100 },
+    verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1, 
+                              "./test/sample_03.rb", 4]] => 120,
+                  [[Rcov::Test::Temporary::Sample03, :f3, 
+                    "./test/sample_03.rb", 11]]=>100 },
                  @a.callsites("Rcov::Test::Temporary::Sample03", "f2"))
   end
 
@@ -129,7 +146,8 @@ class Test_CallSiteAnalyzer < Test::Unit::TestCase
     end
     assert(@a.analyzed_classes.include?("Rcov::Test::Temporary::Sample03"))
     assert_equal(%w[f1 f2], @a.analyzed_methods("Rcov::Test::Temporary::Sample03"))
-    verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 10}, 
+    verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1, 
+                              "./test/sample_03.rb", 4]] => 10}, 
                  @a.callsites("Rcov::Test::Temporary::Sample03", "f2"))
 
   end
@@ -141,23 +159,28 @@ class Test_CallSiteAnalyzer < Test::Unit::TestCase
       b.run_hooked { @o.f1 }
       assert(b.analyzed_classes.include?("Rcov::Test::Temporary::Sample03"))
       assert_equal(%w[f1 f2], b.analyzed_methods("Rcov::Test::Temporary::Sample03"))
-      verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 10}, 
+      verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1,
+                                "./test/sample_03.rb", 4]] => 10}, 
                    b.callsites("Rcov::Test::Temporary::Sample03", "f2"))
 
       @o.f1
       assert_equal(%w[f1 f2], b.analyzed_methods("Rcov::Test::Temporary::Sample03"))
-      verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 10}, 
+      verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1,
+                                "./test/sample_03.rb", 4]] => 10}, 
                    b.callsites("Rcov::Test::Temporary::Sample03", "f2"))
       
       assert(a.analyzed_classes.include?("Rcov::Test::Temporary::Sample03"))
       assert_equal(%w[f1 f2], a.analyzed_methods("Rcov::Test::Temporary::Sample03"))
-      verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 20}, 
+      verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1,
+                                "./test/sample_03.rb", 4]] => 20}, 
                    a.callsites("Rcov::Test::Temporary::Sample03", "f2"))
     end
     b.run_hooked{ @o.f3 }
     assert_equal(%w[f1 f2 f3], b.analyzed_methods("Rcov::Test::Temporary::Sample03"))
-    verify_callsites_equal({["./test/sample_03.rb:4:in `f1'"] => 110,
-                  ["./test/sample_03.rb:11:in `f3'"]=>100 },
+    verify_callsites_equal({[[Rcov::Test::Temporary::Sample03, :f1, 
+                              "./test/sample_03.rb", 4]] => 110,
+                  [[Rcov::Test::Temporary::Sample03, :f3,
+                    "./test/sample_03.rb", 11]]=>100 },
                  b.callsites("Rcov::Test::Temporary::Sample03", "f2"))
   end
 

data/test/test_CodeCoverageAnalyzer.rb

@@ -28,7 +28,7 @@ EOF
     cover = [1, 1, nil, nil, 0, 5, 5, 5, 0]
     line_info, marked_info, 
       count_info = analyzer.instance_eval{ refine_coverage_info(LINES, cover) }
-    assert_equal(LINES.map{|l| l.chomp}, line_info)
+    assert_equal(LINES, line_info)
     assert_equal([true] * 2 + [false] * 3 + [true] * 3 + [false], marked_info)
     assert_equal([1, 1, 0, 0, 0, 5, 5, 5, 0], count_info)
   end
@@ -47,7 +47,7 @@ EOF
     assert_equal(lines, SCRIPT_LINES__[sample_file][0, lines.size])
     assert(analyzer.analyzed_files.include?(sample_file))
     line_info, cov_info, count_info = analyzer.data(sample_file)
-    assert_equal(lines.map{|l| l.chomp}, line_info)
+    assert_equal(lines, line_info)
     assert_equal([true, true, false, false, true, false, true], cov_info)
     assert_equal([1, 2, 0, 0, 1, 0, 11], count_info)
     analyzer.reset

data/test/test_FileStatistics.rb

@@ -92,7 +92,7 @@ class Test_FileStatistics < Test::Unit::TestCase
       1 if bar
       0   b = 2
       0 end
-      0 puts <<EOF
+      1 puts <<EOF
       0  bleh
       0 EOF
       3 c.times{ i += 1}
@@ -113,7 +113,33 @@ class Test_FileStatistics < Test::Unit::TestCase
     assert_equal(expected, sf2.coverage.to_a)
     sf.merge(sf2.lines, sf2.coverage, sf2.counts)
     assert_equal(expected, sf.coverage.to_a)
-    assert_equal([2, 2, 1, 0, 1, 0, 0, 13], sf.counts)
+    assert_equal([2, 2, 1, 0, 2, 0, 0, 13], sf.counts)
+  end
+
+  def test_last_comment_block_is_marked
+    verify_everything_marked "last comment block", <<-EOF
+      1 a = 1
+      1 b = 1
+      0 # foo
+      0 # bar baz
+    EOF
+    verify_everything_marked "last comment block, =begin/=end", <<-EOF
+      1 a = 1
+      2 b = 1
+      0 # fooo
+      0 =begin
+      0  bar baz
+      0 =end
+    EOF
+    verify_everything_marked "last comment block, __END__", <<-EOF
+      1 a = 1
+      2 b = 1
+      0 # fooo
+      0 =begin
+      0  bar baz
+      0 =end
+      __END__
+    EOF
   end
 
   def test_heredocs_basic
@@ -209,6 +235,19 @@ class Test_FileStatistics < Test::Unit::TestCase
     EOF
   end
 
+  def test_heredocs_with_interpolation_alone_in_method
+    verify_everything_marked "lonely heredocs with interpolation", <<-'EOS'
+      1 def to_s
+      0  <<-EOF               
+      1    #{name}
+      0    #{street}          
+      0    #{city}, #{state}  
+      0    #{zip}             
+      0  EOF
+      0 end
+    EOS
+  end
+
   def test_handle_multiline_expressions
     verify_everything_marked "expression", <<-EOF
       1 puts 1, 2.
@@ -253,6 +292,37 @@ class Test_FileStatistics < Test::Unit::TestCase
     EOF
   end
 
+  def test_handle_multiline_blocks_first_not_marked
+    verify_everything_marked "multiline block first not marked", <<-'EOF'
+      1 blah = Array.new
+      1 10.times do
+      0   blah << lambda do |f|
+      1     puts "I should say #{f}!"
+      0   end
+      0 end
+    EOF
+  end
+
+  def test_handle_multiline_blocks_last_line_not_marked
+    verify_everything_marked "multiline block last not marked", <<-'EOF'
+      1 blee = [1, 2, 3]
+      0 blee.map! do |e|
+      1   [e, e]
+      0 end.flatten!
+      1 p blee
+    EOF
+  end
+
+  def test_handle_multiline_data_with_trailing_stuff_on_last_line
+    verify_everything_marked "multiline data hash", <<-'EOF'
+      1    @review = Review.new({
+      0      :product_id => params[:id],
+      0      :user       => current_user
+      0    }.merge(params[:review]))      #red
+      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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rcov
 version: !ruby/object:Gem::Version 
-  version: 0.5.0.1
-date: 2006-05-30 00:00:00 +02:00
+  version: 0.6.0.1
+date: 2006-06-12 00:00:00 +02:00
 summary: Code coverage analysis tool for Ruby
 require_paths: 
 - lib
@@ -34,6 +34,7 @@ files:
 - lib/rcov/version.rb
 - lib/rcov/lowlevel.rb
 - lib/rcov/rant.rb
+- lib/rcov/report.rb
 - ext/rcovrt/extconf.rb
 - ext/rcovrt/rcov.c
 - LEGAL
@@ -43,6 +44,7 @@ files:
 - README.en
 - README.rake
 - README.API
+- README.vim
 - README.rant
 - THANKS
 - test/sample_02.rb
@@ -68,6 +70,8 @@ rdoc_options:
 extra_rdoc_files: 
 - README.API
 - README.rake
+- README.rant
+- README.vim
 executables: 
 - rcov
 extensions: