reliable-queue-rb 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c4a9e5e6155832ba302d8d0e4df11229995e87ee08d5deca4f768a1428b2900
-  data.tar.gz: c8ac07e23b3e3c6fa228944177f20be38ee59224538dd59a31a3d85ae4af1bf8
+  metadata.gz: f60d11205a995de4132cef78a505e1a15c5006988f7c139f96b340cfc23afe09
+  data.tar.gz: e917c4e98b0add02db56d7579a67e163db7f4bc512b473b64a91d0c30423f020
 SHA512:
-  metadata.gz: 5f6e292bc67d7107c6741abe705edf1580ba0fdde704b24777965f687e6875b96398078c10fc7f2ea20f21922630f35c0bfdb1086f7a5b89a37820fe93be497d
-  data.tar.gz: 4faa7e3f5b701111cc780af12e371d9222a76843e125bc4a95b5f7a2b954329980ffbad7917ca7bfb32204c4073c70b02d4ebe36b80776e56c524543001e0692
+  metadata.gz: 772dbd35b2a2b3269d4ac3a03a165adb670364f08addd922aa0470288a0a193c207aa34b8a8feaef4b40c039aa667ac61f03ce9048cd745fd927eb42ee4cc949
+  data.tar.gz: c9e8fd7d693cef08dcd67296808cd8b93f55482097f216f0206da5e865cffad55014098dcf8ef96432c8cd0ae1781f8b1d5adc0f5fc76e7e69c220664c8eadc1

data/CHANGELOG.md

@@ -1,15 +1,39 @@
 # Change Log
+
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.0.0] - 2026-03-27
+
+### Changed
+
+- Replace deprecated `rpoplpush`/`brpoplpush` with `lmove`/`blmove` (requires Redis 6.2+)
+- Modernise dev dependencies
+- Replace Travis CI with GitHub Actions
+- Add house_style and apply the corrections
+- Change the supporting Ruby versions to 2.7 onwards
+
+## [0.4.0] - 2023-11-10
+
+### Changed
+
+- Minimum required Redis client version bumped to 5.0+
+- Updated the code to support the current Redis API
+
 ## [0.3.0] - 2021-09-09
+
 ### Changed
+
 - Upgrade redis
 
 ## [0.2.0] - 2020-12-16
+
 ### Changed
+
 - A single require for both classes
 
 ## [0.1.0] - 2020-12-14
+
 ### Added
+
 - Initial release

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020-2021 Altmetric LLP
+Copyright (c) 2020-2024 Altmetric LLP
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -2,6 +2,10 @@
 
 Ruby reliable queue implementation on top of Redis. It makes sure that message is not lost between popping it from Redis queue and compeleting the task.
 
+## Requirements
+
+- Redis 6.2 or later
+
 ## Installation
 
 Add this line to your application's `Gemfile`:
@@ -12,14 +16,20 @@ gem 'reliable-queue-rb', '~> 0.3.0'
 
 And then execute:
 
-    $ bundle
+```sh
+bundle
+```
 
 Or install it yourself as:
 
-    $ gem install reliable-queue-rb
+```sh
+gem install reliable-queue-rb
+```
 
 ## Usage
+
 Reliable Queue
+
 ```ruby
 queue = ReliableQueue.new(redis_queue, redis_client)
 
@@ -29,6 +39,7 @@ end
 ```
 
 ChunkedReliableQueue
+
 ```ruby
 queue = ChunkedReliableQueue.new(working_on_queue_suffix, redis_queue, redis_client)
 
@@ -39,10 +50,10 @@ end
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/altmetric/reliable-queue-rb.
+Bug reports and pull requests are welcome on GitHub at <https://github.com/altmetric/reliable-queue-rb>.
 
 ## License
 
-Copyright © 2020-2021 Altmetric LLP
+Copyright © 2020-2024 Altmetric LLP
 
 Distributed under the [MIT License](http://opensource.org/licenses/MIT).

data/lib/reliable_queue_rb/chunked_reliable_queue.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class ChunkedReliableQueue
   DEFAULT_SIZE = 100
 
-  attr_reader :name, :queue, :size, :working_queue, :redis
+  attr_reader :name, :queue, :working_queue, :redis
 
   def initialize(name, queue, redis)
     @name = name
@@ -16,20 +18,20 @@ class ChunkedReliableQueue
     return enum_for(:each_slice, size) unless block_given?
 
     loop do
-      blocking_reply = redis.brpoplpush(queue, working_queue, 30)
+      blocking_reply = redis.blmove(queue, working_queue, 'RIGHT', 'LEFT', timeout: 30)
       next unless blocking_reply
 
       replies = [blocking_reply]
       replies += redis.multi { |multi|
         (size - 1).times do
-          multi.rpoplpush(queue, working_queue)
+          multi.lmove(queue, working_queue, 'RIGHT', 'LEFT')
         end
       }.compact
 
       yield replies
       redis.multi do |multi|
         replies.each do |reply|
-          multi.lrem(working_queue, 0, reply)
+          multi.lrem(working_queue, 1, reply)
         end
       end
     end
@@ -38,6 +40,6 @@ class ChunkedReliableQueue
   private
 
   def requeue_unfinished_work
-    loop while redis.rpoplpush(working_queue, queue)
+    loop while redis.lmove(working_queue, queue, 'RIGHT', 'LEFT')
   end
 end

data/lib/reliable_queue_rb/reliable_queue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ReliableQueue
   include Enumerable
 
@@ -15,17 +17,17 @@ class ReliableQueue
     return enum_for(:each) unless block_given?
 
     loop do
-      reply = redis.brpoplpush(queue, working_queue, 30)
+      reply = redis.blmove(queue, working_queue, 'RIGHT', 'LEFT', timeout: 30)
       next unless reply
 
       yield reply
-      redis.lrem(working_queue, 0, reply)
+      redis.lrem(working_queue, 1, reply)
     end
   end
 
   private
 
   def requeue_unfinished_work
-    loop while redis.rpoplpush(working_queue, queue)
+    loop while redis.lmove(working_queue, queue, 'RIGHT', 'LEFT')
   end
 end

data/spec/chunked_reliable_queue_spec.rb

@@ -2,7 +2,7 @@ require 'reliable_queue_rb/chunked_reliable_queue'
 require 'redis'
 
 RSpec.describe ChunkedReliableQueue do
-  let(:redis) { Redis.new }
+  let(:redis) { Redis.new(host: ENV['REDIS_HOST'] || '127.0.0.1', port: ENV['REDIS_PORT'] || 6379) }
 
   after do
     redis.flushall

data/spec/reliable_queue_spec.rb

@@ -2,7 +2,7 @@ require 'reliable_queue_rb/reliable_queue'
 require 'redis'
 
 RSpec.describe ReliableQueue do
-  let(:redis) { Redis.new }
+  let(:redis) { Redis.new(host: ENV['REDIS_HOST'] || '127.0.0.1', port: ENV['REDIS_PORT'] || 6379) }
 
   after do
     redis.del('foo')

metadata

@@ -1,24 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: reliable-queue-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Anna Klimas
 - Jonathan Hernandez
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
@@ -26,40 +22,50 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: house_style
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.10'
-description:
+        version: '0'
 email:
 - support@altmetric.com
 executables: []
@@ -69,7 +75,7 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
-- lib/reliable-queue-rb.rb
+- lib/reliable_queue_rb.rb
 - lib/reliable_queue_rb/chunked_reliable_queue.rb
 - lib/reliable_queue_rb/reliable_queue.rb
 - spec/chunked_reliable_queue_spec.rb
@@ -78,7 +84,6 @@ homepage: https://github.com/altmetric/reliable-queue-rb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,17 +91,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby library for reliable queue processing.
 test_files:
-- spec/reliable_queue_spec.rb
 - spec/chunked_reliable_queue_spec.rb
+- spec/reliable_queue_spec.rb