coverband 0.1.0.preRC3 → 0.1.0.preRC4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc01b93ff5fb4a9ab86b129d9232b54a79cb55bb
-  data.tar.gz: 18d556322f02b72cb975d1db2cb9a55d0eeb44ab
+  metadata.gz: c2b8156d50c00462d50ecf5e65c584a16a027357
+  data.tar.gz: 508cfa3982dbd3235af6ebf854799076d1e821ee
 SHA512:
-  metadata.gz: 23443c8bebc98a504e9eea13fc26c5d5cf172c112875cfa0c3efa5472c5686c1c1f6aa2ed2f63948d0f258e9b4583e4dff7a9f1c895b122fd21e206a96291989
-  data.tar.gz: 2631a30ee5e53acf30a0d80a2b85dbbc9a1cf099cda8ef65316c9ceb105d6c33df5132943852f08cae53c414a2b7a71335a21a67b57afe6a516db2c6f2d37c61
+  metadata.gz: cceef094ab5d86065ac8748174394fe5350f805e31314023040a0eae0c69bbd91355018bcaeda9739c45f5577346c8ca2a2123d5e5802537791bc0c3eefe099c
+  data.tar.gz: 061f6b81c43f3180665529e298c17fb893c57972dc4c319d5da9f932dd0cd14403dcf68077cfa74128ca4f99fbe6e721abf163040d4725503cf389a7ef9017ed

data/lib/coverband/base.rb

@@ -44,7 +44,7 @@ module Coverband
       @reporter = Coverband::RedisStore.new(Coverband.configuration.redis) if Coverband.configuration.redis
       @stats    = Coverband.configuration.stats
       @verbose  = Coverband.configuration.verbose
-      @logger   = Coverband.configuration.logger || Logger.new(STDOUT)
+      @logger   = Coverband.configuration.logger
       self
     end
 
@@ -137,6 +137,16 @@ module Coverband
     end
 
     def add_file_without_checks(file, line)
+      # file from ruby coverband at this method call is a full path
+      # file from native coverband is also a full path
+      #
+      # at the moment the full paths don't merge so the 'last' one wins and each deploy
+      # with a normal capistrano setup resets coverage.
+      #
+      # should we make it relative in this method (slows down collection)
+      # -- OR --
+      # we could have the reporter MERGE the results after normalizing the filenames
+      # (went with this route see report_scov previous_line_hash)
       if @verbose
         @file_usage[file] += 1
         @file_line_usage[file] = Hash.new(0) unless @file_line_usage.include?(file)

data/lib/coverband/configuration.rb

@@ -12,7 +12,7 @@ module Coverband
       @percentage = 0.0
       @verbose = false
       @reporter = 'scov'
-      @logger = nil
+      @logger = Logger.new(STDOUT)
       @startup_delay = 0
     end
   end

data/lib/coverband/reporter.rb

@@ -8,7 +8,10 @@ module Coverband
       @project_directory = File.expand_path(Coverband.configuration.root)
       results = Coverage.result
       results = results.reject{|key, val| !key.match(@project_directory) || Coverband.configuration.ignore.any?{|pattern| key.match(/#{pattern}/)} }
-      puts results.inspect
+
+      if Coverband.configuration.verbose
+        Coverband.configuration.logger.info results.inspect
+      end
       
       File.open('./tmp/coverband_baseline.json', 'w') {|f| f.write(results.to_json) }
     end
@@ -17,7 +20,7 @@ module Coverband
       begin
         require 'simplecov' if Coverband.configuration.reporter=='scov'
       rescue
-        puts "coverband requires simplecov in order to generate a report, when configured for the scov report style."
+        Coverband.configuration.logger.error "coverband requires simplecov in order to generate a report, when configured for the scov report style."
         return
       end
       redis = Coverband.configuration.redis
@@ -26,12 +29,16 @@ module Coverband
       open_report = options.fetch(:open_report){ true }
 
       roots << "#{current_root}/"
-      puts "fixing root: #{roots.join(', ')}"
+
+      if Coverband.configuration.verbose
+        Coverband.configuration.logger.info "fixing root: #{roots.join(', ')}"
+      end
+
       if  Coverband.configuration.reporter=='scov'
         report_scov(redis, existing_coverage, roots, open_report)
       else
         lines = redis.smembers('coverband').map{|key| report_line(redis, key) }
-        puts lines.join("\n")
+        Coverband.configuration.logger.info lines.join("\n")
       end
     end
 
@@ -61,18 +68,30 @@ module Coverband
       redis.smembers('coverband').each do |key|
                                    next if Coverband.configuration.ignore.any?{ |i| key.match(i)}
                                    line_data = line_hash(redis, key, roots)
-                                   scov_style_report.merge!(line_data) if line_data
+                                   
+                                   if line_data
+                                     line_key = line_hash.keys.first
+                                     previous_line_hash = scov_style_report[line_key]
+                                     if merge_line
+                                       line_data[line_key] = line_data[line_key].merge(previous_line_hash)
+                                     end
+                                     scov_style_report.merge!(line_data)
+                                   end
                                  end
       scov_style_report = fix_file_names(scov_style_report, roots)
       existing_coverage = fix_file_names(existing_coverage, roots)
       scov_style_report = merge_existing_coverage(scov_style_report, existing_coverage)
-      puts "report: "
-      puts scov_style_report.inspect
+      
+      if Coverband.configuration.verbose
+        Coverband.configuration.logger.info "report: "
+        Coverband.configuration.logger.info scov_style_report.inspect
+      end
+      
       SimpleCov::Result.new(scov_style_report).format!
       if open_report
         `open #{SimpleCov.coverage_dir}/index.html`
       else
-        puts "report is ready and viewable: open #{SimpleCov.coverage_dir}/index.html"
+        Coverband.configuration.logger.info "report is ready and viewable: open #{SimpleCov.coverage_dir}/index.html"
       end
     end
 
@@ -98,7 +117,7 @@ module Coverband
     # /Users/danmayer/projects/cover_band_server/app/rb: ["54", "55"]
     # /Users/danmayer/projects/cover_band_server/views/layout/erb: ["0", "33", "36", "37", "38", "39", "40", "62", "63", "66", "65532", "65533"]
     def self.report_line(redis, key)
-      "#{key}: #{redis.smembers("coverband.#{key}").inspect}"
+      "#{key}: #{redis.smembers("coverband.#{key}").inspect}" #" fix line styles
     end
 
     def self.filename_from_key(key, roots)
@@ -106,6 +125,9 @@ module Coverband
       roots.each do |root|
         filename = filename.gsub(/^#{root}/, './')
       end
+      # the filename for  SimpleCov is expected to be a full path.
+      # roots.last should be roots << current_root}/
+      # a fully expanded path of config.root
       filename = filename.gsub('./', roots.last)
       filename
     end
@@ -125,7 +147,7 @@ module Coverband
         line_array.each_with_index{|line,index| line_array[index]=1 if lines_hit.include?((index+1).to_s) }
         {filename => line_array}
       else
-        puts "file #{filename} not found in project"
+        Coverband.configuration.logger.info "file #{filename} not found in project"
       end
     end
 

data/lib/coverband/version.rb

@@ -1,3 +1,3 @@
 module Coverband
-  VERSION = "0.1.0.preRC3"
+  VERSION = "0.1.0.preRC4"
 end

data/test/unit/reporter_test.rb

@@ -22,7 +22,6 @@ class ReporterTest < Test::Unit::TestCase
 
     Coverband::Reporter.expects(:current_root).returns('/root_dir')
     fake_redis.expects(:smembers).with('coverband').returns(fake_coverband_members)
-    Coverband::Reporter.expects('puts').with("fixing root: /app/, /root_dir/")
     
     fake_coverband_members.each do |key|
       fake_redis.expects(:smembers).with("coverband.#{key}").returns(["54", "55"])
@@ -33,11 +32,52 @@ class ReporterTest < Test::Unit::TestCase
                 regexp_matches(/account/),
                 regexp_matches(/54/)]
     
-    Coverband::Reporter.expects('puts').with(all_of(*matchers))
+    Coverband.configuration.logger.expects('info').with(all_of(*matchers))
 
     Coverband::Reporter.report
   end
 
+
+  ####
+  # TODO
+  # attempting to write some tests around this reporter
+  # shows that it has become a disaster of self methods relying on side effects.
+  # Fix to standard class and methods.
+  ####
+  should "fix filename from a key with a swappable path" do
+    Coverband.configure do |config|
+      config.redis             = fake_redis
+      config.reporter          = 'std_out'
+      config.root              = '/full/remote_app/path'
+    end
+
+    key = "/app/is/a/path.rb"
+    #the code takes config.root expands and adds a '/'
+    roots = ["/app/", '/full/remote_app/path/']
+
+    assert_equal "/full/remote_app/path/is/a/path.rb", Coverband::Reporter.filename_from_key(key, roots)
+  end
+
+  ####
+  # TODO
+  # attempting to write some tests around this reporter
+  # shows that it has become a disaster of self methods relying on side effects.
+  # Fix to standard class and methods.
+  ####
+  should "leave filename from a key with a local path" do
+    Coverband.configure do |config|
+      config.redis             = fake_redis
+      config.reporter          = 'std_out'
+      config.root              = '/full/remote_app/path'
+    end
+
+    key = "/full/remote_app/path/is/a/path.rb"
+    #the code takes config.root expands and adds a '/'
+    roots = ["/app/", '/full/remote_app/path/']
+
+    assert_equal "/full/remote_app/path/is/a/path.rb", Coverband::Reporter.filename_from_key(key, roots)
+  end
+
   private
 
   def fake_redis

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 0.1.0.preRC3
+  version: 0.1.0.preRC4
 platform: ruby
 authors:
 - Dan Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler