coverband 6.1.0 → 6.1.2.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21e62f4add1bcd44cacd630e37e291a38ecfb924d8fa48698ecbe4ba69a99471
-  data.tar.gz: 4cc4dfd1289bdf13f77c78a7deb399c18075ec53a835abb45fa11011d0815bd4
+  metadata.gz: 5432cf1cd61639c5d7cbf9e2821dd17ce3db882ef44694302b11b0c3f899a23d
+  data.tar.gz: abfd4a6cd427e46656e7d8bd33e7e97a26617e19d7868c03a10e8612b7a41ff3
 SHA512:
-  metadata.gz: 2bcf294b5d07fc508b1468b0e3a2d993d15b1dae067bd147ca1d55ebc444cf6f7157fbd6e5afee205a7fa9e3648bee9fdab66cec6573ff31605c417346c858a3
-  data.tar.gz: 282523aea85ea90943c6a8bbf595a3c135f7a95534ac2046ccfeb379cea252ad4889b3e31799de8917b3b989a9492f55fee032f302f8aa8a8c619e870941c79c
+  metadata.gz: 8c85138cc11053800b739780e69ea459473683f114b76319d3334ddbf6732287458948817e6f650a1dece4be57022f5b30385b24422c6de8d9bbb45077029de2
+  data.tar.gz: d9f8829248d15dd0159824c45eab9ffc3c286f2e357ef76665305db2dfca434c6f6c9184808dd9b8d421fd98c4ada3c6ee3ac5a1afba69d9f10f46608b42d61e

data/changes.md

@@ -1,3 +1,7 @@
+### Coverband 6.1.1
+
+* Performance fix making paged report loading 10X faster
+
 ### Coverband 6.1.0
 
 This release has a number of smaller fixes and improvements. It includes a sizable refactoring around the UI which should simplify improvements going forward. This release is mostly targetting large projects with 6K+ ruby files, use the new `config.paged_reporting = true` option with the HashRedisStore to enable paged reporting for large projects. The HashRedisStore now also includes the last time a line in a file was executed.

data/coverband.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "memory_profiler"
   # breaking change in minitest and mocha...
   # note: we are also adding 'spy' as mocha doesn't want us to spy on redis calls...
+  spec.add_development_dependency "spy"
   # ^^^ probably need a large test cleanup refactor
   spec.add_development_dependency "minitest", "= 5.18.1"
   spec.add_development_dependency "minitest-fork_executor"

data/lib/coverband/adapters/hash_redis_store.rb

@@ -231,14 +231,14 @@ module Coverband
           end
         end
 
+        # NOTE: This is kind of hacky, we find all the matching eager loading data
+        # for current page of runtime data.
         eager_key_pre = key_prefix(Coverband::EAGER_TYPE)
         runtime_key_pre = key_prefix(Coverband::RUNTIME_TYPE)
-        matched_file_set = files_set(Coverband::EAGER_TYPE)
-          .select do |eager_key, _val|
-          runtime_file_set.any? do |runtime_key|
-            (eager_key.sub(eager_key_pre, "") == runtime_key.sub(runtime_key_pre, ""))
-          end
-        end || []
+        matched_file_set = runtime_file_set.map do |runtime_key|
+          runtime_key.sub(runtime_key_pre, eager_key_pre)
+        end
+
         hash_data[Coverband::EAGER_TYPE] = matched_file_set.each_slice(page_size).flat_map do |key_batch|
           @redis.pipelined do |pipeline|
             key_batch.each do |key|
@@ -246,6 +246,7 @@ module Coverband
             end
           end
         end
+
         hash_data[Coverband::RUNTIME_TYPE] = hash_data[Coverband::RUNTIME_TYPE].each_with_object({}) do |data_from_redis, hash|
           add_coverage_for_file(data_from_redis, hash)
         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 = "6.1.0"
+  VERSION = "6.1.2.rc.1"
 end

data/public/application.js

@@ -1,4 +1,4 @@
-$(document).ready(function() {
+$(document).ready(function () {
   // remove the url params like notice=message so they don't stick around
   window.history.replaceState(
     "object or string",
@@ -9,7 +9,7 @@ $(document).ready(function() {
     .delay(3000)
     .fadeOut("slow");
 
-  $(".del").click(function() {
+  $(".del").click(function () {
     if (!confirm("Do you want to delete")) {
       return false;
     }
@@ -42,7 +42,7 @@ $(document).ready(function() {
     var total_rows = 0;
     var page = 1;
     var all_data = [];
-    
+
     // load and render page content before we start the loop
     // perhaps move this into a datatable ready event
     $(".dataTables_empty").html("loading...");
@@ -55,14 +55,14 @@ $(document).ready(function() {
         url: `${$(".file_list").data("coverageurl")}/report_json?page=${page}`,
         type: 'GET',
         dataType: 'json',
-        success: function(data) {
+        success: function (data) {
           total_rows = data["iTotalRecords"];
           all_data = all_data.concat(data["aaData"]);
           $(".dataTables_empty").html("loading... on " + all_data.length + " of " + total_rows + " files");
           page += 1;
-;
-          // the page less than 100 is to stop infinite loop in case of folks never clearing out old coverage reports
-          if (page < 50 && all_data.length < total_rows) {
+
+          // the page less than 50 is to stop infinite loop in case of folks never clearing out old coverage reports
+          if (page < 50 && all_data.length <= total_rows && data["aaData"].length > 0) {
             setTimeout(() => {
               get_page(page);
             }, 10);
@@ -81,28 +81,28 @@ $(document).ready(function() {
   }
 
   src_link_click = (trigger_element) => {
-      var loader_url = $(trigger_element).attr("data-loader-url");
-      auto_click_anchor = null;
-      $(trigger_element).colorbox(jQuery.extend(colorbox_options, { href: loader_url}));
-    };
+    var loader_url = $(trigger_element).attr("data-loader-url");
+    auto_click_anchor = null;
+    $(trigger_element).colorbox(jQuery.extend(colorbox_options, { href: loader_url }));
+  };
 
   var colorbox_options = {
     transition: "none",
     opacity: 1,
     width: "95%",
     height: "95%",
-    onLoad: function() {
+    onLoad: function () {
       // If not highlighted yet, do it!
       var source_table = $(".shared_source_table");
       if (!source_table.hasClass("highlighted")) {
-        source_table.find("pre code").each(function(i, e) {
+        source_table.find("pre code").each(function (i, e) {
           hljs.highlightBlock(e, "  ");
         });
         source_table.addClass("highlighted");
       }
       window.location.hash = this.href.split("#")[1];
     },
-    onCleanup: function() {
+    onCleanup: function () {
       window.location.hash = $(".group_tabs a:first").attr("href");
     }
   }
@@ -112,7 +112,7 @@ $(document).ready(function() {
   $(".file_list_container").hide();
 
   // Add tabs based upon existing file_list_containers
-  $(".file_list_container h2").each(function() {
+  $(".file_list_container h2").each(function () {
     var container_id = $(this)
       .parent()
       .attr("id");
@@ -132,16 +132,16 @@ $(document).ready(function() {
 
     $(".group_tabs").append(
       '<li><a href="#' +
-        container_id +
-        '">' +
-        group_name +
-        " " +
-        covered_percent +
-        "</a></li>"
+      container_id +
+      '">' +
+      group_name +
+      " " +
+      covered_percent +
+      "</a></li>"
     );
   });
 
-  $(".group_tabs a").each(function() {
+  $(".group_tabs a").each(function () {
     $(this).addClass(
       $(this)
         .attr("href")
@@ -150,12 +150,12 @@ $(document).ready(function() {
   });
 
   // Make sure tabs don't get ugly focus borders when active
-  $(".group_tabs a").live("focus", function() {
+  $(".group_tabs a").live("focus", function () {
     $(this).blur();
   });
 
   var favicon_path = $('link[rel="shortcut icon"]').attr("href");
-  $(".group_tabs a").live("click", function() {
+  $(".group_tabs a").live("click", function () {
     if (
       !$(this)
         .parent()
@@ -169,7 +169,7 @@ $(document).ready(function() {
         .addClass("active");
     }
     $(".file_list_container").hide();
-    $(".file_list_container" + $(this).attr("href")).show(function() {
+    $(".file_list_container" + $(this).attr("href")).show(function () {
       // If we have an anchor to click, click it
       // allow rendering to complete before we click the anchor
       setTimeout(() => {
@@ -186,14 +186,14 @@ $(document).ready(function() {
           .attr("href")
           .replace("#", "#_");
     }
-  
+
     // Force favicon reload - otherwise the location change containing anchor would drop the favicon...
     // Works only on firefox, but still... - Anyone know a better solution to force favicon on local relative file path?
     $('link[rel="shortcut icon"]').remove();
     $("head").append(
       '<link rel="shortcut icon" type="image/png" href="' +
-        favicon_path +
-        '" />'
+      favicon_path +
+      '" />'
     );
     return false;
   });

data/test/coverband/adapters/hash_redis_store_test.rb

@@ -242,4 +242,52 @@ class HashRedisStoreTest < Minitest::Test
       @store.coverage["./dog.rb"]
     )
   end
+
+  def test_split_coverage
+    @store = Coverband::Adapters::HashRedisStore.new(
+      @redis,
+      redis_namespace: "coverband_test",
+      relative_file_converter: MockRelativeFileConverter
+    )
+
+    mock_file_hash
+    yesterday = DateTime.now.prev_day.to_time
+    mock_time(yesterday)
+
+    @store.type = :eager_loading
+    data = {
+      "app_path/dog.rb" => [0, nil, 1]
+    }
+    @store.save_report(data)
+
+    @store.type = :runtime
+    @store.save_report(
+      "app_path/dog.rb" => [0, 1, 2]
+    )
+    redis_pipelined = Spy.on(@redis, :pipelined).and_call_through
+    assert_equal(
+      {
+        runtime: {
+          "./dog.rb" => {
+            "first_updated_at" => yesterday.to_i,
+            "last_updated_at" => yesterday.to_i,
+            "file_hash" => "abcd",
+            "data" => [0, 1, 2],
+            "timedata" => [nil, Time.at(yesterday.to_i), Time.at(yesterday.to_i)]
+          }
+        },
+        eager_loading: {
+          "./dog.rb" => {
+            "first_updated_at" => yesterday.to_i,
+            "last_updated_at" => nil,
+            "file_hash" => "abcd",
+            "data" => [0, nil, 1],
+            "timedata" => [nil, nil, Time.at(yesterday.to_i)]
+          }
+        }
+      },
+      @store.split_coverage([Coverband::RUNTIME_TYPE, Coverband::EAGER_TYPE], {}, {page: 1})
+    )
+    assert_equal 2, redis_pipelined.calls.count
+  end
 end

data/test/test_helper.rb

@@ -35,6 +35,7 @@ require "coverband/utils/results"
 require "coverband/reporters/html_report"
 require "coverband/reporters/json_report"
 require "webmock/minitest"
+require "spy/integration"
 
 require_relative "unique_files"
 $VERBOSE = original_verbosity

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.2.rc.1
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2024-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: spy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -510,9 +524,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: