que-scheduler 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2b504deabde4b9902e95944af14f2bd0820c6e7e
-  data.tar.gz: 9cecf4a0dcf0f6497096d0dfe5824c1452447c53
+SHA256:
+  metadata.gz: 15498dda40836c4e4f447f78a2cb5f259df54a2ba6be22d24c4343a3fffad2d1
+  data.tar.gz: b23b41708e1dd364fdd7a101ecdb7a5b6899ea9fad78fe6ca2ff3470db0f08dc
 SHA512:
-  metadata.gz: f2ebae7e9453682a6ed07f84b46523e1a617df42d9ed1aca8f60abb314080a5285067c56bcbaafa6d908d5adf26e90ba810afa90d31c7ac9a5c8a6f36ab8d009
-  data.tar.gz: 3b6425695eaaa1519a8cb4ec579bb40e9eb5a3a4514ffc5bc74218f884f43cb0ee884b2c329753107f56fe1f0d0743bca7a975a5c41e175e9cb86da9e0c5fdd3
+  metadata.gz: 28d70ce26b05e89c0b72ac8ca20b5e730891e032a5bf9a5f3d9e187e145f5f9d5e5ae357bdee1ad752ee11086ef1c9c7188c511adda85bd4ba9abb34d9cc54be
+  data.tar.gz: 7a53a1bd6d4c56c105172ccb2e9a2aa70ab862691bda8473b9476444c3afd4a382f1b0177daa325583cda54719c48ff99f2409bff6f34a29cb64d9cb7029d763

data/README.md

@@ -2,7 +2,7 @@ que-scheduler
 ================
 
 [![Gem Version](https://badge.fury.io/rb/que-scheduler.svg)](https://badge.fury.io/rb/que-scheduler)
-[![Build Status](https://travis-ci.org/hlascelles/que-scheduler.svg?branch=master)](https://travis-ci.org/hlascelles/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)
 
@@ -86,11 +86,13 @@ all_options_job:
   priority: 25
   args: ['open']
   
-# Ensure you never miss a job, even after downtime
+# Ensure you never miss a job, even after downtime, by using "schedule_type: every_event"
 DailyBatchReport:
   cron: "0 3 * * *"
-  # This job will be run every day. If workers are offline for several days, then the backlog
-  # will all be scheduled when they are restored, each with that event's timestamp as the first arg.
+  # 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.
+  # See "Schedule types" below for more information.
   schedule_type: every_event
 ```
 
@@ -104,11 +106,15 @@ A job can have a `schedule_type` assigned to it. Valid values are:
   the way resque-scheduler would perform if it were taken down for some time.
 1. `every_event` - Every cron match will result in a job being scheduled. If multiple cron times go 
   by during an extended period of downtime, then a job will be scheduled for every one missed on 
-  startup. This `schedule_type` should be used for daily batch jobs that need to know which day 
+  startup. This `schedule_type` should be used for regular batch jobs that need to know which time
   they are running a batch for. The job will always be scheduled with an ISO8601 string of the cron 
   that matched as the first argument. 
-   
-   This feature ensures that jobs which *must run* for a certain cron match will always eventually 
+  
+  An example would be an eventing DailyReportJob which summarises a day's sales. If no jobs run for
+  a few days due to a technical failure, then on recovery a report would still be needed for each 
+  individual day. "schedule_type: every_event" would ensure this happens.
+  
+  This feature ensures that jobs which *must run* for a certain cron match will always eventually 
   execute, even after a total system crash, or even a DB backup restore.
 
 ## Gem configuration

data/lib/que/scheduler/migrations.rb

@@ -28,9 +28,17 @@ module Que
 
         def db_version
           return Que.execute(TABLE_COMMENT).first[:description].to_i if audit_table_exists?
+
           Que::Scheduler::Db.count_schedulers.zero? ? 0 : 1
         end
 
+        def audit_table_exists?
+          result = Que.execute(<<-SQL)
+            SELECT * FROM information_schema.tables WHERE table_name = '#{AUDIT_TABLE_NAME}';
+          SQL
+          result.any?
+        end
+
         private
 
         def migrate_up(current, version)
@@ -46,17 +54,11 @@ module Que
         def execute_step(number, direction)
           Que.execute(IO.read("#{__dir__}/migrations/#{number}/#{direction}.sql"))
           return unless audit_table_exists?
+
           Que.execute(
             "COMMENT ON TABLE que_scheduler_audit IS '#{direction == :up ? number : number - 1}'"
           )
         end
-
-        def audit_table_exists?
-          result = Que.execute(<<-SQL)
-            SELECT * FROM information_schema.tables WHERE table_name = '#{AUDIT_TABLE_NAME}';
-          SQL
-          result.any?
-        end
       end
     end
   end

data/lib/que/scheduler/state_checks.rb

@@ -16,6 +16,7 @@ module Que
         def assert_db_migrated
           db_version = Que::Scheduler::Migrations.db_version
           return if db_version == Que::Scheduler::Migrations::MAX_VERSION
+
           raise(<<-ERR)
             The que-scheduler db migration state was found to be #{db_version}. It should be #{Que::Scheduler::Migrations::MAX_VERSION}.
 
@@ -47,6 +48,7 @@ module Que
         def assert_one_scheduler_job
           schedulers = Que::Scheduler::Db.count_schedulers
           return if schedulers == 1
+
           raise(<<-ERR)
             Only one #{Que::Scheduler::SchedulerJob.name} should be enqueued. #{schedulers} were found.
 

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = '3.2.2'.freeze
+    VERSION = '3.2.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.8
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +114,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +198,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.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
@@ -254,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0.61'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0.61'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -358,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A cron scheduler for Que