coverband 4.1.0.beta → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 455614fde267b2ba0264e2949996587a342059f0
-  data.tar.gz: 6246b3c559c1d68d895928ceccdd8ebb8211934a
+  metadata.gz: b7070c0b3648d9f4fe856175711373dbddc19df4
+  data.tar.gz: d31f4e2ae34e9ad28cbf93fa6e7bcebeb99a9c52
 SHA512:
-  metadata.gz: e2c4d201b82e29c772bc201aea5eecc5d3edc79746dbaf0838497b73def8fbb23c8b394b4e218ae9fd6a0e0b9a9df05fd71baa63ecbbf88768afe67fb0259dcb
-  data.tar.gz: ebce43a1554a11de5c8f0c280a32b89a762e44e8a68228e7fb63e3ef1855e0617018bfb6e052492b664708061e0ffc4d6350a2ce02b1f5bed568022b8f3c597f
+  metadata.gz: 630244e791fe41a7f5d53b89a6d2782764252fd6f8f7eecb37eab9259928bf422e1a2a6282dc046e0c6fdbc7d2b3581c8a1eeb9584670848fc1b678b5ab0629e
+  data.tar.gz: b03947618d4e2b51a27a84438de3c5cc5d1da4f9a5024e4d9d6cf00d39f652874ecc0f0c0ae2a6d475b90a8bfa792c133a01696084f337f4c7146d567a8044f9

data/README.md

@@ -198,6 +198,15 @@ ENV['AWS_ACCESS_KEY_ID']
 ENV['AWS_SECRET_ACCESS_KEY']
 ```
 
+### Coverage Data Migration
+
+Between the release of 4.0 and 4.1 our data format changed. This resets all your coverage data. If you want to restore your previous coverage data, feel free to migrate.
+
+`rake coverband:migrate`
+
+* We will be working to support migrations going forward, when possible
+
+
 ### Clear Coverage
 
 Now that Coverband uses MD5 hashes there should be no reason to manually clear coverage unless one is testing, changing versions, possibly debugging Coverband itself.

data/changes.md

@@ -73,14 +73,34 @@ Feature Ideas:
 - out of the box support for resque
 - readme improvements
 - fix on regression of merging directory changing deployments
+  - fixes for duplicate root paths 
 - pilot release of Gems tracking (disabled by default)
 	- todos
 	  - support multiple gem paths (various version managers setup multiple gem paths)
 	  - speed up page load by allowing multiple pages
 - added web settings and debug views
+   - added support for seeing coverage data size consumed in redis 
+- support coverage data migrations from 4.0.x to 4.1.0
+- fixes for heroku /tmp asset building
 
 # Released
 
+### Coverband 4.1.0
+
+- default disabled web clear, add config option to allow it
+- out of the box support for resque
+- readme improvements
+- fix on regression of merging directory changing deployments
+  - fixes for duplicate root paths 
+- pilot release of Gems tracking (disabled by default)
+	- todos
+	  - support multiple gem paths (various version managers setup multiple gem paths)
+	  - speed up page load by allowing multiple pages
+- added web settings and debug views
+   - added support for seeing coverage data size consumed in redis 
+- support coverage data migrations from 4.0.x to 4.1.0
+- fixes for heroku /tmp asset building
+
 ### Coverband 4.0.1
 
 - drops Simplecov runtime dependency

data/lib/coverband.rb

@@ -7,6 +7,7 @@ require 'redis'
 require 'coverband/version'
 require 'coverband/at_exit'
 require 'coverband/configuration'
+require 'coverband/utils/file_path_helper'
 require 'coverband/adapters/base'
 require 'coverband/adapters/redis_store'
 require 'coverband/adapters/file_store'
@@ -49,6 +50,10 @@ module Coverband
     end
   end
 
+  def self.report_coverage(force_report = false)
+    Coverband::Collectors::Coverage.instance.report_coverage(force_report)
+  end
+
   def self.configuration
     self.configuration_data ||= Configuration.new
   end

data/lib/coverband/adapters/base.rb

@@ -3,6 +3,8 @@
 module Coverband
   module Adapters
     class Base
+      include Coverband::Utils::FilePathHelper
+
       def initialize
         @file_hash_cache = {}
       end
@@ -11,13 +13,25 @@ module Coverband
         raise 'abstract'
       end
 
+      def migrate!
+        raise 'abstract'
+      end
+
+      def size
+        raise 'abstract'
+      end
+
+      def size_in_mib
+        format('%.2f', (size.to_f / 2**20))
+      end
+
       # Note: This could lead to slight race on redis
       # where multiple processes pull the old coverage and add to it then push
       # the Coverband 2 had the same issue,
       # and the tradeoff has always been acceptable
       def save_report(report)
         data = report.dup
-        merge_reports(data, get_report)
+        data = merge_reports(data, get_report)
         save_coverage(data)
       end
 
@@ -49,6 +63,7 @@ module Coverband
       end
 
       def expand_report(report)
+        expanded = {}
         report_time = Time.now.to_i
         report.each_pair do |key, line_data|
           extended_data = {
@@ -57,12 +72,13 @@ module Coverband
             'file_hash' => file_hash(key),
             'data' => line_data
           }
-          report[key] = extended_data
+          expanded[full_path_to_relative(key)] = extended_data
         end
+        expanded
       end
 
-      def merge_reports(new_report, old_report)
-        new_report = expand_report(new_report)
+      def merge_reports(new_report, old_report, options = {})
+        new_report = expand_report(new_report) unless options[:skip_expansion]
         keys = (new_report.keys + old_report.keys).uniq
         keys.each do |file|
           new_report[file] = if new_report[file] &&

data/lib/coverband/adapters/file_store.rb

@@ -20,6 +20,14 @@ module Coverband
         File.delete(path) if File.exist?(path)
       end
 
+      def size
+        File.size?(path).to_i
+      end
+
+      def migrate!
+        raise NotImplementedError, "FileStore doesn't support migrations"
+      end
+
       private
 
       attr_accessor :path

data/lib/coverband/adapters/redis_store.rb

@@ -11,25 +11,56 @@ module Coverband
       # used to store data to redis. It is changed only when breaking changes to our
       # redis format are required.
       ###
-      REDIS_STORAGE_FORMAT_VERSION = 'coverband3_1'
+      REDIS_STORAGE_FORMAT_VERSION = 'coverband_3_2'
 
       def initialize(redis, opts = {})
         super()
         @redis           = redis
         @ttl             = opts[:ttl]
         @redis_namespace = opts[:redis_namespace]
+        @format_version  = REDIS_STORAGE_FORMAT_VERSION
       end
 
       def clear!
         @redis.del(base_key)
       end
 
+      def size
+        @redis.get(REDIS_STORAGE_FORMAT_VERSION).bytesize
+      end
+
+      ###
+      # Current implementation moves from coverband3_1 to coverband_3_2
+      # In the future this can be made more general and support a more specific
+      # version format.
+      ###
+      def migrate!
+        reset_base_key
+        @format_version = 'coverband3_1'
+        previous_data = get_report
+        if previous_data.empty?
+          puts 'no previous data to migrate found'
+          exit 0
+        end
+        relative_path_report = previous_data.each_with_object({}) do |(key, vals), fixed_report|
+          fixed_report[full_path_to_relative(key)] = vals
+        end
+        clear!
+        reset_base_key
+        @format_version = REDIS_STORAGE_FORMAT_VERSION
+        save_coverage(merge_reports(get_report, relative_path_report, skip_expansion: true))
+      end
+
       private
 
       attr_reader :redis
 
+      def reset_base_key
+        @base_key = nil
+      end
+
       def base_key
-        @base_key ||= [REDIS_STORAGE_FORMAT_VERSION, @redis_namespace].compact.join('.')
+        @base_key ||= [@format_version, @redis_namespace].compact.join('.')
       end
 
       def save_coverage(data)

data/lib/coverband/at_exit.rb

@@ -11,7 +11,7 @@ module Coverband
         @at_exit_registered = true
         at_exit do
           ::Coverband::Background.stop
-          Coverband::Collectors::Coverage.instance.report_coverage(true)
+          Coverband.report_coverage(true)
           Coverband.configuration.logger&.debug('Coverband: Reported coverage before exit')
         end
       end

data/lib/coverband/configuration.rb

@@ -20,7 +20,10 @@ module Coverband
     def reset
       @root = Dir.pwd
       @root_paths = []
-      @ignore = %w[vendor .erb$ .slim$]
+      # Heroku when building assets runs code from a dynamic directory
+      # /tmp was added to avoid coverage from /tmp/build directories during
+      # heroku asset compilation
+      @ignore = %w[vendor .erb$ .slim$ /tmp]
       @additional_files = []
       @reporting_frequency = 0.0
       @verbose = false
@@ -121,7 +124,18 @@ module Coverband
       Gem::PathSupport.new(ENV).path.select { |path| File.exist?(path) }
     end
 
-    SKIPPED_SETTINGS = %w[@s3_secret_access_key @store]
+    def current_root
+      File.expand_path(Coverband.configuration.root)
+    end
+
+    def all_root_paths
+      roots = Coverband.configuration.root_paths.dup
+      roots += Coverband.configuration.gem_paths.dup if Coverband.configuration.track_gems
+      roots << "#{Coverband.configuration.current_root}/"
+      roots
+    end
+
+    SKIPPED_SETTINGS = %w(@s3_secret_access_key @store)
     def to_h
       instance_variables
         .each_with_object('gem_paths': gem_paths) do |var, hash|

data/lib/coverband/integrations/background.rb

@@ -5,6 +5,7 @@ module Coverband
     @semaphore = Mutex.new
 
     def self.stop
+      return unless @thread
       @semaphore.synchronize do
         if @thread
           @thread.exit
@@ -13,6 +14,10 @@ module Coverband
       end
     end
 
+    def self.running?
+      !!@thread
+    end
+
     def self.start
       return if @thread
 
@@ -23,7 +28,7 @@ module Coverband
         sleep_seconds = Coverband.configuration.background_reporting_sleep_seconds
         @thread = Thread.new do
           loop do
-            Coverband::Collectors::Coverage.instance.report_coverage(true)
+            Coverband.report_coverage(true)
             logger&.debug("Coverband: Reported coverage via thread. Sleeping #{sleep_seconds}s") if Coverband.configuration.verbose
             sleep(sleep_seconds)
           end

data/lib/coverband/integrations/resque.rb

@@ -4,12 +4,18 @@ Resque.after_fork do |job|
   Coverband.start
 end
 
+Resque.before_first_fork do
+  Coverband.configuration.background_reporting_enabled = false
+  Coverband::Background.stop
+  Coverband::Collectors::Coverage.instance.report_coverage(true)
+end
+
 module Coverband
   module ResqueWorker
     def perform
       super
     ensure
-      Coverband::Collectors::Coverage.instance.report_coverage(true)
+      Coverband.report_coverage(true)
     end
   end
 end

data/lib/coverband/reporters/base.rb

@@ -8,8 +8,10 @@ module Coverband
     ###
     class Base
       class << self
+        include Coverband::Utils::FilePathHelper
         def report(store, _options = {})
-          scov_style_report = get_current_scov_data_imp(store, root_paths)
+          all_roots = Coverband.configuration.all_root_paths
+          scov_style_report = get_current_scov_data_imp(store, all_roots)
 
           if Coverband.configuration.verbose
             msg = "report:\n #{scov_style_report.inspect}"
@@ -20,17 +22,6 @@ module Coverband
 
         protected
 
-        def root_paths
-          roots = Coverband.configuration.root_paths
-          roots += Coverband.configuration.gem_paths if Coverband.configuration.track_gems
-          roots << "#{current_root}/"
-          roots
-        end
-
-        def current_root
-          File.expand_path(Coverband.configuration.root)
-        end
-
         def fix_file_names(report_hash, roots)
           if Coverband.configuration.verbose
             Coverband.configuration.logger.info "fixing root: #{roots.join(', ')}"
@@ -38,7 +29,7 @@ module Coverband
 
           # normalize names across servers
           report_hash.each_with_object({}) do |(key, vals), fixed_report|
-            filename = filename_from_key(key, roots)
+            filename = relative_path_to_full(key, roots)
             fixed_report[filename] = if fixed_report.key?(filename) && fixed_report[filename]['data'] && vals['data']
                                        merged_data = merge_arrays(fixed_report[filename]['data'], vals['data'])
                                        vals['data'] = merged_data
@@ -64,40 +55,6 @@ module Coverband
           merged
         end
 
-        ###
-        # filename_from_key code takes:
-        # key: which is a full path the same as reported by Coverage
-        # roots: if a collection of all possible full app paths
-        #    EX: [Coverband.configuration.root_paths, "#{current_root}/"]
-        # The LAST item should be the current file system root
-        # it expands that expands and adds a '/' as that isn't there from Dir.pwd
-        #
-        # NOTEs on configuration.root_paths usage
-        # strings: matching is pretty simple for full string paths
-        # regex: to get regex to work for changing deploy directories
-        #        the regex must be double escaped in double quotes
-        #          (if using \d for example)
-        #        or use single qoutes
-        #        example: '/box/apps/app_name/releases/\d+/'
-        #        example: '/var/local/company/company.d/[0-9]*/'
-        ###
-        def filename_from_key(key, roots)
-          relative_filename = key
-          local_filename = relative_filename
-          roots.each do |root|
-            relative_filename = relative_filename.gsub(/^#{root}/, './')
-          end
-          # the filename for our reports 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)
-          # above only works for app files
-          # we need to rethink some of this logic
-          # gems aren't at project root and can have multiple locations
-          local_root = roots.find { |root| File.exist?(relative_filename.gsub('./', root)) }
-          local_root ? relative_filename.gsub('./', local_root) : local_filename
-        end
-
         ###
         # why do we need to merge covered files data?
         # basically because paths on machines or deployed hosts could be different, so

data/lib/coverband/reporters/html_report.rb

@@ -11,7 +11,7 @@ module Coverband
         base_path = options.fetch(:base_path) { nil }
 
         # list all files, even if not tracked by Coverband (0% coverage)
-        tracked_glob = "#{current_root}/{app,lib,config}/**/*.{rb}"
+        tracked_glob = "#{Coverband.configuration.current_root}/{app,lib,config}/**/*.{rb}"
         report_files = Coverband::Utils::Result.add_not_loaded_files(scov_style_report, tracked_glob)
         # apply coverband filters
         filtered_report_files = {}

data/lib/coverband/reporters/web.rb

@@ -66,7 +66,7 @@ module Coverband
       end
 
       def collect_coverage
-        Coverband::Collectors::Coverage.instance.report_coverage(true)
+        Coverband.report_coverage(true)
         notice = 'coverband coverage collected'
         [301, { 'Location' => "#{base_path}?notice=#{notice}" }, []]
       end

data/lib/coverband/utils/file_path_helper.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+####
+# Helper functions for shared logic related to file path manipulation
+####
+module Coverband
+  module Utils
+    module FilePathHelper
+      ###
+      # Takes a full path and converts to a relative path
+      ###
+      def full_path_to_relative(full_path)
+        relative_filename = full_path
+        Coverband.configuration.all_root_paths.each do |root|
+          relative_filename = relative_filename.gsub(/^#{root}/, './')
+          # once we have a relative path break out of the loop
+          break if relative_filename.start_with? './'
+        end
+        relative_filename
+      end
+
+      ###
+      # relative_path_to_full code takes:
+      # relative_path: which is a full path the same as reported by Coverage
+      # roots: if a collection of all possible full app paths
+      #    EX: [Coverband.configuration.root_paths, "#{current_root}/"]
+      # The LAST item should be the current file system root
+      # it expands that expands and adds a '/' as that isn't there from Dir.pwd
+      #
+      # NOTEs on configuration.root_paths usage
+      # strings: matching is pretty simple for full string paths
+      # regex: to get regex to work for changing deploy directories
+      #        the regex must be double escaped in double quotes
+      #          (if using \d for example)
+      #        or use single qoutes
+      #        example: '/box/apps/app_name/releases/\d+/'
+      #        example: '/var/local/company/company.d/[0-9]*/'
+      ###
+      def relative_path_to_full(relative_path, roots)
+        relative_filename = relative_path
+        local_filename = relative_filename
+        roots.each do |root|
+          relative_filename = relative_filename.gsub(/^#{root}/, './')
+        end
+        # the filename for our reports 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)
+        # above only works for app files
+        # we need to rethink some of this logic
+        # gems aren't at project root and can have multiple locations
+        local_root = roots.find { |root| File.exist?(relative_filename.gsub('./', root)) }
+        local_root ? relative_filename.gsub('./', local_root) : local_filename
+      end
+    end
+  end
+end

data/lib/coverband/utils/railtie.rb

@@ -7,7 +7,7 @@ module Coverband
     end
 
     config.after_initialize do
-      Coverband::Collectors::Coverage.instance.report_coverage(true)
+      Coverband.report_coverage(true)
     end
 
     rake_tasks do

data/lib/coverband/utils/tasks.rb

@@ -25,4 +25,13 @@ namespace :coverband do
     environment
     Coverband.configuration.store.clear!
   end
+
+  ###
+  # clear data helpful for development or after configuration issues
+  ###
+  desc 'upgrade previous Coverband datastore to latest format'
+  task :migrate do
+    environment
+    Coverband.configuration.store.migrate!
+  end
 end

data/lib/coverband/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coverband
-  VERSION = '4.1.0.beta'
+  VERSION = '4.1.0'
 end

data/test/benchmarks/benchmark.rake

@@ -134,7 +134,7 @@ namespace :benchmarks do
       x.config(time: 12, warmup: 5, suite: suite)
       x.report 'coverband' do
         work
-        Coverband::Collectors::Coverage.instance.report_coverage
+        Coverband.report_coverage(true)
       end
       x.report 'no coverband' do
         work
@@ -176,6 +176,10 @@ namespace :benchmarks do
         @file_hash_cache[file] = Digest::MD5.file(__FILE__).hexdigest
       end
     end
+
+    def store.full_path_to_relative(file)
+      file
+    end
   end
 
   def reporting_speed

data/test/unit/collectors_coverage_test.rb

@@ -44,5 +44,10 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
       @coverband.reset_instance
       @coverband.report_coverage
     end
+
+    test 'default tmp ignores' do
+      heroku_build_file = '/tmp/build_81feca8c72366e4edf020dc6f1937485/config/initializers/assets.rb'
+      assert_equal false, @coverband.send(:track_file?, heroku_build_file)
+    end
   end
 end

data/test/unit/configuration_test.rb

@@ -16,22 +16,32 @@ class BaseTest < Minitest::Test
     end
   end
 
-  test 'defaults ' do
+  test 'defaults' do
     coverband = Coverband::Collectors::Coverage.instance.reset_instance
     assert_equal ['vendor', 'internal:prelude', 'schema.rb'], coverband.instance_variable_get('@ignore_patterns')
   end
 
-  test 'gem_paths ' do
+  test 'gem_paths' do
     Coverband::Collectors::Coverage.instance.reset_instance
     assert Coverband.configuration.gem_paths.first != nil
   end
 
-  test 'groups ' do
+  test 'groups' do
     Coverband::Collectors::Coverage.instance.reset_instance
     Coverband.configuration.track_gems = true
     assert_equal %w(App Gems), Coverband.configuration.groups.keys
   end
 
+  test 'all_root_paths' do
+    Coverband::Collectors::Coverage.instance.reset_instance
+    current_paths = Coverband.configuration.root_paths.dup
+    # verify previous bug fix
+    # it would extend the root_paths instance variable on each invokation
+    Coverband.configuration.all_root_paths
+    Coverband.configuration.all_root_paths
+    assert_equal current_paths, Coverband.configuration.root_paths
+  end
+
   test 's3 options' do
     Coverband::Collectors::Coverage.instance.reset_instance
     Coverband.configure do |config|

data/test/unit/full_stack_test.rb

@@ -6,6 +6,7 @@ require 'rack'
 class FullStackTest < Minitest::Test
   REDIS_STORAGE_FORMAT_VERSION = Coverband::Adapters::RedisStore::REDIS_STORAGE_FORMAT_VERSION
   TEST_RACK_APP = '../fake_app/basic_rack.rb'
+  RELATIVE_FILE = './fake_app/basic_rack.rb'
 
   def setup
     super
@@ -15,6 +16,7 @@ class FullStackTest < Minitest::Test
       config.store = Coverband::Adapters::RedisStore.new(Redis.new)
       config.s3_bucket = nil
       config.background_reporting_enabled = false
+      config.root_paths = ["#{File.expand_path('../', File.dirname(__FILE__))}/"]
     end
     Coverband.configuration.store.clear!
     Coverband.start
@@ -29,13 +31,13 @@ class FullStackTest < Minitest::Test
     assert_equal 'Hello Rack!', results.last
     sleep(0.1)
     expected = [nil, nil, 1, nil, 1, 1, 1, nil, nil]
-    assert_equal expected, Coverband.configuration.store.coverage[@rack_file]['data']
+    assert_equal expected, Coverband.configuration.store.coverage[RELATIVE_FILE]['data']
 
     # additional calls increase count by 1
     middleware.call(request)
     sleep(0.1)
     expected = [nil, nil, 1, nil, 1, 1, 2, nil, nil]
-    assert_equal expected, Coverband.configuration.store.coverage[@rack_file]['data']
+    assert_equal expected, Coverband.configuration.store.coverage[RELATIVE_FILE]['data']
   end
 
   test 'call app with gem tracking' do

data/test/unit/rails_full_stack_test.rb

@@ -10,6 +10,7 @@ class RailsFullStackTest < Minitest::Test
     super
     # The normal relative directory lookup of coverband won't work for our dummy rails project
     Coverband.configure("./test/rails#{Rails::VERSION::MAJOR}_dummy/config/coverband.rb")
+    Coverband.configuration.background_reporting_enabled = false
     Coverband.start
   end
 
@@ -21,8 +22,8 @@ class RailsFullStackTest < Minitest::Test
 
   test 'this is how we do it' do
     visit '/dummy/show'
+    Coverband.report_coverage(true)
     assert_content('I am no dummy')
-    sleep 0.2
     visit '/coverage'
     within page.find('a', text: /dummy_controller.rb/).find(:xpath, '../..') do
       assert_selector('td', text: '100.0 %')
@@ -46,7 +47,7 @@ class RailsFullStackTest < Minitest::Test
       3.times do
         visit '/dummy/show'
         assert_content('I am no dummy')
-        Coverband::Collectors::Coverage.instance.report_coverage(true)
+        Coverband.report_coverage(true)
       end
 
       previous_out = $stdout
@@ -57,7 +58,7 @@ class RailsFullStackTest < Minitest::Test
         15.times do
           visit '/dummy/show'
           assert_content('I am no dummy')
-          Coverband::Collectors::Coverage.instance.report_coverage(true)
+          Coverband.report_coverage(true)
           # this is expected to retain memory across requests
           # clear it to remove the false positive from test
           Coverband::Collectors::Coverage.instance.send(:add_previous_results, nil)

data/test/unit/rails_gems_full_stack_test.rb

@@ -12,6 +12,7 @@ class RailsGemsFullStackTest < Minitest::Test
     Coverband.configure("./test/rails#{Rails::VERSION::MAJOR}_dummy/config/coverband.rb")
     Coverband.configuration.track_gems = true
     Coverband.configuration.gem_details = true
+    Coverband.configuration.background_reporting_enabled = false
     Coverband.start
     require 'rainbow'
     Rainbow('this text is red').red
@@ -26,7 +27,7 @@ class RailsGemsFullStackTest < Minitest::Test
   test 'this is how gem it' do
     visit '/dummy/show'
     assert_content('I am no dummy')
-    sleep 0.2
+    Coverband.report_coverage(true)
     visit '/coverage'
     assert_content('Coverband Admin')
     assert_content('Gems')

data/test/unit/reports_base_test.rb

@@ -3,7 +3,7 @@
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class ReportsBaseTest < Minitest::Test
-  test 'filename_from_key fix filename from a key with a swappable path' do
+  test 'relative_path_to_full fix filename from a key with a swappable path' do
     Coverband.configure do |config|
       config.reporter          = 'std_out'
       config.root              = '/full/remote_app/path'
@@ -16,10 +16,10 @@ class ReportsBaseTest < Minitest::Test
     expected_path = '/full/remote_app/path/is/a/path.rb'
     File.expects(:exist?).with(key).returns(false)
     File.expects(:exist?).with(expected_path).returns(true)
-    assert_equal expected_path, Coverband::Reporters::Base.send(:filename_from_key, key, roots)
+    assert_equal expected_path, Coverband::Reporters::Base.send(:relative_path_to_full, key, roots)
   end
 
-  test 'filename_from_key fix filename a changing deploy path with quotes' do
+  test 'relative_path_to_full fix filename a changing deploy path with quotes' do
     Coverband.configure do |config|
       config.reporter          = 'std_out'
       config.root              = '/full/remote_app/path'
@@ -30,14 +30,14 @@ class ReportsBaseTest < Minitest::Test
     roots = ["/box/apps/app_name/releases/\\d+/", '/full/remote_app/path/']
     File.expects(:exist?).with('/box/apps/app_name/releases/\\d+/app/models/user.rb').returns(false)
     File.expects(:exist?).with(expected_path).returns(true)
-    assert_equal expected_path, Coverband::Reporters::Base.send(:filename_from_key, key, roots)
+    assert_equal expected_path, Coverband::Reporters::Base.send(:relative_path_to_full, key, roots)
     File.expects(:exist?).with('/box/apps/app_name/releases/\\d+/app/models/user.rb').returns(false)
     File.expects(:exist?).with(expected_path).returns(true)
     roots = ['/box/apps/app_name/releases/\d+/', '/full/remote_app/path/']
-    assert_equal expected_path, Coverband::Reporters::Base.send(:filename_from_key, key, roots)
+    assert_equal expected_path, Coverband::Reporters::Base.send(:relative_path_to_full, key, roots)
   end
 
-  test 'filename_from_key fix filename a changing deploy path real world examples' do
+  test 'relative_path_to_full fix filename a changing deploy path real world examples' do
     current_app_root = '/var/local/company/company.d/79'
     Coverband.configure do |config|
       config.reporter          = 'std_out'
@@ -50,14 +50,14 @@ class ReportsBaseTest < Minitest::Test
     File.expects(:exist?).with('/var/local/company/company.d/[0-9]*/app/controllers/dashboard_controller.rb').returns(false)
     File.expects(:exist?).with(expected_path).returns(true)
     roots = ['/var/local/company/company.d/[0-9]*/', "#{current_app_root}/"]
-    assert_equal expected_path, Coverband::Reporters::Base.send(:filename_from_key, key, roots)
+    assert_equal expected_path, Coverband::Reporters::Base.send(:relative_path_to_full, key, roots)
     File.expects(:exist?).with('/var/local/company/company.d/[0-9]*/app/controllers/dashboard_controller.rb').returns(false)
     File.expects(:exist?).with(expected_path).returns(true)
     roots = ["/var/local/company/company.d/[0-9]*/", "#{current_app_root}/"]
-    assert_equal expected_path, Coverband::Reporters::Base.send(:filename_from_key, key, roots)
+    assert_equal expected_path, Coverband::Reporters::Base.send(:relative_path_to_full, key, roots)
   end
 
-  test 'filename_from_key leave filename from a key with a local path' do
+  test 'relative_path_to_full leave filename from a key with a local path' do
     Coverband.configure do |config|
       config.reporter          = 'std_out'
       config.root              = '/full/remote_app/path'
@@ -68,7 +68,7 @@ class ReportsBaseTest < Minitest::Test
     roots = ['/app/', '/full/remote_app/path/']
 
     expected_path = '/full/remote_app/path/is/a/path.rb'
-    assert_equal expected_path, Coverband::Reporters::Base.send(:filename_from_key, key, roots)
+    assert_equal expected_path, Coverband::Reporters::Base.send(:relative_path_to_full, key, roots)
   end
 
   test '#merge_arrays basic merge preserves order and counts' do

data/test/unit/reports_console_test.rb

@@ -20,13 +20,14 @@ class HTMLReportTest < Minitest::Test
     end
     Coverband.configuration.logger.stubs('info')
     mock_file_hash
-    Coverband::Reporters::ConsoleReport
-      .expects(:current_root)
-      .returns('app_path')
+    Coverband.configuration
+             .expects(:current_root)
+             .at_least_once
+             .returns('app_path')
     @store.send(:save_report, basic_coverage)
 
     report = Coverband::Reporters::ConsoleReport.report(@store)
-    expected = { 'app_path/dog.rb' => [0, 1, 2] }
+    expected = { './dog.rb' => [0, 1, 2] }
     assert_equal(expected.keys, report.keys)
   end
 end

data/test/unit/resque_worker_test.rb

@@ -6,13 +6,16 @@ class ResqueWorkerTest < Minitest::Test
   def enqueue_and_run_job
     Resque.enqueue(TestResqueJob)
     queue = ENV['QUEUE'] ='resque_coverband'
-    Resque::Worker.new.work_one_job
+    worker = Resque::Worker.new
+    worker.startup
+    worker.work_one_job
   end
 
   def setup
     super
     Coverband.configure do |config|
       config.background_reporting_enabled = false
+      config.root_paths = ["#{File.expand_path('../', File.dirname(__FILE__))}/"]
     end
     Coverband.start
     redis = Coverband.configuration.store.send(:redis)
@@ -20,16 +23,14 @@ class ResqueWorkerTest < Minitest::Test
   end
 
   test 'resque job coverage' do
+    relative_job_file = './unit/test_resque_job.rb'
     resque_job_file = File.expand_path('./test_resque_job.rb', File.dirname(__FILE__))
     require resque_job_file
 
-    #report after loading the file in parent process
-    Coverband::Collectors::Coverage.instance.report_coverage(true)
-
     enqueue_and_run_job
 
-    puts "assert_equal 1, Coverband.configuration.store.coverage['#{resque_job_file}']['data'][4]"
-    assert_equal 1, Coverband.configuration.store.coverage[resque_job_file]['data'][4]
+    assert !Coverband::Background.running?
+
+    assert_equal 1, Coverband.configuration.store.coverage[relative_job_file]['data'][4]
   end
 end
-

data/views/layout.erb

@@ -16,7 +16,7 @@
     <div id="wrapper" style="display:none;">
       <div id="header">
         <a href='<%= base_path %>'>Coverband Admin</a> &nbsp;
-        <a href='<%= base_path %>settings'>Settings</a> &nbsp;
+        <a href='<%= base_path %>settings'>Info</a> &nbsp;
         <%= button("#{base_path}collect_coverage", 'force coverage collection') %> &nbsp;
         <%= button("#{base_path}reload_files", 'reload Coverband files') %> &nbsp;
         <% if Coverband.configuration.web_enable_clear %>

data/views/settings.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns='http://www.w3.org/1999/xhtml'>
   <head>
-    <title>Coverband Settings: <%= Coverband::VERSION %></title>
+    <title>Coverband Info: <%= Coverband::VERSION %></title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <script src='<%= assets_path('application.js') %>' type='text/javascript'></script>
     <link href='<%= assets_path('application.css') %>' media='screen, projection, print' rel='stylesheet' type='text/css'>
@@ -12,7 +12,7 @@
     <div id="wrapper" style="">
       <div id="header">
         <a href='<%= base_path %>'>Coverband Admin</a> &nbsp;
-        <a href='<%= base_path %>settings'>Settings</a> &nbsp;
+        <a href='<%= base_path %>settings'>Info</a> &nbsp;
       </div>
       <div id="content">
         <dl>
@@ -20,6 +20,11 @@
           <dt><%= key %></dt>
           <dd><%= value %></dd>
         <% end %>
+
+        <dt>Size (in bytes)</dt>
+        <dd><%= Coverband.configuration.store.size %></dd>
+        <dt>Size (in MiB)</dt>
+        <dd><%= Coverband.configuration.store.size_in_mib %></dd>
         </dl>
       </div>
       <div id="footer">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 4.1.0.beta
+  version: 4.1.0
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -257,6 +257,7 @@ files:
 - lib/coverband/reporters/web.rb
 - lib/coverband/utils/file_groups.rb
 - lib/coverband/utils/file_list.rb
+- lib/coverband/utils/file_path_helper.rb
 - lib/coverband/utils/gem_list.rb
 - lib/coverband/utils/html_formatter.rb
 - lib/coverband/utils/lines_classifier.rb
@@ -366,9 +367,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1