cover_me 1.0.0.rc2 → 1.0.0.rc3

data/README

@@ -34,7 +34,7 @@ After spending a morning playing with it, I was quickly able to grow the idea in
 
 CoverMe is pretty easy to use, and has been tested with Ruby 1.9.2 and Rails 3. First, add CoverMe to your Gemfile:
 
-  gem 'cover_me', '>= 1.0.0.rc1', :group => :test
+  gem 'cover_me', '>= 1.0.0.rc2', :group => :test
 
 Now make sure to install the gem with Bundler:
 
@@ -71,3 +71,10 @@ CoverMe is easily configurable, under the covers it uses the "Configatron":http:
     } (default)
   end
 
+==Contributors
+
+* Mark Bates
+* Alex Crichton
+* Andrea Campi
+* Rob Zolkos
+* jmthomas

data/lib/cover_me.rb

@@ -33,7 +33,7 @@ require File.expand_path(File.join(path, 'config'))
 
 CoverMe.set_defaults
 
-%w{index report formatter processor html_formatter results}.each do |file|
+%w{index report formatter processor html_formatter emma_formatter results directory_report global_report}.each do |file|
   require File.expand_path(File.join(path, file))
 end
 

data/lib/cover_me/config.rb

@@ -19,7 +19,8 @@ module CoverMe
     
     def set_defaults # :nodoc:
       CoverMe.config do |c|
-        c.project.set_default(:root, Configatron::Delayed.new {Rails.root.to_s})
+        c.project.set_default(:root,
+          Configatron::Delayed.new{defined?(Rails) ? Rails.root.to_s : Dir.pwd})
         c.results.set_default(:store, Configatron::Delayed.new {File.join(CoverMe.config.project.root, 'coverage.data')})
         c.set_default(:file_pattern, Configatron::Delayed.new do
           /(#{CoverMe.config.project.root}\/app\/.+\.rb|#{CoverMe.config.project.root}\/lib\/.+\.rb)/ix
@@ -40,6 +41,7 @@ module CoverMe
         c.html_formatter.set_default(:output_path, Configatron::Delayed.new {File.join(CoverMe.config.project.root, 'coverage')})
         c.html_formatter.set_default(:finalizer_files, {'report.css' => 'report.css', 'index.css' => 'index.css', 
                                                         'jquery.js' => 'jquery.js', 'jquery.tablesorter.js' => 'jquery.tablesorter.js'})
+        c.emma_formatter.set_default(:output_path, Configatron::Delayed.new {File.join(CoverMe.config.project.root, 'coverage')})
       end
     end
     

data/lib/cover_me/directory_report.rb

@@ -0,0 +1,35 @@
+# Used to represent the directory summary.
+class CoverMe::DirectoryReport
+  attr_accessor :name
+  attr_accessor :reports
+  attr_accessor :lines_of_code
+  attr_accessor :lines_executed
+
+  def initialize(name, reports) # :nodoc:
+    self.name = name
+    self.reports = reports
+    self.lines_of_code = 0
+    self.lines_executed = 0
+    reports.each do |report|
+      self.lines_of_code += report.lines_of_code
+      self.lines_executed += report.lines_executed
+    end
+  end
+
+  class << self
+    def summarize(reports)
+      reports_by_dir = reports.group_by do |report|
+        dir_for_file(report.filename)
+      end
+
+      reports_by_dir.map do |dir,reports|
+        self.new(dir, reports)
+      end
+    end
+
+  private
+    def dir_for_file(filename)
+      File.dirname(filename).split(File::SEPARATOR).join('.')
+    end
+  end
+end

data/lib/cover_me/emma_formatter.rb

@@ -0,0 +1,28 @@
+# Generates Emma-style xml coverage files.
+class CoverMe::EmmaFormatter < CoverMe::Formatter
+
+  def initialize(options = {}) # :nodoc:
+    super
+    self.options = ({:output_path => CoverMe.config.emma_formatter.output_path}.merge(self.options)).to_mash
+  end
+
+  def format_report(report)
+    # nothing to do
+  end
+
+  # Formats a CoverMe::Index object using the _emma.xml.erb_ template
+  def format_index(index)
+    reports_by_dir = CoverMe::DirectoryReport.summarize(index.reports)
+    global = CoverMe::GlobalReport.new(reports_by_dir)
+    write_file('coverage') do |file|
+      file.write(self.template('emma.xml.erb').result(binding))
+    end
+  end
+
+  protected
+  def write_file(filename, extension = '.xml', &block) # :nodoc:
+    path = File.join(self.options.output_path, filename)
+    FileUtils.mkdir_p(File.dirname(path))
+    File.open(path + extension, 'w', &block)
+  end
+end

data/lib/cover_me/global_report.rb

@@ -0,0 +1,14 @@
+# Used to represent the module summary.
+class CoverMe::GlobalReport
+  attr_accessor :lines_of_code
+  attr_accessor :lines_executed
+
+  def initialize(reports) # :nodoc:
+    self.lines_of_code = 0
+    self.lines_executed = 0
+    reports.each do |report|
+      self.lines_of_code += report.lines_of_code
+      self.lines_executed += report.lines_executed
+    end
+  end
+end

data/lib/cover_me/report.rb

@@ -5,6 +5,7 @@ class CoverMe::Report
   attr_accessor :coverage
   attr_accessor :lines
   attr_accessor :lines_of_code
+  attr_accessor :lines_executed
   attr_accessor :executed_percent
   attr_accessor :unexecuted_percent
   
@@ -14,7 +15,8 @@ class CoverMe::Report
     self.coverage = coverage
     self.lines = self.coverage.size
     self.lines_of_code = self.coverage.reject{|x| x.nil?}.size
-    self.executed_percent = ((self.coverage.reject{|x| x.nil? || x < 1}.size.to_f / self.lines_of_code.to_f) * 100).round(1)
+    self.lines_executed = self.coverage.reject{|x| x.nil? || x < 1}.size
+    self.executed_percent = ((self.lines_executed.to_f / self.lines_of_code.to_f) * 100).round(1)
     self.unexecuted_percent = (100 - self.executed_percent).round(1)
   end
   

data/lib/cover_me/templates/emma.xml.erb

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- cover_me report -->
+
+<report>
+  <stats>
+    <packages value="42"/>
+    <classes value="42"/>
+    <methods value="42"/>
+    <srcfiles value="42"/>
+    <srclines value="42"/>
+  </stats>
+  <data>
+    <all name="all classes">
+      <coverage type="class, %" value="0%  (0/0)"/>
+      <coverage type="method, %" value="0%  (0/0)"/>
+      <coverage type="block, %" value="0%  (0/0)"/>
+      <coverage type="line, %" value="0%  (<%= global.lines_executed %>/<%= global.lines_of_code %>)"/>
+
+      <% reports_by_dir.sort_by(&:name).each do |dir| %>
+      <package name="<%= dir.name %>">
+        <coverage type="class, %" value="0%   (0/0)"/>
+        <coverage type="method, %" value="0%   (0/0)"/>
+        <coverage type="block, %" value="0%   (0/0)"/>
+        <coverage type="line, %" value="0%   (<%= dir.lines_executed %>/<%= dir.lines_of_code %>)"/>
+
+        <% dir.reports.sort.each do |report| %>
+        <srcfile name="<%= File.basename(report.filename) %>">
+          <coverage type="class, %" value="0%   (0/0)"/>
+          <coverage type="method, %" value="0%   (0/0)"/>
+          <coverage type="block, %" value="0%   (0/0)"/>
+          <coverage type="line, %" value="<%= report.executed_percent.to_i %>%   (<%= report.lines_executed %>/<%= report.lines_of_code %>)"/>
+        </srcfile>
+        <% end %>
+      </package>
+      <% end %>
+    </all>
+  </data>
+</report>

data/lib/cover_me/templates/report.html.erb

@@ -3,8 +3,8 @@
     <title><%= report.filename %></title>
     <%
       root = CoverMe.config.project.root.split(File::SEPARATOR)
-      file = File.dirname(report.filename).split(File::SEPARATOR)
-      diff = file - root
+      file = File.dirname(report.original_filename).split(File::SEPARATOR)
+      diff = file[root.size..-1]
       rel  = (['..'] * diff.count).join(File::SEPARATOR)
     %>
     <link href="<%= File.join(rel, "report.css?#{rand}") %>" media="screen" rel="stylesheet" type="text/css" />

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - markbates
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -04:00
+date: 2010-10-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,13 +55,17 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - lib/cover_me/config.rb
+- lib/cover_me/directory_report.rb
+- lib/cover_me/emma_formatter.rb
 - lib/cover_me/formatter.rb
+- lib/cover_me/global_report.rb
 - lib/cover_me/hash.rb
 - lib/cover_me/html_formatter.rb
 - lib/cover_me/index.rb
 - lib/cover_me/processor.rb
 - lib/cover_me/report.rb
 - lib/cover_me/results.rb
+- lib/cover_me/templates/emma.xml.erb
 - lib/cover_me/templates/index.css
 - lib/cover_me/templates/index.html.erb
 - lib/cover_me/templates/jquery.js