coverband 4.2.4.rc.3 → 4.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13e53266c2fa52796b86da93197611c290f7a0c40e304ef5b75d24c45eed9db3
-  data.tar.gz: 95b685919c1edd7156f1f940d30f05381a1ac6684863557843001f8edf923125
+  metadata.gz: 7095ca0ee73eff7b4290c508df1c6c6961ed1283ce2edcca085cf3f05e12bb9d
+  data.tar.gz: e0fc00dc886a0153b3c6887680a86ffee9e13666e5dce3bbe7bc551b249d5734
 SHA512:
-  metadata.gz: 2e12f0556877efd6435887c447ef3278ab89c0c3ca6740b7ba0de33f9757e17038eb29a74297e9fb29707a8c4d9c999b1138117d3bb64607e0f4da82ca64e0c4
-  data.tar.gz: 27cfd67015140d2461fb2a9217d06c9782823433c8cbdad3be67e6cc05ea26125dab778656ff0b2023e5e806a277dd1c9028976ddd5dedcc8b90e3505d94598f
+  metadata.gz: 4df21534042791528184de6f65548e48ac4a8d06905c815977376b6d3f815eaf121d5117d2e4af4c53b3a46a8122fc32ea3a9c2a1072219d76231f3acf8c530a
+  data.tar.gz: 64f75a91aafb5fd7fa945bde6bbe8b9262f79f90faaa17108743ab480bc3a369a3471225d616144024ca7db0010db219806894ace62dea3cb25941396532a535

data/.jrubyrc

@@ -0,0 +1 @@
+debug.fullTrace=true

data/.rubocop.yml

@@ -3,7 +3,7 @@ AllCops:
   Exclude:
     - vendor/bundle/**/*
     - docs/**/*
-    - test/rails4_dummy/**/*
+    - test/rails6_dummy/**/*
     - test/rails5_dummy/**/*
     - test/fixtures/**/*
     # Get the code passing first then we will enable for tests
@@ -12,7 +12,7 @@ Documentation:
   Enabled: false
 Metrics/MethodLength:
   Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
   Max: 160
 Metrics/BlockNesting:
   Max: 5
@@ -46,6 +46,10 @@ Style/ClassVars:
   Enabled: false
 Style/MultilineBlockChain:
   Enabled: false
+Style/StringLiterals:
+  Enabled: false
+Style/IfInsideElse:
+  Enabled: false
 Style/FrozenStringLiteralComment:
   Enabled: true
 Style/GuardClause:
@@ -58,14 +62,12 @@ Style/NumericLiteralPrefix:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
+Style/SymbolArray:
+  Enabled: false
 Style/SymbolProc:
   Enabled: false
 Style/RegexpLiteral:
   Enabled: false
-Performance/Casecmp:
-  Enabled: false
-Performance/RegexpMatch:
-  Enabled: false
 Layout/MultilineMethodCallIndentation:
   Enabled: true
 Layout/MultilineOperationIndentation:

data/.travis.yml

@@ -4,17 +4,37 @@ rvm:
   - "2.4"
   - "2.5"
   - "2.6.1"
-cache:
-  bundler: true
-  directories:
-  - $HOME/lua51
+  - "2.7"
+  - jruby-9.2.6.0
 gemfile:
   - Gemfile
   - Gemfile.rails4
+  - Gemfile.rails6
+env:
+  global:
+    # --dev improves JRuby startup time
+    # See https://github.com/jruby/jruby/wiki/Improving-startup-time
+    - JRUBY_OPTS="--dev"
+
+jobs:
+  exclude:
+    - rvm: "2.3"
+      gemfile: Gemfile.rails6
+    - rvm: "2.4"
+      gemfile: Gemfile.rails6
+    - rvm: "2.7"
+      gemfile: Gemfile.rails4
+    - rvm: jruby-9.2.6.0
+      gemfile: Gemfile.rails4
+
+cache:
+  bundler: true
+  directories:
+    - $HOME/lua51
 services:
   - redis-server
 script:
-  - sudo ./lua/install.sh 
+  - sudo ./lua/install.sh
   - $HOME/lua51/bin/busted lua/test/*
   - bundle exec rake rubocop
   - COVERBAND_HASH_REDIS_STORE=t bundle exec rake

data/Gemfile

@@ -4,6 +4,16 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in coverband.gemspec
 gemspec
+
+# add when debugging
+# require 'byebug'; byebug
+if ENV['CI']
+  # skipping pry-byebug as it has issues on Ruby 2.3 on travis
+  # and we don't really need it on CI
+else
+  gem 'pry-byebug', platforms: [:mri, :mingw, :x64_mingw]
+end
+
 gem 'rails', '~>5'
 # these gems are used for testing gem tracking
 gem 'irb', require: false

data/Gemfile.rails6

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in coverband.gemspec
+gemspec
+gem 'rails', '~>6'
+# this is used for testing gem tracking
+gem 'rainbow', require: false
+gem 'pundit'

data/README.md

@@ -7,7 +7,6 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/1e6682f9540d75f26da7/maintainability)](https://codeclimate.com/github/danmayer/coverband/maintainability)
 [![Discord Shield](https://img.shields.io/discord/609509533999562753)](https://discord.gg/KAH38EV)
 
-
 <p align="center">
   <a href="#key-features">Key Features</a> •
   <a href="#installation">Installation</a> •
@@ -116,6 +115,17 @@ The web endpoint is a barebones endpoint that you can either expose direct (afte
 - 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 lose all Coverage data but made a change that you expect would impact a particular file.
 
+### JRuby Support
+
+Coverband is compatible with JRuby. If you want to run on JRuby note that I haven't benchmarked and I believe the perf impact on oldre versions of JRuby could be significant, improved Coverage support is in [JRuby master](https://github.com/jruby/jruby/pull/6180), and will be in the next release.
+
+* older versions of JRuby need tracing enabled to work (and this could cause bad performance)
+  * run Jruby with the `--debug` option
+  * add into your `.jrubyrc` the `debug.fullTrace=true` setting
+* For best performance the `oneshot_lines` is recommended, and in the latest releases should have very low overhead
+* See JRuby support in a Rails app configured to run via JRuby, in [Coverband Demo](https://github.com/coverband-service/coverband_demo)
+* JRuby is tested via CI against Rails 5 and 6 
+
 ### Rake Tasks
 
 The rake task generates a report locally and opens a browser pointing to `coverage/index.html`.
@@ -182,7 +192,7 @@ end
 
 ### Working with environment variables
 
-Do you use figaro, mc-settings, dotenv or something else to inject environment variables into your app? If so ensure you have that done BEFORE coverband is required. 
+Do you use figaro, mc-settings, dotenv or something else to inject environment variables into your app? If so ensure you have that done BEFORE coverband is required.
 
 For example if you use dotenv, you need to do this, see https://github.com/bkeepers/dotenv#note-on-load-order
 
@@ -206,6 +216,8 @@ config.ignore +=  ['config/application.rb',
                    'lib/tasks/*']
 ```
 
+**Ignoring Custom Gem Locations:** Note, if you have your gems in a custom location under your app folder you likely want to add them to `config.ignore`. For example, if you have your gems not in a default ignored location of `app/vendor` but have them in `app/gems` you would need to add `gems/*` to your ignore list.
+
 ### View Tracking
 
 Coverband allows an optional feature to track all view files that are used by an application.
@@ -237,9 +249,32 @@ ENV['AWS_ACCESS_KEY_ID']
 ENV['AWS_SECRET_ACCESS_KEY']
 ```
 
+### Fixing Coverage Only Shows Loading Hits
+
+If all your coverage is being counted as loading or eager_loading coverage, and nothing is showing as runtime Coverage the initialization hook failed for some reason. The most likely reason for this issue is manually calling `eager_load!` on some Plugin/Gem. If you or a plugin is altering the Rails initialization process, you can manually flip Coverband to runtime coverage by calling these two lines, in an `after_initialize` block, in `application.rb`.
+
+```ruby
+config.after_initialize do
+  unless Coverband.tasks_to_ignore?
+    Coverband.report_coverage # record the last of the loading coverage
+    Coverband.runtime_coverage! # set all future coverage to runtime
+  end
+end
+```
+
+or if you know you are manually calling eager load anywhere in your initialization process immediately adfter call those two lines. A user reported an issue after calling `ResqueWeb::Engine.eager_load!` for example.
+
+```ruby
+Rails.application.routes.draw do
+  ResqueWeb::Engine.eager_load!
+  Coverband.report_coverage
+  Coverband.runtime_coverage!
+end
+```
+
 ### Avoiding Cache Stampede
 
-If you have many servers and they all hit Redis at the same time you can see spikes in your Redis CPU, and memory. This is do to a concept called [cache stampede](https://en.wikipedia.org/wiki/Cache_stampede). It is better to spread out the reporting across your servers. A simple way to do this is to add a random wiggle on your background reporting. This configuration option allows a wiggle. The right amount of wiggle depends on the numbers of servers you have and how willing you are to have delays in your coverage reporting. I would recommend at least 1 second per server. 
+If you have many servers and they all hit Redis at the same time you can see spikes in your Redis CPU, and memory. This is do to a concept called [cache stampede](https://en.wikipedia.org/wiki/Cache_stampede). It is better to spread out the reporting across your servers. A simple way to do this is to add a random wiggle on your background reporting. This configuration option allows a wiggle. The right amount of wiggle depends on the numbers of servers you have and how willing you are to have delays in your coverage reporting. I would recommend at least 1 second per server.
 
 Add a wiggle (in seconds) to the background thread to avoid all your servers reporting at the same time:
 
@@ -247,11 +282,11 @@ Add a wiggle (in seconds) to the background thread to avoid all your servers rep
 
 ### Redis Hash Store
 
-Coverband on very high volume sites with many server processes reporting can have a race condition. To resolve the race condition and reduce Ruby memory overhead we have introduced a new Redis storage option. This moves the some of the work from the Ruby processes to Redis. It is worth noting because of this, it has a larger demands on the Redis server. So adjust your Redis instance accordingly. To help reduce the extra redis load you can also change the background reporting time period. 
+Coverband on very high volume sites with many server processes reporting can have a race condition. To resolve the race condition and reduce Ruby memory overhead we have introduced a new Redis storage option. This moves the some of the work from the Ruby processes to Redis. It is worth noting because of this, it has a larger demands on the Redis server. So adjust your Redis instance accordingly. To help reduce the extra redis load you can also change the background reporting time period.
 
-* set the new Redis store: `config.store = Coverband::Adapters::HashRedisStore.new(Redis.new(url: redis_url))`
-* adjust from default 30s reporting `config.background_reporting_sleep_seconds = 120`
-* reminder it is recommended to have a unique Redis per workload (background jobs, caching, Coverband), for this store, it may be more important to have a dedicated Redis.
+- set the new Redis store: `config.store = Coverband::Adapters::HashRedisStore.new(Redis.new(url: redis_url))`
+- adjust from default 30s reporting `config.background_reporting_sleep_seconds = 120`
+- reminder it is recommended to have a unique Redis per workload (background jobs, caching, Coverband), for this store, it may be more important to have a dedicated Redis.
 
 ### Clear Coverage
 
@@ -289,7 +324,7 @@ rake coverband:coverage      # report runtime coverband code coverage
 
 ### 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.
+**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.
 
@@ -353,7 +388,7 @@ If you are trying to debug locally wondering what code is being run during a req
 
 ### Ruby and Rails Version Support
 
-We will match Heroku & Ruby's support lifetime, supporting the last 3 major Ruby releases. For details see [supported runtimes](https://devcenter.heroku.com/articles/ruby-support#supported-runtimes). 
+We will match Heroku & Ruby's support lifetime, supporting the last 3 major Ruby releases. For details see [supported runtimes](https://devcenter.heroku.com/articles/ruby-support#supported-runtimes).
 
 For Rails, we will follow the policy of the [Rails team maintenance policy](https://guides.rubyonrails.org/maintenance_policy.html). We officially support the last two major release versions, while providing minimal support (major bugs / security fixes) for an additional version. This means at the moment we primaryly target Rails 6.x, 5.x, and will try to keep current functionality working for Rails 4.x but may release new features that do not work on that target.
 
@@ -374,7 +409,7 @@ If you submit a change please make sure the tests and benchmarks are passing.
 
 - run tests:
   - `bundle exec rake`
-  - `BUNDLE_GEMFILE=Gemfile.rails4 bundle exec rake` (Same tests using rails 4 instead of 5)
+  - `BUNDLE_GEMFILE=Gemfile.rails6 bundle exec rake` (Same tests using rails 6 instead of 5)
 - view test coverage: `open coverage/index.html`
 - run the benchmarks before and after your change to see impact
   - `rake benchmarks`
@@ -385,6 +420,7 @@ If you submit a change please make sure the tests and benchmarks are passing.
 - **total fail** on front end code, for line for line coverage, because of the precompiled template step basically coverage doesn't work well for `erb`, `slim`, and the like.
   - related it will try to report something, but the line numbers reported for `ERB` files are often off and aren't considered useful. I recommend filtering out .erb using the `config.ignore` option. The default configuration excludes these files
   - **NOTE:** We now have file level coverage for view files, but don't support line level detail
+  - The view file detection doesn't workf or mailers at the moment only for web related views / JSON templates. This is due to how Rails active mailer notifications work.
 
 ### Debugging Redis Store
 

data/Rakefile

@@ -22,9 +22,13 @@ Rake::TestTask.new(:test) do |test|
 end
 
 Rake::TestTask.new(:forked_tests) do |test|
-  test.libs << 'lib' << 'test'
-  test.test_files = FileList['test/forked/**/*_test.rb']
-  test.verbose = true
+  if RUBY_PLATFORM == 'java'
+    puts 'forked tests not supported on JRuby'
+  else
+    test.libs << 'lib' << 'test'
+    test.test_files = FileList['test/forked/**/*_test.rb']
+    test.verbose = true
+  end
 end
 
 desc 'load irb with this gem'

data/changes.md

@@ -76,6 +76,18 @@ Feature Ideas:
 
 # Alpha / Beta / Release Candidates
 
+### Coverband 4.2.6
+
+- Address Redis `exists` deprecation warning by baffers
+
+### Coverband 4.2.5
+
+- alpha support of jRuby
+- fix for rails 4.0 by rswaminathan
+- do not error on branch coverage / simplecov compatibility by desertcart
+
+# Released
+
 ### Coverband 4.2.4
 
 - fixes related to startup without Redis, skipping Coverband on common rake tasks (assets:precompile), etc
@@ -87,8 +99,8 @@ Feature Ideas:
 - added support to download coverage and view data in JSON format
 - documentation about working with environment variables
 - add cache wiggle to avoid Redis CPU spikes (cache stampede on Redis server)
-
-# Released
+- make the nocov consistant on the data download and html view
+- small performance improvements
 
 ### Coverband 4.2.3
 
@@ -98,19 +110,18 @@ Feature Ideas:
 - improved messaging around non-loaded files
 - fix on last updated nil issue
 - view tracker improvements
-   - clear all
-   - reset individual file
-   - timestamps on last seen activity
-
+  - clear all
+  - reset individual file
+  - timestamps on last seen activity
 
 ### Coverband 4.2.2
 
 - new experimental hash redis store for high volume collection
-(hundreds of clients), thanks @kbaum
+  (hundreds of clients), thanks @kbaum
 - view_tracker supports tracking view layer files like `.html.erb`
 - documentation improvements, thanks @brossetti1, @jjb, @kbaum
 - we now have discordapp for discussions, thanks @kbaum,
-https://discordapp.com/channels/609509533999562753/609509533999562756
+  https://discordapp.com/channels/609509533999562753/609509533999562756
 - perf fix on Rails initialization, thanks @skangg
 - simplified logging
 

data/coverband.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.version       = Coverband::VERSION
   spec.authors       = ['Dan Mayer', 'Karl Baum']
   spec.email         = ['dan@mayerdan.com']
-  spec.description   = 'Rack middleware to help measure production code usage (LOC runtime usage)'
-  spec.summary       = 'Rack middleware to help measure production code usage (LOC runtime usage)'
+  spec.description   = 'Rack middleware to measure production code usage (LOC runtime usage)'
+  spec.summary       = 'Rack middleware to measure production code usage (LOC runtime usage)'
   spec.homepage      = 'https://github.com/danmayer/coverband'
   spec.license       = 'MIT'
 
@@ -35,12 +35,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'resque'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-performance'
 
   spec.add_development_dependency 'coveralls'
-  # add when debugging
-  # require 'byebug'; byebug
-  spec.add_development_dependency 'pry-byebug'
-
   spec.add_development_dependency 'minitest-profile'
 
   # TODO: Remove when other production adapters exist

data/lib/coverband.rb

@@ -100,6 +100,7 @@ module Coverband
   end
   unless ENV['COVERBAND_DISABLE_AUTO_START']
     begin
+      require 'coverband/utils/jruby_ext' if RUBY_PLATFORM == 'java'
       # Coverband should be setup as early as possible
       # to capture usage of things loaded by initializers or other Rails engines
       configure

data/lib/coverband/adapters/hash_redis_store.rb

@@ -22,6 +22,7 @@ module Coverband
       def initialize(redis, opts = {})
         super()
         @redis_namespace = opts[:redis_namespace]
+        @save_report_batch_size = opts[:save_report_batch_size] || 100
         @format_version = REDIS_STORAGE_FORMAT_VERSION
         @redis = redis
         raise 'HashRedisStore requires redis >= 2.6.0' unless supported?
@@ -58,31 +59,38 @@ module Coverband
         report_time = Time.now.to_i
         updated_time = type == Coverband::EAGER_TYPE ? nil : report_time
         keys = []
-        files_data = report.map do |file, data|
-          relative_file = @relative_file_converter.convert(file)
-          file_hash = file_hash(relative_file)
-          key = key(relative_file, file_hash: file_hash)
-          keys << key
-          script_input(
-            key: key,
-            file: relative_file,
-            file_hash: file_hash,
-            data: data,
-            report_time: report_time,
-            updated_time: updated_time
-          )
+        report.each_slice(@save_report_batch_size) do |slice|
+          files_data = slice.map do |(file, data)|
+            relative_file = @relative_file_converter.convert(file)
+            file_hash = file_hash(relative_file)
+            key = key(relative_file, file_hash: file_hash)
+            keys << key
+            script_input(
+              key: key,
+              file: relative_file,
+              file_hash: file_hash,
+              data: data,
+              report_time: report_time,
+              updated_time: updated_time
+            )
+          end
+          next unless files_data.any?
+
+          arguments_key = [@redis_namespace, SecureRandom.uuid].compact.join('.')
+          @redis.set(arguments_key, { ttl: @ttl, files_data: files_data }.to_json, ex: JSON_PAYLOAD_EXPIRATION)
+          @redis.evalsha(hash_incr_script, [arguments_key])
         end
-        return unless keys.any?
-
-        arguments_key = [@redis_namespace, SecureRandom.uuid].compact.join('.')
-        @redis.set(arguments_key, { ttl: @ttl, files_data: files_data }.to_json, ex: JSON_PAYLOAD_EXPIRATION)
-        @redis.evalsha(hash_incr_script, [arguments_key])
-        @redis.sadd(files_key, keys)
+        @redis.sadd(files_key, keys) if keys.any?
       end
 
       def coverage(local_type = nil)
-        files_set(local_type).each_with_object({}) do |key, hash|
-          add_coverage_for_file(key, hash)
+        files_set = files_set(local_type)
+        @redis.pipelined do
+          files_set.map do |key|
+            @redis.hgetall(key)
+          end
+        end.each_with_object({}) do |data_from_redis, hash|
+          add_coverage_for_file(data_from_redis, hash)
         end
       end
 
@@ -100,9 +108,7 @@ module Coverband
 
       private
 
-      def add_coverage_for_file(key, hash)
-        data_from_redis = @redis.hgetall(key)
-
+      def add_coverage_for_file(data_from_redis, hash)
         return if data_from_redis.empty?
 
         file = data_from_redis[FILE_KEY]
@@ -133,7 +139,7 @@ module Coverband
           file_length: data.length,
           hash_key: key
         }
-        meta.merge!(last_updated_at: updated_time) if updated_time
+        meta[:last_updated_at] = updated_time if updated_time
         {
           hash_key: key,
           meta: meta,

data/lib/coverband/collectors/coverage.rb

@@ -89,12 +89,17 @@ module Coverband
         raise NotImplementedError, 'Coverage needs Ruby > 2.3.0' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
 
         require 'coverage'
-        if Coverage.ruby_version_greater_than_or_equal_to?('2.6.0')
-          ::Coverage.start(oneshot_lines: Coverband.configuration.use_oneshot_lines_coverage) unless ::Coverage.running?
-        elsif Coverage.ruby_version_greater_than_or_equal_to?('2.5.0')
-          ::Coverage.start unless ::Coverage.running?
+        if defined?(SimpleCov) && defined?(Rails) && defined?(Rails.env) && Rails.env.test?
+          puts "Coverband: detected SimpleCov in test Env, allowing it to start Coverage"
+          puts "Coverband: to ensure no error logs or missing Coverage call `SimpleCov.start` prior to requiring Coverband"
         else
-          ::Coverage.start
+          if Coverage.ruby_version_greater_than_or_equal_to?('2.6.0')
+            ::Coverage.start(oneshot_lines: Coverband.configuration.use_oneshot_lines_coverage) unless ::Coverage.running?
+          elsif Coverage.ruby_version_greater_than_or_equal_to?('2.5.0')
+            ::Coverage.start unless ::Coverage.running?
+          else
+            ::Coverage.start
+          end
         end
         reset_instance
       end

data/lib/coverband/collectors/delta.rb

@@ -44,11 +44,17 @@ module Coverband
       private
 
       def generate
+        # TODO: if we filtered before doing this we would avoid calculating the line diff on a ton of files
+        # This would be a fairly noticeable perf win
         current_coverage.each_with_object({}) do |(file, line_counts), new_results|
+          # This handles Coverage branch support, setup by default in
+          # simplecov 0.18.x
+          arr_line_counts = line_counts.is_a?(Hash) ? line_counts[:lines] : line_counts
           new_results[file] = if @@previous_coverage && @@previous_coverage[file]
-                                array_diff(line_counts, @@previous_coverage[file])
+                                prev_line_counts = @@previous_coverage[file].is_a?(Hash) ? @@previous_coverage[file][:lines] : @@previous_coverage[file]
+                                array_diff(arr_line_counts, prev_line_counts)
                               else
-                                line_counts
+                                arr_line_counts
                               end
         end
       end

data/lib/coverband/collectors/view_tracker.rb

@@ -108,7 +108,7 @@ module Coverband
       end
 
       def report_views_tracked
-        redis_store.set(tracker_time_key, Time.now.to_i) unless @one_time_timestamp || redis_store.exists(tracker_time_key)
+        redis_store.set(tracker_time_key, Time.now.to_i) unless @one_time_timestamp || tracker_time_key_exists?
         @one_time_timestamp = true
         reported_time = Time.now.to_i
         views_to_record.each do |file|
@@ -145,6 +145,14 @@ module Coverband
         store.raw_store
       end
 
+      def tracker_time_key_exists?
+        if defined?(redis_store.exists?)
+          redis_store.exists?(tracker_time_key)
+        else
+          redis_store.exists(tracker_time_key)
+        end
+      end
+
       def tracker_key
         'render_tracker_2'
       end

data/lib/coverband/configuration.rb

@@ -54,7 +54,7 @@ module Coverband
       @root = Dir.pwd
       @root_paths = []
       @ignore = IGNORE_DEFAULTS.dup
-      @seach_paths = TRACKED_DEFAULT_PATHS.dup
+      @search_paths = TRACKED_DEFAULT_PATHS.dup
       @additional_files = []
       @verbose = false
       @reporter = 'scov'
@@ -134,14 +134,14 @@ module Coverband
     # Search Paths
     ###
     def tracked_search_paths
-      "#{Coverband.configuration.current_root}/{#{@seach_paths.join(',')}}/**/*.{rb}"
+      "#{Coverband.configuration.current_root}/{#{@search_paths.join(',')}}/**/*.{rb}"
     end
 
     ###
     # Don't allow the to override defaults
     ###
     def search_paths=(path_array)
-      @seach_paths = (@seach_paths + path_array).uniq
+      @search_paths = (@search_paths + path_array).uniq
     end
 
     ###

data/lib/coverband/reporters/html_report.rb

@@ -32,6 +32,10 @@ module Coverband
         end
       end
 
+      def report_data
+        report_dynamic_data
+      end
+
       private
 
       def static?
@@ -54,6 +58,12 @@ module Coverband
                                             base_path: base_path,
                                             notice: notice).format_dynamic_html!
       end
+
+      def report_dynamic_data
+        Coverband::Utils::HTMLFormatter.new(filtered_report_files,
+                                            base_path: base_path,
+                                            notice: notice).format_dynamic_data!
+      end
     end
   end
 end

data/lib/coverband/reporters/web.rb

@@ -32,8 +32,9 @@ module Coverband
 
         return [401, { 'www-authenticate' => 'Basic realm=""' }, ['']] unless check_auth
 
+        request_path_info = (request.path_info == '') ? '/' : request.path_info
         if request.post?
-          case request.path_info
+          case request_path_info
           when %r{\/clear_view_tracking_file}
             clear_view_tracking_file
           when %r{\/clear_view_tracking}
@@ -46,7 +47,7 @@ module Coverband
             [404, { 'Content-Type' => 'text/html' }, ['404 error!']]
           end
         else
-          case request.path_info
+          case request_path_info
           when /.*\.(css|js|gif|png)/
             @static.call(env)
           when %r{\/settings}
@@ -55,6 +56,8 @@ module Coverband
             [200, { 'Content-Type' => 'text/json' }, [view_tracker_data]]
           when %r{\/view_tracker}
             [200, { 'Content-Type' => 'text/html' }, [view_tracker]]
+          when %r{\/enriched_debug_data}
+            [200, { 'Content-Type' => 'text/json' }, [enriched_debug_data]]
           when %r{\/debug_data}
             [200, { 'Content-Type' => 'text/json' }, [debug_data]]
           when %r{\/load_file_details}
@@ -97,6 +100,14 @@ module Coverband
         Coverband.configuration.store.get_coverage_report.to_json
       end
 
+      def enriched_debug_data
+        Coverband::Reporters::HTMLReport.new(Coverband.configuration.store,
+                                             static: false,
+                                             base_path: base_path,
+                                             notice: '',
+                                             open_report: false).report_data
+      end
+
       def load_file_details
         filename = request.params['filename']
         Coverband::Reporters::HTMLReport.new(Coverband.configuration.store,

data/lib/coverband/utils/html_formatter.rb

@@ -29,6 +29,10 @@ module Coverband
         format_html(@coverage_result)
       end
 
+      def format_dynamic_data!
+        format_data(@coverage_result)
+      end
+
       def format_settings!
         format_settings
       end
@@ -71,6 +75,10 @@ module Coverband
         template('layout').result(binding)
       end
 
+      def format_data(result)
+        template('data').result(binding)
+      end
+
       # Returns the an erb instance for the template of given name
       def template(name)
         ERB.new(File.read(File.join(File.dirname(__FILE__), '../../../views/', "#{name}.erb")))

data/lib/coverband/utils/jruby_ext.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+####
+# This exists in CRuby, but not in JRuby, so add it
+#
+# Taken from: https://github.com/ruby/ruby/blob/c5eb24349a4535948514fe765c3ddb0628d81004/ext/coverage/lib/coverage.rb
+####
+module Coverage
+  def self.line_stub(file)
+    lines = File.foreach(file).map { nil }
+    iseqs = [RubyVM::InstructionSequence.compile_file(file)]
+    until iseqs.empty?
+      iseq = iseqs.pop
+      iseq.trace_points.each { |n, type| lines[n - 1] = 0 if type == :line }
+      iseq.each_child { |child| iseqs << child }
+    end
+    lines
+  end
+end

data/lib/coverband/utils/s3_report.rb

@@ -28,7 +28,6 @@ module Coverband
         rescue StandardError
           err_msg = 'Coverband requires aws-sdk in order use S3Report.'
           Coverband.configuration.logger&.error err_msg
-          return
         end
       end
 

data/lib/coverband/version.rb

@@ -5,5 +5,5 @@
 # use format '4.2.1.rc.1' ~> 4.2.1.rc to prerelease versions like v4.2.1.rc.2 and v4.2.1.rc.3
 ###
 module Coverband
-  VERSION = '4.2.4.rc.3'
+  VERSION = '4.2.6'
 end

data/lua/install.sh

@@ -1,16 +1,13 @@
 #!/bin/bash
 
 LUA_DIR="$HOME/lua51"
-BUSTED="$LUA_DIR/bin/busted"
+LUA="$LUA_DIR/bin/lua"
 
-if [ -f "$BUSTED" ]
-then
-  echo "$BUSTED already exists"
-  exit 0
+if [ ! -f $LUA ]; then
+  echo "Installing lua"
+  pip install hererocks
+  hererocks $LUA_DIR -l5.1 -rlatest
 fi
-
-pip install hererocks
-hererocks $LUA_DIR -l5.1 -rlatest
 source $LUA_DIR/bin/activate
 lua -v
 for i in luacov busted redis-lua inspect lua-cjson; do 

data/test/benchmarks/benchmark.rake

@@ -247,7 +247,7 @@ namespace :benchmarks do
 
   desc 'checks memory of collector'
   task memory_check: [:setup] do
-    require 'pry-byebug'
+    # require 'pry-byebug'
     require 'objspace'
     puts 'memory load check'
     puts(ObjectSpace.memsize_of_all / 2**20)
@@ -337,7 +337,7 @@ namespace :benchmarks do
     require 'memory_profiler'
     require './test/unique_files'
 
-    4000.times { |index| require_unique_file('dog.rb.erb', dog_number: index) }
+    4000.times { |index| require_unique_file('big_dog.rb.erb', dog_number: index) }
     # warmup
     3.times { Coverband.report_coverage }
     dogs = 400.times.map { |index| Object.const_get("Dog#{index}") }

data/test/big_dog.rb.erb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class Dog<%=dog_number%>
+
+  def self.bark
+    new.bark
+  end
+
+  def bark
+    'woof'
+  end
+end

data/test/coverband/collectors/delta_test.rb

@@ -49,6 +49,21 @@ class CollectorsDeltaTest < Minitest::Test
     assert_equal(current_coverage, results)
   end
 
+  test 'Coverage has branching enabled and has gone up' do
+    current_coverage = {
+      'car.rb' => { lines: [nil, 1, 5, 1] }
+    }
+    ::Coverage.expects(:peek_result).returns(current_coverage)
+    results = Coverband::Collectors::Delta.results
+
+    current_coverage = {
+      'car.rb' => { lines: [nil, 1, 7, 1] }
+    }
+    ::Coverage.expects(:peek_result).returns(current_coverage)
+    results = Coverband::Collectors::Delta.results
+    assert_equal({ 'car.rb' => [nil, 0, 2, 0] }, results)
+  end
+
   if Coverband.configuration.one_shot_coverage_implemented_in_ruby_version?
     test 'oneshot coverage calls clear' do
       Coverband.configuration.stubs(:use_oneshot_lines_coverage).returns(true)

data/test/coverband/integrations/resque_worker_test.rb

@@ -35,7 +35,13 @@ class ResqueWorkerTest < Minitest::Test
     Coverband.runtime_coverage!
     report = Coverband.configuration.store.get_coverage_report
 
-    assert_equal 0, report[Coverband::EAGER_TYPE][relative_job_file]['data'][6]
-    assert_equal 1, report[Coverband::RUNTIME_TYPE][relative_job_file]['data'][6]
+    if RUBY_PLATFORM == 'java'
+      # NOTE: the todo test only issue seems to be slightly different in JRuby
+      # were nothing is showing up as runtime Coverage... This appears to be a test only issue
+      assert_equal 1, report[Coverband::EAGER_TYPE][relative_job_file]['data'][6]
+    else
+      assert_equal 0, report[Coverband::EAGER_TYPE][relative_job_file]['data'][6]
+      assert_equal 1, report[Coverband::RUNTIME_TYPE][relative_job_file]['data'][6]
+    end
   end
 end

data/test/coverband/reporters/web_test.rb

@@ -27,6 +27,12 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
         assert_match 'Coverband Admin', last_response.body
       end
 
+      test 'renders index content for empty path' do
+        get ''
+        assert last_response.ok?
+        assert_match 'Coverband Admin', last_response.body
+      end
+
       test 'renders 404' do
         get '/show'
         assert last_response.not_found?

data/test/dog.rb.erb

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
 class Dog<%=dog_number%>
-
-  def self.bark
-    new.bark
-  end
-
   def bark
     'woof'
   end

data/test/jruby_check.rb

@@ -0,0 +1,14 @@
+require 'coverage'
+
+Coverage.start
+
+require './test/dog.rb'
+
+puts Coverage.peek_result
+
+puts Dog.new.bark
+
+puts Coverage.peek_result
+
+puts "done"
+

data/test/rails6_dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative 'config/application'
+
+Rails.application.load_tasks

data/test/rails6_dummy/app/controllers/dummy_controller.rb

@@ -0,0 +1,5 @@
+class DummyController < ActionController::Base
+  def show
+    render plain: "I am no dummy"
+  end
+end

data/test/rails6_dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run Rails.application

data/test/rails6_dummy/config/application.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require File.expand_path('boot', __dir__)
+
+require 'rails'
+require 'action_controller/railtie'
+require 'coverband'
+Bundler.require(*Rails.groups)
+
+module Rails6Dummy
+  class Application < Rails::Application
+    config.eager_load = true
+  end
+end

data/test/rails6_dummy/config/boot.rb

@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/test/rails6_dummy/config/coverband.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative '../../rails5_dummy/config/coverband'

data/test/rails6_dummy/config/coverband_missing_redis.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative '../../rails5_dummy/config/coverband_missing_redis'

data/test/rails6_dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/test/rails6_dummy/config/routes.rb

@@ -0,0 +1,4 @@
+Rails.application.routes.draw do
+  get 'dummy/show'
+  mount Coverband::Reporters::Web.new, at: '/coverage'
+end

data/test/rails6_dummy/config/secrets.yml

@@ -0,0 +1,3 @@
+test:
+  secret_key_base: 8080f2894307a3dcf72127c0a279a729c58c7c10c11a15de761c8e16017e0e478647d1a7ac11bf143730cac7b6901fa000428c6b4873d9298250f8ca4657b5c6
+

data/test/test_helper.rb

@@ -15,7 +15,7 @@ require 'ostruct'
 require 'json'
 require 'redis'
 require 'resque'
-require 'pry-byebug'
+# require 'pry-byebug' unless ENV['CI'] # Ruby 2.3 on CI crashes on pry & JRuby doesn't support it
 require_relative 'unique_files'
 $VERBOSE = original_verbosity
 

data/test/unique_files.rb

@@ -20,6 +20,12 @@ def require_unique_file(file = 'dog.rb', variables = {})
   Coverband::Utils::RelativeFileConverter.convert(File.expand_path(temp_file))
 end
 
+@@dogs = 0
+def require_class_unique_file
+  @@dogs +=1
+  require_unique_file('dog.rb.erb', dog_number: @@dogs)
+end
+
 def remove_unique_files
   FileUtils.rm_r(UNIQUE_FILES_DIR) if File.exist?(UNIQUE_FILES_DIR)
 end

data/views/data.erb

@@ -0,0 +1 @@
+<%= result.source_files.to_json %>

data/views/nav.erb

@@ -6,7 +6,8 @@
     <%= button("#{base_path}clear", 'clear coverage report', delete: true) %>
   <% end %>
   <% if Coverband.configuration.web_debug %>
-    <a href='<%= base_path %>debug_data'>Coverage Data</a> &nbsp;
+    <a href='<%= base_path %>debug_data'>Debug Data</a> &nbsp;
+    <a href='<%= base_path %>enriched_debug_data'>Coverage Data</a> &nbsp;
   <% end %>
 </div>
 <% if notice.to_s.length > 0 %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 4.2.4.rc.3
+  version: 4.2.6
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -194,7 +194,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -208,7 +208,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +249,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Rack middleware to help measure production code usage (LOC runtime usage)
+description: Rack middleware to measure production code usage (LOC runtime usage)
 email:
 - dan@mayerdan.com
 executables: []
@@ -257,11 +257,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".jrubyrc"
 - ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.rails4
+- Gemfile.rails6
 - LICENSE
 - LICENSE.txt
 - README.md
@@ -295,6 +297,7 @@ files:
 - lib/coverband/utils/file_list.rb
 - lib/coverband/utils/gem_list.rb
 - lib/coverband/utils/html_formatter.rb
+- lib/coverband/utils/jruby_ext.rb
 - lib/coverband/utils/lines_classifier.rb
 - lib/coverband/utils/railtie.rb
 - lib/coverband/utils/relative_file_converter.rb
@@ -342,6 +345,7 @@ files:
 - test/benchmarks/dog.rb
 - test/benchmarks/graph_bench.sh
 - test/benchmarks/init_rails.rake
+- test/big_dog.rb.erb
 - test/coverband/adapters/base_test.rb
 - test/coverband/adapters/file_store_test.rb
 - test/coverband/adapters/hash_redis_store_test.rb
@@ -388,6 +392,7 @@ files:
 - test/forked/rails_full_stack_test.rb
 - test/forked/rails_rake_full_stack_test.rb
 - test/integration/full_stack_test.rb
+- test/jruby_check.rb
 - test/rails4_dummy/Rakefile
 - test/rails4_dummy/app/controllers/dummy_controller.rb
 - test/rails4_dummy/config.ru
@@ -408,9 +413,21 @@ files:
 - test/rails5_dummy/config/environment.rb
 - test/rails5_dummy/config/routes.rb
 - test/rails5_dummy/tmp/.keep
+- test/rails6_dummy/Rakefile
+- test/rails6_dummy/app/controllers/dummy_controller.rb
+- test/rails6_dummy/config.ru
+- test/rails6_dummy/config/application.rb
+- test/rails6_dummy/config/boot.rb
+- test/rails6_dummy/config/coverband.rb
+- test/rails6_dummy/config/coverband_missing_redis.rb
+- test/rails6_dummy/config/environment.rb
+- test/rails6_dummy/config/routes.rb
+- test/rails6_dummy/config/secrets.yml
+- test/rails6_dummy/tmp/.keep
 - test/rails_test_helper.rb
 - test/test_helper.rb
 - test/unique_files.rb
+- views/data.erb
 - views/file_list.erb
 - views/gem_list.erb
 - views/layout.erb
@@ -434,14 +451,14 @@ 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: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Rack middleware to help measure production code usage (LOC runtime usage)
+summary: Rack middleware to measure production code usage (LOC runtime usage)
 test_files:
 - test/benchmarks/.gitignore
 - test/benchmarks/benchmark.rake
@@ -449,6 +466,7 @@ test_files:
 - test/benchmarks/dog.rb
 - test/benchmarks/graph_bench.sh
 - test/benchmarks/init_rails.rake
+- test/big_dog.rb.erb
 - test/coverband/adapters/base_test.rb
 - test/coverband/adapters/file_store_test.rb
 - test/coverband/adapters/hash_redis_store_test.rb
@@ -495,6 +513,7 @@ test_files:
 - test/forked/rails_full_stack_test.rb
 - test/forked/rails_rake_full_stack_test.rb
 - test/integration/full_stack_test.rb
+- test/jruby_check.rb
 - test/rails4_dummy/Rakefile
 - test/rails4_dummy/app/controllers/dummy_controller.rb
 - test/rails4_dummy/config.ru
@@ -515,6 +534,17 @@ test_files:
 - test/rails5_dummy/config/environment.rb
 - test/rails5_dummy/config/routes.rb
 - test/rails5_dummy/tmp/.keep
+- test/rails6_dummy/Rakefile
+- test/rails6_dummy/app/controllers/dummy_controller.rb
+- test/rails6_dummy/config.ru
+- test/rails6_dummy/config/application.rb
+- test/rails6_dummy/config/boot.rb
+- test/rails6_dummy/config/coverband.rb
+- test/rails6_dummy/config/coverband_missing_redis.rb
+- test/rails6_dummy/config/environment.rb
+- test/rails6_dummy/config/routes.rb
+- test/rails6_dummy/config/secrets.yml
+- test/rails6_dummy/tmp/.keep
 - test/rails_test_helper.rb
 - test/test_helper.rb
 - test/unique_files.rb