resque-scheduler 4.5.0 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c97d0ecaec5a456e20e91d98779f7792fafd99e09f1bfd85452234a01ba47c0
-  data.tar.gz: f3947f2446b6ddac4d5555d467a302a3032a08d3dd77bdc039253674f70a85e1
+  metadata.gz: 4bd2a447d845ab5c056174d73fb88995693d998b06b90a3b565d3aa15981c3bb
+  data.tar.gz: d3cbbd2b7bdff68726bb9565e5c00531c7eb18397915fe6edfe568a9f0d34c26
 SHA512:
-  metadata.gz: cbfefeb510538682d188284280ca56af1641de3dde1a63ad8b79b5a09dcc916dc902839782a9ad988421c77b84146a05b4077291aa754e24d07dc75440786c2e
-  data.tar.gz: 955193ba760e37bd6f58f94a4ba67edab755329a68e4deefa0466c822d3fbd3d057cf357a410bedf23fd145b687255b3fe783d44890d7d4dfd0307773c1baeb5
+  metadata.gz: b91aca3627cc71d2082702b3a46be5ae1d38fd6b75961b49fd41c61c78fb3921dbd469a64ed3fb89348d6c00e79dc09c86a68ede59d75ed11d12ef55097bd6bf
+  data.tar.gz: eae2165cb529f4a38b8321f9c2dfe120ffeae5b13c001819af6bde9901a084a1710724caea469ffbd1b88266621b56e64c7f79b11e75ae55ca45f688497f8d24

data/.github/funding.yml

@@ -0,0 +1,4 @@
+# Docs for this file can be found here:
+# https://docs.github.com/en/github/administering-a-repository/displaying-a-sponsor-button-in-your-repository
+
+github: ["iloveitaly"]

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,59 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master, '*-stable' ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '44 16 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

data/.github/workflows/rubocop.yml

@@ -18,7 +18,7 @@ jobs:
         ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.github/workflows/ruby.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   test:
+    continue-on-error: true
     runs-on: ubuntu-latest
     services:
       redis:
@@ -24,22 +25,51 @@ jobs:
           - 2.6
           - 2.7
           - "3.0"
-          - head
-          - jruby-9.1.17.0
-          - jruby-9.2.9.0
-          - jruby-9.2.19.0
+          - 3.1
         resque-version:
           - "master"
-          - "~> 2.0.0"
+          - "~> 2.4.0"
           - "~> 1.27"
+        rufus-scheduler:
+          - "3.2"
+          - "3.4"
+          - "3.5"
+          - "3.6"
+        redis-version:
+          - "~> 4.x"
+          - "~> 5.x"
+        exclude:
+          - ruby-version: head
+            rufus-scheduler: 3.2
+
+          - ruby-version: 2.3
+            resque-version: "~> 1.27"
+            rufus-scheduler: 3.4
+          - ruby-version: 2.3
+            resque-version: "~> 1.27"
+            rufus-scheduler: 3.5
+          - ruby-version: 2.5
+            resque-version: "~> 2.4.0"
+            rufus-scheduler: 3.5
+          - ruby-version: 2.5
+            resque-version: master
+            rufus-scheduler: 3.2
+
+          - ruby-version: 2.3
+            redis-version: "~> 5.x"
+          - ruby-version: 2.4
+            redis-version: "~> 5.x"
+
+          - resque-version: "~> 1.27"
+            redis-version: "~> 5.x"
     env:
+      REDIS_VERSION: "${{ matrix.redis-version }}"
       RESQUE: "${{ matrix.resque-version }}"
+      RUFUS_SCHEDULER: "${{ matrix.rufus-scheduler }}"
       COVERAGE: 1
-      JRUBY_OPTS: ""
-      RUBYOPT: "-W0"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "${{ matrix.ruby-version }}"

data/AUTHORS.md

@@ -10,6 +10,7 @@ Resque Scheduler authors
 - Brian Landau
 - Brian P O'Rourke
 - Carlos Antonio da Silva
+- Chris Bisnett
 - Chris Kampmeier
 - DJ Hartman
 - Damon P. Cortesi
@@ -42,6 +43,7 @@ Resque Scheduler authors
 - Justin Weiss
 - Les Hill
 - Luke Rodgers
+- Maksymilian Chwałek
 - Manuel Meurer
 - Matt Aimonetti
 - Matt Simpson

data/CHANGELOG.md

@@ -2,9 +2,23 @@
 
 **ATTN**: This project uses [semantic versioning](http://semver.org/).
 
-## Unreleased
+## [4.7.0] - 2022-10-6
+### Fixed
+- Fix tests for redis-rb 5.0 (#757)
+- Use Resque::DataStore#reconnect for redis-rb 5.0 compat (#757)
+- Test suite runs `flushall` to prevent flakiness (#757)
+
+## [4.6.0] - 2022-08-04
+### Changed
+- Remove support for Ruby < 2.3
+- Configuration to use a set of truthy values to enable boolean settings instead of simply existence
+- Add `delay_or_enqueue_at` for delaying existing jobs or creating a new job(#645)
+- Fix deprecated uses of Redis#pipelined
+- Fix reading configuration from environment for boolean values (#735)
+- Unblock rufus-scheduler lock on lower than 3.7 by fixing scheduler shutdown (#736)
+- Removed testing against jruby (resque doesn't test against jruby)
 
-## [4.5.0]
+## [4.5.0] - 2021-09-25
 ### Added
 - Support Ruby 3
 - Add optional argument to `remove_schedule` to control reloading of the schedule
@@ -443,7 +457,8 @@
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/resque/resque-scheduler/compare/v4.4.0...HEAD
+[Unreleased]: https://github.com/resque/resque-scheduler/compare/v4.5.0...HEAD
+[4.5.0]: https://github.com/resque/resque-scheduler/compare/v4.4.0...v4.5.0
 [4.4.0]: https://github.com/resque/resque-scheduler/compare/v4.3.1...v4.4.0
 [4.3.1]: https://github.com/resque/resque-scheduler/compare/v4.3.0...v4.3.1
 [4.3.0]: https://github.com/resque/resque-scheduler/compare/v4.2.1...v4.3.0

data/Gemfile

@@ -1,12 +1,27 @@
 # vim:fileencoding=utf-8
 source 'https://rubygems.org'
 
-case req = ENV['RESQUE']
-when nil
+case resque_version = ENV.fetch('RESQUE', 'master')
 when 'master'
   gem 'resque', git: 'https://github.com/resque/resque'
 else
-  gem 'resque', req
+  gem 'resque', resque_version
+end
+
+case rufus_scheduler_version = ENV.fetch('RUFUS_SCHEDULER', '3.6')
+when 'master'
+  gem 'rufus-scheduler', git: 'https://github.com/jmettraux/rufus-scheduler'
+else
+  gem 'rufus-scheduler', rufus_scheduler_version
+end
+
+case redis_version = ENV.fetch('REDIS_VERSION', 'latest')
+when 'master'
+  gem 'redis', git: 'https://github.com/redis/redis-rb'
+when 'latest'
+  gem 'redis'
+else
+  gem 'redis', redis_version
 end
 
 gemspec

data/README.md

@@ -158,7 +158,7 @@ following task to wherever tasks are kept, such as
 ```ruby
 task 'resque:pool:setup' do
   Resque::Pool.after_prefork do |job|
-    Resque.redis._client.reconnect
+    Resque.redis.reconnect
   end
 end
 ```
@@ -211,7 +211,7 @@ since the jobs are stored in a redis sorted set (zset).  I can't imagine this
 being an issue for someone since redis is stupidly fast even at log(n), but full
 disclosure is always best.
 
-#### Removing Delayed jobs
+#### Removing Delayed Jobs
 
 If you have the need to cancel a delayed job, you can do like so:
 
@@ -255,6 +255,49 @@ Resque.enqueue_delayed_selection { |args| args[0]['account_id'] == current_accou
 Resque.enqueue_delayed_selection { |args| args[0]['user_id'] == current_user.id }
 ```
 
+#### Updating Delayed Jobs
+
+Previously delayed jobs may be delayed even further into the future like so:
+
+```ruby
+# after you've enqueued a job like:
+Resque.enqueue_at(1.minute.from_now, SendNotifications, :user_id => current_user.id)
+# delay running the job until two minutes from now
+Resque.delay_or_enqueue_at(2.minutes.from_now, SendNotifications, :user_id => current_user.id)
+```
+
+You don't need to worry if a matching job has already been queued, because if no matching jobs are found a new job is created and enqueued as if you had called `enqueue_at`. This means you don't need any special conditionals to know if a job has already been queued. You simply create the job like so:
+
+```ruby
+Resque.delay_or_enqueue_at(1.minute.from_now, SendNotifications, :user_id => current_user.id)
+```
+
+If multiple matching jobs are found, all of the matching jobs will be updated to have the same timestamp even if their original timestamps were not the same.
+
+```ruby
+# enqueue multiple jobs with different delay timestamps
+Resque.enqueue_at(1.minute.from_now, SendNotifications, :user_id => current_user.id)
+Resque.enqueue_at(2.minutes.from_now, SendNotifications, :user_id => current_user.id)
+
+# delay running the two jobs until 5 minutes from now
+Resque.delay_or_enqueue_at(5.minutes.from_now, SendNotifications, :user_id => current_user.id)
+```
+
+The most useful case for increasing the delay of an already delayed job is to batch together work based on multiple events. For example, if you wanted to send a notification email to a user when an event triggers but didn't want to send 10 emails if many events happened within a short period, you could use this technique to delay the noficication email until no events have triggered for a period of time. This way you could send 1 email containing the 10 notifications once no events have triggered for 2 minutes. You could implement this like so:
+
+```ruby
+# Send a notification when an event is created.
+# app/models/event.rb
+after_commit on: :create do
+  Resque.delay_or_enqueue_in(2.minutes, SendNotifications, :user_id => user.id)
+end
+```
+
+When the first event is created a job will be scheduled to send unsent notifications to the associated user. If another event is created within the 2 minute window, the timer will be reset to 2 minutes. This will continue as long as new events are created for the specific user before the 2 minute timer expires. Once the timer expires and the job is scheduled any new events that are created will schedule a new job and start the process over. By adjusting the window you can tweak the trade-off between sending notification emails quickly after an event happens and sending fewer emails.
+
+Read more in the [original PR](https://github.com/resque/resque-scheduler/pull/645)
+
+
 ### Scheduled Jobs (Recurring Jobs)
 
 Scheduled (or recurring) jobs are logically no different than a standard cron
@@ -304,7 +347,6 @@ If you would like to setup a job that is executed manually you can configure lik
 
 ```yaml
 ImportOrdersManual:
-  description: 'Import Amazon Orders Manual'
   custom_job_class: 'AmazonMws::ImportOrdersJob'
   never: "* * * * *"
   queue: high
@@ -344,6 +386,38 @@ seconds past the minute).
 A big shout out to [rufus-scheduler](http://github.com/jmettraux/rufus-scheduler)
 for handling the heavy lifting of the actual scheduling engine.
 
+##### Queue with parameters
+
+It's possible to specify parameters, that must be given by the user when they manually queue the job. To enable this feature add `parameters` key to scheduled job definition.
+
+```yaml
+queue_documents_for_indexing:
+  cron: "0 0 * * *"
+  class: "QueueDocuments"
+  queue: high
+  args:
+    foo: "bar"
+    a: "b"
+  parameters:
+    foo:
+      description: "value of foo"
+      default: "baz"
+
+  description: "This job queues all content for indexing in solr"
+```
+
+One can use following options for each parameter:
+* description - tooltip to be shown next to the parameter input
+* default - prefilled value in the parameter input
+
+**NOTE**: When sheduling the job, parameters are merged into job args. Assuming the example above and default parametr value, the job will be run with the following args:
+
+```ruby
+{"foo"=>"baz", "a"=>"b"}
+```
+
+**NOTE**: If user leaves the parameter value empty, it'll be sent as empty string.
+
 #### Dynamic schedules
 
 Dynamic schedules are programmatically set on a running `resque-scheduler`.
@@ -405,18 +479,17 @@ Resque.set_schedule(name, config)
 
 #### Time zones
 
-Note that if you use the cron syntax, this will be interpreted as in the server time zone
-rather than the `config.time_zone` specified in Rails.
-
+If you use the cron syntax, by default it is interpreted in the server time zone.
 You can explicitly specify the time zone that rufus-scheduler will use:
-
 ```yaml
 cron: "30 6 * * 1 Europe/Stockholm"
 ```
 
-Also note that `config.time_zone` in Rails allows for a shorthand (e.g. "Stockholm")
-that rufus-scheduler does not accept. If you write code to set the scheduler time zone
-from the `config.time_zone` value, make sure it's the right format, e.g. with:
+##### Rails
+In Rails, `config.time_zone` will be used to determine the time zone for `resque-scheduler`.
+
+Note that `config.time_zone` allows for a shorthand (e.g. "Stockholm")
+that rufus-scheduler does not accept, so make sure it's the right format, e.g. with:
 
 ```ruby
 ActiveSupport::TimeZone.find_tzinfo(Rails.configuration.time_zone).name
@@ -573,7 +646,7 @@ Now make sure you're passing that file to resque-web like so:
 
 ### Running in the background
 
-(Only supported with ruby >= 1.9). There are scenarios where it's helpful for
+There are scenarios where it's helpful for
 the resque worker to run itself in the background (usually in combination with
 PIDFILE).  Use the BACKGROUND option so that rake will return as soon as the
 worker is started.

data/Rakefile

@@ -12,6 +12,7 @@ Rake::TestTask.new do |t|
     o << "--seed #{ENV['SEED']} " if ENV['SEED']
     o << '--verbose ' if ENV['VERBOSE']
   end
+  t.warning = false
 end
 
 YARD::Rake::YardocTask.new

data/lib/resque/scheduler/configuration.rb

@@ -8,13 +8,18 @@ module Resque
         yield self
       end
 
+      attr_writer :environment
+      def environment
+        @environment ||= ENV
+      end
+
       # Used in `#load_schedule_job`
       attr_writer :env
 
       def env
         return @env if @env
         @env ||= Rails.env if defined?(Rails) && Rails.respond_to?(:env)
-        @env ||= ENV['RAILS_ENV']
+        @env ||= environment['RAILS_ENV']
         @env
       end
 
@@ -22,42 +27,42 @@ module Resque
       attr_writer :verbose
 
       def verbose
-        @verbose ||= !!ENV['VERBOSE']
+        @verbose ||= to_bool(environment['VERBOSE'])
       end
 
       # If set, produces no output
       attr_writer :quiet
 
       def quiet
-        @quiet ||= !!ENV['QUIET']
+        @quiet ||= to_bool(environment['QUIET'])
       end
 
       # If set, will write messages to the file
       attr_writer :logfile
 
       def logfile
-        @logfile ||= ENV['LOGFILE']
+        @logfile ||= environment['LOGFILE']
       end
 
       # Sets whether to log in 'text' or 'json'
       attr_writer :logformat
 
       def logformat
-        @logformat ||= ENV['LOGFORMAT']
+        @logformat ||= environment['LOGFORMAT']
       end
 
       # If set, will try to update the schedule in the loop
       attr_writer :dynamic
 
       def dynamic
-        @dynamic ||= !!ENV['DYNAMIC_SCHEDULE']
+        @dynamic ||= to_bool(environment['DYNAMIC_SCHEDULE'])
       end
 
       # If set, will append the app name to procline
       attr_writer :app_name
 
       def app_name
-        @app_name ||= ENV['APP_NAME']
+        @app_name ||= environment['APP_NAME']
       end
 
       # Amount of time in seconds to sleep between polls of the delayed
@@ -66,7 +71,25 @@ module Resque
 
       def poll_sleep_amount
         @poll_sleep_amount ||=
-          Float(ENV.fetch('RESQUE_SCHEDULER_INTERVAL', '5'))
+          Float(environment.fetch('RESQUE_SCHEDULER_INTERVAL', '5'))
+      end
+
+      private
+
+      # Copied from https://github.com/rails/rails/blob/main/activemodel/lib/active_model/type/boolean.rb#L17
+      TRUE_VALUES = [
+        true, 1,
+        '1', :'1',
+        't', :t,
+        'T', :T,
+        'true', :true,
+        'TRUE', :TRUE,
+        'on', :on,
+        'ON', :ON
+      ].to_set.freeze
+
+      def to_bool(value)
+        TRUE_VALUES.include?(value)
       end
     end
   end

data/lib/resque/scheduler/delaying_extensions.rb

@@ -63,6 +63,24 @@ module Resque
                               klass, *args)
       end
 
+      # Update the delayed timestamp of any matching delayed jobs or enqueue a
+      # new job if no matching jobs are found. Returns the number of delayed or
+      # enqueued jobs.
+      def delay_or_enqueue_at(timestamp, klass, *args)
+        count = remove_delayed(klass, *args)
+        count = 1 if count == 0
+
+        count.times do
+          enqueue_at(timestamp, klass, *args)
+        end
+      end
+
+      # Identical to +delay_or_enqueue_at+, except it takes
+      # number_of_seconds_from_now instead of a timestamp
+      def delay_or_enqueue_in(number_of_seconds_from_now, klass, *args)
+        delay_or_enqueue_at(Time.now + number_of_seconds_from_now, klass, *args)
+      end
+
       # Used internally to stuff the item into the schedule sorted list.
       # +timestamp+ can be either in seconds or a datetime object. The
       # insertion time complexity is O(log(n)). Returns true if it's
@@ -135,10 +153,7 @@ module Resque
         Array(redis.zrange(:delayed_queue_schedule, 0, -1)).each do |item|
           key = "delayed:#{item}"
           items = redis.lrange(key, 0, -1)
-          redis.pipelined do
-            items.each { |ts_item| redis.del("timestamps:#{ts_item}") }
-          end
-          redis.del key
+          redis.del(key, items.map { |ts_item| "timestamps:#{ts_item}" })
         end
 
         redis.del :delayed_queue_schedule
@@ -217,9 +232,9 @@ module Resque
 
         # Beyond 100 there's almost no improvement in speed
         found = timestamps.each_slice(100).map do |ts_group|
-          jobs = redis.pipelined do |r|
+          jobs = redis.pipelined do |pipeline|
             ts_group.each do |ts|
-              r.lrange("delayed:#{ts}", 0, -1)
+              pipeline.lrange("delayed:#{ts}", 0, -1)
             end
           end
 
@@ -299,10 +314,10 @@ module Resque
 
         timestamps = redis.smembers("timestamps:#{encoded_job}")
 
-        replies = redis.pipelined do
+        replies = redis.pipelined do |pipeline|
           timestamps.each do |key|
-            redis.lrem(key, 0, encoded_job)
-            redis.srem("timestamps:#{encoded_job}", key)
+            pipeline.lrem(key, 0, encoded_job)
+            pipeline.srem("timestamps:#{encoded_job}", key)
           end
         end
 
@@ -319,9 +334,9 @@ module Resque
         redis.watch(key) do
           if redis.llen(key).to_i == 0
             # If the list is empty, remove it.
-            redis.multi do
-              redis.del(key)
-              redis.zrem(:delayed_queue_schedule, timestamp.to_i)
+            redis.multi do |transaction|
+              transaction.del(key)
+              transaction.zrem(:delayed_queue_schedule, timestamp.to_i)
             end
           else
             redis.redis.unwatch

data/lib/resque/scheduler/env.rb

@@ -38,12 +38,8 @@ module Resque
                                     true
                                   end
 
-        unless Process.respond_to?('daemon')
-          abort 'background option is set, which requires ruby >= 1.9'
-        end
-
         Process.daemon(true, !Resque::Scheduler.quiet)
-        Resque.redis._client.reconnect
+        Resque.redis.reconnect
       end
 
       def setup_pid_file

data/lib/resque/scheduler/locking.rb

@@ -2,7 +2,7 @@
 
 # ### Locking the scheduler process
 #
-# There are two places in resque-scheduler that need to be synchonized in order
+# There are two places in resque-scheduler that need to be synchronized in order
 # to be able to run redundant scheduler processes while ensuring jobs don't get
 # queued multiple times when the master process changes.
 #

data/lib/resque/scheduler/server/views/delayed.erb

@@ -1,9 +1,9 @@
 <h1>Delayed Jobs</h1>
-<%- size = resque.delayed_queue_schedule_size %>
+<% size = resque.delayed_queue_schedule_size %>
 
 <%= scheduler_view :search_form, layout: false %>
 
-<p style="font-color: red; font-weight: bold;">
+<p style="color: red; font-weight: bold;">
   <%= @error_message %>
 </p>
 
@@ -46,7 +46,7 @@
       <td><%= h(show_job_arguments(job['args'])) if job && delayed_timestamp_size == 1 %></td>
       <td>
         <% if job %>
-          <a href="<%=u URI("/delayed/jobs/#{CGI.escape(job['class'])}?args=" + CGI.escape(job['args'].to_json)) %>">All schedules</a>
+          <a href="<%= u URI("/delayed/jobs/#{CGI.escape(job['class'])}?args=" + CGI.escape(job['args'].to_json)) %>">All schedules</a>
         <% end %>
       </td>
     </tr>
@@ -55,7 +55,7 @@
 
 <% if size > 0 %>
   <br>
-  <form method="POST" action="<%=u 'delayed/clear'%>" class='clear-delayed'>
+  <form method="POST" action="<%= u 'delayed/clear' %>" class='clear-delayed'>
     <input type='submit' name='' value='Clear Delayed Jobs' />
   </form>
 <% end %>

data/lib/resque/scheduler/server/views/delayed_timestamp.erb

@@ -13,7 +13,7 @@
   <% jobs.each do |job| %>
     <tr>
       <td class='class'><%= job['class'] %></td>
-      <td class='args'><%=h show_job_arguments(job['args']) %></td>
+      <td class='args'><%= h show_job_arguments(job['args']) %></td>
     </tr>
   <% end %>
   <% if jobs.empty? %>

data/lib/resque/scheduler/server/views/scheduler.erb

@@ -8,7 +8,7 @@
   <br/> Current master: <%= Resque.redis.get(Resque::Scheduler.master_lock.key) %>
 </p>
 <p class='intro'>
-	The highlighted jobs are skipped for current environment.
+  The highlighted jobs are skipped for current environment.
 </p>
 <div style="overflow-y: auto; width:100%; padding: 0px 5px;">
 <table>
@@ -29,7 +29,7 @@
   <% Resque.schedule.keys.sort.each_with_index do |name, index| %>
     <% config = Resque.schedule[name] %>
     <tr style="<%= scheduled_in_this_env?(name) ? '' : 'color: #9F6000;background: #FEEFB3;' %>">
-	    <td style="padding-left: 15px;"><%= index+ 1 %>.</td>
+      <td style="padding-left: 15px;"><%= index + 1 %>.</td>
       <% if Resque::Scheduler.dynamic %>
         <td style="padding-top: 12px; padding-bottom: 2px; width: 10px">
           <form action="<%= u "/schedule" %>" method="post" style="margin-left: 0">

data/lib/resque/scheduler/server/views/search.erb

@@ -33,7 +33,6 @@
       </tr>
   <% end %>
 </table>
-</h1>
 
 <% queued = @jobs.select { |j| j['where_at'] == 'queued' } %>
 <h1>Queued jobs</h1>
@@ -68,5 +67,3 @@
   </tr>
   <% end %>
 </table>
-
-

data/lib/resque/scheduler/server/views/search_form.erb

@@ -2,7 +2,3 @@
   <input type='input' name='search' value="<%= h params[:search] %>"/>
   <input type='submit' value='Search'/>
 </form>
-
-
-
-

data/lib/resque/scheduler/signal_handling.rb

@@ -10,13 +10,13 @@ module Resque
       end
 
       # For all signals, set the shutdown flag and wait for current
-      # poll/enqueing to finish (should be almost instant).  In the
+      # poll/enqueuing to finish (should be almost instant).  In the
       # case of sleeping, exit immediately.
       def register_signal_handlers
         (Signal.list.keys & %w(INT TERM USR1 USR2 QUIT)).each do |sig|
           trap(sig) do
             signal_queue << sig
-            # break sleep in the primary scheduler thread, alowing
+            # break sleep in the primary scheduler thread, allowing
             # the signal queue to get processed as soon as possible.
             @th.wakeup if @th && @th.alive?
           end

data/lib/resque/scheduler/util.rb

@@ -4,7 +4,7 @@ module Resque
   module Scheduler
     class Util
       # In order to upgrade to resque(1.25) which has deprecated following
-      # methods, we just added these usefull helpers back to use in Resque
+      # methods, we just added these useful helpers back to use in Resque
       # Scheduler.  refer to:
       # https://github.com/resque/resque-scheduler/pull/273
 

data/lib/resque/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Resque
   module Scheduler
-    VERSION = '4.5.0'.freeze
+    VERSION = '4.7.0'.freeze
   end
 end

data/lib/resque/scheduler.rb

@@ -251,7 +251,7 @@ module Resque
         if job_klass && job_klass != 'Resque::Job'
           # The custom job class API must offer a static "scheduled" method. If
           # the custom job class can not be constantized (via a requeue call
-          # from the web perhaps), fall back to enqueing normally via
+          # from the web perhaps), fall back to enqueuing normally via
           # Resque::Job.create.
           begin
             Resque::Scheduler::Util.constantize(job_klass).scheduled(
@@ -377,7 +377,6 @@ module Resque
 
       def stop_rufus_scheduler
         rufus_scheduler.shutdown(:wait)
-        rufus_scheduler.join
       end
 
       def before_shutdown

data/resque-scheduler.gemspec

@@ -26,13 +26,16 @@ Gem::Specification.new do |spec|
     Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
     Also supports queueing jobs on a fixed, cron-like schedule.
   DESCRIPTION
-  spec.homepage = 'http://github.com/resque/resque-scheduler'
+  spec.homepage = 'https://github.com/resque/resque-scheduler'
   spec.license = 'MIT'
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
+  spec.required_ruby_version = '>= 2.3.0'
 
   spec.files = `git ls-files -z`.split("\0").reject do |f|
     f.match(%r{^(test|spec|features|examples|bin|tasks)/}) ||
       f.match(/^(Vagrantfile|Gemfile\.lock)/) ||
-      f.match(/^\.(rubocop|simplecov|travis|vagrant|gitignore)/)
+      f.match(/^\.(rubocop|simplecov|vagrant|gitignore)/)
   end
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -40,7 +43,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'json'
-  spec.add_development_dependency 'kramdown'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'pry'
@@ -49,7 +51,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'test-unit'
   spec.add_development_dependency 'yard'
-  spec.add_development_dependency 'tzinfo-data'
   spec.add_development_dependency 'timecop'
 
   # We pin rubocop because new cops have a tendency to result in false-y
@@ -60,5 +61,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'redis', '>= 3.3'
   spec.add_runtime_dependency 'resque', '>= 1.27'
   # rufus-scheduler v3.7 causes a failure in test/multi_process_test.rb
-  spec.add_runtime_dependency 'rufus-scheduler', '~> 3.2', '< 3.7'
+  # rufus-scheduler v3.3 is missing a to_local method which fails tests
+  spec.add_runtime_dependency 'rufus-scheduler', '~> 3.2', '!= 3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.7.0
 platform: ruby
 authors:
 - Ben VandenBos
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,20 +42,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -168,20 +154,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: tzinfo-data
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -259,9 +231,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -269,9 +241,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.3'
 description: |2
       Light weight job scheduling on top of Resque.
       Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
@@ -288,6 +260,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/funding.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".github/workflows/rubocop.yml"
 - ".github/workflows/ruby.yml"
 - AUTHORS.md
@@ -328,10 +302,11 @@ files:
 - lib/resque/scheduler/util.rb
 - lib/resque/scheduler/version.rb
 - resque-scheduler.gemspec
-homepage: http://github.com/resque/resque-scheduler
+homepage: https://github.com/resque/resque-scheduler
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -340,14 +315,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Light weight job scheduling on top of Resque