coverband 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e214b1bd6119046657daa64ed6d69f77f821c6c670b72e98d307ede5f08e61f
-  data.tar.gz: 469d9470799f90b5b52d53d3a630fae75b3b6bff0390375987902331878f530e
+  metadata.gz: 0736c0a54102da0309de53707d866be707e72f0c977855bcf69586d281c9d2fe
+  data.tar.gz: 4616a0e6a769500797b89e751d8a8b96fa11ad11237c20bf359d592853e5e194
 SHA512:
-  metadata.gz: f1b0f503941ab9dbc2dee6a184fe6d6d937a5f505a5c9112ae7343197372586d6cb42df758f24effde0ee30fb359c0e2e651c64a1f5ee4c9a588a4499683dc73
-  data.tar.gz: ee700abfe4c730011dcc5c1c8521f55a2cc7ec5149e44b08187c8d09419023160a0f7c8aaba4b2aa0bb405eb13f4aeee1d8ce9cabce4860738d4ea94cac63c04
+  metadata.gz: c16f4e0351ffdd49ba3732c203b9932d4ee2ee8e9890b59f0c8d1e0beafcb2e8632d5a47ffc946248813284ebcac727785ceba3e38a6f041b0f5c000c42870f2
+  data.tar.gz: a1119724f958c01dfdb333efe95ed43acc6f2c1396d24efe7a208d8606e33d8de687d73a1099a3a20d5a37dbcef6b43c4ba36fb9d9d194d0a584e02957fdd016

data/.rubocop.yml

@@ -2,14 +2,21 @@ AllCops:
   TargetRubyVersion: 2.4
   Exclude:
     - docs/**/*
+    - test/rails4_dummy/**/*
+    - test/rails5_dummy/**/*
+    - test/fixtures/**/*
+    # Get the code passing first then we will enable for tests
+    - test/**/*
 Documentation:
   Enabled: false
 Metrics/MethodLength:
   Enabled: false
 Metrics/LineLength:
-  Max: 120
+  Max: 160
 Metrics/BlockNesting:
   Max: 5
+Metrics/BlockLength:
+  Max: 30
 Metrics/CyclomaticComplexity:
   Enabled: false
 Metrics/PerceivedComplexity:
@@ -22,38 +29,51 @@ Metrics/ModuleLength:
   Enabled: false
 Metrics/ParameterLists:
   Max: 10
-Style/AccessorMethodName:
-  Enabled: false
-Style/PredicateName:
+Naming/AccessorMethodName:
   Enabled: false
+Naming/PredicateName:
+  Enabled: true
 Style/TernaryParentheses:
   Enabled: false
 Style/MutableConstant:
   Enabled: false
+Style/IdenticalConditionalBranches:
+  Enabled: false
+Style/ClassVars:
+  Enabled: false
+Style/MultilineBlockChain:
+  Enabled: false
 Style/FrozenStringLiteralComment:
   Enabled: true
 Style/GuardClause:
   Enabled: true
 Style/NumericPredicate:
-  Enabled: false
+  Enabled: true
 Style/NumericLiterals:
   Enabled: false
 Style/NumericLiteralPrefix:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
+Style/SymbolProc:
+  Enabled: false
+Style/RegexpLiteral:
+  Enabled: false
 Performance/Casecmp:
   Enabled: false
-Style/MultilineMethodCallIndentation:
+Performance/RegexpMatch:
+  Enabled: false
+Layout/MultilineMethodCallIndentation:
   Enabled: true
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   Enabled: true
 Lint/RescueException:
   Enabled: true
+Lint/UselessAccessModifier:
+  Enabled: true
 Lint/ShadowingOuterLocalVariable:
   Enabled: true
 Style/FormatString:
   Enabled: true
-Lint/Eval:
+Security/Eval:
   Enabled: true
-

data/.travis.yml

@@ -9,11 +9,20 @@ gemfile:
   - Gemfile.rails4
 services:
   - redis-server
+script:
+  - bundle exec rake rubocop
+  - bundle exec rake
+  - bundle exec rake forked_tests
+  # remove this for now as it is flaky
+  # passes locally on 2.3.5 on travis passes sometimes on 2.4 and always on 2.6.1
+  #- bundle exec rake benchmarks:memory
+  - bundle exec rake benchmarks
 before_install:
   - echo 'this is a hack to clear default bundler and force bundler 1.17.3'
   - ls /home/travis/.rvm/gems/
   - rm /home/travis/.rvm/gems/ruby-2.3.7@global/specifications/bundler-2.0.1.gemspec || true
-  - rm /home/travis/.rvm/gems/ruby-2.5.4@global/specifications/bundler-2.0.1.gemspec || true
+  - rm /home/travis/.rvm/gems/ruby-2.4.6@global/specifications/bundler-2.0.1.gemspec || true
+  - rm /home/travis/.rvm/gems/ruby-2.5.5@global/specifications/bundler-2.0.1.gemspec || true
   - gem uninstall bundler || true
   - gem install bundler -v '1.17.3'
   - bundler --version

data/Gemfile

@@ -5,5 +5,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in coverband.gemspec
 gemspec
 gem 'rails', '~>5'
-# this is used for testing gem tracking
+# these gems are used for testing gem tracking
+gem 'irb', require: false
+gem 'pundit'
 gem 'rainbow', require: false

data/Gemfile.rails4

@@ -7,3 +7,4 @@ gemspec
 gem 'rails', '~>4'
 # this is used for testing gem tracking
 gem 'rainbow', require: false
+gem 'pundit'

data/README.md

@@ -4,12 +4,12 @@
 
 [![Build Status](https://travis-ci.org/danmayer/coverband.svg?branch=master)](https://travis-ci.org/danmayer/coverband)
 [![Coverage Status](https://coveralls.io/repos/github/danmayer/coverband/badge.svg?branch=master)](https://coveralls.io/github/danmayer/coverband?branch=master)
+[![Maintainability](https://api.codeclimate.com/v1/badges/1e6682f9540d75f26da7/maintainability)](https://codeclimate.com/github/danmayer/coverband/maintainability)
 
 <p align="center">
   <a href="#key-features">Key Features</a> •
   <a href="#installation">Installation</a> •
   <a href="#coverage-report">Coverage Report</a> •
-  <a href="#verify-correct-installation">Verify Correct Installation</a> •
   <a href="#advanced-config">Advanced Config</a> •
   <a href="#license">License</a> •
   <a href="/changes.md">Change Log / Roadmap</a>
@@ -24,9 +24,11 @@ A gem to measure production code usage, showing a counter for the number of time
 The primary goal of Coverband is giving deep insight into your production runtime usage of your application code, while having the least impact on performance possible.
 
 - Low performance overhead
-- Very simple setup and configuration
+- Simple setup and configuration
 - Out of the box support for all standard code execution paths (web, cron, background jobs, rake tasks, etc)
+- Splits load time (Rails eager load) and Run time metrics
 - Easy to understand actionable insights from the report
+- Tracks Gem usage (still in experimental stages and not recommended for production)
 - Development mode, offers deep insight of code usage details (number of LOC execution during single request, etc) during development.
 - Mountable web interface to easily share reports
 
@@ -52,9 +54,17 @@ gem 'coverband'
 
 If [tracking gem usage](#collecting-gem--library-usage), be sure to include coverband before other gems you would like to track.
 
+## Upgrading to Latest
+
+### No custom code or middleware required
+
+With older versions of coverband, projects would report to redis using rack or sidekiq middleware. After coverband 4.0, this should no longer be required and could cause performance issues. Reporting to redis is now automatically done within a background thread with no custom code needed.
+
+See [changelog](https://github.com/danmayer/coverband/blob/master/changes.md).
+
 ## Rails
 
-The Railtie integration means you shouldn't need to do anything anything else other than ensure coverband is required after rails within your Gemfile.
+The Railtie integration means you shouldn't need to do anything anything else other than ensure coverband is required after rails within your Gemfile. The only exception to this is gem tracking of `Bundle.require` which depends on requiring coverband within the application.rb. See [Collecting Gem / Library Usage](https://github.com/danmayer/coverband#collecting-gem--library-usage).
 
 ## Sinatra
 
@@ -64,7 +74,7 @@ For the best coverage you want this loaded as early as possible. I have been put
 require 'coverband'
 require File.dirname(__FILE__) + '/config/environment'
 
-use Coverband::Middleware
+use Coverband::BackgroundMiddleware
 run ActionController::Dispatcher.new
 ```
 
@@ -88,17 +98,20 @@ Rails.application.routes.draw do
 end
 ```
 
+or you can enable basic auth by setting `ENV['COVERBAND_PASSWORD']` or via your configuration `config.password = 'my_pass'`
+
 ### Coverband Web Endpoint
 
 The web endpoint is a barebones endpoint that you can either expose direct (after authentication) or you can just link to the actions you wish to expose. The index is intended as a example to showcase all the features.
 
-![image](https://raw.github.com/danmayer/coverband/master/docs/coverband_web_update.png)
+![image](https://raw.github.com/danmayer/coverband/master/docs/coverband_web_ui.png)
 
 > The web index as available on the Coverband Demo site
 
 - **force coverage collection:** This triggers coverage collection on the current webserver process
-- **reload Coverband files:** This has Coverband reload files as configured (force reload of some files that might not capture Coverage on boot). This can be used to reload files on demand.
 - **clear coverage report:** This will clear the coverage data. This wipes out all collected data (**dangerous**)
+- View individual file details
+- **clear individual file coverage:** This will clear the details of the file you are looking at. This is helpful if you don't want to loose all Coverage data but made a change that you expect would impact a particular file.
 
 ### Rake Tasks
 
@@ -118,14 +131,6 @@ Index Page
 Details on an example Sinatra app
 ![image](https://raw.github.com/danmayer/coverband/master/docs/coverband_details.png)
 
-# Verify Correct Installation
-
-- boot up your application
-- run app and hit a controller (via a web request, at least one request must complete)
-- run `rake coverband:coverage` this will show app initialization coverage
-- make another request, or enough that your reporting frequency will trigger
-- run `rake coverband:coverage` and you should see coverage increasing for the endpoints you hit.
-
 # Coverband Demo
 
 Take Coverband for a spin on the live Heroku deployed [Coverband Demo](https://coverband-demo.herokuapp.com/). The [full source code for the demo](https://github.com/danmayer/coverband_demo) is available to help with installation, configuration, and understanding of basic usage.
@@ -251,6 +256,8 @@ By adding any files above you will get reporting on those files as part of your
 
 ### Collecting Gem / Library Usage
 
+__WARNING:__ Gem Tracking is still in experimental stages and not recommended for production. We have some performance issues when view reports on large applications. Gem tracing also during background thread data collection has HIGH memory requirements, during report merging (seemingly around 128mb of extra memory, which is crazy). We recommend deploying WITHOUT `track_gems` first and only enabling it after confirming that Coverband is working and performing well.
+
 Gem usage can be tracked by enabling the `track_gems` config.
 
 ```
@@ -261,7 +268,20 @@ end
 
 The `track_gems` feature exposes a Gems tab in the report which prints out the percentage usage of each Gem. See demo [here](https://coverband-demo.herokuapp.com/coverage?#_Gems).
 
-When tracking gems, it is important that `Coverband#start` is called before the gems to be tracked are required. Since `Coverband#start` is automatically called by default when coverband is required, list coverband before the other gems to be tracked within your Gemfile. The exception to this are gems like rails and resque. Since coverband has some specific intergrations for these frameworks, these two gems should be required first.
+When tracking gems, it is important that `Coverband#start` is called before the gems to be tracked are required. The best way to do this is to require coverband before Bundle.require is called. Within rails, require coverband within the application.rb like so:
+
+```ruby
+require 'coverband'
+Bundler.require(*Rails.groups)
+```
+
+If you are using the resque integration, resque needs to be required before coverband since the integration will not run unless resque is loaded. Within the application.rb just require resque before coverband.
+
+```ruby
+require 'resque'
+require 'coverband'
+Bundler.require(*Rails.groups)
+```
 
 The track_gems config only exposes the overall usage of a gem. In order to see the detail of each file, enable the `gem_details` flag.
 
@@ -335,6 +355,7 @@ If you submit a change please make sure the tests and benchmarks are passing.
 - view test coverage: `open coverage/index.html`
 - run the benchmarks before and after your change to see impact
   - `rake benchmarks`
+  - run a single test by line number like rspec: `bundle exec m test/coverband/reporters/html_test.rb:29`
 
 ### Known Issues
 
@@ -352,6 +373,10 @@ What is the coverage data in Redis?
 
 `Coverband.configuration.store.coverage`
 
+## Logo
+
+The Coverband logo was created by [Dave Woodall](http://davewoodall.com). Thanks Dave!
+
 # License
 
 This is a MIT License project...

data/Rakefile

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'
-
 import 'test/benchmarks/benchmark.rake'
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
 
-task default: [:test, :benchmarks]
+task default: %i[test]
+
+task 'test:all': %i[rubocop test forked_tests benchmarks:memory benchmarks]
 
 task :test
 require 'rake/testtask'
@@ -17,9 +21,16 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+Rake::TestTask.new(:forked_tests) do |test|
+  test.libs << 'lib' << 'test'
+  test.test_files = FileList['test/forked/**/*_test.rb']
+  test.verbose = true
+end
+
 desc 'load irb with this gem'
 task :console do
-  exec 'irb -I lib -r coverband'
+  puts 'running console'
+  exec 'bundle exec console'
 end
 
 # This is really just for testing and development because without configuration

data/changes.md

@@ -16,6 +16,8 @@ Will be the fully modern release that drops maintenance legacy support in favor
   - add built-in support for easy loading via Railties
   - built in support for activejob, sidekiq, and other common frameworks
   - reduced configuration options
+- support oneshot
+- drop middleware figure out a way to kick off background without middelware
 - options on reporting
   - background reporting
   - or middleware reporting
@@ -47,6 +49,7 @@ Will be the fully modern release that drops maintenance legacy support in favor
 - move all code to work with relative paths leaving only stdlib Coverage working on full paths
 - add gem_safe_lists to track only some gems
 - add gem_details_safe list to report on details on some gems
+- - display gems that are in loaded with 0 coverage, thanks @kbaum 
 
 ### Coverband_jam_session
 
@@ -54,29 +57,61 @@ This is a possible gem to host experimental or more complex features, which woul
 
 Feature Ideas:
 
+- per request coverage implemented via Ruby 2.6.0 coverage.clear https://bugs.ruby-lang.org/issues/15022
 - statsd adapters (it would allow passing in date ranges on usage)
-- move to SimpleCov console out, or make similar console tabular output
 - Possibly add ability to record code run for a given route
 - integrate recording with deploy tag or deploy timestamp
   - diff code usage across deployed versions
   - what methods increased usage or decreased
-- Improve client code api, around manual usage of sampling (like event usage)
 - ability to change the Coverband config at runtime by changing the config pushed to the Redis hash. In memory cache around the changes to only make that call periodically.
 - Opposed to just showing code usage on a route allow 'tagging' events which would record line coverage for that tag (this would allow tagging all code that modified an ActiveRecord model for example
 - additional adapters (tracepoint, ruby-profiler, etc)
-- code route tracing (entry point to all code executed for example /some_path -> code coverage of that path)
-- tagging of reported Coverage
-- allow only to collect coverage based on route (limiting or scoped coverage)
-- coverage over some other variable like a set of alpha users
+- tagged coverage reports
+  - code route tracing (entry point to all code executed for example /some_path -> code coverage of that path)
+  - deploy git hash tagging of reported Coverage
+  - allow only to collect coverage based on route (limiting or scoped coverage)
+  - coverage over some other variable like a set of alpha users
 - document how to use this on staging / selenium test suite runs
   - possible add API to pull report at end of run
 
-# Alpha
+# Alpha / Beta / Release Candidates
+
+### Coverband 4.2.1
+
+- larger changes
+  - reduce memory usage
+  - fix issue where reports didn't include files with 0 activity
+  - updated runtime relavent lines and runtime percentages
+  - add Oneshot coverage support for Ruby 2.6.0 thanks @zwalker
+   - I would consider this our test oneshot release, please report any issues
+   - improved control over memory vs functionality
+     - oneshot support is the best memory and speed if you are on Ruby 2.6.*
+     - simulated_oneshot works for Ruby prior to 2.6.*, keeps lower runtime memory, at a trade of only being able to detect eager_load or runtime hits not both
+     - full hit tracking (The previous and current default), this uses more memory than other options, but provides full robust data
+
+
+- small changes fixes
+  - further improvements on eager_loading detection, thanks @kbaum
+  - fix on ignore configuration options
+  - fix broken static server
+  - fix issue where clear and coverage trigger coverage reports
+  - improved logging
+  - fix on gem runtime code coverage support, thanks @kbaum
+  - fix sorting of runtime coverage
+  - add runtime coverage to gem summary pages
+  - documented redis TTL, thanks @jjb
+  - resolve regression on coverband rake tasks recording coverage
+  - improved runtime / eager loading tracking
+  - fix on small memory leaks
+  - added warnings that gem tracking isn't production ready
+  - built in support for basic auth on the web rack app, thanks @jjb
+  - don't clobber rake environment method definition, thanks @shioyama
+  - readme improvements, thanks @yuriyalekseyev
+  - fix duplicate requires thanks @yuriyalekseyev
+  - various cleanups and improvements, thanks @kbaum
+  - additional benchmarks to ensure proper memory handling, thanks @kbaum
+  - default redis TTL, thanks @jjb
 
-### Coverband 4.3.0?
-
-- further improvements on eager_loading detection
-- ?
 
 # Released
 
@@ -96,7 +131,7 @@ Feature Ideas:
 - move from thread based reporter instance to process based instance
 - thanks Karl Baum for much of the above mentioned work
 - clear coverage on individual files
-- we have a logo, thanks Dave Woodall
+- we have a logo, thanks Dave Woodall, http://davewoodall.com
 
 ### Coverband 4.1.1
 

data/coverband.gemspec

@@ -28,12 +28,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'm'
   spec.add_development_dependency 'memory_profiler'
   spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest-fork_executor'
   spec.add_development_dependency 'mocha', '~> 1.7.0'
   spec.add_development_dependency 'rack'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'resque'
-  # temporarily needed to fun tests for classifier-reborn as part of benchmarks
+  spec.add_development_dependency 'rubocop'
+  # temporarily needed to run tests for classifier-reborn as part of benchmarks
   spec.add_development_dependency 'minitest-reporters'
 
   # TODO: used for benchmarking and tests I think we have other better benchmarking

data/lib/coverband/adapters/base.rb

@@ -4,26 +4,42 @@ module Coverband
   module Adapters
     class Base
       include Coverband::Utils::FilePathHelper
+
+      DATA_KEY = 'data'
+      FIRST_UPDATED_KEY = 'first_updated_at'
+      LAST_UPDATED_KEY = 'last_updated_at'
+      FILE_HASH = 'file_hash'
+      ABSTRACT_KEY = 'abstract'
+
       attr_accessor :type
 
       def initialize
         @file_hash_cache = {}
+        @type = Coverband::RUNTIME_TYPE
       end
 
       def clear!
-        raise 'abstract'
+        raise ABSTRACT_KEY
       end
 
-      def clear_file!(_file)
-        raise 'abstract'
+      def clear_file!(_file = nil)
+        raise ABSTRACT_KEY
       end
 
       def migrate!
-        raise 'abstract'
+        raise ABSTRACT_KEY
       end
 
       def size
-        raise 'abstract'
+        raise ABSTRACT_KEY
+      end
+
+      def save_coverage
+        raise ABSTRACT_KEY
+      end
+
+      def coverage(_local_type = nil)
+        raise ABSTRACT_KEY
       end
 
       def size_in_mib
@@ -36,14 +52,10 @@ module Coverband
       # and the tradeoff has always been acceptable
       def save_report(report)
         data = report.dup
-        data = merge_reports(data, get_report)
+        data = merge_reports(data, coverage)
         save_coverage(data)
       end
 
-      def coverage
-        get_report
-      end
-
       def get_coverage_report
         data = Coverband.configuration.store.split_coverage(Coverband::TYPES)
         data.merge(Coverband::MERGED_TYPE => Coverband.configuration.store.merged_coverage(Coverband::TYPES))
@@ -53,47 +65,48 @@ module Coverband
         coverage.keys || []
       end
 
-      # TODO: deprecate / remove?
-      def covered_lines_for_file(file)
-        Array(coverage.dig(file, 'data'))
-      end
-
       protected
 
       def split_coverage(types)
         types.reduce({}) do |data, type|
-          data.update(type => get_report(type))
+          if type == Coverband::RUNTIME_TYPE && Coverband.configuration.simulate_oneshot_lines_coverage
+            data.update(type => simulated_runtime_coverage)
+          else
+            data.update(type => coverage(type))
+          end
         end
       end
 
-      def merged_coverage(types)
-        types.reduce({}) do |data, type|
-          merge_reports(data, get_report(type), skip_expansion: true)
+      def simulated_runtime_coverage
+        runtime_data = coverage(Coverband::RUNTIME_TYPE)
+        eager_data = coverage(Coverband::EAGER_TYPE)
+        eager_data.values do |vals|
+          vals['data'].map! { |line_coverage| line_coverage ? (0 - line_coverage) : line_coverage }
         end
+        merge_reports(runtime_data, eager_data, skip_expansion: true)
       end
 
-      def save_coverage
-        raise 'abstract'
-      end
-
-      def get_report
-        raise 'abstract'
+      def merged_coverage(types)
+        types.reduce({}) do |data, type|
+          merge_reports(data, coverage(type), skip_expansion: true)
+        end
       end
 
       def file_hash(file)
         @file_hash_cache[file] ||= Digest::MD5.file(file).hexdigest
       end
 
+      # TODO: modify to extend report inline?
       def expand_report(report)
         expanded = {}
         report_time = Time.now.to_i
-        updated_time = self.type == Coverband::EAGER_TYPE ? nil : report_time
+        updated_time = type == Coverband::EAGER_TYPE ? nil : report_time
         report.each_pair do |key, line_data|
           extended_data = {
-            'first_updated_at' => report_time,
-            'last_updated_at' => updated_time,
-            'file_hash' => file_hash(key),
-            'data' => line_data
+            FIRST_UPDATED_KEY => report_time,
+            LAST_UPDATED_KEY => updated_time,
+            FILE_HASH => file_hash(key),
+            DATA_KEY => line_data
           }
           expanded[full_path_to_relative(key)] = extended_data
         end
@@ -101,12 +114,16 @@ module Coverband
       end
 
       def merge_reports(new_report, old_report, options = {})
+        # transparently update from RUNTIME_TYPE = nil to RUNTIME_TYPE = :runtime
+        # transparent update for format coveband_3_2
+        old_report = coverage(nil, override_type: nil) if old_report.nil? && type == Coverband::RUNTIME_TYPE
+
         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] &&
                                 old_report[file] &&
-                                new_report[file]['file_hash'] == old_report[file]['file_hash']
+                                new_report[file][FILE_HASH] == old_report[file][FILE_HASH]
                                merge_expanded_data(new_report[file], old_report[file])
                              elsif new_report[file]
                                new_report[file]
@@ -119,15 +136,22 @@ module Coverband
 
       def merge_expanded_data(new_expanded, old_expanded)
         {
-          'first_updated_at' => old_expanded['first_updated_at'],
-          'last_updated_at' => new_expanded['last_updated_at'],
-          'file_hash' => new_expanded['file_hash'],
-          'data' => array_add(new_expanded['data'], old_expanded['data'])
+          FIRST_UPDATED_KEY => old_expanded[FIRST_UPDATED_KEY],
+          LAST_UPDATED_KEY => new_expanded[LAST_UPDATED_KEY],
+          FILE_HASH => new_expanded[FILE_HASH],
+          DATA_KEY => array_add(new_expanded[DATA_KEY], old_expanded[DATA_KEY])
         }
       end
 
+      # TODO: This should only be 2 cases get our dup / not dups aligned
       def array_add(latest, original)
-        latest.map.with_index { |v, i| (v && original[i]) ? v + original[i] : nil }
+        if Coverband.configuration.use_oneshot_lines_coverage
+          latest.map!.with_index { |v, i| (v + original[i] >= 1 ? 1 : 0) if v && original[i] }
+        elsif Coverband.configuration.simulate_oneshot_lines_coverage
+          latest.map.with_index { |v, i| (v + original[i] >= 1 ? 1 : 0) if v && original[i] }
+        else
+          latest.map.with_index { |v, i| (v && original[i]) ? v + original[i] : nil }
+        end
       end
     end
   end

data/lib/coverband/adapters/file_store.rb

@@ -28,6 +28,14 @@ module Coverband
         raise NotImplementedError, "FileStore doesn't support migrations"
       end
 
+      def coverage(_local_type = nil)
+        if File.exist?(path)
+          JSON.parse(File.read(path))
+        else
+          {}
+        end
+      end
+
       private
 
       attr_accessor :path
@@ -35,14 +43,6 @@ module Coverband
       def save_coverage(report)
         File.open(path, 'w') { |f| f.write(report.to_json) }
       end
-
-      def get_report
-        if File.exist?(path)
-          JSON.parse(File.read(path))
-        else
-          {}
-        end
-      end
     end
   end
 end