coverband 1.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8438c95988521edfcb5911828e1b75b4a83d625
-  data.tar.gz: 8a92bc7880429005fb1ba837b273e4968bda8a7d
+  metadata.gz: 596cbfbecac5e0b49abfb79b09b10a8b68913c48
+  data.tar.gz: 340cbd1d66d93036dfa88ba2ea28072862bb26a6
 SHA512:
-  metadata.gz: 78922ea8ccdad5cc0b71ff9096d5e2928777b3ba58156bb3a637c46fe5fd43faa011d9f575e193c380209eebdf1920cd29cb3c958167f1d262dd830b92f2d782
-  data.tar.gz: b75a40fac79fb36c18bed97bb4f6f8e345ad94c21204d003ddc5cc03f25846ea6265b86b026e07bbe655b4ee999799e89fc265c4e143070128215dfde2c9c8c4
+  metadata.gz: 7d12ac9b92ca27079ceef0cac971295f85808f2b4ca75f6ed8e150f1bc4302012402ab6be91c8084ce1ac5e46182eea4bce921d1fee448117203179532866480
+  data.tar.gz: bec658051aa2b3f324e8b5aa0d04bf5d1a4a163dda65cbe2304f78c924fe8c7837657f057a4cfd248d3aa9016c0b94c282f6f8e9fa525d2050123e98c1f35223

data/lib/coverband/base.rb

@@ -1,4 +1,5 @@
 require 'singleton'
+require 'set'
 
 module Coverband
   class Base
@@ -38,9 +39,8 @@ module Coverband
       @project_directory = File.expand_path(Coverband.configuration.root)
       @enabled = false
       @tracer_set = false
-      @files = {}
-      @file_usage = Hash.new(0)
       @file_line_usage = {}
+      @ignored_files = Set.new
       @startup_delay = Coverband.configuration.startup_delay
       @ignore_patterns = Coverband.configuration.ignore + ["internal:prelude"]
       @ignore_patterns += ['gems'] unless Coverband.configuration.include_gems
@@ -88,13 +88,8 @@ module Coverband
 
       unset_tracer
 
-      @files.reject!{|file, lines| !track_file?(file) }
-
-      #make lines uniq
-      @files.each{|file, lines| lines.uniq!}
-
       if @verbose
-        @logger.info "coverband file usage: #{@file_usage.sort_by {|_key, value| value}.inspect}"
+        @logger.info "coverband file usage: #{file_usage.inspect}"
         if @verbose=="debug"
           output_file_line_usage
         end
@@ -103,21 +98,17 @@ module Coverband
       if @reporter
         if @stats
           @before_time = Time.now
-          @stats.count "coverband.files.recorded_files", @files.length
+          @stats.count "coverband.files.recorded_files", @file_line_usage.length
         end
-        @reporter.store_report(@files)
+        @reporter.store_report(@file_line_usage)
         if @stats
           @time_spent = Time.now - @before_time
           @stats.timing "coverband.files.recorded_time", @time_spent
         end
-        @files.clear
-        if @verbose
-          @file_usage.clear
-          @file_line_usage.clear
-        end
+        @file_line_usage.clear
       elsif @verbose
         @logger.info "coverage report: "
-        @logger.info @files.inspect
+        @logger.info @file_line_usage.inspect
       end
     rescue RuntimeError => err
       if @verbose
@@ -156,18 +147,30 @@ module Coverband
 
     private
 
+    def file_usage
+      hash = {}
+      @file_line_usage.each do |file, lines|
+        hash[file] = lines.values.inject(0, :+)
+      end
+      hash.sort_by {|_key, value| value}
+    end
+
+    def add_file(file, line)
+      @file_line_usage[file] = Hash.new(0) unless @file_line_usage.include?(file)
+      @file_line_usage[file][line] += 1
+    end
+
     def create_trace_point
       TracePoint.new(*Coverband.configuration.trace_point_events) do |tp|
         if Thread.current == @current_thread
           file = tp.path
-          line = tp.lineno
-          if @verbose
-            @file_usage[file] += 1
-            @file_line_usage[file] = Hash.new(0) unless @file_line_usage.include?(file)
-            @file_line_usage[file][line] += 1
+          if !@ignored_files.include?(file)
+            if track_file?(file)
+              add_file(file, tp.lineno)
+            else
+              @ignored_files << file
+            end
           end
-          file_lines = (@files[file] ||= [])
-          file_lines.push(line) unless file_lines.include?(line)
         end
       end
     end

data/lib/coverband/redis_store.rb

@@ -10,7 +10,7 @@ module Coverband
         store_array('coverband', report.keys)
 
         report.each do |file, lines|
-          store_array("coverband.#{file}", lines)
+          store_array("coverband.#{file}", lines.keys)
         end
       end
     end

data/lib/coverband/version.rb

@@ -1,3 +1,3 @@
 module Coverband
-  VERSION = "1.2"
+  VERSION = "1.3.0"
 end

data/test/unit/base_test.rb

@@ -75,7 +75,7 @@ class BaseTest < Test::Unit::TestCase
     coverband.instance_variable_set("@verbose", true)
     store = Coverband::RedisStore.new(Redis.new)
     coverband.instance_variable_set("@reporter", store)
-    store.expects(:store_report).once.with(has_entries(dog_file => [3]) )
+    store.expects(:store_report).once.with(has_entries(dog_file => { 3 => 5 }) )
     assert_equal false, coverband.instance_variable_get("@enabled")
     coverband.start
     5.times { Dog.new.bark }
@@ -83,12 +83,12 @@ class BaseTest < Test::Unit::TestCase
     coverband.save
   end
 
-  test "tracer should collect uniq line numbers" do
+  test "tracer should count line numbers" do
     dog_file = File.expand_path('./dog.rb', File.dirname(__FILE__))
     coverband = Coverband::Base.instance.reset_instance
     coverband.start
     100.times { Dog.new.bark }
-    assert_equal 1, coverband.instance_variable_get("@files")[dog_file].select{ |i| 3 == i }.count
+    assert_equal 100, coverband.instance_variable_get("@file_line_usage")[dog_file][3]
     coverband.stop
     coverband.save
   end

data/test/unit/memory_cache_store_test.rb

@@ -9,12 +9,14 @@ module Coverband
       @memory_store = MemoryCacheStore.new(@store)
     end
 
+    def data
+      {
+        'file1' => { 3 => 1, 5 => 2 },
+        'file2' => { 1 => 1, 2 => 1 }
+      }
+    end
 
     test 'it passes data into store' do
-      data = {
-        'file1' => [ 3, 5 ],
-        'file2' => [1, 2]
-      }
       @store.expects(:store_report).with data
       @store.expects(:covered_lines_for_file).with('file1').returns []
       @store.expects(:covered_lines_for_file).with('file2').returns []
@@ -22,10 +24,6 @@ module Coverband
     end
 
     test 'it passes data into store only once' do
-      data = {
-        'file1' => [ 3, 5 ],
-        'file2' => [1, 2]
-      }
       @store.expects(:store_report).once.with data
       @store.expects(:covered_lines_for_file).with('file1').returns []
       @store.expects(:covered_lines_for_file).with('file2').returns []
@@ -33,32 +31,24 @@ module Coverband
     end
 
     test 'it only passes files and lines we have not hit yet' do
-      first_data = {
-        'file1' => [ 3, 5 ],
-        'file2' => [1, 2]
-      }
       second_data = {
-        'file1' => [ 3, 5, 10 ],
-        'file2' => [1, 2]
+        'file1' => { 3 => 1, 5 => 1, 10 => 1 },
+        'file2' => { 1 => 1, 2 => 1 }
       }
       @store.expects(:covered_lines_for_file).with('file1').returns []
       @store.expects(:covered_lines_for_file).with('file2').returns []
-      @store.expects(:store_report).once.with first_data
+      @store.expects(:store_report).once.with data
       @store.expects(:store_report).once.with(
-        'file1' => [10]
+        'file1' => { 10 => 1 }
       )
-      @memory_store.store_report first_data
+      @memory_store.store_report data
       @memory_store.store_report second_data
     end
 
     test 'it initializes cache with what is in store' do
-      data = {
-        'file1' => [ 3, 5 ],
-        'file2' => [1, 2]
-      }
       @store.expects(:covered_lines_for_file).with('file1').returns [3,5]
       @store.expects(:covered_lines_for_file).with('file2').returns [2]
-      @store.expects(:store_report).with( 'file2' => [1] )
+      @store.expects(:store_report).with('file2' => { 1 => 1 })
       @memory_store.store_report data
     end
 

data/test/unit/redis_store_test.rb

@@ -22,8 +22,8 @@ class RedisTest < Test::Unit::TestCase
 
   def test_data
     {
-      "/Users/danmayer/projects/cover_band_server/app.rb"=>[54, 55],
-      "/Users/danmayer/projects/cover_band_server/server.rb"=>[5]
+      "/Users/danmayer/projects/cover_band_server/app.rb" => { 54 => 1, 55 => 2 },
+      "/Users/danmayer/projects/cover_band_server/server.rb" => { 5 => 1 }
     }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.3.0
 platform: ruby
 authors:
 - Dan Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-12 00:00:00.000000000 Z
+date: 2016-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler