relevance-rcov 0.9.0 → 0.9.1.1

data/Rakefile

@@ -40,11 +40,27 @@ Rcov::RcovTask.new(:rcov_ccanalyzer) do |t|
 end
 
 desc "Run the unit tests with rcovrt."
-Rake::TestTask.new(:test_rcovrt => ["ext/rcovrt/rcovrt.so"]) do |t|
-  system("cd ext/rcovrt && make clean && rm Makefile")
-  t.libs << "ext/rcovrt"
-  t.test_files = FileList['test/*_test.rb']
-  t.verbose = true
+if RUBY_PLATFORM == 'java'
+  Rake::TestTask.new(:test_rcovrt => ["lib/rcovrt.jar"]) do |t|
+    t.libs << "lib"
+    t.ruby_opts << "--debug"
+    t.test_files = FileList['test/*_test.rb']
+    t.verbose = true
+  end
+
+  file "lib/rcovrt.jar" => FileList["ext/java/**/*.java"] do |t|
+    rm_f "lib/rcovrt.jar"
+    mkdir_p "pkg/classes"
+    sh "javac -classpath #{Java::JavaLang::System.getProperty('java.class.path')} -d pkg/classes #{t.prerequisites.join(' ')}"
+    sh "jar cf #{t.name} -C pkg/classes ."
+  end
+else
+    Rake::TestTask.new(:test_rcovrt => ["ext/rcovrt/rcovrt.so"]) do |t|
+    system("cd ext/rcovrt && make clean && rm Makefile")
+    t.libs << "ext/rcovrt"
+    t.test_files = FileList['test/*_test.rb']
+    t.verbose = true
+  end
 end
 
 file "ext/rcovrt/rcovrt.so" => FileList["ext/rcovrt/*.c"] do

data/THANKS

@@ -1,3 +1,11 @@
+Jay McGaffigan:
+* JRuby support integrated from original rcov4j
+
+Aaron Bedra:
+* major refactoring
+* added threshold testing
+* Took on the task of keeping RCov going
+
 Corey Ehmke (Bantik):
 * redesigned index and detail XHTML
 * added sortable columns in coverage table

data/lib/rcov/formatters/base_formatter.rb

@@ -1,8 +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/]
+    ignore_files = [ /\btc_[^.]*.rb/, /_test\.rb\z/, /\btest\//, /\bvendor\//, /\A#{Regexp.escape(__FILE__)}\z/]
+
+    unless RUBY_PLATFORM =~ /java/
+      require 'mkmf'
+      ignore_files << [/\A#{Regexp.escape(Pathname.new(::Config::CONFIG['libdir']).cleanpath.to_s)}/]
+    end
 
     DEFAULT_OPTS = { :ignore => ignore_files, :sort => :name, :sort_reverse => false,
                      :output_threshold => 101, :dont_ignore => [], :callsite_analyzer => nil, \

data/lib/rcov/version.rb

@@ -3,7 +3,7 @@
 # See LICENSE for licensing information.
 
 module Rcov
-  VERSION = "0.9.0"
+  VERSION = "0.9.1.1"
   RELEASE_DATE = "2009-08-30"
   RCOVRT_ABI = [2,0,0]
   UPSTREAM_URL = "http://github.com/relevance/rcov"

data/test/code_coverage_analyzer_test.rb

@@ -47,7 +47,9 @@ EOF
     line_info, cov_info, count_info = analyzer.data(sample_file)
     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)
+    assert_equal([1, 2, 0, 0, 1, 0, 11], count_info) unless RUBY_PLATFORM =~ /java/
+    # JRUBY reports an if x==blah as hitting this type of line once, JRUBY also optimizes this stuff so you'd have to run with --debug to get "extra" information.  MRI hits it twice.
+    assert_equal([1, 3, 0, 0, 1, 0, 33], count_info) if RUBY_PLATFORM =~ /java/
     analyzer.reset
     assert_equal(nil, analyzer.data(sample_file))
     assert_equal([], analyzer.analyzed_files)
@@ -80,6 +82,18 @@ EOF
     assert_equal(counts, ncounts)
   end
 
+  def test_if_elsif_reports_correctly
+    sample_file = File.join(File.dirname(__FILE__), "assets/sample_06.rb")
+    lines = File.readlines(sample_file)
+    analyzer = Rcov::CodeCoverageAnalyzer.new
+    analyzer.run_hooked{ load sample_file }
+    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, line_info)
+    assert_equal([true, true, false, true, true, false, false, false], cov_info) unless RUBY_PLATFORM == "java"
+  end
+
   def test_differential_coverage_data
     sample_file = File.join(File.dirname(__FILE__), "assets/sample_01.rb")
     lines = File.readlines(sample_file)
@@ -94,23 +108,33 @@ EOF
     sample_file = File.join(File.dirname(__FILE__), "assets/sample_02.rb")
     analyzer.run_hooked{ load sample_file }
     line_info, cov_info, count_info = analyzer.data(sample_file)
-    assert_equal([8, 1, 0, 0, 0], count_info) unless RUBY_VERSION =~ /1.9/
-    assert_equal([4, 1, 0, 0, 4], count_info) if RUBY_VERSION =~ /1.9/
+    if RUBY_PLATFORM == "java"
+      assert_equal([8, 3, 0, 0, 0], count_info) 
+    else
+      assert_equal([8, 1, 0, 0, 0], count_info) unless  RUBY_VERSION =~ /1.9/
+      assert_equal([4, 1, 0, 0, 4], count_info) if RUBY_VERSION =~ /1.9/
+    end
 
     analyzer.reset
     assert_equal([], analyzer.analyzed_files)
     analyzer.run_hooked{ Rcov::Test::Temporary::Sample02.foo(1, 1) }
     line_info, cov_info, count_info = analyzer.data(sample_file)
-    assert_equal([0, 1, 1, 1, 0], count_info) unless RUBY_VERSION =~ /1.9/
-    assert_equal([0, 2, 1, 0, 0], count_info) if RUBY_VERSION =~ /1.9/
+    if RUBY_PLATFORM == "java"
+      assert_equal([0, 1, 3, 1, 0], count_info) unless RUBY_VERSION =~ /1.9/
+    else
+      assert_equal([0, 1, 1, 1, 0], count_info) unless RUBY_VERSION =~ /1.9/
+      assert_equal([0, 2, 1, 0, 0], count_info) if RUBY_VERSION =~ /1.9/
+    end
     analyzer.run_hooked do
       10.times{ Rcov::Test::Temporary::Sample02.foo(1, 1) }
     end
     line_info, cov_info, count_info = analyzer.data(sample_file)
-    assert_equal([0, 11, 11, 11, 0], count_info)
+    assert_equal([0, 11, 33, 11, 0], count_info) if RUBY_PLATFORM == "java"
+    assert_equal([0, 11, 11, 11, 0], count_info) unless RUBY_PLATFORM == "java"
     10.times{ analyzer.run_hooked{ Rcov::Test::Temporary::Sample02.foo(1, 1) } }
     line_info, cov_info, count_info = analyzer.data(sample_file)
-    assert_equal([0, 21, 21, 21, 0], count_info)
+    assert_equal([0, 21, 63, 21, 0], count_info) if RUBY_PLATFORM == "java"
+    assert_equal([0, 21, 21, 21, 0], count_info) unless RUBY_PLATFORM == "java"
 
     count_info2 = nil
     10.times do |i|
@@ -120,8 +144,13 @@ EOF
         line_info2, cov_info2, count_info2 = analyzer.data(sample_file)
       end
     end
-    assert_equal([0, 25, 25, 25, 0], count_info)
-    assert_equal([0, 31, 31, 31, 0], count_info2)
+    if RUBY_PLATFORM == "java"
+      assert_equal([0, 25, 75, 25, 0], count_info)
+      assert_equal([0, 31, 93, 31, 0], count_info2)
+    else
+      assert_equal([0, 25, 25, 25, 0], count_info)
+      assert_equal([0, 31, 31, 31, 0], count_info2)
+    end
   end
 
   def test_nested_analyzer_blocks
@@ -154,8 +183,13 @@ EOF
 
     _, _, counts1 = a1.data(sample_file)
     _, _, counts2 = a2.data(sample_file)
-    assert_equal([0, 221, 221, 221, 0], counts1)
-    assert_equal([0, 121, 121, 121, 0], counts2)
+    if RUBY_PLATFORM == "java"
+      assert_equal([0, 221, 663, 221, 0], counts1)    
+      assert_equal([0, 121, 363, 121, 0], counts2)
+    else
+      assert_equal([0, 221, 221, 221, 0], counts1)
+      assert_equal([0, 121, 121, 121, 0], counts2)
+    end
   end
 
   def test_reset
@@ -171,7 +205,8 @@ EOF
       end
     end
 
-    assert_equal([0, 50, 50, 50, 0], a1.data(sample_file)[2])
+    assert_equal([0, 50, 50, 50, 0], a1.data(sample_file)[2]) unless RUBY_PLATFORM == "java"
+    assert_equal([0, 50, 150, 50, 0], a1.data(sample_file)[2]) if RUBY_PLATFORM == "java"
   end
 
   def test_compute_raw_difference

data/test/functional_test.rb

@@ -41,8 +41,10 @@ class TestFunctional < Test::Unit::TestCase
   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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: relevance-rcov
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1.1
 platform: ruby
 authors: 
 - Relevance
 - Chad Humphries (spicycode)
 - Aaron Bedra (abedra)
+- Jay McGaffigan
 - Mauricio Fernandez
 autorequire: 
 bindir: bin