mongodb-scheduler 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ced35defa4e08f8f85d1acebd1c1f540cde5fd78bf8ab705413b7c21a6b834c8
-  data.tar.gz: 75bac1efddceae22c188238636f8dc4c736c42da4a6b7b3e97ec2c49488eb6c7
+  metadata.gz: c7f349aeb19c7cbbdff5bb250f0195abd020ff0bd46f547b2d50bf6442f29f5f
+  data.tar.gz: 473214d4f4ecaef4b870f66c158cd97e34e377b91da68f6bfd5b3389218352b5
 SHA512:
-  metadata.gz: 12ce7bf3f88c5fa3ad1ff05525e1f8e0343c8b0e19ed78dbbe2d4c20ba82d20e6ab1d7c79379f25006a509b47cb29891470b0cde0c6b25e57fa0a93a243a00cd
-  data.tar.gz: f737ca2752308ee94af20dea9815e991cef3784c723b2e269066d11f7e631fa65e00264900771bfe080c5a800f26fb0b972d4f30b038f8e150ff8d455fec8140
+  metadata.gz: 21a71236aefaccb4793cd4ecc385cf7954bfc97aa5fe4d76aa19f6b89dfcea36e55d5473c005e56f0946992f0da9f3fb136e98eb59752701c326634fd1308206
+  data.tar.gz: ab0bdd5c15d10c4a0cad8b74202db1bc6c51c2c3f1e720d209406f324a55f3d4955d7ab64efab30ed89fece06e592b041adedec23c0811a986d3f0ec8faf5587

data/lib/scheduler/main_process.rb

@@ -52,13 +52,14 @@ module Scheduler
         begin
           # Counts jobs to schedule.
           running_jobs = @job_class.running.entries
-          schedulable_jobs = @job_class.queued.order_by(scheduled_at: :asc).entries
+          scheduled_jobs = @job_class.queued.order_by(scheduled_at: :asc).entries
+          performable_jobs = scheduled_jobs.select { |job| job.run_at <= Time.now }
           jobs_to_schedule = @max_concurrent_jobs - running_jobs.count
           jobs_to_schedule = 0 if jobs_to_schedule < 0
   
           # Finds out scheduled jobs waiting to be performed.
-          scheduled_jobs = []
-          schedulable_jobs.first(jobs_to_schedule).each do |job|
+          performed_jobs = []
+          performable_jobs.first(jobs_to_schedule).each do |job|
             job_pid = Process.fork do
               begin
                 job.perform(Process.pid)
@@ -68,20 +69,21 @@ module Scheduler
               end
             end
             Process.detach(job_pid)
-            scheduled_jobs << job
+            performed_jobs << job
             @queue << job.id.to_s
           end
   
           # Logs launched jobs
-          if scheduled_jobs.any?
-            @logger.info Rainbow("[Scheduler:#{@pid}] Launched #{scheduled_jobs.count} "\
-              "jobs: #{scheduled_jobs.map(&:id).map(&:to_s).join(', ')}.").cyan
+          if performed_jobs.any?
+            @logger.info Rainbow("[Scheduler:#{@pid}] Launched #{performed_jobs.count} "\
+              "jobs: #{performed_jobs.map(&:id).map(&:to_s).join(', ')}.").cyan
           else
-            if schedulable_jobs.count == 0
-              @logger.info Rainbow("[Scheduler:#{@pid}] No jobs in queue.").cyan
+            if performable_jobs.count == 0
+              @logger.info Rainbow("[Scheduler:#{@pid}] No jobs launched, "\
+                "#{scheduled_jobs.count} in queue waiting to be performed.").cyan
             else
               @logger.warn Rainbow("[Scheduler:#{@pid}] No jobs launched, reached maximum "\
-                "number of concurrent jobs. Jobs in queue: #{schedulable_jobs.count}.").yellow
+                "number of concurrent jobs. Jobs in queue: #{performable_jobs.count}.").yellow
             end
           end
   

data/lib/scheduler/schedulable.rb

@@ -9,12 +9,36 @@ module Scheduler
     # Possible log levels.
     LOG_LEVELS = [ :debug, :info, :warn, :error ]
 
+    ##
+    # A class to delay jobs.
+    class Delayed
+
+      ##
+      # New delayed job.
+      def initialize(job_class, time)
+        @job_class = job_class
+        @time = time
+      end
+
+      ##
+      # Creates an instance of this class and schedules the job.
+      #
+      # @param [String] executable_class the class of the job to run.
+      # @param [Array] *job_args job arguments
+      #
+      # @return [Object] the created job.
+      def schedule(executable_class, *job_args)
+        @job_class.create(executable_class: executable_class, args: job_args, run_at: Time.now + @time).schedule
+      end
+    end
+
     def self.included(base)
       base.class_eval do
         include Mongoid::Document
 
         field :executable_class,        type: String
         field :args,                    type: Array,      default: []
+        field :run_at,                  type: DateTime,   default: Time.now
         field :scheduled_at,            type: DateTime
         field :executed_at,             type: DateTime
         field :completed_at,            type: DateTime
@@ -76,6 +100,16 @@ module Scheduler
             self.create(executable_class: executable_class, args: job_args).schedule
           end
 
+          ##
+          # Creates an instance of this class and schedules the job after the amount of given time.
+          #
+          # @param [Integer] time the amount of time to wait.
+          #
+          # @return [Object] the created job.
+          def in(time)
+            Scheduler::Schedulable::Delayed.new(self, time)
+          end
+
           ##
           # Creates an instance of this class and performs the job.
           #

data/lib/scheduler/version.rb

@@ -1,3 +1,3 @@
 module Scheduler
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongodb-scheduler
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Francesco Ballardin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid