crono 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c146a6ca9be59f261b40b2716337e6db97962c60
-  data.tar.gz: f0889fab37a17460d0c676dead916f0c36e315ac
+  metadata.gz: d44592e0e575b43cbfbc08ae70a3ba2b48fe4c56
+  data.tar.gz: f7155bff1058414b3772e008a497e5932e1117f1
 SHA512:
-  metadata.gz: 5498ec9e3ef28a21fa38ffb372d6807f7e34bd4088346a6381151dabf925a26b68857b6c5d5ba74af092a2470a6afc47844875d5c700775d4843d75f0678e614
-  data.tar.gz: f4b21a9fe445df51770cff88da34a888fa3e03666c1371b74efe45267c2c0f4d44cba76ebb3571e6e644be366da78c7b41f89114cfe3c51dae91f7c10e91dd84
+  metadata.gz: cc7a404b38391f25500e7ac662e06426d7bd9129c8911bc909a82262f4d231a824852b33a30f4a52ae58503c7e6ec7eacddd27a3379d1292de0bc61ab5cb5dd9
+  data.tar.gz: 6c101c91fc475b626baacd442725cdd7bd55b86b6e77c5d3cf3bbfa312062fa0931215ba683cb593c7ec9371972657d0968144f37e9a355f89c95f4a4adbbe40

data/Changes.md

@@ -7,3 +7,8 @@
 ———————————
 
 - Added -e/--environment ENV option to set the daemon rails environment.
+
+0.5.2
+———————————
+
+- Fix: Scheduled time now related to the last performing time.

data/README.md

@@ -26,7 +26,7 @@ Add the following line to your application's Gemfile:
 
     gem 'crono'
 
-Run the bundle command to install it.  
+Run the `bundle` command to install it.  
 After you install Crono, you can run the generator:
 
     rails generate crono:install
@@ -42,8 +42,8 @@ Now you are ready to move forward to create a job and schedule it.
 Crono can use Active Job jobs from `app/jobs/`. The only requirements is that the `perform` method should take no arguments.
 
 Here's an example of a test job:
-app/jobs/test_job.rb
 
+    # app/jobs/test_job.rb
     class TestJob < ActiveJob::Base
       def perform
         # put you scheduled code here
@@ -65,6 +65,7 @@ The ActiveJob jobs is convenient because you can use one job in both periodic an
 
 The schedule described in the configuration file `config/cronotab.rb`, that created using `crono:install` or manually. The semantic is pretty straightforward:
 
+    # config/cronotab.rb
     Crono.perform(TestJob).every 2.days, at: "15:30"
 
 You can schedule one job a few times, if you want a job to be performed a few times a day:
@@ -94,10 +95,15 @@ Usage: crono [options]
 ```
 
 ## Capistrano
+
 Use the `capistrano-crono` gem ([github](https://github.com/plashchynski/capistrano-crono/)).
 
+
+## Support
+
+Feel free to create [issues](https://github.com/plashchynski/crono/issues)
+
+
 ## License
 
-Copyright 2015 Dzmitry Plashchynski <plashchynski@gmail.com>  
-Licensed under the Apache License, Version 2.0  
 Please see [LICENSE](https://github.com/plashchynski/crono/blob/master/LICENSE) for licensing details.

data/examples/cronotab.rb

@@ -0,0 +1,15 @@
+# cronotab.rb — Crono configuration example file
+#
+# Here you can specify periodic jobs and their schedule.
+# You can specify a periodic job as a ActiveJob class in `app/jobs/`
+# Actually you can use any class. The only requirement is that
+# the class should implement a method `perform` without arguments.
+#
+
+class TestJob
+  def perform
+    puts "Test!"
+  end
+end
+
+Crono.perform(TestJob).every 5.second

data/lib/crono.rb

@@ -4,6 +4,7 @@ end
 require "active_support/all"
 require "crono/version.rb"
 require "crono/period.rb"
+require "crono/job.rb"
 require "crono/schedule.rb"
 require "crono/config.rb"
 require "crono/performer_proxy.rb"

data/lib/crono/cli.rb

@@ -3,17 +3,15 @@ require 'optparse'
 
 module Crono
   mattr_accessor :schedule
+  mattr_accessor :logger
 
   class CLI
     include Singleton
     attr_accessor :config
-    attr_accessor :schedule
-    attr_accessor :logger
 
     def initialize
       self.config = Config.new
-      self.schedule = Schedule.new
-      Crono.schedule = schedule
+      Crono.schedule = Schedule.new
     end
 
     def run
@@ -44,12 +42,12 @@ module Crono
 
     def init_logger
       logfile = config.daemonize ? config.logfile : STDOUT
-      self.logger = Logger.new(logfile)
+      Crono.logger = Logger.new(logfile)
     end
 
     def print_banner
-      logger.info "Loading Crono #{Crono::VERSION}"
-      logger.info "Running in #{RUBY_DESCRIPTION}"
+      Crono.logger.info "Loading Crono #{Crono::VERSION}"
+      Crono.logger.info "Running in #{RUBY_DESCRIPTION}"
     end
 
     def load_rails
@@ -60,16 +58,11 @@ module Crono
       require File.expand_path(config.cronotab)
     end
 
-    def run_job(klass)
-      logger.info "Perform #{klass}"
-      Thread.new { klass.new.perform }
-    end
-
     def start_working_loop
       loop do
-        klass, time = schedule.next
-        sleep(time - Time.now)
-        run_job(klass)
+        job = Crono.schedule.next
+        sleep(job.next - Time.now)
+        job.perform
       end
     end
 

data/lib/crono/job.rb

@@ -0,0 +1,21 @@
+module Crono
+  class Job
+    attr_accessor :performer
+    attr_accessor :period
+    attr_accessor :last_performed_at
+
+    def initialize(performer, period)
+      self.performer, self.period = performer, period
+    end
+
+    def next
+      period.next(since: last_performed_at)
+    end
+
+    def perform
+      Crono.logger.info "Perform #{performer}"
+      self.last_performed_at = Time.now
+      Thread.new { performer.new.perform }
+    end
+  end
+end

data/lib/crono/performer_proxy.rb

@@ -6,7 +6,8 @@ module Crono
     end
 
     def every(period, *args)
-      @schedule.add(@performer, Period.new(period, *args))
+      job = Job.new(@performer, Period.new(period, *args))
+      @schedule.add(job)
     end
   end
 

data/lib/crono/period.rb

@@ -5,8 +5,9 @@ module Crono
       @at_hour, @at_min = parse_at(at) if at
     end
 
-    def next
-      @period.from_now.change({hour: @at_hour, min: @at_min}.compact)
+    def next(since: nil)
+      since ||= Time.now
+      @period.since(since).change({hour: @at_hour, min: @at_min}.compact)
     end
 
     def parse_at(at)

data/lib/crono/schedule.rb

@@ -1,20 +1,22 @@
 module Crono
   class Schedule
+    attr_accessor :schedule
+
     def initialize
-      @schedule = []
+      self.schedule = []
     end
 
-    def add(peformer, period)
-      @schedule << [peformer, period]
+    def add(job)
+      schedule << job
     end
 
     def next
-      [queue.first[0], queue.first[1].next]
+      queue.first
     end
 
-    private
+  private
     def queue
-      @schedule.sort { |a,b| a[1].next <=> b[1].next }
+      schedule.sort { |a,b| a.next <=> b.next }
     end
   end
 end

data/lib/crono/version.rb

@@ -1,3 +1,3 @@
 module Crono
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/cli_spec.rb

@@ -18,13 +18,6 @@ describe Crono::CLI do
     end
   end
 
-  describe "#run_job" do
-    it "should run job in separate thread" do
-      thread = cli.send(:run_job, TestJob).join
-      expect(thread).to be_stop
-    end
-  end
-
   describe "#start_working_loop" do
     it "should start working loop"
   end

data/spec/job_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+class TestJob
+  def perform;end
+end
+
+describe Crono::Job do
+  let(:period) { Crono::Period.new(2.day) }
+  let(:job) { Crono::Job.new(TestJob, period) } 
+
+  it "should contain performer and period" do
+    expect(job.performer).to be TestJob
+    expect(job.period).to be period
+  end
+
+  describe "#perform" do
+    it "should run performer in separate thread" do
+      thread = job.perform.join
+      expect(thread).to be_stop
+    end
+  end
+end

data/spec/performer_proxy_spec.rb

@@ -5,8 +5,8 @@ class TestJob
 end
 
 describe Crono::PerformerProxy do
-  it "should add job and period to schedule" do
-    expect(Crono.schedule).to receive(:add).with(TestJob, kind_of(Crono::Period))
+  it "should add job to schedule" do
+    expect(Crono.schedule).to receive(:add).with(kind_of(Crono::Job))
     Crono.perform(TestJob).every(2.days, at: "15:30")
   end
 end

data/spec/period_spec.rb

@@ -30,6 +30,11 @@ describe Crono::Period do
           @period = Crono::Period.new(2.day, at: 1)
         }.to raise_error("Unknown 'at' format")
       end
+
+      it "should return time in relation to last time" do
+        @period = Crono::Period.new(2.day)
+        expect(@period.next(since: 1.day.ago)).to be_eql(1.day.from_now)
+      end
     end
   end
 end

data/spec/schedule_spec.rb

@@ -5,16 +5,23 @@ class TestJob
 end
 
 describe Crono::Schedule do
+  before(:each) do
+    @schedule = Crono::Schedule.new
+    @jobs = [
+      Crono::Period.new(3.day, at: "18:55"),
+      Crono::Period.new(1.day, at: "15:30"),
+      Crono::Period.new(7.day, at: "06:05")
+    ].map { |period| Crono::Job.new(TestJob, period) }
+    @schedule.schedule = @jobs
+  end
+
   describe "#next" do
     it "should return next job in schedule" do
-      @schedule = Crono::Schedule.new
-      [
-        Crono::Period.new(3.day, at: "18:55"),
-        Crono::Period.new(1.day, at: "15:30"),
-        Crono::Period.new(7.day, at: "06:05")
-      ].each { |period| @schedule.add(TestJob, period) }
+      expect(@schedule.next).to be @jobs[1]
+    end
 
-      expect(@schedule.next).to be_eql([TestJob, 1.day.from_now.change(hour: 15, min: 30)])
+    it "should return next based on last" do
+      expect(@schedule.next)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crono
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Dzmitry Plashchynski
@@ -114,10 +114,12 @@ files:
 - Rakefile
 - bin/crono
 - crono.gemspec
+- examples/cronotab.rb
 - examples/monitrc.conf
 - lib/crono.rb
 - lib/crono/cli.rb
 - lib/crono/config.rb
+- lib/crono/job.rb
 - lib/crono/performer_proxy.rb
 - lib/crono/period.rb
 - lib/crono/schedule.rb
@@ -126,6 +128,7 @@ files:
 - lib/generators/crono/install/templates/cronotab.rb.erb
 - spec/cli_spec.rb
 - spec/config_spec.rb
+- spec/job_spec.rb
 - spec/performer_proxy_spec.rb
 - spec/period_spec.rb
 - spec/schedule_spec.rb