crono 0.8.7.pre → 0.8.8.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aba8e6d1336334c7705b1849e0627afb048f3aa
-  data.tar.gz: 0bbb66243e43eebb3bff785759c9b644f94e6883
+  metadata.gz: 4ada92b83365f8a5dc386a0206bc78c885406109
+  data.tar.gz: 4d8a3131f5fb9b8e80b2fd5ef289ff00e673b7fc
 SHA512:
-  metadata.gz: 7327585dd13c2f2b996d7caaa232d36154b0fde0944655d7b19e31234753f12f88beea3c7a5eb6292bd69c95bd95aff439cf090a4da37bc051841ea57483e591
-  data.tar.gz: 9dc8f836867c3b5dbfce6b06cdfb5abf9d40d57e89465bc22a59f4d3f7ed427aad05bbde875d942c0d20779bd20879d269d1d0de75f88440733622ff751927ea
+  metadata.gz: f23b4482087ae0345cf642507e72afc0695fcfddd604eaadfb78bae95114dbe0ae902d39512e41cfaaeccf6f3c936e858eeac71b11bc45d728e64df92d49a6ef
+  data.tar.gz: d33fac75dba413e402171fb7a1fbdb94ee0ae78401cb4cf9ebf67d4f7027065a2dc66d0a3066e0a738338620f2764091b929a4958b4714bb8552090ea4c10bc9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    crono (0.8.7.pre)
+    crono (0.8.8.pre)
       activejob (~> 4.0)
       activerecord (~> 4.0)
       activesupport (~> 4.0)

data/lib/crono.rb

@@ -10,6 +10,7 @@ require 'crono/job'
 require 'crono/scheduler'
 require 'crono/config'
 require 'crono/performer_proxy'
+require 'crono/cronotab'
 require 'crono/orm/active_record/crono_job'
 require 'crono/railtie' if defined?(Rails)
 

data/lib/crono/cli.rb

@@ -21,6 +21,7 @@ module Crono
 
       write_pid
       load_rails
+      Cronotab.process(File.expand_path(config.cronotab))
       print_banner
 
       check_jobs
@@ -71,7 +72,6 @@ module Crono
       require 'rails'
       require File.expand_path('config/environment.rb')
       ::Rails.application.eager_load!
-      require File.expand_path(config.cronotab)
     end
 
     def check_jobs

data/lib/crono/cronotab.rb

@@ -0,0 +1,10 @@
+module Crono
+  class Cronotab
+    def self.process(cronotab_path = nil)
+      cronotab_path ||= ENV['CRONOTAB'] || (defined?(Rails) &&
+                        File.join(Rails.root, Config::CRONOTAB))
+      fail 'No cronotab defined' unless cronotab_path
+      require cronotab_path
+    end
+  end
+end

data/lib/crono/job.rb

@@ -6,18 +6,20 @@ module Crono
   class Job
     include Logging
 
-    attr_accessor :performer, :period, :last_performed_at, :job_log,
-                  :job_logger, :healthy
+    attr_accessor :performer, :period, :last_performed_at,
+                  :next_performed_at, :job_log, :job_logger, :healthy
 
     def initialize(performer, period)
       self.performer, self.period = performer, period
       self.job_log = StringIO.new
       self.job_logger = Logger.new(job_log)
+      self.next_performed_at = period.next
       @semaphore = Mutex.new
     end
 
     def next
-      period.next(since: last_performed_at)
+      return next_performed_at if next_performed_at.future?
+      Time.now
     end
 
     def description
@@ -31,6 +33,7 @@ module Crono
     def perform
       log "Perform #{performer}"
       self.last_performed_at = Time.now
+      self.next_performed_at = period.next(since: last_performed_at)
 
       Thread.new { perform_job }
     end
@@ -44,6 +47,7 @@ module Crono
 
     def load
       self.last_performed_at = model.last_performed_at
+      self.next_performed_at = period.next(since: last_performed_at)
     end
 
     private
@@ -61,23 +65,24 @@ module Crono
 
     def perform_job
       performer.new.perform
-      finished_time_sec = format('%.2f', Time.now - last_performed_at)
     rescue StandardError => e
-      handle_job_fail(e, finished_time_sec)
+      handle_job_fail(e)
     else
-      handle_job_success(finished_time_sec)
+      handle_job_success
     ensure
       save
     end
 
-    def handle_job_fail(exception, finished_time_sec)
+    def handle_job_fail(exception)
+      finished_time_sec = format('%.2f', Time.now - last_performed_at)
       self.healthy = false
       log_error "Finished #{performer} in #{finished_time_sec} seconds"\
-                "with error: #{exception.message}"
+                " with error: #{exception.message}"
       log_error exception.backtrace.join("\n")
     end
 
-    def handle_job_success(finished_time_sec)
+    def handle_job_success
+      finished_time_sec = format('%.2f', Time.now - last_performed_at)
       self.healthy = true
       log "Finished #{performer} in #{finished_time_sec} seconds"
     end

data/lib/crono/version.rb

@@ -1,3 +1,3 @@
 module Crono
-  VERSION = '0.8.7.pre'
+  VERSION = '0.8.8.pre'
 end

data/lib/tasks/crono_tasks.rake

@@ -1,18 +1,8 @@
-module Crono
-  def self.load_cronotab
-    cronotab_path = ENV['CRONOTAB'] || (defined?(Rails) &&
-                      File.join(Rails.root, cronotab_path))
-    fail 'No cronotab defined' unless cronotab_path
-    puts "Load cronotab #{cronotab_path}"
-    require cronotab_path
-  end
-end
-
 namespace :crono do
   desc 'Clean unused job stats from DB'
   task clean: :environment do
     Crono.scheduler = Crono::Scheduler.new
-    Crono.load_cronotab
+    Crono::Cronotab.process
     current_job_ids = Crono.scheduler.jobs.map(&:job_id)
     Crono::CronoJob.where.not(job_id: current_job_ids).destroy_all
   end
@@ -20,7 +10,7 @@ namespace :crono do
   desc 'Check cronotab.rb syntax'
   task check: :environment do
     Crono.scheduler = Crono::Scheduler.new
-    Crono.load_cronotab
+    Crono::Cronotab.process
     puts 'Syntax ok'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crono
 version: !ruby/object:Gem::Version
-  version: 0.8.7.pre
+  version: 0.8.8.pre
 platform: ruby
 authors:
 - Dzmitry Plashchynski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -206,6 +206,7 @@ files:
 - lib/crono.rb
 - lib/crono/cli.rb
 - lib/crono/config.rb
+- lib/crono/cronotab.rb
 - lib/crono/job.rb
 - lib/crono/logging.rb
 - lib/crono/orm/active_record/crono_job.rb