progressrus 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d353cca4bf4eca46acd2837f9e62f6dbe35834cd3efe00bf66ece1c02a2924d0
-  data.tar.gz: 2b8c0dc2e6ec18c4f22b3a911bedfbcd73232517c4576dcc4971c46fc7abaabb
+  metadata.gz: 4f66da2e66134a7ca0b4db7d198c8910e9bec348c73d40e969e053a41f282edc
+  data.tar.gz: bcda55d9cd6959911c81456943f183cd28525d54450d1b4537470ff5ad718c09
 SHA512:
-  metadata.gz: d1b1f0472d3ed65a214a020433315f7dd9cc37618fe992125e9a8836b320e0b92cc3adb5dca28f9109f15bb670abf6392a9493df3e7bd5921b9206f78e9d0b3c
-  data.tar.gz: 9823e1025dff167ffc79e33d12cc636fd5494a23cf5c97500fb655eb69a5aabbb0df45518ed8928f11ac41cf8b62f9f0f196d125cde2f3f98b0e5e3980206e21
+  metadata.gz: 1609c053c0e4acc20fa8ddc50c36e0050fa3d19ed28568911e67647159f09f836a3e390804aeeb90e3e769cea4c775e663b2b32b11b805559a05ba0a56fe5a10
+  data.tar.gz: 880783ea27e8d89684a5d3fb6541daf0de3eba418191c9d192c94882b07f08a5d0fd283ee0032e1eeeb4235dd7eef1f37cc0875437b2acba406f7624ebc80cfb

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"]
     services:
       redis:
         image: redis

data/lib/progressrus/store/redis.rb

@@ -17,9 +17,11 @@ class Progressrus
         if outdated?(progress) || force
           key_for_scope = key(progress.scope)
 
-          redis.pipelined do |pipeline|
-            pipeline.hset(key_for_scope, progress.id, progress.to_serializeable.to_json)
-            pipeline.expireat(key_for_scope, expires_at.to_i) if expires_at
+          redis.with do |client|
+            client.pipelined do |pipeline|
+              pipeline.hset(key_for_scope, progress.id, progress.to_serializeable.to_json)
+              pipeline.expireat(key_for_scope, expires_at.to_i) if expires_at
+            end
           end
 
           @persisted_ats[progress.scope][progress.id] = now
@@ -29,7 +31,9 @@ class Progressrus
       end
 
       def scope(scope)
-        scope = redis.hgetall(key(scope))
+        scope = redis.with do |client|
+          client.hgetall(key(scope))
+        end
         scope.each_pair { |id, value|
           scope[id] = Progressrus.new(**deserialize(value))
         }
@@ -38,7 +42,7 @@ class Progressrus
       end
 
       def find(scope, id)
-        value = redis.hget(key(scope), id)
+        value = redis.with { |client| client.hget(key(scope), id) }
         return unless value
 
         Progressrus.new(**deserialize(value))
@@ -47,10 +51,12 @@ class Progressrus
       end
 
       def flush(scope, id = nil)
-        if id
-          redis.hdel(key(scope), id)
-        else
-          redis.del(key(scope))
+        redis.with do |client|
+          if id
+            client.hdel(key(scope), id)
+          else
+            client.del(key(scope))
+          end
         end
       rescue *BACKEND_EXCEPTIONS => e
         raise Progressrus::Store::BackendError.new(e)

data/lib/progressrus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Progressrus
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/progressrus.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "redis", ">= 3.0"
+  spec.add_dependency "redis", ">= 4.7.0"
   spec.add_dependency "ruby-progressbar", "~> 1.0"
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "mocha", "~> 0.14"
+  spec.add_development_dependency "mocha", "~> 2.7"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "pry-byebug"

data/test/progressrus_test.rb

@@ -247,8 +247,7 @@ class ProgressrusTest < Minitest::Test
   end
 
   def test_tick_and_complete_dont_raise_if_store_is_unavailable
-    store = Progressrus.stores[:redis]
-    store.redis.expects(:hset).at_least_once.raises(::Redis::BaseError)
+    Redis::PipelinedConnection.any_instance.expects(:hset).at_least_once.raises(::Redis::BaseError)
     @progress.tick
     @progress.complete
   end

data/test/store/redis_test.rb

@@ -7,7 +7,7 @@ class RedisStoreTest < Minitest::Test
     end
   end
   def setup
-  	@scope = ["walrus", "1234"]
+    @scope = ["walrus", "1234"]
     @progress = Progressrus.new(
       scope: @scope,
       id: "oemg",
@@ -15,7 +15,7 @@ class RedisStoreTest < Minitest::Test
       name: "oemg-name"
     )
 
-  	@another_progress = Progressrus.new(
+    @another_progress = Progressrus.new(
       scope: @scope,
       id: "oemg-two",
       total: 100,
@@ -38,16 +38,16 @@ class RedisStoreTest < Minitest::Test
   end
 
   def test_persist_should_set_key_value_if_outdated
-  	@store.persist(@progress)
+    @store.persist(@progress)
 
-  	assert_equal 'oemg', @store.find(['walrus', '1234'], 'oemg').id
+    assert_equal 'oemg', @store.find(['walrus', '1234'], 'oemg').id
   end
 
   def test_persist_should_not_set_key_value_if_not_outdated
-  	@store.redis.expects(:hset).once
+    Redis::PipelinedConnection.any_instance.expects(:hset).once
 
-  	@store.persist(@progress)
-  	@store.persist(@progress)
+    @store.persist(@progress)
+    @store.persist(@progress)
   end
 
   def test_scope_should_return_progressruses_indexed_by_id
@@ -62,7 +62,7 @@ class RedisStoreTest < Minitest::Test
   end
 
   def test_scope_should_return_an_empty_hash_if_nothing_is_found
-  	assert_equal({}, @store.scope(@scope))
+    assert_equal({}, @store.scope(@scope))
   end
 
   def test_find_should_return_a_single_progressrus_for_scope_and_id
@@ -73,41 +73,41 @@ class RedisStoreTest < Minitest::Test
   end
 
   def test_find_should_return_nil_if_nothing_is_found
-  	assert_nil @store.find(@scope, 'oemg')
+    assert_nil @store.find(@scope, 'oemg')
   end
 
   def test_flush_should_delete_by_scope
-  	@store.persist(@progress)
-  	@store.persist(@another_progress)
+    @store.persist(@progress)
+    @store.persist(@another_progress)
 
-  	@store.flush(@scope)
+    @store.flush(@scope)
 
-  	assert_equal({}, @store.scope(@scope))
+    assert_equal({}, @store.scope(@scope))
   end
 
   def test_flush_should_delete_by_scope_and_id
-	  @store.persist(@progress)
-  	@store.persist(@another_progress)
+    @store.persist(@progress)
+    @store.persist(@another_progress)
 
-	  @store.flush(@scope, 'oemg')
+    @store.flush(@scope, 'oemg')
 
-  	assert_nil @store.find(@scope, 'oemg')
-  	assert @store.find(@scope, 'oemg-two')
+    assert_nil @store.find(@scope, 'oemg')
+    assert @store.find(@scope, 'oemg-two')
   end
 
   def test_initializes_name_to_redis
-  	assert_equal :redis, @store.name
+    assert_equal :redis, @store.name
   end
 
   def test_persist_should_not_write_by_default
-    @store.redis.expects(:hset).once
+    Redis::PipelinedConnection.any_instance.expects(:hset).once
 
     @store.persist(@progress)
     @store.persist(@progress)
   end
 
   def test_persist_should_write_if_forced
-    @store.redis.expects(:hset).twice
+    Redis::PipelinedConnection.any_instance.expects(:hset).twice
 
     @store.persist(@progress)
     @store.persist(@progress, force: true)

data/test/test_helper.rb

@@ -2,7 +2,7 @@ require 'coveralls'
 Coveralls.wear!
 
 require 'minitest/autorun'
-require "mocha/setup"
+require 'mocha/minitest'
 require 'pry'
 require 'byebug'
 require 'pry-byebug'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: progressrus
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Simon Eskildsen
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +154,6 @@ homepage: https://github.com/Sirupsen/progressrus
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Monitor the progress of remote, long-running jobs.
 test_files: