sidekiq-cron 1.12.0 → 2.0.0.rc2

data/lib/sidekiq/cron/namespace.rb

@@ -0,0 +1,43 @@
+module Sidekiq
+  module Cron
+    class Namespace
+      def self.all
+        namespaces = nil
+
+        Sidekiq.redis do |conn|
+          namespaces = conn.keys('cron_jobs:*').collect do |key|
+            key.split(':').last
+          end
+        end
+
+        # Adds the default namespace if not present
+        has_default = namespaces.detect do |name|
+          name == Sidekiq::Cron.configuration.default_namespace
+        end
+
+        unless has_default
+          namespaces << Sidekiq::Cron.configuration.default_namespace
+        end
+
+        namespaces
+      end
+
+      def self.all_with_count
+        all.map do |namespace_name|
+          {
+            count: count(namespace_name),
+            name: namespace_name
+          }
+        end
+      end
+
+      def self.count(name = Sidekiq::Cron.configuration.default_namespace)
+        out = 0
+        Sidekiq.redis do |conn|
+          out = conn.scard("cron_jobs:#{name}")
+        end
+        out
+      end
+    end
+  end
+end

data/lib/sidekiq/cron/poller.rb

@@ -1,25 +1,24 @@
-require 'sidekiq'
-require 'sidekiq/cron'
+# frozen_string_literal: true
+
 require 'sidekiq/scheduled'
-require 'sidekiq/options'
 
 module Sidekiq
   module Cron
-    # The Poller checks Redis every N seconds for sheduled cron jobs.
+    # The Poller checks Redis every N seconds for scheduled cron jobs.
     class Poller < Sidekiq::Scheduled::Poller
       def initialize(config = nil)
-        if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5.0')
-          super
-        else
-          # Old version of Sidekiq does not accept a config argument.
-          @config = config
-          super()
-        end
+        super
+      end
+
+      def start
+        Sidekiq::Cron::Job.migrate_old_jobs_if_needed!
+
+        super
       end
 
       def enqueue
         time = Time.now.utc
-        Sidekiq::Cron::Job.all.each do |job|
+        Sidekiq::Cron::Job.all('*').each do |job|
           enqueue_job(job, time)
         end
       rescue => ex
@@ -33,7 +32,7 @@ module Sidekiq
       private
 
       def enqueue_job(job, time = Time.now.utc)
-        job.test_and_enque_for_time! time if job && job.valid?
+        job.test_and_enqueue_for_time! time if job && job.valid?
       rescue => ex
         # Problem somewhere in one job.
         Sidekiq.logger.error "CRON JOB: #{ex.message}"

data/lib/sidekiq/cron/schedule_loader.rb

@@ -1,9 +1,5 @@
-require 'sidekiq'
-require 'sidekiq/cron/job'
-require 'sidekiq/options'
-
 Sidekiq.configure_server do |config|
-  schedule_file = Sidekiq::Options[:cron_schedule_file] || 'config/schedule.yml'
+  schedule_file = Sidekiq::Cron.configuration.cron_schedule_file
 
   if File.exist?(schedule_file)
     config.on(:startup) do

data/lib/sidekiq/cron/support.rb

@@ -1,8 +1,7 @@
-# https://github.com/rails/rails/blob/352865d0f835c24daa9a2e9863dcc9dde9e5371a/activesupport/lib/active_support/inflector/methods.rb#L270
-
 module Sidekiq
   module Cron
     module Support
+      # Inspired by Active Support Inflector
       def self.constantize(camel_cased_word)
         names = camel_cased_word.split("::".freeze)
 

data/lib/sidekiq/cron/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Cron
-    VERSION = "1.12.0"
+    VERSION = "2.0.0.rc2"
   end
 end

data/lib/sidekiq/cron/views/cron.erb

@@ -1,22 +1,25 @@
 <header class='row'>
   <div class='col-sm-5 pull-left'>
-    <h3><%= t('CronJobs') %></h3>
+    <h3>
+      <%= t('CronJobs') %>
+      <small><%= @current_namespace %></small>
+    </h3>
   </div>
-  <div class='col-sm-7 pull-right' style="margin-top: 20px; margin-bottom: 10px;">
+  <div class='col-sm-7 pull-right h2'>
     <% if @cron_jobs.size > 0 %>
-      <form action="<%= root_path %>cron/__all__/delete" method="post" class="pull-right">
+      <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/delete" method="post" class="pull-right">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
         <input class="btn btn-danger" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSureDeleteCronJobs') %>" />
       </form>
-      <form action="<%= root_path %>cron/__all__/disable" method="post" class="pull-right">
+      <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/disable" method="post" class="pull-right">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
         <input class="btn btn-warn" type="submit" name="enque" value="<%= t('DisableAll') %>" />
       </form>
-      <form action="<%= root_path %>cron/__all__/enable" method="post" class="pull-right">
+      <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/enable" method="post" class="pull-right">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
         <input class="btn btn-warn" type="submit" name="enque" value="<%= t('EnableAll') %>" />
       </form>
-      <form action="<%= root_path %>cron/__all__/enque" method="post" class="pull-right">
+      <form action="<%= root_path %>cron/namespaces/<%= @current_namespace %>/all/enque" method="post" class="pull-right">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
         <input class="btn btn-warn" type="submit" name="enque" value="<%= t('EnqueueAll') %>" data-confirm="<%= t('AreYouSureEnqueueCronJobs') %>" />
       </form>
@@ -24,67 +27,79 @@
   </div>
 </header>
 
-<% if @cron_jobs.size > 0 %>
+<!-- Namespaces -->
+<div class='row'>
+  <div class="col-sm-12 summary_bar">
+    <ul class="list-unstyled summary row">
+      <% @namespaces.sort_by { |namespace| namespace[:name] }.each do |namespace| %>
+        <li class="col-sm-1">
+          <a href="<%= root_path %>cron/namespaces/<%= namespace[:name] %>">
+            <span class="count"><%= namespace[:count] %></span>
+            <span class="desc"><%= namespace[:name] %></span>
+          </a>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>
+<!-- Namespaces -->
 
+<% if @cron_jobs.size > 0 %>
   <table class="table table-hover table-bordered table-striped table-white">
     <thead>
+    <tr>
       <th><%= t('Status') %></th>
-      <th><%= t('Name') %></th>
+      <th width="50%"><%= t('Name') %></th>
       <th><%= t('Cron string') %></th>
       <th><%= t('Last enqueued') %></th>
-      <th width="180"><%= t('Actions')%></th>
+      <th width="180"><%= t('Actions') %></th>
+    </tr>
     </thead>
 
     <tbody>
-      <% @cron_jobs.sort{|a,b| a.sort_name <=> b.sort_name }.each_with_index do |job, index| %>
-        <% style = "#{job.status == 'disabled' ? "background: #ecc; color: #585454;": ""}" %>
+      <% @cron_jobs.sort{ |a,b| a.sort_name <=> b.sort_name }.each do |job| %>
+        <% klass = (job.status == 'disabled') ? 'bg-danger text-muted' : '' %>
+        <% escaped_job_name = CGI.escape(job.name).gsub('+', '%20') %>
         <tr>
-          <td style="<%= style %>"><%= t job.status %></td>
-          <td style="<%= style %>">
-            <a href="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>">
-              <b style="<%= style %>"><%= job.name %></b>
+          <td class="<%= klass %>"><%= t job.status %></td>
+          <td class="<%= klass %>">
+            <a href="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>" title="<%= job.description %>">
+              <b class="<%= klass %>"><%= job.name %></b>
             </a>
-            <hr style="margin:3px;border:0;">
-            <small>
+            <br/>
             <% if job.message and job.message.to_s.size > 100 %>
-              <% if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("6.3.0") %>
-                <button data-toggle="job_<%= index %>" class="btn btn-warn btn-xs"><%= t('ShowAll')%></button>
-                <div class="toggle" id="job_<%= index %>" style="display: inline;"><%= job.message[0..100] + "... " %></div>
-                <div class="toggle" id="job_<%= index %>_full" style="display: none;"><%= job.message %></div>
-              <% else %>
-                <button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-warn btn-xs"><%= t('ShowAll')%></button>
-                <div class="toggle worker_<%= index %>" style="display: inline;"><%= job.message[0..100] + "... " %></div>
-                <div class="toggle worker_<%= index %>" style="display: none;"><%= job.message %></div>
-              <% end %>
+              <details>
+                <summary class="btn btn-warn btn-xs">Show message</summary>
+                <p><small><%= job.message %></small></p>
+              </details>
             <% else %>
-              <%= job.message %>
+              <small><%= job.message %></small>
             <% end %>
-            </small>
           </td>
-          <td style="<%= style %>"><b><%= job.cron.gsub(" ", "&nbsp;") %></b></td>
-          <td style="<%= style %>"><%= job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-" %></td>
-          <td style="<%= style %>">
+          <td class="<%= klass %>"><b><%= job.human_cron %><br/><small><%= job.cron.gsub(" ", "&nbsp;") %></small></b></td>
+          <td class="<%= klass %>"><%= job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-" %></td>
+          <td class="<%= klass %>">
             <% if job.status == 'enabled' %>
-              <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enque" method="post">
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enque" method="post">
                 <%= csrf_tag if respond_to?(:csrf_tag) %>
                 <input class='btn btn-warn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
               </form>
-              <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/disable" method="post">
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/disable" method="post">
                 <%= csrf_tag if respond_to?(:csrf_tag) %>
                 <input class='btn btn-warn btn-xs pull-left' type="submit" name="disable" value="<%= t('Disable') %>"/>
               </form>
             <% else %>
-              <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enque" method="post">
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enque" method="post">
                 <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>"/>
+                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
               </form>
-              <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enable" method="post">
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/enable" method="post">
                 <%= csrf_tag if respond_to?(:csrf_tag) %>
                 <input class='btn btn-warn btn-xs pull-left' type="submit" name="enable" value="<%= t('Enable') %>"/>
               </form>
-              <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/delete" method="post">
+              <form action="<%= root_path %>cron/namespaces/<%= job.namespace %>/jobs/<%= escaped_job_name %>/delete" method="post">
                 <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-xs btn-danger pull-left' type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => job.name) %>"/>
+                <input class='btn btn-xs btn-danger pull-left help-block' type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => job.name) %>"/>
               </form>
             <% end %>
           </td>

data/lib/sidekiq/cron/views/cron_show.erb

@@ -5,25 +5,25 @@
       <small><%= @job.name %></small>
     </h3>
   </div>
-  <div class="span col-sm-7 pull-right" style="margin-top: 20px; margin-bottom: 10px;">
-    <% cron_job_path = "#{root_path}cron/#{CGI.escape(@job.name).gsub('+', '%20')}" %>
-    <form action="<%= cron_job_path %>/enque?redirect=<%= cron_job_path %>" method="post">
+  <div class="span col-sm-7 pull-right h2">
+    <% cron_job_path = "#{root_path}cron/namespaces/#{@current_namespace}/jobs/#{CGI.escape(@job.name).gsub('+', '%20')}" %>
+    <form action="<%= cron_job_path %>/enque?redirect=<%= cron_job_path %>" class="pull-right" method="post">
       <%= csrf_tag if respond_to?(:csrf_tag) %>
       <input class="btn btn-warn pull-left" name="enque" type="submit" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => @job.name) %>" />
     </form>
     <% if @job.status == 'enabled' %>
-      <form action="<%= cron_job_path %>/disable?redirect=<%= cron_job_path %>" method="post">
+      <form action="<%= cron_job_path %>/disable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
         <input class="btn btn-warn pull-left" name="disable" type="submit" value="<%= t('Disable') %>" />
       </form>
     <% else %>
-      <form action="<%= cron_job_path %>/enable?redirect=<%= cron_job_path %>" method="post">
+      <form action="<%= cron_job_path %>/enable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
         <input class="btn btn-warn pull-left" name="enable" type="submit" value="<%= t('Enable') %>" />
       </form>
-      <form action="<%= cron_job_path %>/delete" method="post">
+      <form action="<%= cron_job_path %>/delete" class="pull-right" method="post">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-danger" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => @job.name) %>" name="delete" type="submit" value="<%= t('Delete') %>" />
+        <input class="btn btn-danger pull-left" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => @job.name) %>" name="delete" type="submit" value="<%= t('Delete') %>" />
       </form>
     <% end %>
   </div>
@@ -39,6 +39,10 @@
     <th><%= t 'Name' %></th>
     <td><%= @job.name %></td>
   </tr>
+  <tr>
+    <th><%= t 'Namespace' %></th>
+    <td><%= @job.namespace %></td>
+  </tr>
   <tr>
     <th><%= t 'Description' %></th>
     <td><%= @job.description %></td>

data/lib/sidekiq/cron/web.rb

@@ -1,7 +1,17 @@
 require "sidekiq/cron/web_extension"
 require "sidekiq/cron/job"
+require "sidekiq/cron/namespace"
 
 if defined?(Sidekiq::Web)
-  Sidekiq::Web.register Sidekiq::Cron::WebExtension
-  Sidekiq::Web.tabs["Cron"] = "cron"
+  if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('7.3.0')
+    Sidekiq::Web.register(
+      Sidekiq::Cron::WebExtension, # Class which contains the HTTP actions, required
+      name: "cron", # the name of the extension, used to namespace assets
+      tab: "Cron", # labels(s) of the UI tabs
+      index: "cron", # index route(s) for each tab
+    )
+  else
+    Sidekiq::Web.register Sidekiq::Cron::WebExtension
+    Sidekiq::Web.tabs["Cron"] = "cron"
+  end
 end

data/lib/sidekiq/cron/web_extension.rb

@@ -4,65 +4,111 @@ module Sidekiq
       def self.registered(app)
         app.settings.locales << File.join(File.expand_path("..", __FILE__), "locales")
 
+        app.helpers do
+          # This method constructs the URL for the cron jobs page within the specified namespace.
+          def namespace_redirect_path
+            "#{root_path}cron/namespaces/#{route_params[:namespace]}"
+          end
+        end
+
         # Index page of cron jobs.
         app.get '/cron' do
-          view_path    = File.join(File.expand_path("..", __FILE__), "views")
+          view_path = File.join(File.expand_path("..", __FILE__), "views")
 
+          @current_namespace = 'default'
+
+          @namespaces = Sidekiq::Cron::Namespace.all_with_count
+
+          # Not passing namespace takes all the jobs from the default one.
           @cron_jobs = Sidekiq::Cron::Job.all
 
           render(:erb, File.read(File.join(view_path, "cron.erb")))
         end
 
+        app.get '/cron/namespaces/:name' do
+          view_path = File.join(File.expand_path("..", __FILE__), "views")
+
+          @current_namespace = route_params[:name]
+
+          @namespaces = Sidekiq::Cron::Namespace.all_with_count
+
+          @cron_jobs = Sidekiq::Cron::Job.all(@current_namespace)
+
+          render(:erb, File.read(File.join(view_path, "cron.erb")))
+        end
+
         # Display job detail + jid history.
-        app.get '/cron/:name' do
+        app.get '/cron/namespaces/:namespace/jobs/:name' do
           view_path = File.join(File.expand_path("..", __FILE__), "views")
 
-          @job = Sidekiq::Cron::Job.find(route_params[:name])
+          @current_namespace = route_params[:namespace]
+          @job_name = route_params[:name]
+
+          @namespaces = Sidekiq::Cron::Namespace.all_with_count
+
+          @job = Sidekiq::Cron::Job.find(@job_name, @current_namespace)
+
           if @job
             render(:erb, File.read(File.join(view_path, "cron_show.erb")))
           else
-            redirect "#{root_path}cron"
+            redirect namespace_redirect_path
           end
         end
 
+        # Enqueue all cron jobs.
+        app.post '/cron/namespaces/:namespace/all/enque' do
+          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enqueue!)
+          redirect params['redirect'] || namespace_redirect_path
+        end
+
         # Enqueue cron job.
-        app.post '/cron/:name/enque' do
-          if route_params[:name] === '__all__'
-            Sidekiq::Cron::Job.all.each(&:enque!)
-          elsif job = Sidekiq::Cron::Job.find(route_params[:name])
-            job.enque!
+        app.post '/cron/namespaces/:namespace/jobs/:name/enque' do
+          if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
+            job.enqueue!
           end
-          redirect params['redirect'] || "#{root_path}cron"
+          redirect params['redirect'] || namespace_redirect_path
+        end
+
+        # Delete all schedules.
+        app.post '/cron/namespaces/:namespace/all/delete' do
+          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:destroy)
+          redirect params['redirect'] || namespace_redirect_path
         end
 
         # Delete schedule.
-        app.post '/cron/:name/delete' do
-          if route_params[:name] === '__all__'
-            Sidekiq::Cron::Job.all.each(&:destroy)
-          elsif job = Sidekiq::Cron::Job.find(route_params[:name])
+        app.post '/cron/namespaces/:namespace/jobs/:name/delete' do
+          if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.destroy
           end
-          redirect "#{root_path}cron"
+          redirect params['redirect'] || namespace_redirect_path
+        end
+
+        # Enable all jobs.
+        app.post '/cron/namespaces/:namespace/all/enable' do
+          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enable!)
+          redirect params['redirect'] || namespace_redirect_path
         end
 
         # Enable job.
-        app.post '/cron/:name/enable' do
-          if route_params[:name] === '__all__'
-            Sidekiq::Cron::Job.all.each(&:enable!)
-          elsif job = Sidekiq::Cron::Job.find(route_params[:name])
+        app.post '/cron/namespaces/:namespace/jobs/:name/enable' do
+          if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.enable!
           end
-          redirect params['redirect'] || "#{root_path}cron"
+          redirect params['redirect'] || namespace_redirect_path
+        end
+
+        # Disable all jobs.
+        app.post '/cron/namespaces/:namespace/all/disable' do
+          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:disable!)
+          redirect params['redirect'] || namespace_redirect_path
         end
 
         # Disable job.
-        app.post '/cron/:name/disable' do
-          if route_params[:name] === '__all__'
-            Sidekiq::Cron::Job.all.each(&:disable!)
-          elsif job = Sidekiq::Cron::Job.find(route_params[:name])
+        app.post '/cron/namespaces/:namespace/jobs/:name/disable' do
+          if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
             job.disable!
           end
-          redirect params['redirect'] || "#{root_path}cron"
+          redirect params['redirect'] || namespace_redirect_path
         end
       end
     end

data/lib/sidekiq/cron.rb

@@ -1,9 +1,65 @@
-require "sidekiq/cron/job"
-require "sidekiq/cron/poller"
-require "sidekiq/cron/launcher"
-require "sidekiq/cron/schedule_loader"
-
 module Sidekiq
   module Cron
+    class << self
+      attr_accessor :configuration
+    end
+
+    def self.configure
+      self.configuration ||= Configuration.new
+      yield(configuration) if block_given?
+    end
+
+    def self.reset!
+      self.configuration = Configuration.new
+    end
+
+    class Configuration
+      # The default namespace is used when no namespace is specified.
+      attr_accessor :default_namespace
+
+      # The parsing mode when using the natural language cron syntax from the `fugit` gem.
+      #
+      # :single -- use the first parsed cron line and ignore the rest (default)
+      # :strict -- raise an error if multiple cron lines are parsed from one string
+      attr_reader :natural_cron_parsing_mode
+
+      # The poller will not enqueue jobs that are late by more than this amount of seconds.
+      # Defaults to 60 seconds.
+      #
+      # This is useful when sidekiq (and sidekiq-cron) is not used in zero downtime deployments and
+      # when the deployment is done and sidekiq-cron starts to catch up, it will consider older
+      # jobs that missed their schedules during the deployment. E.g., jobs that run once a day.
+      attr_accessor :reschedule_grace_period
+
+      # The maximum number of recent cron job execution histories to retain.
+      # This value controls how many past job executions are stored.
+      attr_accessor :cron_history_size
+
+      # The interval, in seconds, at which to poll for scheduled cron jobs.
+      # This determines how frequently the scheduler checks for jobs to enqueue.
+      attr_accessor :cron_poll_interval
+
+      # The path to a YAML file containing multiple cron job schedules.
+      attr_accessor :cron_schedule_file
+
+      def initialize
+        @default_namespace = 'default'
+        @natural_cron_parsing_mode = :single
+        @reschedule_grace_period = 60
+        @cron_history_size = 10
+        @cron_poll_interval = 30
+        @cron_schedule_file = 'config/schedule.yml'
+      end
+
+      def natural_cron_parsing_mode=(mode)
+        unless %i[single strict].include?(mode)
+          raise ArgumentError, "Unknown natural cron parsing mode: #{mode.inspect}"
+        end
+
+        @natural_cron_parsing_mode = mode
+      end
+    end
   end
 end
+
+Sidekiq::Cron.configure

data/lib/sidekiq/options.rb

@@ -1,5 +1,4 @@
-require 'sidekiq'
-
+# Module to access Sidekiq config
 module Sidekiq
   module Options
     def self.[](key)
@@ -16,13 +15,12 @@ module Sidekiq
 
     def self.options_field
       return @options_field unless @options_field.nil?
+
       sidekiq_version = Gem::Version.new(Sidekiq::VERSION)
       @options_field = if sidekiq_version >= Gem::Version.new('7.0')
         :default_configuration
-      elsif sidekiq_version >= Gem::Version.new('6.5')
-        false
       else
-        :options
+        false
       end
     end
   end

data/lib/sidekiq-cron.rb

@@ -1,2 +1,8 @@
 require "sidekiq"
 require "sidekiq/cron"
+require "sidekiq/options"
+require "sidekiq/cron/job"
+require "sidekiq/cron/namespace"
+require "sidekiq/cron/poller"
+require "sidekiq/cron/launcher"
+require "sidekiq/cron/schedule_loader"

data/sidekiq-cron.gemspec

@@ -26,9 +26,10 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.7"
 
-  s.add_dependency("fugit", "~> 1.8")
-  s.add_dependency("sidekiq", ">= 6")
+  s.add_dependency("cronex", ">= 0.13.0")
+  s.add_dependency("fugit", "~> 1.8", ">= 1.11.1")
   s.add_dependency("globalid", ">= 1.0.1")
+  s.add_dependency("sidekiq", ">= 6.5.0")
 
   s.add_development_dependency("minitest", "~> 5.15")
   s.add_development_dependency("mocha", "~> 2.1")