jruby-rcov 0.8.2.2-java → 0.8.2.3-java

data/lib/rcov/version.rb

@@ -3,9 +3,11 @@
 # See LEGAL and LICENSE for licensing information.
 
 module Rcov
-  VERSION = "0.8.2.1"
-  RELEASE_DATE = "2009-03-17"
-  RCOVRT_ABI = [2,0,0]
-  UPSTREAM_URL = "http://github.com/spicycode/rcov"
+
+VERSION = "0.8.2.3"
+RELEASE_DATE = "2009-06-03"
+RCOVRT_ABI = [2,0,0]
+UPSTREAM_URL = "http://github.com/jruby/rcov"
 
 end
+# vi: set sw=2:

data/lib/rcov/xx.rb

@@ -35,7 +35,7 @@ require "rexml/document"
 
 
 module XX
-
+#--{{{
   VERSION = "0.1.0"
 
   %w(
@@ -46,48 +46,55 @@ module XX
   ).each{|c| const_set c, c}
 
   class Document
-
+#--{{{
     attr "doc"
     attr "stack"
     attr "size"
 
-    def initialize(*a, &b)
+    def initialize *a, &b
+#--{{{
       @doc = ::REXML::Document::new(*a, &b)
       @stack = [@doc]
       @size = 0
+#--}}}
     end
-    
     def top
+#--{{{
       @stack.last
+#--}}}
     end
-    
-    def push(element)
+    def push element
+#--{{{
       @stack.push element
+#--}}}
     end
-
     def pop
+#--{{{
       @stack.pop unless @stack.size == 1
+#--}}}
     end
-
     def tracking_additions
+#--{{{
       n = @size
       yield
       return @size - n
+#--}}}
     end
-
-    def to_str(port = "")
+    def to_str port = ""
+#--{{{
       @doc.write port, indent=-1, transitive=false, ie_hack=true
       port
+#--}}}
     end
-    
     alias_method "to_s", "to_str"
-
-    def pretty(port = '') 
+    def pretty port = '' 
+#--{{{
       @doc.write port, indent=2, transitive=false, ie_hack=true
       port
+#--}}}
     end
-
-    def create(element)
+    def create element
+#--{{{
       push element
       begin
         object = nil
@@ -103,10 +110,10 @@ module XX
       end
       self << element
       element
-
+#--}}}
     end
     def << object
-
+#--{{{
       t, x = top, object
 
       if x
@@ -186,19 +193,19 @@ module XX
 
       @size += 1
       self
-
+#--}}}
     end
-
+#--}}}
   end
 
   module Markup
-
+#--{{{
     class Error < ::StandardError; end
 
     module InstanceMethods
-
+#--{{{
       def method_missing m, *a, &b
-
+#--{{{
         m = m.to_s
 
         tag_method, tag_name = xx_class::xx_tag_method_name m
@@ -236,10 +243,10 @@ module XX
         end
 
         ret
-
+#--}}}
       end
       def xx_tag_ tag_name, *a, &b
-
+#--{{{
         tag_method, tag_name = xx_class::xx_tag_method_name tag_name 
 
         ret, defined = nil
@@ -254,11 +261,11 @@ module XX
         end
 
         ret
-
+#--}}}
       end
       alias_method "g_", "xx_tag_"
       def xx_which *argv 
-
+#--{{{
         @xx_which = nil unless defined? @xx_which
         if argv.empty?
           @xx_which
@@ -271,10 +278,10 @@ module XX
             @xx_which = xx_which
           end
         end
-
+#--}}}
       end
       def xx_with_doc_in_effect *a, &b
-
+#--{{{
         @xx_docs ||= []
         doc = ::XX::Document::new(*a)
         ddoc = doc.doc
@@ -304,15 +311,15 @@ module XX
         ensure
           @xx_docs.pop
         end
-
+#--}}}
       end
       def xx_doc
-
+#--{{{
         @xx_docs.last rescue raise "no xx_doc in effect!"
-
+#--}}}
       end
       def xx_text_ *objects, &b
-
+#--{{{
         doc = xx_doc
 
         text =
@@ -325,12 +332,12 @@ module XX
         end
 
         doc.create text, &b
-
+#--}}}
       end
       alias_method "text_", "xx_text_"
       alias_method "t_", "xx_text_"
       def xx_markup_ *objects, &b
-
+#--{{{
         doc = xx_doc
 
         doc2 = ::REXML::Document::new ""
@@ -344,11 +351,11 @@ module XX
         puts doc2.to_s
         STDIN.gets
         ret
-
+#--}}}
       end
       alias_method "x_", "xx_markup_"
       def xx_any_ *objects, &b
-
+#--{{{
         doc = xx_doc
         nothing = %r/.^/m
 
@@ -362,13 +369,13 @@ module XX
         end
 
         doc.create text, &b
-
+#--}}}
       end
       alias_method "h_", "xx_any_"
       remove_method "x_" if instance_methods.include? "x_"
       alias_method "x_", "xx_any_" # supplant for now
       def xx_cdata_ *objects, &b
-
+#--{{{
         doc = xx_doc
 
         cdata = ::REXML::CData::new ""
@@ -378,20 +385,20 @@ module XX
         end
 
         doc.create cdata, &b
-
+#--}}}
       end
       alias_method "c_", "xx_cdata_"
       def xx_parse_attributes string
-
+#--{{{
         string = string.to_s
         tokens = string.split %r/,/o
         tokens.map{|t| t.sub!(%r/[^=]+=/){|key_eq| key_eq.chop << " : "}}
         xx_parse_yaml_attributes(tokens.join(','))
-
+#--}}}
       end
       alias_method "att_", "xx_parse_attributes"
       def xx_parse_yaml_attributes string
-
+#--{{{
         require "yaml"
         string = string.to_s
         string = "{" << string unless string =~ %r/^\s*[{]/o
@@ -399,75 +406,75 @@ module XX
         obj = ::YAML::load string
         raise ArgumentError, "<#{ obj.class }> not Hash!" unless Hash === obj
         obj
-
+#--}}}
       end
       alias_method "at_", "xx_parse_yaml_attributes"
       alias_method "yat_", "xx_parse_yaml_attributes"
       def xx_class
-
+#--{{{
         @xx_class ||= self.class
-
+#--}}}
       end
       def xx_tag_method_name *a, &b 
-
+#--{{{
         xx_class.xx_tag_method_name(*a, &b)
-
+#--}}}
       end
       def xx_define_tmp_method *a, &b 
-
+#--{{{
         xx_class.xx_define_tmp_methodr(*a, &b)
-
+#--}}}
       end
       def xx_define_tag_method *a, &b 
-
+#--{{{
         xx_class.xx_define_tag_method(*a, &b)
-
+#--}}}
       end
       def xx_remove_tag_method *a, &b 
-
+#--{{{
         xx_class.xx_tag_remove_method(*a, &b)
-
+#--}}}
       end
       def xx_ancestors
-
+#--{{{
         raise Error, "no xx_which in effect" unless xx_which
         xx_class.xx_ancestors xx_which
-
+#--}}}
       end
       def xx_config
-
+#--{{{
         xx_class.xx_config
-
+#--}}}
       end
       def xx_config_for *a, &b
-
+#--{{{
         xx_class.xx_config_for(*a, &b)
-
+#--}}}
       end
       def xx_configure *a, &b
-
+#--{{{
         xx_class.xx_configure(*a, &b)
-
+#--}}}
       end
-
+#--}}}
     end
 
     module ClassMethods
-
+#--{{{
       def xx_tag_method_name m
-
+#--{{{
         m = m.to_s
         tag_method, tag_name = m, m.gsub(%r/_+$/, "")
         [ tag_method, tag_name ]
-
+#--}}}
       end
       def xx_define_tmp_method m 
-
+#--{{{
         define_method(m){ raise NotImplementedError, m.to_s }
-
+#--}}}
       end
       def xx_define_tag_method tag_method, tag_name = nil
-
+#--{{{
         tag_method = tag_method.to_s
         tag_name ||= tag_method.gsub %r/_+$/, ""
 
@@ -486,15 +493,15 @@ module XX
           end
         code
         tag_method
-
+#--}}}
       end
       def xx_remove_tag_method tag_method
-
+#--{{{
         remove_method tag_method rescue nil
-
+#--}}}
       end
       def xx_ancestors xx_which = self
-
+#--{{{
         list = []
         ancestors.each do |a|
           list << a if a < xx_which
@@ -503,15 +510,15 @@ module XX
           list << a if a <= Markup
         end
         list
-
+#--}}}
       end
       def xx_config
-
+#--{{{
         @@xx_config ||= Hash::new{|h,k| h[k] = {}}
-
+#--}}}
       end
       def xx_config_for key, xx_which = nil 
-
+#--{{{
         key = key.to_s 
         xx_which ||= self
         xx_ancestors(xx_which).each do |a|
@@ -520,23 +527,23 @@ module XX
           end
         end
         nil
-
+#--}}}
       end
       def xx_configure key, value, xx_which = nil 
-
+#--{{{
         key = key.to_s
         xx_which ||= self
         xx_config[xx_which][key] = value
-
+#--}}}
       end
-
+#--}}}
     end
 
     extend ClassMethods
     include InstanceMethods
 
     def self::included other, *a, &b
-
+#--{{{
       ret = super
       other.module_eval do
         include Markup::InstanceMethods
@@ -546,7 +553,7 @@ module XX
         end
       end
       ret
-
+#--}}}
     end
     XX_MARKUP_RECURSIVE_INCLUSION_PROC = method("included").to_proc
 
@@ -554,16 +561,16 @@ module XX
     xx_configure "tags", []
     xx_configure "doctype", nil
     xx_configure "xmldecl", nil
-
+#--}}}
   end
 
   module XHTML
-
+#--{{{
     include Markup
     xx_configure "doctype", %(html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd")
 
     def xhtml_ which = XHTML, *a, &b
-
+#--{{{
       xx_which(which) do
         doc = xx_with_doc_in_effect(*a, &b)
         ddoc = doc.doc
@@ -581,11 +588,11 @@ module XX
         end
         doc
       end
-
+#--}}}
     end
 
     module Strict
-
+#--{{{
       include XHTML
       xx_configure "doctype", %(html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd")
       xx_configure "tags", %w(
@@ -600,40 +607,40 @@ module XX
       xx_configure "method_missing", ::XX::STRICT
 
       def xhtml_ which = XHTML::Strict, *a, &b
-
+#--{{{
         super(which, *a, &b)
-
+#--}}}
       end
-
+#--}}}
     end
 
     module Transitional
-
+#--{{{
       include XHTML
       xx_configure "doctype", %(html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd")
       def xhtml_ which = XHTML::Transitional, *a, &b
-
+#--{{{
         super(which, *a, &b)
-
+#--}}}
       end
-
+#--}}}
     end
-
+#--}}}
   end
 
   module HTML4
-
+#--{{{
     include Markup
     xx_configure "doctype", %(html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN")
  
     def html4_ which = HTML4, *a, &b
-
+#--{{{
       xx_which(which){ xx_with_doc_in_effect(*a, &b) }
-
+#--}}}
     end
 
     module Strict
-
+#--{{{
       include HTML4
       xx_configure "doctype", %(html PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN")
       xx_configure "tags", %w(
@@ -647,41 +654,41 @@ module XX
       )
       xx_configure "method_missing", ::XX::STRICT
       def html4_ which = HTML4::Strict, *a, &b
-
+#--{{{
         super(which, *a, &b)
-
+#--}}}
       end
-
+#--}}}
     end
 
     module Transitional
-
+#--{{{
       include HTML4
       xx_configure "doctype", %(html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN")
       def html4_ which = HTML4::Transitional, *a, &b
-
+#--{{{
         super(which, *a, &b)
-
+#--}}}
       end
-
+#--}}}
     end
-
+#--}}}
   end
   HTML = HTML4
 
   module XML
-
+#--{{{
     include Markup
     xx_configure "xmldecl", ::REXML::XMLDecl::new
 
     def xml_ *a, &b
-
+#--{{{
       xx_which(XML){ xx_with_doc_in_effect(*a, &b)}
-
+#--}}}
     end
-
+#--}}}
   end
-
+#--}}}
 end
 
 $__xx_rb__ = __FILE__

data/lib/rcov.rb

@@ -10,7 +10,6 @@
 # methods is actually executed under rcov's inspection.
 
 require 'rcov/version'
-require 'rcov/formatters'
 
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 

data/test/functional_test.rb

@@ -25,7 +25,7 @@ class TestFunctional < Test::Unit::TestCase
   @@dir = Pathname(__FILE__).expand_path.dirname
 
   def strip_variable_sections(str)
-    str.sub(/Generated on.+$/, '').sub(/Generated using the.+$/, '').squeeze("\n")
+    str.sub(/Generated on.+$/, '').sub(/Generated using the.+$/, '')
   end
 
   def cmp(file)
@@ -56,34 +56,39 @@ class TestFunctional < Test::Unit::TestCase
 
   @@selection = "--include-file=sample --exclude=rcov"
   def test_text_gcc
-    run_rcov("--gcc #{@@selection}", "assets/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 "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
+    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 "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
+    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}", "assets/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}", "assets/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}", "assets/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,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-rcov
 version: !ruby/object:Gem::Version 
-  version: 0.8.2.2
+  version: 0.8.2.3
 platform: java
 authors: 
 - Mauricio Fernandez
 - Chad Humphries
 - Aaron Bedra
+- Jay McGaffigan
 autorequire: 
 bindir: bin
 cert_chain: 
@@ -51,13 +52,6 @@ files:
 - setup.rb
 - BLURB
 - CHANGES
-- lib/rcov/formatters/base_formatter.rb
-- lib/rcov/formatters/full_text_report.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.rb
 - lib/rcov/lowlevel.rb
 - lib/rcov/rcovtask.rb
 - lib/rcov/report.rb