que-scheduler 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53c67a2992ebec58fd5f78b27d498b3c57fc3d96e12418eef44f107137c4e87d
-  data.tar.gz: 9327a0ad5ec9f30ab8a21a83adb6b7ddc288816c94a159bb75a5255c82a6f199
+  metadata.gz: 7529f8184cfe7309afb6c9eee51711491b820bf7f67268b0a6d3c061ff382cca
+  data.tar.gz: d6b56d73a4c7844881418b12071283a2da79c9bf932e7d24320211d3dcdc0d54
 SHA512:
-  metadata.gz: d975f2f8bfaef54fd7356b7339da8fb12c5d2333b3c719de122d23cd409ba64ef9159443a98b7a960033fddc8d77739783fec4585846463b26e4b0f021c41d16
-  data.tar.gz: 588bec202c190e898fffe4bb0c5188b1439dca86ead2d0b160a2b170f879e72d3f12374bd766787f53c62c30c2d2331327c1563274dd954a82d06746db3f805e
+  metadata.gz: 7623907aacf3c0754ac60677a63638455dcf38fc0bb7abbb39f4cbbd728d880d5697354f43e6557985a7cc64eecfcb1c7cc7ee918536f16ac70c53a7c3c1765e
+  data.tar.gz: 115f75f933ded700e39f3ad68a930bfc160a09c34eb872f99bb0bc9cfae8c058b3c54de3b2875293ea8cedf06a086648b54c3706b1bf53158093487deb09d555

data/lib/que/scheduler.rb

@@ -1,4 +1,5 @@
 require 'que/scheduler/version'
+require 'que/scheduler/version_support'
 require 'que/scheduler/config'
 require 'que/scheduler/scheduler_job'
 require 'que/scheduler/db'

data/lib/que/scheduler/scheduler_job.rb

@@ -30,7 +30,7 @@ module Que
           )
 
           # Only now we're sure nothing errored, log the results
-          logs.each { |str| ::Que.log(message: str) }
+          logs.each { |str| ::Que.log(event: 'que-scheduler'.to_sym, message: str) }
           destroy
         end
       end

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = '3.2.5'.freeze
+    VERSION = '3.2.6'.freeze
   end
 end

data/lib/que/scheduler/version_support.rb

@@ -5,29 +5,50 @@ require 'que'
 module Que
   module Scheduler
     module VersionSupport
+      # rubocop:disable Style/GuardClause Temporary code
       class << self
         def set_priority(context, priority)
-          context.instance_variable_set('@priority', priority)
+          if zero_major?
+            context.instance_variable_set('@priority', priority)
+          else
+            raise 'Unsupported Que version'
+          end
         end
 
         def job_attributes(enqueued_job)
-          enqueued_job.attrs.transform_keys(&:to_sym)
+          if zero_major?
+            enqueued_job.attrs.transform_keys(&:to_sym)
+          else
+            raise 'Unsupported Que version'
+          end
         end
 
-        # Between Que 0.x and 1.x the result of `Que.execute` changed keys from strings to symbols.
+        # Between Que 0.x and 1.x the result of Que execute changed keys from strings to symbols.
         # Here we wrap the concept and make sure either way produces symbols
         def execute(str, args = [])
           normalise_array_of_hashes(Que.execute(str, args))
         end
 
         def default_scheduler_queue
-          ''
+          if zero_major?
+            ''
+          else
+            raise 'Unsupported Que version'
+          end
         end
 
+        def zero_major?
+          # This is the only way to handle beta releases too
+          @zero_major ||= Gem.loaded_specs['que'].version.to_s.split('.').first.to_i.zero?
+        end
+
+        private
+
         def normalise_array_of_hashes(array)
           array.map { |row| row.transform_keys(&:to_sym) }
         end
       end
+      # rubocop:enable Style/GuardClause
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -198,20 +198,6 @@ 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.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -260,14 +246,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.0
+        version: 0.68.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.63.0
+        version: 0.68.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement