mini_scheduler 0.18.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b5d08632e54389302df347b8c5c938b7d3693d63c126009b537a0a26532c239
-  data.tar.gz: 5db6eea6cae5c21efec10310b87e0ab4d8f7211512467547cae56e6888cbcf55
+  metadata.gz: a5a55f29798c78302b8e9ad6279f200bff9842980cb2591d932841c613eeb260
+  data.tar.gz: 8a2a7d79a5a0997c54b7dc1f6bf55f316963cd10102f542e4d358c3cadb98bbc
 SHA512:
-  metadata.gz: 2e3d947fa7227bc58774576778f5e42989bb1adcc5e28fc891a5faef504ac30e49a455216fdecbb5d7861fe21574e3db7ec4adb6a9e12ac006916374f9f4cc53
-  data.tar.gz: e3c519534c28c36f5067c02eb12953d64e7a41e96b45fb8da7d7aee05cbfc83906139be971a5681468f3bbbbab8b04cf5424997f2f829ad217a3f9a7150f452a
+  metadata.gz: 2dd40dbf5325b0b881d2b4c49ecb147d39cd433372700410aef26ad70091a094563520dc9cc5b5ed15642f3ff68a77982d53ba5d28b30dd18ea948755e24e230
+  data.tar.gz: 9cbea4b51e7b97e02d86d5473ab48596945484aff05b47d3a3313764d70d79bdc4f75e9cd6b88ff9c79b2b62aa85f308d66b626755e11263b546bc1a6160e055

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 0.20.0 - 2026-05-13
+
+- Fix `MiniScheduler::Web` integration in Sidekiq 8+
+- Move `redis` import to specs, host application won't need to explicitly
+  declare an otherwise unnecessary dependency (Sidekiq already migrated
+  to `redis-client` in v7.0)
+
+# 0.19.0 - 2026-03-30
+
+- Fix race condition in `MiniScheduler::Manager`
+- Add support for Sidekiq 8.0, 8.1
+- Add Ruby 3.4, 4.0 to CI pipeline
+- Add DragonflyDB to test matrix
+- Update minimum Ruby version to 3.2
+
 # 0.18.0 - 2024-12-20
 
 - Add support for Sidekiq 7+

data/app/models/mini_scheduler/stat.rb

@@ -6,7 +6,7 @@ if defined?(ActiveRecord::Base)
       self.table_name = "scheduler_stats"
 
       def self.purge_old
-        where("started_at < ?", 1.months.ago).delete_all
+        where("started_at < ?", 1.month.ago).delete_all
       end
     end
   end

data/gemfiles/sidekiq-8.0.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "sidekiq", "~> 8.0.0"

data/gemfiles/sidekiq-8.1.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "sidekiq", "~> 8.1.0"

data/lib/mini_scheduler/distributed_mutex.rb

@@ -22,9 +22,9 @@ module MiniScheduler
       @mutex = Mutex.new
     end
 
-    MAX_POLLING_ATTEMPTS ||= 60
-    BASE_SLEEP_DURATION ||= 0.001
-    MAX_SLEEP_DURATION ||= 1
+    MAX_POLLING_ATTEMPTS = 60
+    BASE_SLEEP_DURATION = 0.001
+    MAX_SLEEP_DURATION = 1
 
     # NOTE wrapped in mutex to maintain its semantics
     def synchronize

data/lib/mini_scheduler/manager.rb

@@ -28,8 +28,8 @@ module MiniScheduler
         @keep_alive_thread =
           Thread.new do
             while !@stopped
-              @mutex.synchronize { keep_alive }
               sleep(@manager.keep_alive_duration / 2)
+              @mutex.synchronize { keep_alive }
             end
           end
 
@@ -348,7 +348,7 @@ module MiniScheduler
     end
 
     def stop!
-      @runner.stop!
+      @runner&.stop!
       self.class.current.delete(@queue)
     end
 
@@ -357,7 +357,7 @@ module MiniScheduler
     end
 
     def keep_alive(*ids)
-      ids = [identity_key, *@runner.worker_thread_ids] if ids.size == 0
+      ids = [identity_key, *@runner&.worker_thread_ids] if ids.size == 0
       ids.each { |identity_key| redis.setex identity_key, keep_alive_duration, "" }
     end
 

data/lib/mini_scheduler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniScheduler
-  VERSION = "0.18.0"
+  VERSION = "0.20.0"
 end

data/lib/mini_scheduler/web.rb

@@ -18,22 +18,24 @@ module MiniScheduler
       end
     end
 
-    def self.registered(app)
-      app.helpers do
-        def sane_time(time)
-          return unless time
-          time
-        end
+    module Helpers
+      def sane_time(time)
+        return unless time
+        time
+      end
 
-        def sane_duration(duration)
-          return unless duration
-          if duration < 1000
-            "#{duration}ms"
-          else
-            "#{"%.2f" % (duration / 1000.0)} secs"
-          end
+      def sane_duration(duration)
+        return unless duration
+        if duration < 1000
+          "#{duration}ms"
+        else
+          "#{"%.2f" % (duration / 1000.0)} secs"
         end
       end
+    end
+
+    def self.registered(app)
+      app.helpers Helpers
 
       app.get "/scheduler" do
         MiniScheduler.before_sidekiq_web_request&.call
@@ -72,5 +74,18 @@ module MiniScheduler
   end
 end
 
-Sidekiq::Web.register(MiniScheduler::Web)
-Sidekiq::Web.tabs["Scheduler"] = "scheduler"
+sidekiq_version = Gem::Version.new(Sidekiq::VERSION)
+register_options = {
+  name: nil, # asset namespace (not used here)
+  tab: "Scheduler", # tab label
+  index: "scheduler", # index route name
+}
+
+if sidekiq_version < "7.3.0"
+  Sidekiq::Web.register MiniScheduler::Web
+  Sidekiq::Web.tabs[register_options[:tab]] = register_options[:index]
+elsif sidekiq_version < "8.0.0"
+  Sidekiq::Web.register(MiniScheduler::Web, **register_options)
+else # 8.0+
+  Sidekiq::Web.configure { |cfg| cfg.register(MiniScheduler::Web, **register_options) }
+end

data/lib/mini_scheduler.rb

@@ -5,7 +5,6 @@ require "mini_scheduler/schedule_info"
 require "mini_scheduler/manager"
 require "mini_scheduler/distributed_mutex"
 require "sidekiq"
-require "redis"
 
 begin
   require "sidekiq/exception_handler"

data/mini_scheduler.gemspec

@@ -15,21 +15,21 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/discourse/mini_scheduler"
   spec.license = "MIT"
 
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.2.0"
 
   spec.files = `git ls-files`.split($/).reject { |s| s =~ /^(spec|\.)/ }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "sidekiq", ">= 6.5", "< 8.0"
+  spec.add_runtime_dependency "sidekiq", ">= 6.5", "< 9.0"
 
   spec.add_development_dependency "pg", "~> 1.0"
   spec.add_development_dependency "activesupport", "~> 7.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "mocha", "~> 2.0"
+  spec.add_development_dependency "mocha", "~> 3.0"
   spec.add_development_dependency "guard", "~> 2.0"
   spec.add_development_dependency "guard-rspec", "~> 4.0"
   spec.add_development_dependency "redis", ">= 4.0"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rubocop-discourse", "= 3.8.1"
+  spec.add_development_dependency "rubocop-discourse", "= 3.18.0"
   spec.add_development_dependency "syntax_tree"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Sam Saffron
 - Neil Lalonde
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -20,7 +19,7 @@ dependencies:
         version: '6.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +29,7 @@ dependencies:
         version: '6.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -79,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -149,14 +148,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: 3.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: 3.18.0
 - !ruby/object:Gem::Dependency
   name: syntax_tree
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +188,8 @@ files:
 - gemfiles/sidekiq-7.1.gemfile
 - gemfiles/sidekiq-7.2.gemfile
 - gemfiles/sidekiq-7.3.gemfile
+- gemfiles/sidekiq-8.0.gemfile
+- gemfiles/sidekiq-8.1.gemfile
 - lib/generators/mini_scheduler/install/install_generator.rb
 - lib/generators/mini_scheduler/install/templates/create_mini_scheduler_stats.rb
 - lib/generators/mini_scheduler/install/templates/mini_scheduler_initializer.rb
@@ -207,7 +208,6 @@ homepage: https://github.com/discourse/mini_scheduler
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,15 +215,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Adds recurring jobs for Sidekiq
 test_files: []