sidekiq-cron 1.11.0 → 2.0.0

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">
-      <%= 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) %>" />
+  <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 %>/enqueue?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+      <%= csrf_tag %>
+      <input class="btn btn-warn pull-left" name="enqueue" 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">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
+      <form action="<%= cron_job_path %>/disable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+        <%= 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">
-        <%= csrf_tag if respond_to?(:csrf_tag) %>
+      <form action="<%= cron_job_path %>/enable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+        <%= 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">
-        <%= 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') %>" />
+      <form action="<%= cron_job_path %>/delete" class="pull-right" method="post">
+        <%= csrf_tag %>
+        <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,112 @@ module Sidekiq
       def self.registered(app)
         app.settings.locales << File.join(File.expand_path("..", __FILE__), "locales")
 
-        # Index page of cron jobs.
+        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
+
+          def redirect_to_previous_or_default
+            redirect params['redirect'] || namespace_redirect_path
+          end
+
+          def render_erb(view)
+            views_path = File.join(File.expand_path("..", __FILE__), "views")
+            erb(File.read(File.join(views_path, "#{view}.erb")))
+          end
+        end
+
+        # Index page.
         app.get '/cron' do
-          view_path    = File.join(File.expand_path("..", __FILE__), "views")
+          @current_namespace = 'default'
+          @cron_jobs = Sidekiq::Cron::Job.all(@current_namespace)
 
-          @cron_jobs = Sidekiq::Cron::Job.all
+          render_erb(:cron)
+        end
+
+        # Detail page for a specific namespace.
+        app.get '/cron/namespaces/:name' do
+          @current_namespace = route_params[:name]
+          @cron_jobs = Sidekiq::Cron::Job.all(@current_namespace)
 
-          render(:erb, File.read(File.join(view_path, "cron.erb")))
+          render_erb(:cron)
         end
 
         # Display job detail + jid history.
-        app.get '/cron/:name' do
-          view_path = File.join(File.expand_path("..", __FILE__), "views")
+        app.get '/cron/namespaces/:namespace/jobs/:name' do
+          @current_namespace = route_params[:namespace]
+          @job = Sidekiq::Cron::Job.find(route_params[:name], @current_namespace)
 
-          @job = Sidekiq::Cron::Job.find(route_params[:name])
           if @job
-            render(:erb, File.read(File.join(view_path, "cron_show.erb")))
+            render_erb(:cron_show)
           else
-            redirect "#{root_path}cron"
+            redirect namespace_redirect_path
           end
         end
 
+        # Enqueue all cron jobs.
+        app.post '/cron/namespaces/:namespace/all/enqueue' do
+          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enqueue!)
+
+          redirect_to_previous_or_default
+        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/enqueue' do
+          if job = Sidekiq::Cron::Job.find(route_params[:name], route_params[:namespace])
+            job.enqueue!
           end
-          redirect params['redirect'] || "#{root_path}cron"
+
+          redirect_to_previous_or_default
+        end
+
+        # Delete all schedules.
+        app.post '/cron/namespaces/:namespace/all/delete' do
+          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:destroy)
+
+          redirect_to_previous_or_default
         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_to_previous_or_default
+        end
+
+        # Enable all jobs.
+        app.post '/cron/namespaces/:namespace/all/enable' do
+          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:enable!)
+
+          redirect_to_previous_or_default
         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_to_previous_or_default
+        end
+
+        # Disable all jobs.
+        app.post '/cron/namespaces/:namespace/all/disable' do
+          Sidekiq::Cron::Job.all(route_params[:namespace]).each(&:disable!)
+
+          redirect_to_previous_or_default
         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_to_previous_or_default
         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 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
+
+      # 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 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
+
+      def initialize
+        @cron_poll_interval = 30
+        @cron_schedule_file = 'config/schedule.yml'
+        @cron_history_size = 10
+        @default_namespace = 'default'
+        @natural_cron_parsing_mode = :single
+        @reschedule_grace_period = 60
+      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,24 +1,26 @@
-require 'sidekiq'
-
+# Module to access Sidekiq config
 module Sidekiq
   module Options
     def self.[](key)
-      options_field ? Sidekiq.public_send(options_field)[key] : Sidekiq[key]
+      self.config[key]
     end
 
     def self.[]=(key, value)
-      options_field ? Sidekiq.public_send(options_field)[key] = value : Sidekiq[key] = value
+      self.config[key] = value
+    end
+
+    def self.config
+      options_field ? Sidekiq.public_send(options_field) : Sidekiq
     end
 
     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")

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cronex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: fugit
   requirement: !ruby/object:Gem::Requirement
@@ -17,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,34 +41,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.1
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: globalid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: globalid
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 6.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 6.5.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -170,11 +190,13 @@ files:
 - lib/sidekiq/cron/launcher.rb
 - lib/sidekiq/cron/locales/de.yml
 - lib/sidekiq/cron/locales/en.yml
+- lib/sidekiq/cron/locales/id.yml
 - lib/sidekiq/cron/locales/it.yml
 - lib/sidekiq/cron/locales/ja.yml
 - lib/sidekiq/cron/locales/pt.yml
 - lib/sidekiq/cron/locales/ru.yml
 - lib/sidekiq/cron/locales/zh-CN.yml
+- lib/sidekiq/cron/namespace.rb
 - lib/sidekiq/cron/poller.rb
 - lib/sidekiq/cron/schedule_loader.rb
 - lib/sidekiq/cron/support.rb
@@ -204,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Scheduler/Cron for Sidekiq jobs