cover_rage 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d22a15a12e4376aa1a441dd5f4d21e7a6043390e1cef64e8739da1e6fcb81eb
-  data.tar.gz: ec07f2d32071bce21d03771e3d3ba3c6dd24e0e1cae745962fe0a36b89bc00ef
+  metadata.gz: e35c3c64110ebafa0432d4ac37f2d05b19a552df8505263f751f4fb85a841525
+  data.tar.gz: 9cd16923a839fd2ddcd6f5b585d28bfc19ab40a466d810ac8a93378bf5c13b02
 SHA512:
-  metadata.gz: 16754fdef9cc29c0f6304e56a6f0c70dd91bc18c294bc944a7d3f927b642b07127acb079ecb9617156c3d0f703ec440536433f97b0f53d9742f6541d7df087cf
-  data.tar.gz: 94bddf50ab05b0f8227e42743910343b5f7c595c74774994bc60f5ecfc807dc1ec3f4bfcd5227ccb24a5207a2cfad77864077e934a986f91d4c8e254921cf359
+  metadata.gz: b1b158a2dc50611a60482aeae2f448c9f4f8ae59f3d1ebb6ecd29bc03fea38a82a934b4b84906a4f331a7b293ccfcb4780ab7d956fe24015c42c54a8d4a52cdc
+  data.tar.gz: b06bdca3118bf5d80f7225e4792d258a18ef17a27f9255e0993a0e9523aab81e1aa88051b6c6670241ea688bfd10df10118ce9934e84e1c4379d4fcae02b7282

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
@@ -44,12 +44,17 @@ module CoverRage
 
         records << Record.new(
           path: relative_path,
-          revision: revision,
-          source: source,
-          execution_count: execution_count
+          revision:,
+          source:,
+          execution_count:
         )
       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/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,6 +8,8 @@ module CoverRage
   module Stores
     class Sqlite
       def initialize(path)
+        @mutex = Mutex.new
+        @path = path
         @db = SQLite3::Database.new(path)
         @db.execute <<-SQL
           create table if not exists records (
@@ -29,40 +31,27 @@ module CoverRage
         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, &)
+        rescue SQLite3::BusyException
+          retry
         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) values #{
+            (['(?,?,?,?)'] * records.length).join(',')
+          }",
+          records.each_with_object([]) do |record, memo|
+            memo.push(
+              record.path,
+              record.revision,
+              record.source,
+              JSON.dump(record.execution_count)
+            )
+          end
         )
       end
 
@@ -71,9 +60,9 @@ module CoverRage
           .execute('select path, revision, source, execution_count from records')
           .map do |(path, revision, source, execution_count)|
             Record.new(
-              path: path,
-              revision: revision,
-              source: source,
+              path:,
+              revision:,
+              source:,
               execution_count: JSON.parse(execution_count)
             )
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cover_rage
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Weihang Jian
 bindir: bin
 cert_chain: []
-date: 2024-12-28 00:00:00.000000000 Z
+date: 2024-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -95,7 +95,8 @@ files:
 homepage: https://github.com/tonytonyjan/cover_rage
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib