arask 1.1.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bbc371d18529aa76cdb47358c395712a623f95c6
-  data.tar.gz: c48f5ddda64e71cafac940cb3ce4af81691ae2ba
+SHA256:
+  metadata.gz: 124439fc5b51273732a02efb953350c77953bfd4c2fe120460d6bb74b8762f02
+  data.tar.gz: a6c54e857d937e5d4e87a38b50c2c75a8beeb1d3e708e903047b15de2e6a74af
 SHA512:
-  metadata.gz: 2061665d541fc6bc7758b0a595161b18820f267ea90e3bb56edead27f7bc666fe78d765405c2f86e69d11d744052a918a11a98bdfd76463a745a3f81c34a68d5
-  data.tar.gz: 1338c50d342cd77ff4d26bc273f518c276e1174369fcc5db0a27938573302dfd148dafd6243dcdb7126027f29682dd1c50902aab20122c603cbba5183d58b87f
+  metadata.gz: f9b78ff561bb8e9dfcc1850f70f52550e045b6fee4a3fba4e2e687e9bce3d83f6e8032cd222dc07c45da5580fdad5f7a82065e8ce971628c8bea75003327c19f
+  data.tar.gz: 1a075fc84d7cf53155725221774277822da02adfe06e418443fd6d825bdae0eb440bf41ee17c11504ab1325291b6c5bc7422d8ef5210e37cd3f4af2ff25c8435

data/README.md

@@ -49,6 +49,11 @@ arask.create script: 'Attachment.process_new', interval: 5.hours, run_first_time
 
 # On exceptions, send email with details
 arask.on_exception email: 'errors@example.com'
+
+# Run code on exceptions
+arask.on_exception do |exception, arask_job|
+  MyExceptionHandler.new(exception)
+end
 ```
 
 ### About cron
@@ -61,15 +66,19 @@ The interval starts when the task has started running. If a task with the interv
 
 ## Todos
 * Have a "try again" feature. For instance `arask.create script: 'raise "I failed"', interval: :daily, fail_retry: 5.minutes, retry_at_most: 2`
-* Be able to run a block when an exception occurs. `arask.on_exception do <code> end`
 * Be able to specify line and number that failed for an exception:
 ```ruby
-file,line,_ = caller.first.split(' ')[0].split(':')
+file,line,_ = caller.first.split(':')
 fileline = File.readlines(file)[line.to_i - 1].strip
 ```
 
-## Setup for Heroku
-None. But if you use a hobby dyno and it falls to sleep, so will Arask. As soon as the dyno wakes up, Arask will run any pending jobs.
+## Special environments
+
+### Heroku
+Nothing special to setup. But if you use a hobby dyno and it falls to sleep, so will Arask. As soon as the dyno wakes up, Arask will run any pending jobs.
+
+### Docker
+Nothing special to setup.
 
 ## Caveats
 If you reload a database dump, your jobs could be run again.

data/lib/arask.rb

@@ -5,26 +5,32 @@ require "arask/setup"
 require 'fugit' # To parse cron
 
 module Arask
-  class << self; attr_accessor :jobs_touched, :exception_email, :exception_email_from; end
+  class << self; attr_accessor :jobs_touched, :exception_email, :exception_email_from, :exception_block, :jobs_block; end
 
-  def self.setup
-    # Make sure we only run setup if Rails is actually run as a server or testing.
-    return unless defined?(Rails::Server) or Rails.env.test?
-    ActiveSupport.on_load :after_initialize, yield: true do
-      Arask.jobs_touched = []
-      yield Setup
-      begin
-        AraskJob.all.where.not(id: Arask.jobs_touched).delete_all
-        Arask.queue_self
-      rescue
-      end
+  def self.setup(force_run = false, &block)
+    Arask.jobs_block = block
+    # Make sure we only run setup now if we are testing.
+    # Else we would run them at every cli execution.
+    # railtie.rb inits the jobs when the server is ready
+    Arask.init_jobs if force_run
+  end
+
+  def self.init_jobs
+    Arask.jobs_touched = []
+    Arask.jobs_block.call(Setup)
+    Arask.jobs_block = nil
+    begin
+      AraskJob.all.where.not(id: Arask.jobs_touched).delete_all
+      Arask.jobs_touched = nil
+      Arask.queue_self
+    rescue
     end
   end
 
   def self.queue_self
     begin
       next_job_run = AraskJob.order(execute_at: :asc).first.try(:execute_at)
-      # At least check database for jobs every 5 minutes
+      # At least check database for jobs every day
       next_job_run = 1.day.from_now if next_job_run.nil? or (next_job_run - DateTime.now)/60/60 > 24
       RunJobs.set(wait_until: next_job_run).perform_later
     rescue

data/lib/arask/arask_job.rb

@@ -16,6 +16,9 @@ module Arask
         p self
         puts e.message
 
+        unless Arask.exception_block.nil?
+          Arask.exception_block.call(e, self)
+        end
         unless Arask.exception_email.nil?
           ActionMailer::Base.mail(
             from: Arask.exception_email_from,

data/lib/arask/initialize.rb

@@ -21,4 +21,9 @@ Arask.setup do |arask|
 
   # On exceptions, send email with details
   #arask.on_exception email: 'errors@example.com'
+
+  # Run code on exceptions
+  #arask.on_exception do |exception, arask_job|
+  #  MyExceptionHandler.new(exception)
+  #end
 end

data/lib/arask/railtie.rb

@@ -1,4 +1,8 @@
 module Arask
   class Railtie < ::Rails::Railtie
+    # Executes when the rails server is running
+    server do
+      Arask.init_jobs
+    end
   end
 end

data/lib/arask/setup.rb

@@ -1,9 +1,12 @@
 module Arask
   class Setup
-    def self.on_exception(email: nil, from: 'robot@server')
-      Arask.exception_email = email
-      Arask.exception_email_from = from
-      puts "Arask could not parse parameter for on_exception!" unless email.class == String
+    def self.on_exception(email: nil, from: 'robot@server', &block)
+      Arask.exception_email = email unless email.nil?
+      Arask.exception_email_from = from unless from.nil?
+      puts "Arask could not parse parameter for on_exception!" unless email.nil? or email.class == String
+      if block_given?
+        Arask.exception_block = block
+      end
     end
 
     def self.create(script: nil, task: nil, job: nil, interval: nil, cron: nil, run_first_time: false)

data/lib/arask/version.rb

@@ -1,3 +1,3 @@
 module Arask
-  VERSION = '1.1.3'
+  VERSION = '1.2.4'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: arask
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Esben Damgaard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: fugit
   requirement: !ruby/object:Gem::Requirement
@@ -90,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Automatic RAils taSKs (with minimal setup)