sidekiq-robust-job 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16456089ded6f826bcb4d0c9e1c2538dbf577a2204b512204f7228553cfe2405
-  data.tar.gz: 96b63fb47b131378d8409c3e0022b78749e8ca9f231ceb469fdd8a21af282416
+  metadata.gz: 4ae0b509be740c96eeac6f7e83b717d5d53fd0b26cdff4174f07c6ffa1e90092
+  data.tar.gz: e981dad74a923463ee9d458fc44df440c945029b5f5afa08f5b70f66f4e0738c
 SHA512:
-  metadata.gz: c78e1907f15a9c881273c4e8f26a0937bd8233267e358aeb374fe91a5b68db28191e9a863a7c7761e5c6ff0994dd6c3ae57cf94c191f93b81b2a1ee88e24715e
-  data.tar.gz: a901ad322c8e4a370ea2bf84e6ceb42c44930c1cd9804c0a23ad2e9230979b8ede1b13466e3dc38561bbe3c79a7d48be57aa40991044bde1f2ca6f8fbff8b0b1
+  metadata.gz: 8227e4b1c295c8479071c3939e9ccc174e06cb4f11e84cbc36509d19cf49dbd0d6085fcd64ca903350049a71941370f54b941fb393a79be9541b68f1f3feb4e8
+  data.tar.gz: c0de8095a6d8515f0cf30c65f0c8b9a15c0f18db8478311db4a1f251a83a29e67c53850aacff8f95a6e44559fb44291e1e03093ded11edd9fabb2061a6eefcd2

data/.github/workflows/ci.yml

@@ -0,0 +1,61 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+      redis:
+        image: redis:7
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ruby: "3.3"
+            gemfile: gemfiles/sidekiq_cron_1.gemfile
+            rails_version: "~> 7.1.0"
+          - ruby: "3.4"
+            gemfile: gemfiles/sidekiq_cron_2.gemfile
+            rails_version: "~> 8.0.0"
+          - ruby: "4.0"
+            gemfile: gemfiles/sidekiq_cron_2.gemfile
+            rails_version: "~> 8.1.0"
+
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      RAILS_VERSION: ${{ matrix.rails_version }}
+      PGHOST: localhost
+      PGUSER: postgres
+      PGPASSWORD: postgres
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rspec

data/.ruby-gemset

@@ -0,0 +1 @@
+sidekiq-robust-job

data/Changelog.md

@@ -2,6 +2,9 @@
 
 ## master
 
+## 1.0.0
+- Require at least ActiveRecord 7.1, support sidekiq-cron 2.x
+
 ## 0.3.0
 - Fix `enqueue_conflict_resolution_strategies` to work well with `until_executing` strategy. Handles corner case when job is being processed, yet we can't enqueue another one
 - Introduce `while_executing` uniqueness strategy, which is basically execution mutex - ensures only that 2 jobs are not executed in parallel, without considering enqueueing uniqueness.

data/README.md

@@ -224,7 +224,11 @@ Recommended especially when you don't use Sidekiq Pro's `super_fetch`. If you de
 If you want to take advantage of this feature, just add the job to schedule (based on [sidekiq-cron](https://github.com/ondrejbartas/sidekiq-cron)):
 
 ``` rb
-SidekiqRobustJob.schedule_missed_jobs_handling
+Sidekiq.configure_server do |config|
+  config.on(:startup) do
+    SidekiqRobustJob.schedule_missed_jobs_handling
+  end
+end
 ```
 
 By default, the job will be executed every 3 hours. It is going to look for the jobs created more than 3 hours ago that are still not completed or not dropped and reschedule them. You can customize both how often the job is executed and when the job should be considered to be missed:

data/gemfiles/sidekiq_cron_1.gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "sidekiq-cron", "~> 1.0"
+
+rails_version = ENV.fetch("RAILS_VERSION", "~> 7.1.0")
+gem "activerecord", rails_version
+gem "railties", rails_version

data/gemfiles/sidekiq_cron_2.gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "sidekiq-cron", "~> 2.0"
+
+rails_version = ENV.fetch("RAILS_VERSION", "~> 8.1.0")
+gem "activerecord", rails_version
+gem "railties", rails_version

data/lib/sidekiq/robust/job/version.rb

@@ -1,7 +1,7 @@
 module Sidekiq
   module Robust
     module Job
-      VERSION = "0.3.0"
+      VERSION = "1.0.0"
     end
   end
 end

data/lib/sidekiq_robust_job.rb

@@ -21,7 +21,7 @@ require "sidekiq_robust_job/uniqueness_strategy/no_uniqueness"
 require "sidekiq_robust_job/uniqueness_strategy/until_executed"
 require "sidekiq_robust_job/uniqueness_strategy/until_executing"
 require "sidekiq_robust_job/uniqueness_strategy/while_executing"
-require "sidekiq/cron/job"
+require "sidekiq-cron"
 require "sidekiq"
 require "active_support/concern"
 

data/sidekiq-robust-job.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{A gem making Sidekiq jobs fully durable with some extra features}
   spec.homepage      = "https://github.com/BookingSync/sidekiq-robust-job"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "sidekiq", ">= 5"
-  spec.add_dependency "sidekiq-cron", "~> 1"
+  spec.add_dependency "sidekiq-cron", ">= 1"
   spec.add_dependency "activesupport", ">= 5"
 
   spec.add_development_dependency "rake", "~> 13.0"
@@ -36,7 +36,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-sidekiq"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "shoulda-matchers"
-  spec.add_development_dependency "activerecord", "~> 5"
+  spec.add_development_dependency "activerecord", ">= 7.1"
+  spec.add_development_dependency "railties", ">= 7.1"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "factory_bot_rails"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-robust-job
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Karol Galanciak
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2026-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -28,14 +28,14 @@ dependencies:
   name: sidekiq-cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
@@ -126,16 +126,30 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -171,17 +185,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-gemset"
 - ".travis.yml"
 - Changelog.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/sidekiq_cron_1.gemfile
+- gemfiles/sidekiq_cron_2.gemfile
 - lib/sidekiq-robust-job.rb
 - lib/sidekiq/robust/job.rb
 - lib/sidekiq/robust/job/version.rb
@@ -225,14 +242,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A gem making Sidekiq jobs fully durable with some extra features

data/Gemfile.lock

@@ -1,127 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sidekiq-robust-job (0.3.0)
-      activesupport (>= 5)
-      sidekiq (>= 5)
-      sidekiq-cron (~> 1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (5.2.4.5)
-      actionview (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.5)
-      activesupport (= 5.2.4.5)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.4.5)
-      activesupport (= 5.2.4.5)
-    activerecord (5.2.4.5)
-      activemodel (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
-      arel (>= 9.0)
-    activesupport (5.2.4.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    builder (3.2.4)
-    concurrent-ruby (1.1.9)
-    connection_pool (2.2.3)
-    crass (1.0.6)
-    diff-lcs (1.4.4)
-    erubi (1.10.0)
-    et-orbi (1.2.7)
-      tzinfo
-    factory_bot (6.1.0)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.1.0)
-      factory_bot (~> 6.1.0)
-      railties (>= 5.0.0)
-    fugit (1.5.3)
-      et-orbi (~> 1, >= 1.2.7)
-      raabro (~> 1.4)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    loofah (2.10.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    pg (1.2.3)
-    raabro (1.4.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (5.2.4.5)
-      actionpack (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (13.0.1)
-    redis (4.2.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-sidekiq (3.1.0)
-      rspec-core (~> 3.0, >= 3.0.0)
-      sidekiq (>= 2.4.0)
-    rspec-support (3.10.0)
-    shoulda-matchers (4.4.1)
-      activesupport (>= 4.2.0)
-    sidekiq (6.1.2)
-      connection_pool (>= 2.2.2)
-      rack (~> 2.0)
-      redis (>= 4.2.0)
-    sidekiq-cron (1.3.0)
-      fugit (>= 1.1)
-      sidekiq (>= 4.2.1)
-    thor (1.1.0)
-    thread_safe (0.3.6)
-    timecop (0.9.2)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5)
-  factory_bot_rails
-  pg
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rspec-sidekiq
-  shoulda-matchers
-  sidekiq-robust-job!
-  timecop
-
-BUNDLED WITH
-   2.2.22