que-scheduler 4.1.0 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a75db11d923c140204bd92360916e4cacaac5531fc25470616a4d558dde22dd3
-  data.tar.gz: ba08caa1a8bf8a87532da3fa5cbfc8b720784e88354ab74b240c5d724c46fb07
+  metadata.gz: e73846d81092ac0bacd4a3c854a3610bde40c8c4a5289728f42b59a5ef7833bf
+  data.tar.gz: 01e41964ee78f56cf90836457a5f439d0bc5185466890e5fcbbcbe4e77306041
 SHA512:
-  metadata.gz: 19ad5f4284dd03b6129d970e87cdd1652f8e992a5c141c032fc4935beaea2bbf15f35253c5c5f6c93e3cf6b32875beb6138112d43e8e5e123235c32fa9593984
-  data.tar.gz: f8618b848befcccf03387fe2e891f201790c1dc8b736406a62bd3d63990ac1c8f47737966103713d843a627ec39d2ff23128570dd6b03cd28682bc4613638fcf
+  metadata.gz: 49bd076fb802ef81ad445d4dd668bd144a0d313aeee04988cb5bae8ebd9061955ac19c30efe46085f7453bb6dfd20f04b63c4225f6360407a46afefc8b833391
+  data.tar.gz: 1d4074dda7344d003140ed4b2e513702ffc8386620d236df8602a660f1fa1209d5f324d4f840bb17434b7164f5785b02d93ee4cfef08c2e055625ec675634fe8

data/README.md

@@ -2,7 +2,6 @@ que-scheduler
 ================
 
 [![Gem Version](https://badge.fury.io/rb/que-scheduler.svg)](https://badge.fury.io/rb/que-scheduler)
-[![Build status](https://gitlab.com/hlascelles/que-scheduler/badges/master/pipeline.svg)](https://gitlab.com/hlascelles/que-scheduler/pipelines)
 [![Coverage Status](https://coveralls.io/repos/github/hlascelles/que-scheduler/badge.svg?branch=master)](https://coveralls.io/github/hlascelles/que-scheduler?branch=master)
 [![Code Climate Maintainability](https://api.codeclimate.com/v1/badges/710d2fc5202f95d76e8a/maintainability)](https://codeclimate.com/github/hlascelles/que-scheduler/maintainability)
 
@@ -107,7 +106,7 @@ DailyBatchReport:
   cron: "0 3 * * *"
   # This job will be run every day at 03:00 as normal.
   # However, the "schedule_type: every_event" setting below will ensure that if workers are offline
-  # for any amount of time then the bcaklog will always be enqueued on recovery.
+  # for any amount of time then the backlog will always be enqueued on recovery.
   # See "Schedule types" below for more information.
   schedule_type: every_event
 ```
@@ -311,6 +310,13 @@ A full changelog can be found here: [CHANGELOG.md](https://github.com/hlascelles
 
 Your [postgres](https://www.postgresql.org/) database must be at least version 9.5.0.
 
+Ruby 2.6 and above is supported. Ruby 2.5 currently still currently works but is unsupported.
+
+Using que 0.x with Rails 6 needs a patch to support it. 
+See the patch and how to use it here: https://github.com/que-rb/que/issues/247#issuecomment-595258236
+If that patch is included then que-scheduler will work. This setup is tested, but is not supported.
+
+
 ## Inspiration
 
 This gem was inspired by the makers of the excellent [Que](https://github.com/chanks/que) job scheduler gem. 
@@ -324,3 +330,5 @@ This gem was inspired by the makers of the excellent [Que](https://github.com/ch
 * @joehorsnell
 * @krzyzak
 * @papodaca
+* @ajoneil
+* @ippachi

data/lib/que/scheduler/defined_job.rb

@@ -86,7 +86,7 @@ module Que
         # queue name is only supported for a subrange of ActiveJob versions. Print this out as a
         # warning.
         if queue &&
-           Que::Scheduler::ToEnqueue.active_job_loaded? &&
+           Que::Scheduler::ToEnqueue.active_job_defined? &&
            job_class < ::ActiveJob::Base &&
            Que::Scheduler::ToEnqueue.active_job_version < Gem::Version.create("6.0.3")
           puts <<~ERR

data/lib/que/scheduler/jobs/que_scheduler_audit_clear_down_job.rb

@@ -36,7 +36,7 @@ module Que
             # This will delete all but `retain_row_count` oldest rows
             count = Que::Scheduler::VersionSupport.execute(DELETE_AUDIT_SQL, [retain_row_count])
             log = "#{self.class} cleared down #{count.first.fetch(:count)} rows"
-            ::Que.log(event: "que-scheduler".to_sym, message: log)
+            ::Que.log(event: :"que-scheduler", message: log)
           end
         end
       end

data/lib/que/scheduler/migrations/6/up.sql

@@ -13,7 +13,7 @@ DECLARE
 BEGIN
     IF OLD.job_class = 'Que::Scheduler::SchedulerJob' THEN
         IF NOT que_scheduler_check_job_exists() THEN
-            raise exception 'Deletion of que_scheduler job % prevented. Deleting the que_scheduler job is almost certainly a mistake.', OLD.job_id;
+            raise exception 'Deletion of que_scheduler job prevented. Deleting the que_scheduler job is almost certainly a mistake.';
         END IF;
     END IF;
     RETURN OLD;

data/lib/que/scheduler/migrations.rb

@@ -59,7 +59,7 @@ module Que
         end
 
         def execute_step(number, direction)
-          sql = IO.read("#{__dir__}/migrations/#{number}/#{direction}.sql")
+          sql = File.read("#{__dir__}/migrations/#{number}/#{direction}.sql")
           Que::Scheduler::VersionSupport.execute(sql)
           return unless audit_table_exists?
 

data/lib/que/scheduler/schedule.rb

@@ -27,7 +27,7 @@ module Que
         end
 
         def from_file(location)
-          from_yaml(IO.read(location))
+          from_yaml(File.read(location))
         end
 
         def from_yaml(config)
@@ -36,10 +36,9 @@ module Que
         end
 
         def from_hash(config_hash)
-          config_hash.map do |name, defined_job_hash|
-            name_str = name.to_s
-            [name_str, hash_item_to_defined_job(name_str, defined_job_hash)]
-          end.to_h
+          config_hash
+            .map { |name, defined_job_hash| hash_item_to_defined_job(name.to_s, defined_job_hash) }
+            .index_by(&:name)
         end
 
         def hash_item_to_defined_job(name, defined_job_hash_in)

data/lib/que/scheduler/scheduler_job.rb

@@ -33,7 +33,7 @@ module Que
             scheduler_job_args, scheduler_job_args.as_time, result.job_dictionary, enqueued_jobs
           )
           # Only now we're sure nothing errored, log the results
-          logs.each { |str| ::Que.log(event: "que-scheduler".to_sym, message: str) }
+          logs.each { |str| ::Que.log(event: :"que-scheduler", message: str) }
         end
       end
 
@@ -50,11 +50,11 @@ module Que
       def check_enqueued_job(to_enqueue, enqueued_job, logs)
         logs << if enqueued_job.present?
                   "que-scheduler enqueueing #{enqueued_job.job_class} " \
-                              "#{enqueued_job.job_id} with args: #{enqueued_job.args}"
+                    "#{enqueued_job.job_id} with args: #{enqueued_job.args}"
                 else
                   # This can happen if a middleware nixes the enqueue call
                   "que-scheduler called enqueue on #{to_enqueue.job_class} " \
-                              "but it reported no job was scheduled. Has `enqueue` been overridden?"
+                    "but it reported no job was scheduled. Has `enqueue` been overridden?"
                 end
       end
 

data/lib/que/scheduler/to_enqueue.rb

@@ -22,8 +22,8 @@ module Que
           type_from_job_class(job_class).present?
         end
 
-        def active_job_loaded?
-          !!active_job_version
+        def active_job_defined?
+          Object.const_defined?("ActiveJob")
         end
 
         def active_job_version
@@ -54,7 +54,7 @@ module Que
               hash = {
                 ::Que::Job => QueJobType,
               }
-              hash[::ActiveJob::Base] = ActiveJobType if ToEnqueue.active_job_loaded?
+              hash[::ActiveJob::Base] = ActiveJobType if ToEnqueue.active_job_defined?
               hash
             end
         end

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = "4.1.0".freeze
+    VERSION = "4.2.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.2
 platform: ruby
 authors:
 - Harry Lascelles
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,7 +53,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: que
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
         version: '0.12'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta4
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
         version: '0.12'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta4
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -98,6 +101,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +147,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -210,6 +216,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -256,16 +276,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -368,7 +388,8 @@ metadata:
   changelog_uri: https://github.com/hlascelles/que-scheduler/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/hlascelles/que-scheduler/
   bug_tracker_uri: https://github.com/hlascelles/que-scheduler/issues
-post_install_message:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -376,15 +397,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A cron scheduler for Que
 test_files: []