belated 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3264ca317aa687386cf4f87b45a358b25197e0a8442d79c28116abbdf373cd5c
-  data.tar.gz: fc520d4de51b80b7ec87622f7ef66fd17a60423800a72a402fde7f7361e52a2e
+  metadata.gz: ed06672798a42b07c69c9dc84f32d1ba12a58a7b95028f0c4a2f5d1a5f0b04c4
+  data.tar.gz: 0ecf13b8abf076c5fbe8a0037017840e55f32c674f4a40092a6e35845503f4e9
 SHA512:
-  metadata.gz: 5512108388bf979973d471f9107b8f11f1af79320029324053ca748eeac3940635efdbff744410305e185e781de6732fa003ca7251d5d26be1c706e59818f960
-  data.tar.gz: 25045c09fbd423b0169cc4eda7a01a4cbf1e93c6a3ee13d0b574f24fabfd3fae9a58768eb6bef962b8613536c3585fb542e02151950eda82d6867c34a0d6e85f
+  metadata.gz: 1e16e639db3c05d9112a4b31232d0cb78dbe6fe93ed05cd33f1d9a7856ded7c40319c145c20cddf1dd5a8bafb2894d8f96d46fc423a6718180e4d5e4584fdc41
+  data.tar.gz: 86793a533285a0ae5761b3eb11d4f16fe44793cc83d2a24c6f7aebae6a4d27ff7795b3ef2e69ce7e2b12f5c86fb9e108d5252f2aa863c645262f880f0ad56cf7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.4.1] - 2021-08-05
+
+- Now handles saving future jobs too! So if you have a job enqueued for tomorrow, and restart Belated, it should still be enqueued. 
+
 ## [0.4.0] - 2021-08-03
 
 - Now you can enqueue jobs to be done at a later time. Just pass an `at:` keyword param to the client. 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    belated (0.4.0)
+    belated (0.4.1)
       drb
       dry-configurable
 

data/README.md

@@ -8,12 +8,13 @@ Note that Belated used to be called HardWorker. That name was already in use in
 
 It uses dRuby to do the communication! Which is absolute great. No need for Redis or PostgreSQL, just Ruby standard libraries.
 
+Can be used with or without Rails. 
+
 TODO LIST:
 
 - Catch SIGTERM and friends
   - Now supports it, partly. 
 - Don't crash on errors (Partially done)
-- Save jobs enqueued at a future date too when quitting (now it only saves the jobs in the queue)
 - Have multiple queues?
 - Maybe support ActiveJob?
 - Have a web UI

data/lib/belated.rb

@@ -22,7 +22,6 @@ class Belated
   include Logging
   include Singleton unless $TESTING
   URI = 'druby://localhost:8788'
-  FILE_NAME = 'belated_dump'
   @@queue = Belated::Queue.new
 
   setting :rails, true
@@ -37,7 +36,7 @@ class Belated
   # Aliased for testing purposes.
   # This is only run from the bin file.
   def start
-    boot_app && load_jobs
+    boot_app && @@queue.load_jobs
     @worker_list = []
     Belated.config.workers.times do |i|
       @worker_list << Thread.new { Worker.new(number: i.next) }
@@ -97,20 +96,9 @@ class Belated
     end
   end
 
-  def load_jobs
-    log "reloading... if file exists #{File.exist?(Belated::FILE_NAME)}"
-    return unless File.exist?(Belated::FILE_NAME)
-
-    jobs = YAML.load(File.binread(FILE_NAME))
-    jobs.each do |job|
-      @@queue.push(job)
-    end
-    File.delete(Belated::FILE_NAME)
-  end
-
   def reload
     log 'reloading...'
-    load_jobs
+    @@queue.load_jobs
   end
 
   def stop_workers
@@ -118,13 +106,7 @@ class Belated
       sleep 0.1 if worker.alive?
       Thread.kill(worker)
     end
-    class_array = []
-    @@queue.length.times do |_i|
-      unless (klass = @@queue.pop).instance_of?(Proc) || klass == :shutdown
-        class_array << klass
-      end
-    end
-    pp File.open(FILE_NAME, 'wb') { |f| f.write(YAML.dump(class_array)) }
+    @@queue.save_jobs
     exit unless $TESTING
   end
 

data/lib/belated/queue.rb

@@ -1,9 +1,14 @@
-require 'belated/job'
+# frozen_string_literal: true
 
+require 'belated/job'
+require 'belated/logging'
 class Belated
   class Queue
+    include Logging
     attr_accessor :future_jobs
 
+    FILE_NAME = 'belated_dump'
+
     def initialize(queue: Thread::Queue.new, future_jobs: [])
       @queue = queue
       self.future_jobs = future_jobs
@@ -33,5 +38,42 @@ class Belated
     def length
       @queue.length
     end
+
+    def load_jobs
+      log "reloading... if file exists #{File.exist?(FILE_NAME)}"
+      return unless File.exist?(FILE_NAME)
+
+      jobs = YAML.load(File.binread(FILE_NAME))
+      jobs.each do |job|
+        if job.is_a?(Job)
+          future_jobs.push(job)
+        else
+          @queue.push(job)
+        end
+      end
+      File.delete(FILE_NAME)
+    end
+
+    def save_jobs
+      class_array = []
+      @queue.length.times do |_i|
+        unless proc_or_shutdown?(klass = @queue.pop)
+          class_array << klass
+        end
+      end
+      future_jobs.each do |_job|
+        unless proc_or_shutdown?(klass = future_jobs.pop)
+          class_array << klass
+        end
+      end
+
+      pp File.open(FILE_NAME, 'wb') { |f| f.write(YAML.dump(class_array)) }
+    end
+
+    private
+
+    def proc_or_shutdown?(job)
+      job.instance_of?(Proc) || job == :shutdown
+    end
   end
 end

data/lib/belated/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Belated
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: belated
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sampo Kuokkanen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drb