cover_rage 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d22a15a12e4376aa1a441dd5f4d21e7a6043390e1cef64e8739da1e6fcb81eb
-  data.tar.gz: ec07f2d32071bce21d03771e3d3ba3c6dd24e0e1cae745962fe0a36b89bc00ef
+  metadata.gz: 5621019f54428ba46ed131c128c14da48bb2e9fd2bc10e283a3c0c8f8642b2c0
+  data.tar.gz: a1a8912ce53c591c178923f790c6eba60651fb22834489513b89368a785dfea2
 SHA512:
-  metadata.gz: 16754fdef9cc29c0f6304e56a6f0c70dd91bc18c294bc944a7d3f927b642b07127acb079ecb9617156c3d0f703ec440536433f97b0f53d9742f6541d7df087cf
-  data.tar.gz: 94bddf50ab05b0f8227e42743910343b5f7c595c74774994bc60f5ecfc807dc1ec3f4bfcd5227ccb24a5207a2cfad77864077e934a986f91d4c8e254921cf359
+  metadata.gz: 10fafa62c5ddc3c37b1be895d7875c116c44343ea2bed5b18ff3571003958c6867ef40c2945ec70f4747a84760dc786e9ef5fc6c14865e770f7283a05a6004a0
+  data.tar.gz: 5d60032466d783830936617366c326df471fde464428fbabf00b0e8e390b1f9b1c79d9c384ea15f5d80448a1f6edd4d3ec5e369b273dbc659e19f6ba053da3d9

data/lib/cover_rage/record.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module CoverRage
-  Record = Data.define(:path, :revision, :source, :execution_count) do
+  Record = Data.define(:path, :revision, :source, :execution_count, :last_executed_at) do
     def self.merge(existing, current)
       records_to_save = []
       current.each do |record|
@@ -20,6 +20,13 @@ module CoverRage
       with(
         execution_count: execution_count.map.with_index do |item, index|
           item.nil? ? nil : item + other.execution_count[index]
+        end,
+        last_executed_at: last_executed_at.map.with_index do |item, index|
+          if item.nil? && other.last_executed_at[index].nil? then nil
+          elsif item.nil? then other.last_executed_at[index]
+          elsif other.last_executed_at[index].nil? then item
+          else [item.to_i, other.last_executed_at[index].to_i].max
+          end
         end
       )
     end

data/lib/cover_rage/recorder.rb

@@ -26,7 +26,7 @@ module CoverRage
         interval = Config.interval
         jitter = 0.15
         loop do
-          sleep(interval + rand * interval * jitter)
+          sleep(interval + (rand * interval * jitter))
           save(Coverage.result(stop: false, clear: true))
         end
       end
@@ -42,14 +42,23 @@ module CoverRage
         relative_path = filepath.delete_prefix(@path_prefix)
         revision, source = read_file_with_revision(filepath)
 
+        now = Time.now.to_i
+        last_executed_at = execution_count.map { |c| c&.positive? ? now : nil }
+
         records << Record.new(
           path: relative_path,
-          revision: revision,
-          source: source,
-          execution_count: execution_count
+          revision:,
+          source:,
+          execution_count:,
+          last_executed_at:
         )
       end
-      @store.import(records) if records.any?
+      return unless records.any?
+
+      @store.transaction do
+        records_to_save = Record.merge(@store.list, records)
+        @store.update(records_to_save)
+      end
     end
 
     private

data/lib/cover_rage/reporters/html_reporter/index.html.erb

@@ -27,11 +27,18 @@
       .number {
         display: inline-block;
         text-align: right;
-        margin-right: 0.5em;
         background-color: lightgray;
         padding: 0 0.5em 0 1.5em;
       }
 
+      .timestamp {
+        display: inline-block;
+        text-align: right;
+        margin-right: 0.5em;
+        background-color: lightgray;
+        padding: 0 0.5em 0 0.5em;
+      }
+
       .nav {
         display: flex;
         list-style: none;
@@ -123,9 +130,13 @@
               if (typeof value === "number")
                 color = value > 0 ? "green" : "red";
               const number = typeof value === "number" ? value : "-";
-              return `<span class="line ${color}"><span class="number">${number
-                .toString()
-                .padStart(digit_width, " ")}</span>${line}</span>`;
+              const posix_time = record.last_executed_at[index];
+              const iso8601_time = typeof posix_time === "number" ? new Date(posix_time * 1000).toISOString().slice(0, 10) : "-";
+              return `<span class="line ${color}"><span class="number">${
+                  number.toString().padStart(digit_width, " ")
+                }</span><time class="timestamp">${
+                  iso8601_time.padStart(10, " ")
+                }</time>${line}</span>`;
             })
             .join("\n");
         }

data/lib/cover_rage/stores/pstore.rb

@@ -10,27 +10,42 @@ module CoverRage
         @store = PStore.new(path, true)
       end
 
-      def import(records)
+      def transaction
         @store.transaction do
-          persisted_records = @store.keys.map { @store[_1] }
-          records_to_save = Record.merge(persisted_records, records)
-          records_to_save.each { @store[_1.path] = _1 }
+          @transaction = true
+          yield
+        ensure
+          @transaction = false
         end
       end
 
-      def find(path)
-        @store.transaction { @store[path] }
+      def update(records)
+        if @transaction
+          records.each { @store[_1.path] = _1 }
+        else
+          @store.transaction do
+            records.each { @store[_1.path] = _1 }
+          end
+        end
       end
 
       def list
-        @store.transaction do
+        if @transaction
           @store.keys.map { @store[_1] }
+        else
+          @store.transaction do
+            @store.keys.map { @store[_1] }
+          end
         end
       end
 
       def clear
-        @store.transaction do
+        if @transaction
           @store.keys.each { @store.delete(_1) }
+        else
+          @store.transaction do
+            @store.keys.each { @store.delete(_1) }
+          end
         end
       end
     end

data/lib/cover_rage/stores/redis.rb

@@ -12,30 +12,33 @@ module CoverRage
       def initialize(url)
         @redis =
           if url.start_with?('rediss')
-            ::Redis.new(url: url, ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE })
+            ::Redis.new(url:, ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE })
           else
-            ::Redis.new(url: url)
+            ::Redis.new(url:)
           end
       end
 
-      def import(records)
+      def transaction(&)
         loop do
           break if @redis.watch(KEY) do
-            records_to_save = Record.merge(list, records)
-            arguments = []
-            records_to_save.each do |record|
-              arguments.push(record.path, JSON.dump(record.to_h))
+            @redis.multi do |multi|
+              Thread.current[:redis_multi] = multi
+              yield
+            ensure
+              Thread.current[:redis_multi] = nil
             end
-            @redis.multi { _1.hset(KEY, *arguments) }
           end
         end
       end
 
-      def find(path)
-        result = @redis.hget(KEY, path)
-        return nil if result.nil?
+      def update(records)
+        arguments = []
+        records.each do |record|
+          arguments.push(record.path, JSON.dump(record.to_h))
+        end
 
-        Record.new(**JSON.parse(result))
+        client = Thread.current[:redis_multi] || @redis
+        client.hset(KEY, *arguments)
       end
 
       def list

data/lib/cover_rage/stores/sqlite.rb

@@ -8,13 +8,17 @@ module CoverRage
   module Stores
     class Sqlite
       def initialize(path)
+        @mutex = Mutex.new
+        @path = path
         @db = SQLite3::Database.new(path)
+        @db.busy_handler { true }
         @db.execute <<-SQL
           create table if not exists records (
             path text primary key not null,
             revision blob not null,
             source text not null,
-            execution_count text not null
+            execution_count text not null,
+            last_executed_at text not null
           )
         SQL
         process_ext = Module.new
@@ -23,58 +27,46 @@ module CoverRage
             store.instance_variable_get(:@db).close
             pid = super()
             store.instance_variable_set(:@db, SQLite3::Database.new(path))
+            store.instance_variable_get(:@db).busy_handler { true }
             pid
           end
         end
         Process.singleton_class.prepend(process_ext)
       end
 
-      def import(records)
-        @db.transaction(:exclusive) do
-          records_to_save = Record.merge(list, records)
-          @db.execute(
-            "insert or replace into records (path, revision, source, execution_count) values #{
-              (['(?,?,?,?)'] * records_to_save.length).join(',')
-            }",
-            records_to_save.each_with_object([]) do |record, memo|
-              memo.push(
-                record.path,
-                record.revision,
-                record.source,
-                JSON.dump(record.execution_count)
-              )
-            end
-          )
+      def transaction(&)
+        @mutex.synchronize do
+          @db.transaction(:exclusive, &)
         end
-      rescue SQLite3::BusyException
-        retry
       end
 
-      def find(path)
-        rows = @db.execute(
-          'select revision, source, execution_count from records where path = ? limit 1',
-          [path]
-        )
-        return nil if rows.empty?
-
-        revision, source, execution_count = rows.first
-        Record.new(
-          path: path,
-          revision: revision,
-          source: source,
-          execution_count: JSON.parse(execution_count)
+      def update(records)
+        @db.execute(
+          "insert or replace into records (path, revision, source, execution_count, last_executed_at) values #{
+            (['(?,?,?,?,?)'] * records.length).join(',')
+          }",
+          records.each_with_object([]) do |record, memo|
+            memo.push(
+              record.path,
+              record.revision,
+              record.source,
+              JSON.dump(record.execution_count),
+              JSON.dump(record.last_executed_at)
+            )
+          end
         )
       end
 
       def list
         @db
-          .execute('select path, revision, source, execution_count from records')
-          .map do |(path, revision, source, execution_count)|
+          .execute('select path, revision, source, execution_count, last_executed_at from records')
+          .map do |(path, revision, source, execution_count, last_executed_at)|
             Record.new(
-              path: path,
-              revision: revision,
-              source: source,
-              execution_count: JSON.parse(execution_count)
+              path:,
+              revision:,
+              source:,
+              execution_count: JSON.parse(execution_count),
+              last_executed_at: JSON.parse(last_executed_at)
             )
           end
       end

metadata

@@ -1,70 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: cover_rage
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Weihang Jian
 bindir: bin
 cert_chain: []
-date: 2024-12-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: pstore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.18'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.18'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.3'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
 description: |
   cover_rage is a Ruby code coverage tool designed to be simple and easy to use. It can be used not only for test coverage but also in production services to identify unused code.
 
@@ -95,7 +53,8 @@ files:
 homepage: https://github.com/tonytonyjan/cover_rage
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -110,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.4
 specification_version: 4
 summary: cover_rage is a Ruby code coverage tool designed to be simple and easy to
   use. It can be used not only for test coverage but also in production services to