coverband 0.0.7 → 0.0.8

data/lib/coverband/middleware.rb

@@ -4,7 +4,7 @@ module Coverband
     def initialize(app, settings={})
       @app = app
       root = settings[:root] || './'
-      @project_directory = File.expand_path(root+'../')
+      @project_directory = File.expand_path(root)
       @enabled = true
       @function_set = false
       @files = {}

data/lib/coverband/reporter.rb

@@ -8,7 +8,7 @@ module Coverband
       require 'coverage'
       Coverage.start
       yield
-      @project_directory = File.expand_path(Dir.pwd+'../')
+      @project_directory = File.expand_path(Dir.pwd)
       results = Coverage.result
       results = results.reject{|key, val| !key.match(@project_directory)}
       puts results.inspect
@@ -17,8 +17,12 @@ module Coverband
     end
 
     def self.report(redis, options = {})
+      roots = options.fetch(:roots){[]}
+      existing_coverage = options.fetch(:existing_coverage){ {} }
+      roots << "#{File.expand_path(Dir.pwd)}/"
+      puts "fixing root: #{roots.join(', ')}"
       if options.fetch(:reporter){ 'rcov' }=='rcov'
-        report_rcov(redis, options['existing_coverage'])
+        report_rcov(redis, existing_coverage, roots)
       else
         redis.smembers('coverband').each{|key| report_line(redis, key) }
       end
@@ -26,11 +30,22 @@ module Coverband
 
     private
 
-    def self.report_rcov(redis, existing_coverage)
+    def self.fix_file_names(report_hash, roots)
+      fixed_report = {} #normalize names across servers
+      report_hash.each_pair do |key, values| 
+        filename = filename_from_key(key, roots)
+        fixed_report[filename] = values
+      end
+      fixed_report
+    end
+
+    def self.report_rcov(redis, existing_coverage, roots)
       rcov_style_report = {}
-      redis.smembers('coverband').each{|key| line_data = line_hash(redis, key); rcov_style_report.merge!(line_data) if line_data }
+      redis.smembers('coverband').each{|key| line_data = line_hash(redis, key, roots); rcov_style_report.merge!(line_data) if line_data }
+      rcov_style_report = fix_file_names(rcov_style_report, roots)
+      existing_coverage = fix_file_names(existing_coverage, roots)
       rcov_style_report = merge_existing_coverage(rcov_style_report, existing_coverage)
-      puts "report:"
+      puts "report: "
       puts rcov_style_report.inspect
       SimpleCov::Result.new(rcov_style_report).format!
       `open coverage/index.html`
@@ -61,10 +76,19 @@ module Coverband
       puts "#{key.gsub('.','/')}: #{redis.smembers("coverband#{key}").inspect}"
     end
 
+    def self.filename_from_key(key, roots)
+      filename = key.gsub('.','/').gsub('//','./').gsub('/rb','.rb').gsub('/erb','.erb')
+      roots.each do |root|
+        filename = filename.gsub(root, './')
+      end
+      filename = filename.gsub('./', roots.last)
+      filename
+    end
+
     # >> puts  Coverage.result.inspect
     # {"/Users/danmayer/projects/hearno/script/tester.rb"=>[1, nil, 1, 1, nil, nil, nil]}
-    def self.line_hash(redis, key)
-      filename = key.gsub('.','/').gsub('/rb','.rb').gsub('/erb','.erb')
+    def self.line_hash(redis, key, roots)
+      filename = filename_from_key(key, roots)
       if File.exists?(filename)
         lines_hit = redis.smembers("coverband#{key}")
         count = File.foreach(filename).inject(0) {|c, line| c+1}

data/lib/coverband/version.rb

@@ -1,3 +1,3 @@
 module Coverband
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1958954660094686763
+      hash: -1569723320352132712
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1958954660094686763
+      hash: -1569723320352132712
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25