crono 0.7.0 → 0.8.0

data/spec/performer_proxy_spec.rb

@@ -1,12 +1,13 @@
-require "spec_helper"
+require 'spec_helper'
 
 class TestJob
-  def perform;end
+  def perform
+  end
 end
 
 describe Crono::PerformerProxy do
-  it "should add job to schedule" do
+  it 'should add job to schedule' do
     expect(Crono.scheduler).to receive(:add_job).with(kind_of(Crono::Job))
-    Crono.perform(TestJob).every(2.days, at: "15:30")
+    Crono.perform(TestJob).every(2.days, at: '15:30')
   end
 end

data/spec/period_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Crono::Period do
   around(:each) do |example|
@@ -7,49 +7,93 @@ describe Crono::Period do
     end
   end
 
-  describe "#description" do
-    it "should return period description" do
-      @period = Crono::Period.new(2.day, at: "15:20")
-      expect(@period.description).to be_eql("every 2 days at 15:20")
+  describe '#description' do
+    it 'should return period description' do
+      @period = Crono::Period.new(1.week, on: :monday, at: '15:20')
+      expect(@period.description).to be_eql('every 7 days at 15:20 on Monday')
     end
   end
 
-  describe "#next" do
-    context "in daily basis" do
-      it "should return the time 2 days from now" do
+  describe '#next' do
+    context 'in weakly basis' do
+      it "should raise error if 'on' is wrong" do
+        expect { @period = Crono::Period.new(7.days, on: :bad_day) }
+          .to raise_error("Wrong 'on' day")
+      end
+
+      it 'should raise error when period is less than 1 week' do
+        expect { @period = Crono::Period.new(6.days, on: :monday) }
+          .to raise_error("period should be at least 1 week to use 'on'")
+      end
+
+      it "should return a 'on' day" do
+        @period = Crono::Period.new(1.week, on: :thursday, at: '15:30')
+        current_week = Time.now.beginning_of_week
+        last_run_time = current_week.advance(days: 1) # last run on the tuesday
+        next_run_at = Time.now.next_week.advance(days: 3)
+                      .change(hour: 15, min: 30)
+        expect(@period.next(since: last_run_time)).to be_eql(next_run_at)
+      end
+
+      it "should return a next week day 'on'" do
+        @period = Crono::Period.new(1.week, on: :thursday)
+        Timecop.freeze(Time.now.beginning_of_week.advance(days: 4)) do
+          expect(@period.next).to be_eql(Time.now.next_week.advance(days: 3))
+        end
+      end
+
+      it 'should return a current week day on the first run if not too late' do
+        @period = Crono::Period.new(7.days, on: :tuesday)
+        beginning_of_the_week = Time.now.beginning_of_week
+        tuesday = beginning_of_the_week.advance(days: 1)
+        Timecop.freeze(beginning_of_the_week) do
+          expect(@period.next).to be_eql(tuesday)
+        end
+      end
+    end
+
+    context 'in daily basis' do
+      it 'should return the time 2 days from now' do
         @period = Crono::Period.new(2.day)
         expect(@period.next).to be_eql(2.day.from_now)
       end
 
       it "should set time to 'at' time as a string" do
         time = 10.minutes.ago
-        @period = Crono::Period.new(2.day, at: [time.hour, time.min].join(':'))
+        at = [time.hour, time.min].join(':')
+        @period = Crono::Period.new(2.day, at: at)
         expect(@period.next).to be_eql(2.day.from_now.change(hour: time.hour, min: time.min))
       end
 
       it "should set time to 'at' time as a hash" do
         time = 10.minutes.ago
-        at = {hour: time.hour, min: time.min}
+        at = { hour: time.hour, min: time.min }
         @period = Crono::Period.new(2.day, at: at)
         expect(@period.next).to be_eql(2.day.from_now.change(at))
       end
 
       it "should raise error when 'at' is wrong" do
         expect {
-          @period = Crono::Period.new(2.day, at: 1)
+          Crono::Period.new(2.day, at: 1)
         }.to raise_error("Unknown 'at' format")
       end
 
-      it "should return time in relation to last time" do
+      it 'should raise error when period is less than 1 day' do
+        expect {
+          Crono::Period.new(5.hours, at: '15:30')
+        }.to raise_error("period should be at least 1 day to use 'at'")
+      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
 
-      it "should return today time if it is first run and not too late" do
+      it 'should return today time if it is first run and not too late' do
         time = 10.minutes.from_now
-        at = {hour: time.hour, min: time.min}
+        at = { hour: time.hour, min: time.min }
         @period = Crono::Period.new(2.day, at: at)
-        expect(@period.next).to be_eql(Time.now.change(at))
+        expect(@period.next.utc.to_s).to be_eql(Time.now.change(at).utc.to_s)
       end
     end
   end

data/spec/scheduler_spec.rb

@@ -1,30 +1,31 @@
-require "spec_helper"
+require 'spec_helper'
 
 class TestJob
-  def perform;end
+  def perform
+  end
 end
 
 describe Crono::Scheduler do
   before(:each) do
     @scheduler = Crono::Scheduler.new
     @jobs = [
-      Crono::Period.new(3.day, at: 10.minutes.from_now.strftime("%H:%M")),
-      Crono::Period.new(1.day, at: 20.minutes.from_now.strftime("%H:%M")),
-      Crono::Period.new(7.day, at: 40.minutes.from_now.strftime("%H:%M"))
+      Crono::Period.new(3.day, at: 10.minutes.from_now.strftime('%H:%M')),
+      Crono::Period.new(1.day, at: 20.minutes.from_now.strftime('%H:%M')),
+      Crono::Period.new(7.day, at: 40.minutes.from_now.strftime('%H:%M'))
     ].map { |period| Crono::Job.new(TestJob, period) }
     @scheduler.jobs = @jobs
   end
 
-  describe "#add_job" do
-    it "should call Job#load on Job" do
-      @job = Crono::Job.new(TestJob, Crono::Period.new(10.day, at: "04:05"))
+  describe '#add_job' do
+    it 'should call Job#load on Job' do
+      @job = Crono::Job.new(TestJob, Crono::Period.new(10.day, at: '04:05'))
       expect(@job).to receive(:load)
       @scheduler.add_job(@job)
     end
   end
 
-  describe "#next" do
-    it "should return next job in schedule" do
+  describe '#next' do
+    it 'should return next job in schedule' do
       expect(@scheduler.next).to be @jobs[0]
     end
   end

data/spec/spec_helper.rb

@@ -6,9 +6,10 @@ require 'byebug'
 require 'crono'
 require 'generators/crono/install/templates/migrations/create_crono_jobs.rb'
 
-ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: "file::memory:?cache=shared")
+ActiveRecord::Base.establish_connection(
+  adapter: 'sqlite3',
+  database: 'file::memory:?cache=shared'
+)
+
 ActiveRecord::Base.logger = Logger.new(STDOUT)
 CreateCronoJobs.up
-
-RSpec.configure do |config|
-end

data/spec/web_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'rack/test'
+include Rack::Test::Methods
+
+describe Crono::Web do
+  let(:app) { Crono::Web }
+
+  before do
+    @test_job_id = 'Perform TestJob every 5 seconds'
+    @test_job_log = 'All runs ok'
+    @test_job = Crono::CronoJob.create!(
+      job_id: @test_job_id,
+      log: @test_job_log
+    )
+  end
+
+  after { @test_job.destroy }
+
+  describe '/' do
+    it 'should show all jobs' do
+      get '/'
+      expect(last_response).to be_ok
+      expect(last_response.body).to include @test_job_id
+    end
+
+    it 'should show a error mark when a job is unhealthy' do
+      @test_job.update(healthy: false)
+      get '/'
+      expect(last_response.body).to include 'Error'
+    end
+  end
+
+  describe '/job/:id' do
+    it 'should show job log' do
+      get "/job/#{@test_job.id}"
+      expect(last_response).to be_ok
+      expect(last_response.body).to include @test_job_id
+      expect(last_response.body).to include @test_job_log
+    end
+
+    it 'should show a message about the unhealthy job' do
+      message = 'An error occurs during the last execution of this job'
+      @test_job.update(healthy: false)
+      get "/job/#{@test_job.id}"
+      expect(last_response.body).to include message
+    end
+  end
+end

data/web/views/dashboard.haml

@@ -7,11 +7,16 @@
     %th Job
     %th Last performed at
     %th
-  - for job in @jobs
+    %th
+  - @jobs.each do |job|
     %tr
       %td= job.job_id
-      %td= job.last_performed_at || "—"
+      %td= job.last_performed_at || '-'
+      %td
+        - if job.healthy == false
+          %a{ href: url("/job/#{job.id}") }
+            %span.label.label-danger Error
       %td
-        %a{href: url("/jobs/#{job.id}")}
+        %a{ href: url("/job/#{job.id}") }
           Log
           %span.glyphicon.glyphicon-menu-right

data/web/views/job.haml

@@ -1,8 +1,14 @@
 %ol.breadcrumb
   %li
-    %a{href: url("/")} Home
+    %a{ href: url('/') } Home
   %li.active= @job.job_id
 
 %h2
   "#{@job.job_id}" Log:
+
+- if @job.healthy == false
+  .alert.alert-danger{ role: 'alert' }
+    An error occurs during the last execution of this job.
+    Check the log below for details.
+
 %pre= @job.log

data/web/views/layout.haml

@@ -1,15 +1,15 @@
 !!! 5
-%html{lang: "en"}
+%html{ lang: 'en' }
   %head
-    %meta{charset: "utf-8"}
-    %meta{"http-equiv" => "X-UA-Compatible", content: "IE=edge"}
-    %meta{name: "viewport", content: "width=device-width, initial-scale=1"}
+    %meta{ charset: 'utf-8' }
+    %meta{ 'http-equiv' => 'X-UA-Compatible', content: 'IE=edge' }
+    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }
 
     %title Crono Dashboard
 
-    %link{href: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css", rel: "stylesheet"}
-    %link{href: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css", rel: "stylesheet"}
-    %link{href: "#{env['SCRIPT_NAME']}/custom.css", rel: "stylesheet"}
+    %link{ href: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css', rel: 'stylesheet' }
+    %link{ href: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css', rel: 'stylesheet' }
+    %link{ href: "#{env['SCRIPT_NAME']}/custom.css", rel: 'stylesheet' }
 
   %body
     %br
@@ -21,5 +21,5 @@
           %small Dashboard
       = yield
 
-    %script{src: "https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"}
-    %script{src: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"}
+    %script{ src: 'https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js' }
+    %script{ src: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crono
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Dzmitry Plashchynski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Job scheduler for Rails
 email:
 - plashchynski@gmail.com
@@ -209,6 +223,7 @@ files:
 - spec/period_spec.rb
 - spec/scheduler_spec.rb
 - spec/spec_helper.rb
+- spec/web_spec.rb
 - tmp/.gitkeep
 - web/assets/custom.css
 - web/views/dashboard.haml
@@ -234,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: crono
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Job scheduler for Rails