cover_me 1.0.0.pre4 → 1.0.0.rc1

data/README

@@ -32,9 +32,9 @@ After spending a morning playing with it, I was quickly able to grow the idea in
 
 ==Use
 
-CoverMe is pretty easy to use, and has been tested with Ruby 1.9.2 and Rails 3.rc1. First, add CoverMe to your Gemfile:
+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.pre2', :require => false, :group => :test
+  gem 'cover_me', '>= 1.0.0.rc1', :group => :test
 
 Now make sure to install the gem with Bundler:
 

data/lib/cover_me.rb

@@ -1,5 +1,4 @@
 # http://engineering.attinteractive.com/2010/08/code-coverage-in-ruby-1-9/
-
 require 'coverage'
 require 'erb'
 require 'fileutils'
@@ -7,6 +6,24 @@ require 'configatron'
 require 'hashie'
 
 module CoverMe
+  
+  class << self
+    
+    def complete!
+      data_file = CoverMe.config.results.store
+
+      if File.exists?(data_file)
+        data = CoverMe::Results.read_results(data_file)
+
+        CoverMe::Processor.new(data).process!
+        CoverMe.config.at_exit.call
+        
+        File.delete(data_file)
+      end
+    end
+    
+  end
+  
 end
 
 path = File.join(File.dirname(__FILE__), 'cover_me')
@@ -16,16 +33,13 @@ require File.expand_path(File.join(path, 'config'))
 
 CoverMe.set_defaults
 
-%w{index report formatter processor html_formatter}.each do |file|
+%w{index report formatter processor html_formatter results}.each do |file|
   require File.expand_path(File.join(path, file))
 end
 
 # Start the code coverage
-# if ENV['use_coverage']
-  Coverage.start
+Coverage.start
 
-  at_exit do
-    CoverMe::Processor.new(Coverage.result).process!
-    CoverMe.config.at_exit.call
-  end
-# end
+at_exit do
+  CoverMe::Results.merge_results!(Coverage.result)
+end

data/lib/cover_me/config.rb

@@ -20,9 +20,14 @@ module CoverMe
     def set_defaults # :nodoc:
       CoverMe.config do |c|
         c.project.set_default(:root, Configatron::Delayed.new {Rails.root.to_s})
+        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
         end)
+        
+        c.proximity.set_default(:near, 90)
+        c.proximity.set_default(:hit, 100)
+        
         c.set_default(:formatter, Configatron::Delayed.new {CoverMe::HtmlFormatter})
         c.set_default(:at_exit, Proc.new {
           if CoverMe.config.formatter == CoverMe::HtmlFormatter

data/lib/cover_me/processor.rb

@@ -21,11 +21,11 @@ class CoverMe::Processor
       if filename.match(self.options.pattern)
         report = CoverMe::Report.new(filename, coverage)
         self.index.reports << report
-        self.options.formatter.format(report)
+        self.options[:formatter].format(report)
       end
     end
-    self.options.formatter.format(self.index)
-    self.options.formatter.finalize
+    self.options[:formatter].format(self.index)
+    self.options[:formatter].finalize
   end
   
 end

data/lib/cover_me/report.rb

@@ -23,8 +23,8 @@ class CoverMe::Report
   def proximity
     unless @proximity
       @proximity = 'miss'
-      @proximity = 'near' if self.executed_percent >= 90
-      @proximity = 'hit' if self.executed_percent >= 100
+      @proximity = 'near' if self.executed_percent >= CoverMe.config.proximity.near
+      @proximity = 'hit' if self.executed_percent >= CoverMe.config.proximity.hit
     end
     return @proximity
   end

data/lib/cover_me/results.rb

@@ -0,0 +1,44 @@
+module CoverMe
+  module Results
+    
+    class << self
+      
+      def read_results(path = CoverMe.config.results.store)
+        data = {}
+        if File.exists?(path)
+          data = eval(File.read(path)) || {}
+        end
+        return data
+      end
+      
+      def merge_results!(cov_results, path = CoverMe.config.results.store)
+        
+        data = CoverMe::Results.read_results(path)
+        
+        cov_results.each do |file, results|
+          if data.has_key?(file)
+            results.each_with_index do |result, i|
+              summed_value = result # default
+              if result.nil?
+                summed_value = data[file][i]
+              elsif !data[file][i].nil?
+                summed_value = data[file][i] + result
+              end
+              data[file][i] = summed_value
+            end
+          else
+            data[file] = results
+          end
+        end
+
+        File.open(path, 'w') do |f|
+          f.write(data.inspect)
+        end
+        
+        return data
+      end
+      
+    end
+    
+  end # Results
+end # CoverMe

data/lib/generators/cover_me/install/install_generator.rb

@@ -0,0 +1,33 @@
+require 'rails/generators/base'
+
+puts 'cover me generator!!'
+
+# class LayoutGenerator < Rails::Generators::Base
+#   def self.source_root
+#     @_cover_me_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+#   end
+# 
+#   def generate_layout  
+#     copy_file "cover_me.rake", "lib/tasks/cover_me.rake"  
+#   end
+# end
+
+module CoverMe
+  class InstallGenerator < Rails::Generators::Base #:nodoc:
+    
+    desc 'Installs a Rake task for the CoverMe gem.'
+    
+    def self.source_root
+      @_cover_me_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+    end
+    
+    def self.banner
+      "rails generate cover_me:install"
+    end
+
+    def copy_files
+      template        'cover_me.rake', 'lib/tasks/cover_me.rake'
+    end
+    
+  end
+end

data/lib/generators/cover_me/install/templates/cover_me.rake

@@ -0,0 +1,16 @@
+namespace :cover_me do
+  
+  task :report do
+    require 'cover_me'
+    CoverMe.complete!
+  end
+  
+end
+
+task :test do
+  Rake::Task['cover_me:report'].invoke
+end
+
+task :spec do
+  Rake::Task['cover_me:report'].invoke
+end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - pre4
-  version: 1.0.0.pre4
+  - rc1
+  version: 1.0.0.rc1
 platform: ruby
 authors: 
 - markbates
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -04:00
+date: 2010-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - lib/cover_me/index.rb
 - lib/cover_me/processor.rb
 - lib/cover_me/report.rb
+- lib/cover_me/results.rb
 - lib/cover_me/templates/index.css
 - lib/cover_me/templates/index.html.erb
 - lib/cover_me/templates/jquery.js
@@ -68,13 +69,31 @@ files:
 - lib/cover_me/templates/report.css
 - lib/cover_me/templates/report.html.erb
 - lib/cover_me.rb
+- lib/generators/cover_me/install/install_generator.rb
+- lib/generators/cover_me/install/templates/cover_me.rake
 - README
 - LICENSE
 has_rdoc: true
 homepage: http://www.metabates.com
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  Thank you for installing CoverMe!
+  
+  USAGE:
+  At the top of your 'test_helper.rb' or 'spec_helper.rb' place the following:
+  
+  require 'cover_me'
+  
+  !!! IT IS VERY IMPORTANT THAT THE REQUIRE STATEMENT BE THE VERY FIRST LINE OF THE FILE !!!
+  
+  RAILS 3:
+  If you are planning on using this with a Rails 3 project please run the following:
+  
+  $ rails g cover_me:install
+  
+  This will install a Rake task to wrap your tests in CoverMe.
+
 rdoc_options: []
 
 require_paths: 
@@ -84,10 +103,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -280141288175222533
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 9
+      - 2
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: