ci-queue 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a727d6a5f5c01a4b5837d1f7ed629ce3f9c971fed502d6b850a43b384e72c59a
-  data.tar.gz: 3ab46419fd8c1932d2e94cd40bbfb087df927d9013f9d0e998f3ed60839440e6
+  metadata.gz: 2847d2cc56c64030f51a65ef6b9262d04b647b15b6d6ef846cf76adb90715e44
+  data.tar.gz: bf4f65911c9f39c2e6049abc6006f853f8de1aa444dfe8d5c7237cd698d0a59f
 SHA512:
-  metadata.gz: f6fd6c5f71fc10b0b5085b0d5259aa25eb1b1cc969f7b182e45c975deff56e72b1bef6e133adb812db87809feda33044ad7e137f36d88c5866c34a469af4b0fd
-  data.tar.gz: 0415f91c5aa6c1bdfd185842ae88ee5d73ed3c553945eeacd2a095288156336f4bb00d2d49ab302f7758d7fcbb78c7fcd2b500d6265c12aa3b33dfbc2d5d7829
+  metadata.gz: b7c62dd52f53069dd2aad2b51724334e7ea2e8fc2cdc8f19f022b6dfd926bb7323437c3f6d1c4ffe7071316c07cde6b924671be07a2e7b402e2d528becd16acf
+  data.tar.gz: 056b3a585d95b88479f79448dd204eef72e16635c0c2df5c619ad78be2caf3b97a6e52c15edf09f2a2dcccf80afa3ea0018cfe9361114f6d03914383ab080efb

data/ci-queue.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest', ENV.fetch('MINITEST_VERSION', '~> 5.11')
-  spec.add_development_dependency 'rspec', '~> 3.7.0'
+  spec.add_development_dependency 'rspec', '~> 3.10'
   spec.add_development_dependency 'redis'
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'

data/lib/ci/queue/redis/base.rb

@@ -21,16 +21,16 @@ module CI
         end
 
         def size
-          redis.multi do
-            redis.llen(key('queue'))
-            redis.zcard(key('running'))
+          redis.multi do |transaction|
+            transaction.llen(key('queue'))
+            transaction.zcard(key('running'))
           end.inject(:+)
         end
 
         def to_a
-          redis.multi do
-            redis.lrange(key('queue'), 0, -1)
-            redis.zrange(key('running'), 0, -1)
+          redis.multi do |transaction|
+            transaction.lrange(key('queue'), 0, -1)
+            transaction.zrange(key('running'), 0, -1)
           end.flatten.reverse.map { |k| index.fetch(k) }
         end
 

data/lib/ci/queue/redis/build_record.rb

@@ -22,9 +22,9 @@ module CI
         end
 
         def pop_warnings
-          warnings = redis.multi do
-            redis.lrange(key('warnings'), 0, -1)
-            redis.del(key('warnings'))
+          warnings = redis.multi do |transaction|
+            transaction.lrange(key('warnings'), 0, -1)
+            transaction.del(key('warnings'))
           end.first
 
           warnings.map { |p| Marshal.load(p) }
@@ -35,21 +35,21 @@ module CI
         end
 
         def record_error(id, payload, stats: nil)
-          redis.pipelined do
-            redis.hset(
+          redis.pipelined do |pipeline|
+            pipeline.hset(
               key('error-reports'),
               id.dup.force_encoding(Encoding::BINARY),
               payload.dup.force_encoding(Encoding::BINARY),
             )
-            record_stats(stats)
+            record_stats(stats, pipeline: pipeline)
           end
           nil
         end
 
         def record_success(id, stats: nil)
-          redis.pipelined do
-            redis.hdel(key('error-reports'), id.dup.force_encoding(Encoding::BINARY))
-            record_stats(stats)
+          redis.pipelined do |pipeline|
+            pipeline.hdel(key('error-reports'), id.dup.force_encoding(Encoding::BINARY))
+            record_stats(stats, pipeline: pipeline)
           end
           nil
         end
@@ -65,8 +65,8 @@ module CI
         end
 
         def fetch_stats(stat_names)
-          counts = redis.pipelined do
-            stat_names.each { |c| redis.hvals(key(c)) }
+          counts = redis.pipelined do |pipeline|
+            stat_names.each { |c| pipeline.hvals(key(c)) }
           end
           sum_counts = counts.map do |values|
             values.map(&:to_f).inject(:+).to_f
@@ -75,9 +75,9 @@ module CI
         end
 
         def reset_stats(stat_names)
-          redis.pipelined do
+          redis.pipelined do |pipeline|
             stat_names.each do |stat_name|
-              redis.hdel(key(stat_name), config.worker_id)
+              pipeline.hdel(key(stat_name), config.worker_id)
             end
           end
         end
@@ -86,10 +86,10 @@ module CI
 
         attr_reader :config, :redis
 
-        def record_stats(stats)
+        def record_stats(stats, pipeline: redis)
           return unless stats
           stats.each do |stat_name, stat_value|
-            redis.hset(key(stat_name), config.worker_id, stat_value)
+            pipeline.hset(key(stat_name), config.worker_id, stat_value)
           end
         end
 

data/lib/ci/queue/redis/grind_record.rb

@@ -11,12 +11,12 @@ module CI
         end
 
         def record_error(payload, stats: nil)
-          redis.pipelined do
-            redis.lpush(
+          redis.pipelined do |pipeline|
+            pipeline.lpush(
               key('error-reports'),
               payload.force_encoding(Encoding::BINARY),
             )
-            record_stats(stats)
+            record_stats(stats, pipeline: pipeline)
           end
           nil
         end
@@ -34,8 +34,8 @@ module CI
         end
 
         def fetch_stats(stat_names)
-          counts = redis.pipelined do
-            stat_names.each { |c| redis.hvals(key(c)) }
+          counts = redis.pipelined do |pipeline|
+            stat_names.each { |c| pipeline.hvals(key(c)) }
           end
           stat_names.zip(counts.map { |values| values.map(&:to_f).inject(:+).to_f }).to_h
         end
@@ -54,10 +54,10 @@ module CI
           ['build', config.build_id, *args].join(':')
         end
 
-        def record_stats(stats)
+        def record_stats(stats, pipeline: redis)
           return unless stats
           stats.each do |stat_name, stat_value|
-            redis.hset(key(stat_name), config.worker_id, stat_value)
+            pipeline.hset(key(stat_name), config.worker_id, stat_value)
           end
         end
       end

data/lib/ci/queue/redis/test_time_record.rb

@@ -19,8 +19,8 @@ module CI
         attr_reader :redis
 
         def record_test_time(test_name, duration)
-          redis.pipelined do
-            redis.lpush(
+          redis.pipelined do |pipeline|
+            pipeline.lpush(
               test_time_key(test_name),
               duration.to_s.force_encoding(Encoding::BINARY),
             )
@@ -29,8 +29,8 @@ module CI
         end
 
         def record_test_name(test_name)
-          redis.pipelined do
-            redis.lpush(
+          redis.pipelined do |pipeline|
+            pipeline.lpush(
               all_test_names_key,
               test_name.dup.force_encoding(Encoding::BINARY),
             )
@@ -39,18 +39,15 @@ module CI
         end
 
         def fetch_all_test_names
-          values = redis.pipelined do
-            redis.lrange(all_test_names_key, 0, -1)
+          values = redis.pipelined do |pipeline|
+            pipeline.lrange(all_test_names_key, 0, -1)
           end
           values.flatten.map(&:to_s)
         end
 
         def fetch_test_time(test_name)
-          values = redis.pipelined do
-            key = test_time_key(test_name)
-            redis.lrange(key, 0, -1)
-          end
-          values.flatten.map(&:to_f)
+          key = test_time_key(test_name)
+          redis.lrange(key, 0, -1).map(&:to_f)
         end
 
         def all_test_names_key

data/lib/ci/queue/redis/worker.rb

@@ -194,10 +194,10 @@ module CI
           @total = tests.size
 
           if @master = redis.setnx(key('master-status'), 'setup')
-            redis.multi do
-              redis.lpush(key('queue'), tests) unless tests.empty?
-              redis.set(key('total'), @total)
-              redis.set(key('master-status'), 'ready')
+            redis.multi do |transaction|
+              transaction.lpush(key('queue'), tests) unless tests.empty?
+              transaction.set(key('total'), @total)
+              transaction.set(key('master-status'), 'ready')
             end
           end
           register

data/lib/ci/queue/version.rb

@@ -2,7 +2,7 @@
 
 module CI
   module Queue
-    VERSION = '0.22.0'
+    VERSION = '0.22.1'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement