crono 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9660f893cd0651c8ba42035cf1aa7ffcd3b5bf2
-  data.tar.gz: 8061bc8671ac7028a2fa5e809b7c8514ca42882a
+  metadata.gz: ca06047f3fd1428fe8babcee91ca5a1e1ff9e326
+  data.tar.gz: 8f1a48db399615c5a3d8641f194273a3a82ef9cc
 SHA512:
-  metadata.gz: 78ec65fafc3e3f4d1b58c939286991cdf52d687a8e7174f38f3d2ca7cae45b08601c275f0f4a4b2dd0e87fc4d351a2d0d1fc20fc12ad9aa880f500b351c847c6
-  data.tar.gz: 6ececad5653b20ee789086f2de26aff1b4679e28cd762c5ddab7d80fa72fde61c22f88953df46b49a67a0ebb56f30c4bada52014e0d05d251f66a3d48046c2ca
+  metadata.gz: d12831d9d1f5bae9801491cce5c4039049f4cefebd0b23b5b33050916ae9e42af2623ca66476f2f2b3eb0204d39296f74079b85492f3fa3cca016ff7cbd8b585
+  data.tar.gz: 35baf793c81867128dd577c10b19cb273ad2c15d34987903fb3f9bfe0dc0e5e69e4d27d642b67a2afee8b5c5129b7cfb5f72c0cd7417404934ef6ca8593ad938

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 log/*.log
+.byebug_history

data/.travis.yml

@@ -3,14 +3,8 @@ os:
   - linux
   - osx
 rvm:
-  - 2.0.0
-  - 2.1.7
-  - 2.2.3
-  - 2.3.1
-matrix:
-  exclude:
-    - rvm: 2.3.1
-      os: osx
+  - 2.2.6
+  - 2.3.3
 notifications:
   webhooks:
     urls:

data/Changes.md

@@ -1,3 +1,13 @@
+1.1.0
+-----------
+- Rails 3 and old Rubies are not supported anymore, sorry rails 3 guys...
+- Requires Ruby 2.2.2 or newer
+- Fixed crash when no jobs defined in your cronotab
+- Some doc updates (thanks to @pachacamac)
+- Job will schedule on: today if at: time not passed (thanks to @acolyer)
+- Job log truncating (thanks to @reiz)
+
+
 1.0.3
 -----------
 - "every 1 week" jobs now displaying on Rails 5 as "1 week" not as "7 days"

data/Gemfile.lock

@@ -1,57 +1,57 @@
 PATH
   remote: .
   specs:
-    crono (1.0.3)
+    crono (1.1.0)
       activerecord (>= 4.0)
       activesupport (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.0)
-      activesupport (= 5.0.0)
-    activerecord (5.0.0)
-      activemodel (= 5.0.0)
-      activesupport (= 5.0.0)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       arel (~> 7.0)
-    activesupport (5.0.0)
+    activesupport (5.0.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (7.0.0)
-    byebug (9.0.5)
+    arel (7.1.4)
+    byebug (9.0.6)
     concurrent-ruby (1.0.2)
-    daemons (1.2.3)
+    daemons (1.2.4)
     diff-lcs (1.2.5)
     haml (4.0.7)
       tilt
     i18n (0.7.0)
-    minitest (5.9.0)
-    rack (1.6.4)
+    minitest (5.9.1)
+    rack (1.6.5)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (11.2.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rake (11.3.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     sinatra (1.4.7)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    sqlite3 (1.3.11)
+    sqlite3 (1.3.12)
     thread_safe (0.3.5)
     tilt (2.0.5)
     timecop (0.8.1)
@@ -75,4 +75,4 @@ DEPENDENCIES
   timecop (>= 0.7)
 
 BUNDLED WITH
-   1.11.2
+   1.13.6

data/README.md

@@ -4,7 +4,6 @@ Crono — Job scheduler for Rails
 [![Build Status](https://travis-ci.org/plashchynski/crono.svg?branch=master)](https://travis-ci.org/plashchynski/crono)
 [![Code Climate](https://codeclimate.com/github/plashchynski/crono/badges/gpa.svg)](https://codeclimate.com/github/plashchynski/crono)
 [![security](https://hakiri.io/github/plashchynski/crono/master.svg)](https://hakiri.io/github/plashchynski/crono/master)
-[![Join the chat at https://gitter.im/plashchynski/crono](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/plashchynski/crono?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Crono is a time-based background job scheduler daemon (just like Cron) for Ruby on Rails.
 
@@ -18,7 +17,7 @@ Currently, there is no such thing as Ruby Cron for Rails. Well, there's [Wheneve
 
 ## Requirements
 
-Tested with latest MRI Ruby (2.3, 2.2, 2.1 and 2.0) and Rails 3.2+ (including Rails 5).
+Tested with latest MRI Ruby 2.2+, 2.3+, Rails 4.\*, and Rails 5.\*.
 Other versions are untested but might work fine.
 
 
@@ -77,8 +76,8 @@ Here's an example of a Rake Task within a job:
 ```ruby
 # config/cronotab.rb
 require 'rake'
-# Be sure to change AppName to your application name!
-AppName::Application.load_tasks
+
+Rails.app_class.load_tasks
 
 class Test
   def perform
@@ -131,6 +130,12 @@ serialized using JSON.generate
 Crono.perform(TestJob, 'some', 'args').every 1.day, at: {hour: 12, min: 15}
 ```
 
+You can set some options that not passed to the job but affect how the job will be treated by Crono. For example, you can set to truncate job logs (which stored in the database) to a certain number of records:
+
+```ruby
+Crono.perform(TestJob).with_options(truncate_log: 100).every 1.week, on: :monday
+```
+
 #### Run
 
 To run Crono, in your Rails project root directory:
@@ -184,6 +189,14 @@ Rails.application.routes.draw do
 
 Access management and other questions described in the [wiki](https://github.com/plashchynski/crono/wiki/Web-UI).
 
+#### Known issues
+
+For Rails 5, in case of the errors:
+```
+`require': cannot load such file -- rack/showexceptions (LoadError)
+```
+See the related issue [#52](https://github.com/plashchynski/crono/issues/52)
+
 
 ## Capistrano
 

data/lib/crono/cli.rb

@@ -29,7 +29,11 @@ module Crono
       Cronotab.process(File.expand_path(config.cronotab))
       print_banner
 
-      check_jobs
+      unless have_jobs?
+        logger.error "You have no jobs in you cronotab file #{config.cronotab}"
+        return
+      end
+
       if config.daemonize
         start_working_loop_in_daemon
       else
@@ -39,6 +43,10 @@ module Crono
 
     private
 
+    def have_jobs?
+      Crono.scheduler.jobs.present?
+    end
+
     def setup_log
       if config.daemonize
         self.logfile = config.logfile
@@ -85,11 +93,6 @@ module Crono
       ::Rails.application.eager_load!
     end
 
-    def check_jobs
-      return if Crono.scheduler.jobs.present?
-      logger.error "You have no jobs in you cronotab file #{config.cronotab}"
-    end
-
     def start_working_loop_in_daemon
       unless ENV['RAILS_ENV'] == 'test'
         begin

data/lib/crono/job.rb

@@ -6,15 +6,16 @@ module Crono
   class Job
     include Logging
 
-    attr_accessor :performer, :period, :job_args, :last_performed_at,
+    attr_accessor :performer, :period, :job_args, :last_performed_at, :job_options,
                   :next_performed_at, :job_log, :job_logger, :healthy, :execution_interval
 
-    def initialize(performer, period, job_args)
+    def initialize(performer, period, job_args, job_options = {})
       self.execution_interval = 0.minutes
       self.performer, self.period = performer, period
       self.job_args = JSON.generate(job_args) 
       self.job_log = StringIO.new
       self.job_logger = Logger.new(job_log)
+      self.job_options = job_options
       self.next_performed_at = period.next
       @semaphore = Mutex.new
     end
@@ -61,9 +62,15 @@ module Crono
       job_log.truncate(job_log.rewind)
     end
 
+    def truncate_log(log)
+      return log.lines.last(job_options[:truncate_log]).join if job_options[:truncate_log]
+      return log
+    end
+
     def update_model
       saved_log = model.reload.log || ''
       log_to_save = saved_log + job_log.string
+      log_to_save = truncate_log(log_to_save)
       model.update(last_performed_at: last_performed_at, log: log_to_save,
                    healthy: healthy)
     end
@@ -98,7 +105,7 @@ module Crono
 
     def log(message, severity = Logger::INFO)
       @semaphore.synchronize do
-        logger.log severity, message
+        logger.log(severity, message) if logger
         job_logger.log severity, message
       end
     end

data/lib/crono/performer_proxy.rb

@@ -8,7 +8,7 @@ module Crono
     end
 
     def every(period, *args)
-      @job = Job.new(@performer, Period.new(period, *args), @job_args)
+      @job = Job.new(@performer, Period.new(period, *args), @job_args, @options)
       @scheduler.add_job(@job)
       self
     end
@@ -17,6 +17,11 @@ module Crono
       @job.execution_interval = execution_interval if @job
       self
     end
+
+    def with_options(options)
+      @options = options
+      self
+    end
   end
 
   def self.perform(performer, *job_args)

data/lib/crono/period.rb

@@ -23,6 +23,7 @@ module Crono
         return initial_next unless since
         @next = @period.since(since)
       end
+
       @next = @next.beginning_of_week.advance(days: @on) if @on
       @next = @next.change(time_atts)
       return @next if @next.future?
@@ -48,6 +49,7 @@ module Crono
     def initial_day
       return Time.now unless @on
       day = Time.now.beginning_of_week.advance(days: @on)
+      day = day.change(time_atts)
       return day if day.future?
       @period.from_now.beginning_of_week.advance(days: @on)
     end

data/lib/crono/version.rb

@@ -1,3 +1,3 @@
 module Crono
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/lib/generators/crono/install/templates/migrations/create_crono_jobs.rb

@@ -2,7 +2,7 @@ class CreateCronoJobs < ActiveRecord::Migration
   def self.up
     create_table :crono_jobs do |t|
       t.string    :job_id, null: false
-      t.text      :log
+      t.text      :log, limit: 4294967295 # LONGTEXT for MySQL
       t.datetime  :last_performed_at
       t.boolean   :healthy
       t.timestamps null: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crono
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Dzmitry Plashchynski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Job scheduler for Rails