rcov_stats 2.1.1 → 2.2.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+2.2.0 (September 2010)
+  fixed root paths
+  added rspec2 support
+  added support of no bundler
+  some code improvements
 2.1.1 (September 2010)
   missing require
 2.1.0 (September 2010)

data/README

@@ -6,13 +6,20 @@ RcovStats provides rcov extension, so you can select test files and test covered
 How to install :
 
 ** for Merb:
-  gem install rcov_stats #from gemcutter
+  gem install rcov_stats
   ## puts this dependency inside your config/init.rb file ##
   dependency "rcov_stats"
 ** for Rails
   ## puts this into Gemfile file ##
   gem "rcov_stats"
 
+  ## puts also this code to RakeFile (for Rails3 before Application.load_tasks)
+
+  begin
+    require 'rcov_stats_tasks'
+  rescue LoadError; end
+
+
 
 How to configure
 

data/lib/rcov_stats.rb

@@ -1,21 +1,7 @@
 require "fileutils"
 require "erb"
 require "hpricot"
-
-class RcovStatsForErb
-
-  def initialize( options )
-    options.each_pair do |key, value|
-      instance_variable_set(:"@#{key}",value)
-    end
-  end
-
-  def get_binding
-    binding
-  end
-
-end
-
+require 'rcov_stats_related/erb_binding'
 
 class RcovStats
 
@@ -26,25 +12,31 @@ class RcovStats
     self.send("#{name}=", value) if value
   end
 
-  cattr_accessor_with_default :is_rails, Object.const_defined?('Rails')
-  cattr_accessor_with_default :is_merb, Object.const_defined?('Merb')
-  cattr_accessor_with_default :root, ((@@is_rails && Rails.root) or (@@is_merb && Merb.root) or nil)
+  cattr_accessor_with_default :is_rails, defined?(Rails)
+  cattr_accessor_with_default :is_merb, defined?(Merb)
+
+  def self.root
+    "."
+  end
+
+  raise "Rcov Stats could not detect Rails or Merb framework" unless root
+  
   cattr_accessor_with_default :rcov_stats_dir, File.dirname(__FILE__)
-  cattr_accessor_with_default :rcov_stats_config_file, File.join(@@root, 'config', 'rcov_stats.yml')
-  cattr_accessor_with_default :use_rspec, File.exists?(File.join(@@root, 'spec'))
-  cattr_accessor_with_default :test_name, @@use_rspec ? "spec" : "test"
-  cattr_accessor_with_default :test_file_indicator, "*_#{@@test_name}.rb"
+  cattr_accessor_with_default :rcov_stats_config_file, File.join(root, 'config', 'rcov_stats.yml')
+
   cattr_accessor_with_default :cover_file_indicator, "*.rb"
 
   attr_accessor :name, :sections
 
+
+
   def initialize(name_, sections_ = nil)
     self.name = name_
     self.sections = sections_.blank? ? [name_] : sections_
   end
 
   def self.get_config(option)
-    YAML::load(File.open(File.join(@@root, 'config', 'rcov_stats.yml')))[option]
+    YAML::load(File.open(File.join(root, 'config', 'rcov_stats.yml')))[option]
   end
 
   def self.before_rcov
@@ -68,7 +60,7 @@ class RcovStats
   def parse_file_to_test(list)
     result = []
     list.each do |f|
-      file_list = File.directory?(File.join(@@root, @@test_name, f)) ? File.join(@@test_name, f, "**", @@test_file_indicator) : File.join(@@test_name, f)
+      file_list = File.directory?(File.join(self.class.root, test_name, f)) ? File.join(test_name, f, "**", test_file_indicator) : File.join(test_name, f)
       unless (list_of_read_files = Dir[file_list]).empty?
         result += list_of_read_files
       end
@@ -79,7 +71,7 @@ class RcovStats
   def parse_file_to_cover(list)
     result = []
     list.each do |f|
-      file_list = File.directory?(File.join(@@root, f)) ? File.join(f, "**", @@cover_file_indicator) : File.join(f)
+      file_list = File.directory?(File.join(self.class.root, f)) ? File.join(f, "**", self.class.cover_file_indicator) : File.join(f)
       unless (list_of_read_files = Dir[file_list]).empty?
         result += list_of_read_files
       end
@@ -87,46 +79,19 @@ class RcovStats
     result.uniq
   end
 
-  def invoke_rcov_task
-    require 'rake/win32'
-    files_to_cover_parsed = parse_file_to_cover(files_to_cover).map { |f| "(#{f})".gsub("/", "\/") }.join("|")
-    rcov_settings = "--sort coverage --text-summary -x \"^(?!(#{files_to_cover_parsed}))\" "
-    rcov_settings +="--output=#{File.join(@@root, "coverage", @name)} "
-    rcov_tests = parse_file_to_test(files_to_test)
-    return false if rcov_tests.empty?
-    rcov_settings += rcov_tests.join(' ')
-    cmd = "bundle exec rcov #{rcov_settings}"
-    Rake::Win32.windows? ? Rake::Win32.rake_system(cmd) : system(cmd)
-  end
-
-  def invoke_rcov_spec_task
-    require 'spec/rake/spectask'
-    rcov_tests = parse_file_to_test(files_to_test)
-    return false if rcov_tests.empty?
-    Spec::Rake::SpecTask.new(@name) do |t|
-      spec_opts = File.join(@@root, @@test_name, 'spec.opts')
-      t.spec_opts = ['--options', "\"#{spec_opts}\""] if File.exists?(spec_opts)
-      t.spec_files = rcov_tests
-      t.rcov = true
-      t.rcov_dir =  File.join(@@root, "coverage", @name)
-      files_to_cover_parsed = parse_file_to_cover(files_to_cover).map { |f| "(#{f})".gsub("/", "\/") }.join("|")
-      t.rcov_opts = ["--text-summary", "--sort", "coverage", "-x", "\"^(?!(#{files_to_cover_parsed}))\""]
-    end
-  end
-
-  def invoke
-    @@use_rspec ? invoke_rcov_spec_task : invoke_rcov_task
+  def test_file_indicator
+    "*_#{test_name}.rb"
   end
 
   def generate_index
-    Dir[File.join(@@rcov_stats_dir, '..', 'templates/*')].each do |i|
-      FileUtils.cp(i, File.join(@@root, 'coverage', i.split("/").last))
+    Dir[File.join(self.class.rcov_stats_dir, '..', 'templates/*')].each do |i|
+      FileUtils.mkdir_p File.join(self.class.root, 'coverage')
+      FileUtils.cp(i, File.join(self.class.root, 'coverage', i.split("/").last))
     end
 
-
-
     @sections.each do |i|
-      coverage_index = File.join(@@root, 'coverage', i, "index.html")
+      FileUtils.mkdir_p File.join(self.class.root, 'coverage', i)
+      coverage_index = File.join(self.class.root, 'coverage', i, "index.html")
       next unless File.exists?(coverage_index)
       doc = open(coverage_index) { |f| Hpricot(f) }
       footer_tts = doc.search("//tfoot/tr/td//tt")
@@ -145,23 +110,46 @@ class RcovStats
       template_object["generated_on"] = "Generated on #{Time.now}"
 
 
-      template_source = ERB.new(IO.read(File.join(@@root, 'coverage', "index.html")))
+      template_source = ERB.new(IO.read(File.join(self.class.root, 'coverage', "index.html")))
 
-      File.open(File.join(@@root, 'coverage', "index.html"), "w+") do |f|
-        f.write( template_source.result(RcovStatsForErb.new(template_object).get_binding))
+      File.open(File.join(self.class.root, 'coverage', "index.html"), "w+") do |f|
+        f.write( template_source.result(RcovStatsRelated::ErbBinding.new(template_object).get_binding))
       end
     end
   end
 
+  def bundler?
+    File.exist?("./Gemfile")
+  end
+
   def self.setup
-    if @@is_merb
-      Merb::Plugins.add_rakefiles(File.join(@@rcov_stats_dir, "rcov_stats_tasks"))
+    if is_merb
+      Merb::Plugins.add_rakefiles(File.join(rcov_stats_dir, "rcov_stats_tasks"))
     end
-    unless File.exists?(@@rcov_stats_config_file)
-      which_conf_use = (@@use_rspec ? 'rcov_rspec' : 'rcov_standard') + '.yml'
-      FileUtils.cp(File.join(@@rcov_stats_dir, '..', 'config', which_conf_use), @@rcov_stats_config_file)
+
+    if defined?(RSpec)
+      require 'rcov_stats_related/integrations/rspec2'
+      include RcovStatsRelated::Integrations::Rspec2
+      which_conf_use =  'rcov_rspec'
+    elsif defined?(Spec)
+      require 'rcov_stats_related/integrations/rspec'
+      include RcovStatsRelated::Integrations::Rspec
+      which_conf_use =  'rcov_rspec'
+    else
+      require 'rcov_stats_related/integrations/test_unit'
+      include RcovStatsRelated::Integrations::TestUnit
+      which_conf_use = 'rcov_standard'
+    end
+
+
+    unless File.exists?(rcov_stats_config_file)
+      which_conf_use += '.yml'
+      FileUtils.cp(File.join(rcov_stats_dir, '..', 'config', which_conf_use), rcov_stats_config_file)
     end
   end
 end
 
-RcovStats.setup
+
+RcovStats.setup
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rcov_stats
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Bartosz Knapik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +02:00
+date: 2010-09-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency