cover_rage 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ad4585a873585456f2c9948a88bcab8d54438b5c952a7fdb03a0e411763e3e
-  data.tar.gz: 231662f71294e8e983e7632c8ad530b3c18752f2e6d4d0a5d2ea3ea2de0edc90
+  metadata.gz: 0d90184f8a2099a605e3a70ea825577f946312fa5116fdb7b178d3716f507686
+  data.tar.gz: e39a25676c9879a64aaecd45c31a2c21adf6cb0c99de5af81fed5468c3423941
 SHA512:
-  metadata.gz: '048eb40f6ed0df7c75e4f353ce17fa516345a2832d6b25497453d4bb94aa302197e8e57c5fdbe50444d3a35da91bf641d1a0bbbd2b8d911cf457988016588932'
-  data.tar.gz: 587134f993d40afb1c4b9242e030aac02ea886436a1e3912413630f1e7f4e97a403b1b2693a4af8907df23e9a4a8f91e7fa2f782089fa7609fe997ed6e45fa88
+  metadata.gz: 541824efe9627329848384b72f63fcfde79290ae83d6f7f1367f0018334b8cad09a6169086d5292f35488598cfd0d55773efdc7d52b207847299781fa3e9dacb
+  data.tar.gz: 533b57415a77f94b77ad32c00fd220894ec77f4244fb31be3067e904fb4a79aff6ac7b2616842f120602587b89173777a8a8ec44db96782eb5099c527c91a3cb

data/lib/cover_rage/record.rb

@@ -2,15 +2,15 @@
 
 module CoverRage
   Record = Data.define(:path, :revision, :source, :execution_count, :last_executed_at) do
-    def self.merge(existing, current)
+    def self.merge(existing_records, current_records)
       records_to_save = []
-      current.each do |record|
-        found = existing.find { _1.path == record.path }
+      current_records.each do |current_record|
+        existing_record = existing_records.find { _1.path == current_record.path }
         records_to_save <<
-          if found.nil? || record.revision != found.revision
-            record
+          if existing_record.nil? || current_record.revision != existing_record.revision
+            current_record
           else
-            record + found
+            existing_record + current_record
           end
       end
       records_to_save
@@ -19,13 +19,17 @@ module CoverRage
     def +(other)
       with(
         execution_count: execution_count.map.with_index do |item, index|
-          item.nil? ? nil : item + other.execution_count[index]
+          other_item = other.execution_count[index]
+          if item.nil? && other_item.nil? then nil
+          elsif item.nil? || other_item.nil? then other_item
+          else item + other_item
+          end
         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, other.last_executed_at[index]].max
+          other_item = other.last_executed_at[index]
+          if item.nil? && other_item.nil? then nil
+          elsif item.nil? || other_item.nil? then other_item
+          else [item, other_item].max
           end
         end
       )

data/lib/cover_rage/stores/redis.rb

@@ -9,13 +9,10 @@ module CoverRage
   module Stores
     class Redis
       KEY = 'cover_rage_records'
+      IS_REDIS_BELOW_V5 = Gem::Version.new(::Redis::VERSION) < Gem::Version.new('5')
       def initialize(url)
-        @redis =
-          if url.start_with?('rediss')
-            ::Redis.new(url:, ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE })
-          else
-            ::Redis.new(url:)
-          end
+        @redis = new_redis(url)
+        @redis_for_below_v5 = new_redis(url) if IS_REDIS_BELOW_V5
       end
 
       def transaction(&)
@@ -42,7 +39,14 @@ module CoverRage
       end
 
       def list
-        result = @redis.hgetall(KEY)
+        # For Redis versions below 5, we need to use the separate client to read
+        # the data while the transaction is in progress.
+        client = if Thread.current[:redis_multi] && IS_REDIS_BELOW_V5
+                   @redis_for_below_v5
+                 else
+                   @redis
+                 end
+        result = client.hgetall(KEY)
         return [] if result.empty?
 
         result.map { |_, value| Record.new(**JSON.parse(value)) }
@@ -51,6 +55,16 @@ module CoverRage
       def clear
         @redis.del(KEY)
       end
+
+      private
+
+      def new_redis(url)
+        if url.start_with?('rediss')
+          ::Redis.new(url:, ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE })
+        else
+          ::Redis.new(url:)
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cover_rage
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Weihang Jian
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.13
 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