sidekiq-clutch 2.1.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20afe5d56df439c45d8866da01d4a61f4e9b29ffa795544cae880c158650d15f
-  data.tar.gz: 51226b9dfd3846b652dfd0b17b45a057d16a4ee55b21ad1eeae1701c22279cb8
+  metadata.gz: b1aeadb1bf712264c64a2770ac20cfcf779af8ab29ed120b40dd1730e30b28d0
+  data.tar.gz: 3cda98c60d5bb023b220320ea11a15e941ede2bf44df4625677e7950286a2176
 SHA512:
-  metadata.gz: 33e799264f3bf4c2a7cf6b564e92076b34a491269d5572a3a5623d0b52d766d9a0dd67fdb5f383ee1b4b3480a724bb45fe04c3b645008718cd6c2a990ab7f63c
-  data.tar.gz: 074af1df0fd3b46e8ee4e6b73d79093f096298a7feb21af74ab03e6aa56ae0b04ce3c50d098af49b910e9041af96989dc4592b66575f72fe0466f03c30d68d45
+  metadata.gz: 2b2e5468e6162b849245fbdba40fda75e96de6ad91757aba4cdc537ef7d5188a5abdcd37163d38f0e3c1b44dc2610654e14145cf0cebebec17f0bbfd1f238ad2
+  data.tar.gz: 8e10d8416293f4ef95df375612b8dbd9b023fae01301e90e2c229f4522125b4ddd8cd50f281f4bcc15e6a6f2af8d6c7f47fe1eafc293024655320901b4ec8b16

data/.circleci/config.yml

@@ -4,10 +4,9 @@ jobs:
     parallelism: 1
     docker:
     - image: cimg/ruby:3.3
-    - image: redis:3.2
+    - image: redis:8.0-M03-alpine
     steps:
     - checkout
-    - run: sed -i "s/spec.add_dependency 'sidekiq', '>= 5.0.0'/spec.add_dependency 'sidekiq', '>= 5.0.0', '< 7.0.0'/" sidekiq-clutch.gemspec
     - run: gem install bundler
     - run: bundle install
     - run: bundle exec rspec

data/.envrc

@@ -0,0 +1,6 @@
+# Automatically sets up your devbox environment whenever you cd into this
+# directory via our direnv integration:
+
+if command -v devbox 2>&1 >/dev/null && [[ -z "$DISABLE_DEVBOX_DIRENV" ]]; then
+  eval "$(devbox generate direnv --print-envrc)"
+fi

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.0.0 - Feb 19, 2025
+
+* CHORE: Remove old-style job handling code
+  This would only be breaking if you have ongoing batches
+  that haven't yet completed (unlikely).
+
 # 2.1.2 - Feb 18, 2025
 
 * FIX: Don't leave orphaned redis keys laying around

data/devbox.json

@@ -0,0 +1,14 @@
+{
+  "$schema":  "https://raw.githubusercontent.com/jetify-com/devbox/0.14.0/.schema/devbox.schema.json",
+  "packages": ["ruby_3_3@latest"],
+  "shell": {
+    "init_hook": [
+      "echo 'Welcome to devbox!' > /dev/null"
+    ],
+    "scripts": {
+      "test": [
+        "echo \"Error: no test specified\" && exit 1"
+      ]
+    }
+  }
+}

data/devbox.lock

@@ -0,0 +1,73 @@
+{
+  "lockfile_version": "1",
+  "packages": {
+    "github:NixOS/nixpkgs/nixpkgs-unstable": {
+      "resolved": "github:NixOS/nixpkgs/632f04521e847173c54fa72973ec6c39a371211c?lastModified=1739863612&narHash=sha256-UbtgxplOhFcyjBcNbTVO8%2BHUHAl%2FWXFDOb6LvqShiZo%3D"
+    },
+    "ruby_3_3@latest": {
+      "last_modified": "2024-09-10T15:01:03Z",
+      "plugin_version": "0.0.2",
+      "resolved": "github:NixOS/nixpkgs/5ed627539ac84809c78b2dd6d26a5cebeb5ae269#ruby",
+      "source": "devbox-search",
+      "version": "3.3.4",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/zsngi7cq7asxc6kb0lcmbyydasfrmai6-ruby-3.3.4",
+              "default": true
+            },
+            {
+              "name": "devdoc",
+              "path": "/nix/store/c0zmjmfw5pp00slwy842bd8zzy74pava-ruby-3.3.4-devdoc"
+            }
+          ],
+          "store_path": "/nix/store/zsngi7cq7asxc6kb0lcmbyydasfrmai6-ruby-3.3.4"
+        },
+        "aarch64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/8vri7d6b75gspvnfrdpqnagfi5bbvis9-ruby-3.3.4",
+              "default": true
+            },
+            {
+              "name": "devdoc",
+              "path": "/nix/store/bfrwr1n6pxd3hz31h589j317g290p0r5-ruby-3.3.4-devdoc"
+            }
+          ],
+          "store_path": "/nix/store/8vri7d6b75gspvnfrdpqnagfi5bbvis9-ruby-3.3.4"
+        },
+        "x86_64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/hksac0axpx3savrgmy75rid3smv0d9nj-ruby-3.3.4",
+              "default": true
+            },
+            {
+              "name": "devdoc",
+              "path": "/nix/store/3564jxjgp9dk8vzjwb7i3fpzkpw74z3m-ruby-3.3.4-devdoc"
+            }
+          ],
+          "store_path": "/nix/store/hksac0axpx3savrgmy75rid3smv0d9nj-ruby-3.3.4"
+        },
+        "x86_64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/2vg3asd3rmhng3wqvp781a1q5dhrr4yn-ruby-3.3.4",
+              "default": true
+            },
+            {
+              "name": "devdoc",
+              "path": "/nix/store/2vgrf69lcz8ipawxipza3w7gsqdnbbnk-ruby-3.3.4-devdoc"
+            }
+          ],
+          "store_path": "/nix/store/2vg3asd3rmhng3wqvp781a1q5dhrr4yn-ruby-3.3.4"
+        }
+      }
+    }
+  }
+}

data/lib/sidekiq/clutch/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   class Clutch
-    VERSION = '2.1.2'.freeze
+    VERSION = '3.0.0'.freeze
   end
 end

data/lib/sidekiq/clutch.rb

@@ -72,8 +72,6 @@ module Sidekiq
     end
 
     def on_success(status, options)
-      return on_success_legacy(status, options) if options['jobs']
-
       raise 'invariant: key_base is missing!' unless options['key_base']
       raise 'invariant: result_key_index is missing!' unless options['result_key_index']
 
@@ -101,20 +99,6 @@ module Sidekiq
 
     private
 
-    # accept old style of passing job data, will be removed in 3.0
-    def on_success_legacy(status, options)
-      @key_base = options['result_key'].sub(/-\d+$/, '')
-      if options['jobs'].empty?
-        clean_up_temporary_keys
-        return
-      end
-      parent_batch = Sidekiq::Batch.new(status.parent_bid)
-      service = self.class.new(parent_batch)
-      service.jobs.raw = options['jobs']
-      service.current_result_key = options['result_key']
-      service.engage
-    end
-
     def key_base
       @key_base ||= "clutch:#{SecureRandom.uuid}"
     end
@@ -146,8 +130,6 @@ module Sidekiq
     def result_key_index(step)
       if step['result_key_index']
         step['result_key_index']
-      elsif step['result_key'] # legacy style, will be removed in 3.0
-        step['result_key'].split('-').last.to_i
       else
         raise "invariant: expected result_key_index passed in step; got: #{step.inspect}"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-clutch
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Tim Morgan
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".envrc"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -69,6 +70,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- devbox.json
+- devbox.lock
 - lib/sidekiq/clutch.rb
 - lib/sidekiq/clutch/job_wrapper.rb
 - lib/sidekiq/clutch/jobs_collection.rb