sidekiq-scheduler 4.0.3 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c16869144651f4193112eb896e092d382af94340b373f11ba92cefbdcc8fa875
-  data.tar.gz: 00b8efaca9cfcfe0379b633f5ca8aa215fa1f382fcd86fd29910b7ac64e6db7f
+  metadata.gz: ff0427944d5e42f269323d2178f99e85883f0bf1c319606e492fd3c2f248cebc
+  data.tar.gz: 2589826435a6609724de6adae9c2376195cf2336907a30f836067aebb3d00b70
 SHA512:
-  metadata.gz: 5afc74e4fa2a54d2b00e9d1a1343f64f242d217bee9c0ec170a4fd502cc7d7233598123c769034b7ad830c75eecab1f9aa99513bcac0d42bcaef91d771ddf7d0
-  data.tar.gz: 2e096c861063f78ce359807fd6e58477ca3e8489d645dca3a5c188e5713ed07b61392ddc96ec0d0eb6f5c0c6b3da91aec3c9cf3e27dcd9f4094f37b3185352b1
+  metadata.gz: 342671556514ae49da4d84b4a6e2e014060d69b7149284ce079bf56dedbf51d5c6e6e31987606e05e62d9d1070c47ff15e464dba10b69b1bf0292811c43292d8
+  data.tar.gz: b81d626a69832dec123de5fde3d255d1f4c4f3158a7298d26c10746b4e5444bdabc74f6f47e6da2823fc0786e9cb136e9ed59c41555674d1b5ede8e075194d4f

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+# 5.0.1
+
+  - [**ENHANCEMENT**] Adds Ruby 3.2 to the CI matrix. [#420](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/420)
+  - [**DOCS**] README: refer to v5 as released. [#421](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/421)
+  - [**FIX**] Fix dependency on Rails `.present?` method. [#425](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/425)
+ 
+# 5.0.0
+
+  - [**FIX**] Ensure generated scheduled time has a precision of 3 miliseconds. [#418](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/418)
+
+*Note 1:* Check [# 5.0.0.beta1](#500beta1) & [# 5.0.0.beta2](#500beta2) releases for breaking changes.
+
+*Note 2:* Sidekiq Embedding is yet not supported, see [#419](https://github.com/sidekiq-scheduler/sidekiq-scheduler/issues/419) for more details.
+
+
+# 5.0.0.beta2
+
+  - [**FIX**] Drop explicit redis dependency [#416](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/416)
+
+# 5.0.0.beta1
+
+- [**BREAKING CHANGE**] Moves all sidekiq-scheduler config options under the `scheduler` key in the `sidekiq.yml` file [#412](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/412)
+  - If you're migrating from v4 to v5, any `sidekiq-scheduler` config you may have in your `sidekiq.yml` should be moved under the `scheduler` key.
+  - See [#412](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/412) to see which are the config options that you need to move under the `scheduler` key.
+  
+- [**BREAKING CHANGE**] Drop support for EOL Ruby & Sidekiq versions (Ruby: `2.5.x` & `2.6.x`; Sidekiq: `4.x` & `5.x`) [#411](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/411)
+
+- [**FIX**] Add support for Sidekiq 7 [#410](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/410)
+
+
 # 4.0.3
 
 - [**GH Actions**] Add dependabot for GitHub Actions [#390](https://github.com/sidekiq-scheduler/sidekiq-scheduler/pull/390)

data/README.md

@@ -18,7 +18,7 @@
 `sidekiq-scheduler` is an extension to [Sidekiq](http://github.com/mperham/sidekiq) that
 pushes jobs in a scheduled way, mimicking cron utility.
 
-__Note:__ Current branch contains work of the v4 release, if you are looking for version 2.2.* or 3.*, go to [2.2-stable branch](https://github.com/sidekiq-scheduler/sidekiq-scheduler/tree/2.2-stable) / [v3-stable](https://github.com/sidekiq-scheduler/sidekiq-scheduler/tree/v3-stable).
+__Note:__ Current branch contains work of the v5 release, if you are looking for version 2.2.\*, 3.\*, or 4.\*, go to [2.2-stable branch](https://github.com/sidekiq-scheduler/sidekiq-scheduler/tree/2.2-stable) / [v3-stable](https://github.com/sidekiq-scheduler/sidekiq-scheduler/tree/v3-stable) / [v4-stable](https://github.com/sidekiq-scheduler/sidekiq-scheduler/tree/v4-stable).
 
 ## Installation
 
@@ -48,10 +48,11 @@ end
 ``` yaml
 # config/sidekiq.yml
 
-:schedule:
-  hello_world:
-    cron: '0 * * * * *'   # Runs once per minute
-    class: HelloWorld
+:scheduler:
+  :schedule:
+    hello_world:
+      cron: '0 * * * * *'   # Runs once per minute
+      class: HelloWorld
 ```
 
 Run sidekiq:
@@ -83,40 +84,41 @@ Configuration options are placed inside `sidekiq.yml` config file.
 Available options are:
 
 ``` yaml
-:dynamic: <if true the schedule can be modified in runtime [false by default]>
-:dynamic_every: <if dynamic is true, the schedule is reloaded every interval [5s by default]>
-:enabled: <enables scheduler if true [true by default]>
 :scheduler:
+  :dynamic: <if true the schedule can be modified in runtime [false by default]>
+  :dynamic_every: <if dynamic is true, the schedule is reloaded every interval [5s by default]>
+  :enabled: <enables scheduler if true [true by default]>
   :listened_queues_only: <push jobs whose queue is being listened by sidekiq [false by default]>
-:rufus_scheduler_options: <Set custom options for rufus scheduler, like max_work_threads [{} by default]>
+  :rufus_scheduler_options: <Set custom options for rufus scheduler, like max_work_threads [{} by default]>
 ```
 
 ## Schedule configuration
 
-The schedule is configured through the `:schedule` config entry in the sidekiq config file:
+The schedule is configured through the `:scheduler:` -> `:schedule` config entry in the sidekiq config file:
 
 ``` yaml
-:schedule:
-  CancelAbandonedOrders:
-    cron: '0 */5 * * * *'   # Runs when second = 0, every 5 minutes
+:scheduler:
+  :schedule:
+    CancelAbandonedOrders:
+      cron: '0 */5 * * * *'   # Runs when second = 0, every 5 minutes
 
-  queue_documents_for_indexing:
-    cron: '0 0 * * * *'   # Runs every hour
+    queue_documents_for_indexing:
+      cron: '0 0 * * * *'   # Runs every hour
 
-    # By default the job name will be taken as worker class name.
-    # If you want to have a different job name and class name, provide the 'class' option
-    class: QueueDocuments
+      # By default the job name will be taken as worker class name.
+      # If you want to have a different job name and class name, provide the 'class' option
+      class: QueueDocuments
 
-    queue: slow
-    args: ['*.pdf']
-    description: "This job queues pdf content for indexing in solr"
+      queue: slow
+      args: ['*.pdf']
+      description: "This job queues pdf content for indexing in solr"
 
-    # Enable the `metadata` argument which will pass a Hash containing the schedule metadata
-    # as the last argument of the `perform` method. `false` by default.
-    include_metadata: true
+      # Enable the `metadata` argument which will pass a Hash containing the schedule metadata
+      # as the last argument of the `perform` method. `false` by default.
+      include_metadata: true
 
-    # Enable / disable a job. All jobs are enabled by default.
-    enabled: true
+      # Enable / disable a job. All jobs are enabled by default.
+      enabled: true
 ```
 
 ### Schedule metadata
@@ -157,9 +159,10 @@ Cron, every, and interval types push jobs into sidekiq in a recurrent manner.
 `cron` follows the same pattern as cron utility, with seconds resolution.
 
 ``` yaml
-:schedule:
-  HelloWorld:
-    cron: '0 * * * * *' # Runs when second = 0
+:scheduler:
+  :schedule:
+    HelloWorld:
+      cron: '0 * * * * *' # Runs when second = 0
 ```
 
 `every` triggers following a given frequency:
@@ -250,7 +253,8 @@ When `:dynamic` flag is set to `true`, schedule changes are loaded every 5 secon
 
 ``` yaml
 # config/sidekiq.yml
-:dynamic: true
+:scheduler:
+  :dynamic: true
 ```
 
 If `:dynamic` flag is set to `false`, you'll have to reload the schedule manually in sidekiq
@@ -299,8 +303,9 @@ You can also override the thread pool size in Rufus Scheduler by setting the fol
 ---
 ...
 
-rufus_scheduler_options:
-  max_work_threads: 5
+:scheduler:
+  rufus_scheduler_options:
+    max_work_threads: 5
 
 ...
 ```
@@ -386,12 +391,13 @@ Say you have one process with the schedule:
 
 :queues:
   - default
-:schedule:
-  do_something_every_minute:
-    class: DoSomethingJob
-    args: matey
-    queue: :scheduler
-    cron: '0 * * * * * America/Los_Angeles'
+:scheduler:
+  :schedule:
+    do_something_every_minute:
+      class: DoSomethingJob
+      args: matey
+      queue: :scheduler
+      cron: '0 * * * * * America/Los_Angeles'
 ```
 
 And a separate separate configured process without one:
@@ -401,7 +407,8 @@ And a separate separate configured process without one:
   - scheduler
 
 ## NOTE Disable the Scheduler
-:enabled: false
+:scheduler:
+  :enabled: false
 ```
 
 ### Details

data/lib/sidekiq-scheduler/config.rb

@@ -0,0 +1,80 @@
+module SidekiqScheduler
+  class Config
+    # We have to set the default as nil because the scheduler could be instantiated without
+    # passing the sidekiq config, and in those scenarios we don't want to fail
+    def initialize(sidekiq_config: nil, without_defaults: false)
+      @sidekiq_config = sidekiq_config
+      @scheduler_config = fetch_scheduler_config(sidekiq_config, without_defaults)
+    end
+
+    def enabled?
+      scheduler_config[:enabled]
+    end
+
+    def enabled=(value)
+      scheduler_config[:enabled] = value
+    end
+
+    def dynamic?
+      scheduler_config[:dynamic]
+    end
+
+    def dynamic=(value)
+      scheduler_config[:dynamic] = value
+    end
+
+    def dynamic_every?
+      scheduler_config[:dynamic_every]
+    end
+
+    def dynamic_every=(value)
+      scheduler_config[:dynamic_every] = value
+    end
+
+    def schedule
+      scheduler_config[:schedule]
+    end
+
+    def schedule=(value)
+      scheduler_config[:schedule] = value
+    end
+
+    def listened_queues_only?
+      scheduler_config[:listened_queues_only]
+    end
+
+    def listened_queues_only=(value)
+      scheduler_config[:listened_queues_only] = value
+    end
+
+    def rufus_scheduler_options
+      scheduler_config[:rufus_scheduler_options]
+    end
+
+    def rufus_scheduler_options=(value)
+      scheduler_config[:rufus_scheduler_options] = value
+    end
+
+    def sidekiq_queues
+      SidekiqScheduler::SidekiqAdapter.sidekiq_queues(sidekiq_config)
+    end
+
+    private
+
+    attr_reader :scheduler_config
+    attr_reader :sidekiq_config
+
+    DEFAULT_OPTIONS = {
+      enabled: true,
+      dynamic: false,
+      dynamic_every: '5s',
+      schedule: {},
+      rufus_scheduler_options: {}
+    }.freeze
+
+    def fetch_scheduler_config(sidekiq_config, without_defaults)
+      conf = SidekiqScheduler::SidekiqAdapter.fetch_scheduler_config_from_sidekiq(sidekiq_config)
+      without_defaults ? conf : DEFAULT_OPTIONS.merge(conf)
+    end
+  end
+end

data/lib/sidekiq-scheduler/manager.rb

@@ -1,5 +1,3 @@
-require 'redis'
-
 require 'sidekiq-scheduler/schedule'
 require 'sidekiq-scheduler/scheduler'
 
@@ -10,19 +8,12 @@ module SidekiqScheduler
   # from Redis onto the work queues
   #
   class Manager
-    DEFAULT_SCHEDULER_OPTIONS = {
-      enabled: true,
-      dynamic: false,
-      dynamic_every: '5s',
-      schedule: {}
-    }
-
-    def initialize(options)
-      scheduler_options = load_scheduler_options(options)
+    def initialize(config)
+      set_current_scheduler_options(config)
 
-      @scheduler_instance = SidekiqScheduler::Scheduler.new(scheduler_options)
+      @scheduler_instance = SidekiqScheduler::Scheduler.new(config)
       SidekiqScheduler::Scheduler.instance = @scheduler_instance
-      Sidekiq.schedule = scheduler_options[:schedule] if @scheduler_instance.enabled
+      Sidekiq.schedule = config.schedule if @scheduler_instance.enabled
     end
 
     def stop
@@ -35,19 +26,19 @@ module SidekiqScheduler
 
     private
 
-    def load_scheduler_options(options)
-      options[:listened_queues_only] = options.fetch(:scheduler, {})[:listened_queues_only]
-      scheduler_options = DEFAULT_SCHEDULER_OPTIONS.merge(options)
-
-      current_options = {
-        enabled: SidekiqScheduler::Scheduler.enabled,
-        dynamic: SidekiqScheduler::Scheduler.dynamic,
-        dynamic_every: SidekiqScheduler::Scheduler.dynamic_every,
-        schedule: Sidekiq.schedule,
-        listened_queues_only: SidekiqScheduler::Scheduler.listened_queues_only
-      }.delete_if { |_, value| value.nil? }
-
-      scheduler_options.merge(current_options)
+    def set_current_scheduler_options(config)
+      enabled = SidekiqScheduler::Scheduler.enabled
+      dynamic = SidekiqScheduler::Scheduler.dynamic
+      dynamic_every = SidekiqScheduler::Scheduler.dynamic_every
+      listened_queues_only = SidekiqScheduler::Scheduler.listened_queues_only
+
+      config.enabled = enabled unless enabled.nil?
+      config.dynamic = dynamic unless dynamic.nil?
+      config.dynamic_every = dynamic_every unless dynamic_every.nil?
+      unless Sidekiq.schedule.nil? || (Sidekiq.schedule.respond_to?(:empty?) && Sidekiq.schedule.empty?)
+        config.schedule = Sidekiq.schedule
+      end
+      config.listened_queues_only = listened_queues_only unless listened_queues_only.nil?
     end
   end
 end

data/lib/sidekiq-scheduler/redis_manager.rb

@@ -96,7 +96,7 @@ module SidekiqScheduler
     #
     # @return [Boolean] true if the schedules key is set, false otherwise
     def self.schedule_exist?
-      Sidekiq.redis { |r| r.exists?(schedules_key) }
+      SidekiqScheduler::SidekiqAdapter.redis_key_exists?(schedules_key)
     end
 
     # Returns all the schedule changes for a given time range.
@@ -136,7 +136,7 @@ module SidekiqScheduler
         end
       end
 
-      registered
+      registered.instance_of?(Integer) ? (registered > 0) : registered
     end
 
     # Removes instances of the job older than 24 hours
@@ -210,7 +210,7 @@ module SidekiqScheduler
     end
 
     private
-    
+
     # Returns the value of a Redis stored hash field
     #
     # @param [String] hash_key The key name of the hash

data/lib/sidekiq-scheduler/scheduler.rb

@@ -2,6 +2,7 @@ require 'rufus/scheduler'
 require 'json'
 require 'sidekiq-scheduler/rufus_utils'
 require 'sidekiq-scheduler/redis_manager'
+require 'sidekiq-scheduler/config'
 
 module SidekiqScheduler
   class Scheduler
@@ -10,6 +11,15 @@ module SidekiqScheduler
       alias_method :params, :opts
     end
 
+    # TODO: Can we remove those attr_accessor's? If we need to keep them, we should
+    # update those values on the config object instead of just here in the scheduler.
+    # That's why we need to do what we do in the set_current_scheduler_options (not
+    # saying we will have to do it somehow still)
+    #
+    # NOTE: ^ Keeping this TODO here for now, in a future version of this project
+    # we will remove those attr acessors and use only our config object. For now,
+    # let's keep as it is.
+
     # Set to enable or disable the scheduler.
     attr_accessor :enabled
 
@@ -41,12 +51,14 @@ module SidekiqScheduler
       end
     end
 
-    def initialize(options = {})
-      self.enabled = options[:enabled]
-      self.dynamic = options[:dynamic]
-      self.dynamic_every = options[:dynamic_every]
-      self.listened_queues_only = options[:listened_queues_only]
-      self.rufus_scheduler_options = options[:rufus_scheduler_options] || {}
+    def initialize(config = SidekiqScheduler::Config.new(without_defaults: true))
+      @scheduler_config = config
+
+      self.enabled = config.enabled?
+      self.dynamic = config.dynamic?
+      self.dynamic_every = config.dynamic_every?
+      self.listened_queues_only = config.listened_queues_only?
+      self.rufus_scheduler_options = config.rufus_scheduler_options
     end
 
     # the Rufus::Scheduler jobs that are scheduled
@@ -82,7 +94,7 @@ module SidekiqScheduler
         Sidekiq.logger.info 'Schedule empty! Set Sidekiq.schedule' if Sidekiq.schedule.empty?
 
         @scheduled_jobs = {}
-        queues = sidekiq_queues
+        queues = scheduler_config.sidekiq_queues
 
         Sidekiq.schedule.each do |name, config|
           if !listened_queues_only || enabled_queue?(config['queue'].to_s, queues)
@@ -158,7 +170,7 @@ module SidekiqScheduler
       config = prepare_arguments(job_config.dup)
 
       if config.delete('include_metadata')
-        config['args'] = arguments_with_metadata(config['args'], "scheduled_at" => time.to_f)
+        config['args'] = arguments_with_metadata(config['args'], "scheduled_at" => time.to_f.round(3))
       end
 
       if SidekiqScheduler::Utils.active_job_enqueue?(config['class'])
@@ -238,6 +250,8 @@ module SidekiqScheduler
 
     private
 
+    attr_reader :scheduler_config
+
     def new_job(name, interval_type, config, schedule, options)
       options = options.merge({ :job => true, :tags => [name] })
 
@@ -277,7 +291,7 @@ module SidekiqScheduler
     # since epoch.
     #
     # @example with hash argument
-    #   arguments_with_metadata({value: 1}, scheduled_at: Time.now)
+    #   arguments_with_metadata({value: 1}, scheduled_at: Time.now.round(3))
     #   #=> [{value: 1}, {scheduled_at: <miliseconds since epoch>}]
     #
     # @param args [Array|Hash]
@@ -291,14 +305,6 @@ module SidekiqScheduler
       end
     end
 
-    def sidekiq_queues
-      if SIDEKIQ_GTE_6_5_0
-        Sidekiq[:queues].map(&:to_s)
-      else
-        Sidekiq.options[:queues].map(&:to_s)
-      end
-    end
-
     # Returns true if a job's queue is included in the array of queues
     #
     # If queues are empty, returns true.

data/lib/sidekiq-scheduler/sidekiq_adapter.rb

@@ -0,0 +1,80 @@
+module SidekiqScheduler
+  class OptionNotSupportedAnymore < StandardError; end
+
+  class SidekiqAdapter
+    SIDEKIQ_GTE_6_5_0 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5.0')
+    SIDEKIQ_GTE_7_0_0 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('7.0.0')
+
+    def self.fetch_scheduler_config_from_sidekiq(sidekiq_config)
+      return {} if sidekiq_config.nil?
+
+      check_using_old_sidekiq_scheduler_config!(sidekiq_config)
+
+      if SIDEKIQ_GTE_6_5_0
+        sidekiq_config.fetch(:scheduler, {})
+      else
+        sidekiq_config.options.fetch(:scheduler, {})
+      end
+    end
+
+    def self.check_using_old_sidekiq_scheduler_config!(sidekiq_config)
+      %i[enabled dynamic dynamic_every schedule listened_queues_only rufus_scheduler_options].each do |option|
+        if SIDEKIQ_GTE_7_0_0
+          if sidekiq_config.key?(option)
+            raise OptionNotSupportedAnymore, ":#{option} option should be under the :scheduler: key"
+          end
+        elsif SIDEKIQ_GTE_6_5_0
+          unless sidekiq_config[option].nil?
+            raise OptionNotSupportedAnymore, ":#{option} option should be under the :scheduler: key"
+          end
+        else
+          if sidekiq_config.options.key?(option)
+            raise OptionNotSupportedAnymore, ":#{option} option should be under the :scheduler: key"
+          end
+        end
+      end
+    end
+
+    def self.start_schedule_manager(sidekiq_config:, schedule_manager:)
+      if SIDEKIQ_GTE_6_5_0
+        sidekiq_config[:schedule_manager] = schedule_manager
+        sidekiq_config[:schedule_manager].start
+      else
+        sidekiq_config.options[:schedule_manager] = schedule_manager
+        sidekiq_config.options[:schedule_manager].start
+      end
+    end
+
+    def self.stop_schedule_manager(sidekiq_config:)
+      if SIDEKIQ_GTE_6_5_0
+        sidekiq_config[:schedule_manager].stop
+      else
+        sidekiq_config.options[:schedule_manager].stop
+      end
+    end
+
+    def self.sidekiq_queues(sidekiq_config)
+      if SIDEKIQ_GTE_7_0_0
+        if sidekiq_config.nil? || (sidekiq_config.respond_to?(:empty?) && sidekiq_config.empty?)
+          Sidekiq.instance_variable_get(:@config).queues.map(&:to_s)
+        else
+          sidekiq_config.queues.map(&:to_s)
+        end
+      elsif SIDEKIQ_GTE_6_5_0
+        Sidekiq[:queues].map(&:to_s)
+      else
+        Sidekiq.options[:queues].map(&:to_s)
+      end
+    end
+
+    def self.redis_key_exists?(key_name)
+      Sidekiq.redis do |r|
+        if SIDEKIQ_GTE_7_0_0
+          r.exists(key_name) > 0
+        else
+          r.exists?(key_name)
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq-scheduler/version.rb

@@ -1,3 +1,3 @@
 module SidekiqScheduler
-  VERSION = "4.0.3"
+  VERSION = "5.0.1"
 end

data/lib/sidekiq-scheduler/web.rb

@@ -3,7 +3,7 @@ require 'sidekiq-scheduler'
 require_relative 'job_presenter'
 
 module SidekiqScheduler
-  # Hook into *Sidekiq::Web* Sinatra app which adds a new '/recurring-jobs' page
+  # Hook into *Sidekiq::Web* app which adds a new '/recurring-jobs' page
 
   module Web
     VIEW_PATH = File.expand_path('../../../web/views', __FILE__)

data/lib/sidekiq-scheduler.rb

@@ -5,9 +5,9 @@ require_relative 'sidekiq/scheduler'
 require_relative 'sidekiq-scheduler/version'
 require_relative 'sidekiq-scheduler/manager'
 require_relative 'sidekiq-scheduler/redis_manager'
+require_relative 'sidekiq-scheduler/config'
 require_relative 'sidekiq-scheduler/extensions/schedule'
-
-SIDEKIQ_GTE_6_5_0 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5.0')
+require_relative 'sidekiq-scheduler/sidekiq_adapter'
 
 Sidekiq.configure_server do |config|
 
@@ -15,25 +15,14 @@ Sidekiq.configure_server do |config|
     # schedules_changed's type was changed from SET to ZSET, so we remove old versions at startup
     SidekiqScheduler::RedisManager.clean_schedules_changed
 
-    # Accessing the raw @config hash through .options is deprecated in 6.5 and to be removed in 7.0
-    config_options = SIDEKIQ_GTE_6_5_0 ? Sidekiq.instance_variable_get(:@config) : config.options
+    scheduler_config = SidekiqScheduler::Config.new(sidekiq_config: config)
 
-    schedule_manager = SidekiqScheduler::Manager.new(config_options)
-    if SIDEKIQ_GTE_6_5_0
-      config[:schedule_manager] = schedule_manager
-      config[:schedule_manager].start
-    else
-      config.options[:schedule_manager] = schedule_manager
-      config.options[:schedule_manager].start
-    end
+    schedule_manager = SidekiqScheduler::Manager.new(scheduler_config)
+    SidekiqScheduler::SidekiqAdapter.start_schedule_manager(sidekiq_config: config, schedule_manager: schedule_manager)
   end
 
   config.on(:quiet) do
-    if SIDEKIQ_GTE_6_5_0
-      config[:schedule_manager].stop
-    else
-      config.options[:schedule_manager].stop
-    end
+    SidekiqScheduler::SidekiqAdapter.stop_schedule_manager(sidekiq_config: config)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 5.0.1
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -21,7 +21,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,21 +31,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -80,14 +66,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -187,19 +173,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: Light weight job scheduling extension for Sidekiq that adds support for
   queueing jobs in a recurring way.
 email:
@@ -214,6 +200,7 @@ files:
 - README.md
 - Rakefile
 - lib/sidekiq-scheduler.rb
+- lib/sidekiq-scheduler/config.rb
 - lib/sidekiq-scheduler/extensions/schedule.rb
 - lib/sidekiq-scheduler/extensions/web.rb
 - lib/sidekiq-scheduler/job_presenter.rb
@@ -222,6 +209,7 @@ files:
 - lib/sidekiq-scheduler/rufus_utils.rb
 - lib/sidekiq-scheduler/schedule.rb
 - lib/sidekiq-scheduler/scheduler.rb
+- lib/sidekiq-scheduler/sidekiq_adapter.rb
 - lib/sidekiq-scheduler/utils.rb
 - lib/sidekiq-scheduler/version.rb
 - lib/sidekiq-scheduler/web.rb
@@ -253,14 +241,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Light weight job scheduling extension for Sidekiq