sidekiq-batch 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0811ae31d4850eee031831062fbe1aca229d9255f28ee85641fff02f22e4ff49'
-  data.tar.gz: d37febab0ff1087d3b3966f0beae1155246b3535f703e3bd62e9ae04fd83a553
+  metadata.gz: 3d45a854229157eb70e9fb9b04390e6b4958fd535cb68d6dd2e0aab84c51e4b7
+  data.tar.gz: b8ec67ac9cce0cafde5b70883c0a77794f0d8506b694f74fb79765dc0ae5d7f2
 SHA512:
-  metadata.gz: dafce26855e716909db76ed31c04f31381d2ca4ab9d9d22b4d85e95b4deda62cf5438d562cce5344596172bbc912dc5995a5b5c435cceadca78004bf8db0a7b3
-  data.tar.gz: e25c54027984ff63d2242037de20795c8e223c4b295504678aa5a4a5f339568f44e290458f1a732d25f4c692dd6b3961256525bed66c19e20b95e0de936bf3be
+  metadata.gz: e703eb7d37c4234269835ee009d73cafd4bb9afb11d8c818860e18e7504244db08142830eeac20d32bff96079febcb13ae130fd7e0a21eadeea6115cb5384989
+  data.tar.gz: e616deb4ed0f7599b9c09d1d0fd943f25131c89966ae0575b073c507053ac9012357ed07ac34456ba0f60d1a91ab7d75c337ffe6fb4e8aca6b21fe2aea2b1ea4

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10

data/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", ruby-head]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true # 'bundle install' and cache gems
+        ruby-version: ${{ matrix.ruby }}
+    - name: Run tests
+      run: bundle exec rake

data/.github/workflows/stale.yml

@@ -0,0 +1,19 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "0 0 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

data/Gemfile

@@ -5,5 +5,4 @@ gemspec
 group :test do
   gem "simplecov"
   gem "codeclimate-test-reporter", "~> 1.0.0"
-  gem 'pry-byebug'
 end

data/lib/sidekiq/batch/callback.rb

@@ -39,15 +39,15 @@ module Sidekiq
           return unless parent_bid
 
           _, _, success, _, complete, pending, children, failure = Sidekiq.redis do |r|
-            r.multi do
-              r.sadd("BID-#{parent_bid}-success", bid)
-              r.expire("BID-#{parent_bid}-success", Sidekiq::Batch::BID_EXPIRE_TTL)
-              r.scard("BID-#{parent_bid}-success")
-              r.sadd("BID-#{parent_bid}-complete", bid)
-              r.scard("BID-#{parent_bid}-complete")
-              r.hincrby("BID-#{parent_bid}", "pending", 0)
-              r.hincrby("BID-#{parent_bid}", "children", 0)
-              r.scard("BID-#{parent_bid}-failed")
+            r.multi do |pipeline|
+              pipeline.sadd("BID-#{parent_bid}-success", bid)
+              pipeline.expire("BID-#{parent_bid}-success", Sidekiq::Batch::BID_EXPIRE_TTL)
+              pipeline.scard("BID-#{parent_bid}-success")
+              pipeline.sadd("BID-#{parent_bid}-complete", bid)
+              pipeline.scard("BID-#{parent_bid}-complete")
+              pipeline.hincrby("BID-#{parent_bid}", "pending", 0)
+              pipeline.hincrby("BID-#{parent_bid}", "children", 0)
+              pipeline.scard("BID-#{parent_bid}-failed")
             end
           end
           # if job finished successfully and parent batch completed call parent complete callback
@@ -61,10 +61,10 @@ module Sidekiq
 
         def complete(bid, status, parent_bid)
           pending, children, success = Sidekiq.redis do |r|
-            r.multi do
-              r.hincrby("BID-#{bid}", "pending", 0)
-              r.hincrby("BID-#{bid}", "children", 0)
-              r.scard("BID-#{bid}-success")
+            r.multi do |pipeline|
+              pipeline.hincrby("BID-#{bid}", "pending", 0)
+              pipeline.hincrby("BID-#{bid}", "children", 0)
+              pipeline.scard("BID-#{bid}-success")
             end
           end
 
@@ -80,12 +80,12 @@ module Sidekiq
 
             Sidekiq.logger.debug {"Finalize parent complete bid: #{parent_bid}"}
             _, complete, pending, children, failure = Sidekiq.redis do |r|
-              r.multi do
-                r.sadd("BID-#{parent_bid}-complete", bid)
-                r.scard("BID-#{parent_bid}-complete")
-                r.hincrby("BID-#{parent_bid}", "pending", 0)
-                r.hincrby("BID-#{parent_bid}", "children", 0)
-                r.scard("BID-#{parent_bid}-failed")
+              r.multi do |pipeline|
+                pipeline.sadd("BID-#{parent_bid}-complete", bid)
+                pipeline.scard("BID-#{parent_bid}-complete")
+                pipeline.hincrby("BID-#{parent_bid}", "pending", 0)
+                pipeline.hincrby("BID-#{parent_bid}", "children", 0)
+                pipeline.scard("BID-#{parent_bid}-failed")
               end
             end
             if complete == children && pending == failure

data/lib/sidekiq/batch/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   class Batch
-    VERSION = '0.1.6'.freeze
+    VERSION = '0.1.7'.freeze
   end
 end

data/lib/sidekiq/batch.rb

@@ -42,12 +42,12 @@ module Sidekiq
       return unless %w(success complete).include?(event.to_s)
       callback_key = "#{@bidkey}-callbacks-#{event}"
       Sidekiq.redis do |r|
-        r.multi do
-          r.sadd(callback_key, JSON.unparse({
+        r.multi do |pipeline|
+          pipeline.sadd(callback_key, JSON.unparse({
             callback: callback,
             opts: options
           }))
-          r.expire(callback_key, BID_EXPIRE_TTL)
+          pipeline.expire(callback_key, BID_EXPIRE_TTL)
         end
       end
     end
@@ -62,10 +62,10 @@ module Sidekiq
           parent_bid = Thread.current[:batch].bid if Thread.current[:batch]
 
           Sidekiq.redis do |r|
-            r.multi do
-              r.hset(@bidkey, "created_at", @created_at)
-              r.hset(@bidkey, "parent_bid", parent_bid.to_s) if parent_bid
-              r.expire(@bidkey, BID_EXPIRE_TTL)
+            r.multi do |pipeline|
+              pipeline.hset(@bidkey, "created_at", @created_at)
+              pipeline.hset(@bidkey, "parent_bid", parent_bid.to_s) if parent_bid
+              pipeline.expire(@bidkey, BID_EXPIRE_TTL)
             end
           end
 
@@ -85,19 +85,19 @@ module Sidekiq
         return [] if @ready_to_queue.size == 0
 
         Sidekiq.redis do |r|
-          r.multi do
+          r.multi do |pipeline|
             if parent_bid
-              r.hincrby("BID-#{parent_bid}", "children", 1)
-              r.hincrby("BID-#{parent_bid}", "total", @ready_to_queue.size)
-              r.expire("BID-#{parent_bid}", BID_EXPIRE_TTL)
+              pipeline.hincrby("BID-#{parent_bid}", "children", 1)
+              pipeline.hincrby("BID-#{parent_bid}", "total", @ready_to_queue.size)
+              pipeline.expire("BID-#{parent_bid}", BID_EXPIRE_TTL)
             end
 
-            r.hincrby(@bidkey, "pending", @ready_to_queue.size)
-            r.hincrby(@bidkey, "total", @ready_to_queue.size)
-            r.expire(@bidkey, BID_EXPIRE_TTL)
+            pipeline.hincrby(@bidkey, "pending", @ready_to_queue.size)
+            pipeline.hincrby(@bidkey, "total", @ready_to_queue.size)
+            pipeline.expire(@bidkey, BID_EXPIRE_TTL)
 
-            r.sadd(@bidkey + "-jids", @ready_to_queue)
-            r.expire(@bidkey + "-jids", BID_EXPIRE_TTL)
+            pipeline.sadd(@bidkey + "-jids", @ready_to_queue)
+            pipeline.expire(@bidkey + "-jids", BID_EXPIRE_TTL)
           end
         end
 
@@ -138,9 +138,9 @@ module Sidekiq
 
     def persist_bid_attr(attribute, value)
       Sidekiq.redis do |r|
-        r.multi do
-          r.hset(@bidkey, attribute, value)
-          r.expire(@bidkey, BID_EXPIRE_TTL)
+        r.multi do |pipeline|
+          pipeline.hset(@bidkey, attribute, value)
+          pipeline.expire(@bidkey, BID_EXPIRE_TTL)
         end
       end
     end
@@ -148,26 +148,26 @@ module Sidekiq
     class << self
       def process_failed_job(bid, jid)
         _, pending, failed, children, complete, parent_bid = Sidekiq.redis do |r|
-          r.multi do
-            r.sadd("BID-#{bid}-failed", jid)
+          r.multi do |pipeline|
+            pipeline.sadd("BID-#{bid}-failed", jid)
 
-            r.hincrby("BID-#{bid}", "pending", 0)
-            r.scard("BID-#{bid}-failed")
-            r.hincrby("BID-#{bid}", "children", 0)
-            r.scard("BID-#{bid}-complete")
-            r.hget("BID-#{bid}", "parent_bid")
+            pipeline.hincrby("BID-#{bid}", "pending", 0)
+            pipeline.scard("BID-#{bid}-failed")
+            pipeline.hincrby("BID-#{bid}", "children", 0)
+            pipeline.scard("BID-#{bid}-complete")
+            pipeline.hget("BID-#{bid}", "parent_bid")
 
-            r.expire("BID-#{bid}-failed", BID_EXPIRE_TTL)
+            pipeline.expire("BID-#{bid}-failed", BID_EXPIRE_TTL)
           end
         end
 
         # if the batch failed, and has a parent, update the parent to show one pending and failed job
         if parent_bid
           Sidekiq.redis do |r|
-            r.multi do
-              r.hincrby("BID-#{parent_bid}", "pending", 1)
-              r.sadd("BID-#{parent_bid}-failed", jid)
-              r.expire("BID-#{parent_bid}-failed", BID_EXPIRE_TTL)
+            r.multi do |pipeline|
+              pipeline.hincrby("BID-#{parent_bid}", "pending", 1)
+              pipeline.sadd("BID-#{parent_bid}-failed", jid)
+              pipeline.expire("BID-#{parent_bid}-failed", BID_EXPIRE_TTL)
             end
           end
         end
@@ -179,24 +179,26 @@ module Sidekiq
 
       def process_successful_job(bid, jid)
         failed, pending, children, complete, success, total, parent_bid = Sidekiq.redis do |r|
-          r.multi do
-            r.scard("BID-#{bid}-failed")
-            r.hincrby("BID-#{bid}", "pending", -1)
-            r.hincrby("BID-#{bid}", "children", 0)
-            r.scard("BID-#{bid}-complete")
-            r.scard("BID-#{bid}-success")
-            r.hget("BID-#{bid}", "total")
-            r.hget("BID-#{bid}", "parent_bid")
-
-            r.srem("BID-#{bid}-failed", jid)
-            r.srem("BID-#{bid}-jids", jid)
-            r.expire("BID-#{bid}", BID_EXPIRE_TTL)
+          r.multi do |pipeline|
+            pipeline.scard("BID-#{bid}-failed")
+            pipeline.hincrby("BID-#{bid}", "pending", -1)
+            pipeline.hincrby("BID-#{bid}", "children", 0)
+            pipeline.scard("BID-#{bid}-complete")
+            pipeline.scard("BID-#{bid}-success")
+            pipeline.hget("BID-#{bid}", "total")
+            pipeline.hget("BID-#{bid}", "parent_bid")
+
+            pipeline.srem("BID-#{bid}-failed", jid)
+            pipeline.srem("BID-#{bid}-jids", jid)
+            pipeline.expire("BID-#{bid}", BID_EXPIRE_TTL)
           end
         end
 
+        all_success = pending.to_i.zero? && children == success
         # if complete or successfull call complete callback (the complete callback may then call successful)
-        if (pending.to_i == failed.to_i && children == complete) || (pending.to_i.zero? && children == success)
+        if (pending.to_i == failed.to_i && children == complete) || all_success
           enqueue_callbacks(:complete, bid)
+          enqueue_callbacks(:success, bid) if all_success
         end
       end
 
@@ -204,13 +206,13 @@ module Sidekiq
         batch_key = "BID-#{bid}"
         callback_key = "#{batch_key}-callbacks-#{event}"
         already_processed, _, callbacks, queue, parent_bid, callback_batch = Sidekiq.redis do |r|
-          r.multi do
-            r.hget(batch_key, event)
-            r.hset(batch_key, event, true)
-            r.smembers(callback_key)
-            r.hget(batch_key, "callback_queue")
-            r.hget(batch_key, "parent_bid")
-            r.hget(batch_key, "callback_batch")
+          r.multi do |pipeline|
+            pipeline.hget(batch_key, event)
+            pipeline.hset(batch_key, event, true)
+            pipeline.smembers(callback_key)
+            pipeline.hget(batch_key, "callback_queue")
+            pipeline.hget(batch_key, "parent_bid")
+            pipeline.hget(batch_key, "callback_batch")
           end
         end
 

data/sidekiq-batch.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "sidekiq", ">= 3"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "fakeredis", "~> 0.7.0"
+  spec.add_development_dependency "fakeredis", "~> 0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-batch
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Marcin Naglik
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2022-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 description: Sidekiq Batch Jobs Implementation
 email:
 - marcin.naglik@gmail.com
@@ -87,6 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/stale.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -106,7 +109,7 @@ homepage: http://github.com/breamware/sidekiq-batch
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,8 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Sidekiq Batch Jobs
 test_files: []