clockwork 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeec7e9d85ccbc4235df4e959852c62964bd756c
-  data.tar.gz: b17b8d59d78d23e19813fee904a5f32817566f4f
+  metadata.gz: a1c0df23cd1bd9f2a974f5d5461b162d5449858b
+  data.tar.gz: 57d4d055c37fea9164a51ea16afb34cf72b6ca16
 SHA512:
-  metadata.gz: 46e85795da235c9ad95081f33d871e58712fd37cfaca1ba02239722a8bbeb109aea00538c9e8a852ad8f752f5847a494098da15a7c6ec1e34daea1d9b23ac031
-  data.tar.gz: 68ba156bc2bd8400fe74f10420f543eeb547167b14bc35ef108357674074b2b8cd0e834daddfa04802425b88c08c1e9e307148ed84862075ed28ae068fa52644
+  metadata.gz: 61a97fce154912af62947c6591f771ce532e1b87bc4b25cd83d6983ac2d1618ebe9c98a4c2df7cc939a3af2d04aa9bef6b29169f3b38ca07eb63fece32a97fdc
+  data.tar.gz: f9a24be2f061626b409b69fa43f53b0ee16da421d892a5b5afd4bc86623ce41e74ab598bf0b89a9451c42c0279cc76314b92f8fb1706922312cdf51c53092dee

data/.travis.yml

@@ -1,7 +1,11 @@
+language: ruby
+sudo: false
+cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
+  - 2.2
   - jruby-19mode
   - # rbx-2.2.7
 gemfile:

data/README.md

@@ -36,7 +36,7 @@ module Clockwork
 end
 ```
 
-Run it with the clockwork binary:
+Run it with the clockwork executable:
 
 ```
 $ clockwork clock.rb
@@ -269,6 +269,9 @@ You can specify the day of week to run:
 every(1.week, 'myjob', :at => 'Monday 16:20')
 ```
 
+If another task is already running at the specified time, clockwork will skip execution of the task with the `:at` option.
+If this is a problem, please use the `:thread` option to prevent the long running task from blocking clockwork's scheduler.
+
 ### :tz
 
 `:tz` parameter lets you specify a timezone (default is the local timezone):
@@ -300,11 +303,11 @@ Clockwork.every(1.second, 'myjob', :if => lambda { |_| true })
 
 ### :thread
 
-In default, clockwork runs in single-process, single-thread.
-If an event handler takes long time, the main routine of clockwork is blocked until it ends.
+By default, clockwork runs in a single-process and single-thread.
+If an event handler takes a long time, the main routine of clockwork is blocked until it ends.
 Clockwork does not misbehave, but the next event is blocked, and runs when the process is returned to the clockwork routine.
 
-This `:thread` option is to avoid blocking. An event with `:thread => true`  runs in a different thread.
+The `:thread` option is to avoid blocking. An event with `thread: true` runs in a different thread.
 
 ```ruby
 Clockwork.every(1.day, 'run.me.in.new.thread', :thread => true)
@@ -390,7 +393,7 @@ Anatomy of a clock file
 -----------------------
 
 clock.rb is standard Ruby.  Since we include the Clockwork module (the
-clockwork binary does this automatically, or you can do it explicitly), this
+clockwork executable does this automatically, or you can do it explicitly), this
 exposes a small DSL to define the handler for events, and then the events themselves.
 
 The handler typically looks like this:

data/clockwork.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "clockwork"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.authors = ["Adam Wiggins", "tomykaira"]
   s.license = 'MIT'
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", "~> 1.3"
   s.add_development_dependency "rake"
   s.add_development_dependency "daemons"
-  s.add_development_dependency "contest"
+  s.add_development_dependency "test-unit"
   s.add_development_dependency "minitest", "~> 4.0"
   s.add_development_dependency "mocha"
 end

data/lib/clockwork/manager.rb

@@ -42,7 +42,11 @@ module Clockwork
       (@callbacks[event.to_sym]||=[]) << block
     end
 
-    def every(period, job, options={}, &block)
+    def every(period, job='unnamed', options={}, &block)
+      if job.is_a?(Hash) and options.empty?
+        options = job
+        job = "unnamed"
+      end
       if options[:at].respond_to?(:each)
         every_with_multiple_times(period, job, options, &block)
       else

data/test/at_test.rb

@@ -1,11 +1,12 @@
 require File.expand_path('../../lib/clockwork', __FILE__)
 require 'rubygems'
-require 'contest'
+require 'test/unit'
 require 'mocha/setup'
 require 'time'
 require 'active_support/time'
+require 'active_support/test_case'
 
-class AtTest < Test::Unit::TestCase
+class AtTest < ActiveSupport::TestCase
   def time_in_day(hour, minute)
     Time.new(2013, 1, 1, hour, minute, 0)
   end

data/test/clockwork_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../../lib/clockwork', __FILE__)
-require 'contest'
+require 'test/unit'
 require 'mocha/setup'
 
 class ClockworkTest < Test::Unit::TestCase

data/test/database_events/sync_performer_test.rb

@@ -1,7 +1,8 @@
-require 'contest'
+require 'test/unit'
 require 'mocha/setup'
 require 'time'
 require 'active_support/time'
+require 'active_support/test_case'
 
 require_relative '../../lib/clockwork'
 require_relative '../../lib/clockwork/database_events'
@@ -9,7 +10,7 @@ require_relative 'test_helpers'
 
 module DatabaseEvents
 
-  class SyncPerformerTest < Test::Unit::TestCase
+  class SyncPerformerTest < ActiveSupport::TestCase
 
     setup do
       @now = Time.now
@@ -58,7 +59,7 @@ module DatabaseEvents
           setup_sync(model: DatabaseEventModel, :every => @sync_frequency, :events_run => @events_run)
 
           tick_at(@now, :and_every_second_for => 1.second)
-          
+
           assert_equal ["DatabaseEventModel:1"], @events_run
         end
 
@@ -263,7 +264,7 @@ module DatabaseEvents
         setup do
           @events_run = []
           @utc_time_now = Time.now.utc
-          
+
           DatabaseEventModel.create(:frequency => 1.days, :at => @utc_time_now.strftime('%H:%M'), :tz => 'America/Montreal')
           setup_sync(model: DatabaseEventModel, :every => 1.minute, :events_run => @events_run)
         end

data/test/event_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../lib/clockwork', __FILE__)
-require 'contest'
+require 'active_support/test_case'
 
-class EventTest < Test::Unit::TestCase
+class EventTest < ActiveSupport::TestCase
   describe "#thread?" do
     setup do
       @manager = mock

data/test/manager_test.rb

@@ -1,11 +1,12 @@
 require File.expand_path('../../lib/clockwork', __FILE__)
 require 'rubygems'
-require 'contest'
+require 'test/unit'
 require 'mocha/setup'
 require 'time'
 require 'active_support/time'
+require 'active_support/test_case'
 
-class ManagerTest < Test::Unit::TestCase
+class ManagerTest < ActiveSupport::TestCase
   setup do
     @manager = Clockwork::Manager.new
     class << @manager
@@ -156,6 +157,16 @@ class ManagerTest < Test::Unit::TestCase
     assert_equal false, @manager.config[:thread]
   end
 
+  test "should accept unnamed job" do
+    event = @manager.every(1.minute)
+    assert_equal 'unnamed', event.job
+  end
+
+  test "should accept options without job name" do
+    event = @manager.every(1.minute, {})
+    assert_equal 'unnamed', event.job
+  end
+
   describe ':at option' do
     test "once a day at 16:20" do
       @manager.every(1.day, 'myjob', :at => '16:20')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clockwork
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Adam Wiggins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: contest
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="