clockwork 0.7.5 → 0.7.7

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 2.0.0
   - 2.1.0
   - jruby-19mode
-  - rbx
+  - # rbx-2.2.7
 gemfile:
   - gemfiles/activesupport3.gemfile
   - gemfiles/activesupport4.gemfile

data/clockwork.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "clockwork"
-  s.version = "0.7.5"
+  s.version = "0.7.7"
 
   s.authors = ["Adam Wiggins", "tomykaira"]
   s.license = 'MIT'
@@ -24,5 +24,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "daemons"
   s.add_development_dependency "contest"
+  s.add_development_dependency "minitest", "~> 4.0"
   s.add_development_dependency "mocha"
 end

data/lib/clockwork/at.rb

@@ -12,7 +12,7 @@ module Clockwork
     def self.parse(at)
       return unless at
       case at
-      when /^([[:alpha:]]+)\s(.*)$/
+      when /\A([[:alpha:]]+)\s(.*)\z/
         if wday = WDAYS[$1]
           parsed_time = parse($2)
           parsed_time.wday = wday
@@ -20,11 +20,11 @@ module Clockwork
         else
           raise FailedToParse, at
         end
-      when /^(\d{1,2}):(\d\d)$/
+      when /\A(\d{1,2}):(\d\d)\z/
         new($2.to_i, $1.to_i)
-      when /^\*{1,2}:(\d\d)$/
+      when /\A\*{1,2}:(\d\d)\z/
         new($1.to_i)
-      when /^(\d{1,2}):\*\*$/
+      when /\A(\d{1,2}):\*\*\z/
         new(NOT_SPECIFIED, $1.to_i)
       else
         raise FailedToParse, at

data/lib/clockwork/event.rb

@@ -33,7 +33,10 @@ module Clockwork
       @last = convert_timezone(t)
       if thread?
         if @manager.thread_available?
-          Thread.new { execute }
+          t = Thread.new do
+            execute
+          end
+          t['creator'] = @manager
         else
           @manager.log_error "Threads exhausted; skipping #{self}"
         end

data/lib/clockwork/manager.rb

@@ -12,7 +12,7 @@ module Clockwork
     end
 
     def thread_available?
-      Thread.list.count < config[:max_threads]
+      Thread.list.select { |t| t['creator'] == self }.count < config[:max_threads]
     end
 
     def configure

data/lib/clockwork/manager_with_database_tasks.rb

@@ -97,7 +97,7 @@ module Clockwork
       end
 
       def array_of_ats_for(task, opts={})
-        if task.at.nil?
+        if task.at.to_s.empty?
           opts[:nil_if_empty] ? nil : []
         else
           task.at.split(',').map(&:strip)

data/test/at_test.rb

@@ -90,4 +90,29 @@ class AtTest < Test::Unit::TestCase
       Clockwork::At.parse('32:00')
     end
   end
+
+  test 'invalid multi-line with Sat 12:00' do
+    assert_raise Clockwork::At::FailedToParse do
+      Clockwork::At.parse("sat 12:00\nreally invalid time")
+    end
+  end
+
+  test 'invalid multi-line with 8:30' do
+    assert_raise Clockwork::At::FailedToParse do
+      Clockwork::At.parse("8:30\nreally invalid time")
+    end
+  end
+
+  test 'invalid multi-line with *:10' do
+    assert_raise Clockwork::At::FailedToParse do
+      Clockwork::At.parse("*:10\nreally invalid time")
+    end
+  end
+
+  test 'invalid multi-line with 12:**' do
+    assert_raise Clockwork::At::FailedToParse do
+      Clockwork::At.parse("12:**\nreally invalid time")
+    end
+  end
+
 end

data/test/manager_test.rb

@@ -247,17 +247,38 @@ class ManagerTest < Test::Unit::TestCase
     end
   end
 
-  test "should warn about missing jobs upon exhausting threads" do
-    logger = Logger.new(StringIO.new)
-    @manager.configure do |config|
-      config[:max_threads] = 0
-      config[:logger] = logger
+  describe "max_threads" do
+    test "should warn when an event tries to generate threads more than max_threads" do
+      logger = Logger.new(STDOUT)
+      @manager.configure do |config|
+        config[:max_threads] = 1
+        config[:logger] = logger
+      end
+
+      @manager.every(1.minute, 'myjob1', :thread => true) { sleep 2 }
+      @manager.every(1.minute, 'myjob2', :thread => true) { sleep 2 }
+      logger.expects(:error).with("Threads exhausted; skipping myjob2")
+
+      @manager.tick(Time.now)
     end
 
-    @manager.every(1.minute, 'myjob', :thread => true)
-    logger.expects(:error).with("Threads exhausted; skipping myjob")
+    test "should not warn when thread is managed by others" do
+      begin
+        t = Thread.new { sleep 5 }
+        logger = Logger.new(StringIO.new)
+        @manager.configure do |config|
+          config[:max_threads] = 1
+          config[:logger] = logger
+        end
 
-    @manager.tick(Time.now)
+        @manager.every(1.minute, 'myjob', :thread => true)
+        logger.expects(:error).never
+
+        @manager.tick(Time.now)
+      ensure
+        t.kill
+      end
+    end
   end
 
   describe "callbacks" do

data/test/manager_with_database_tasks_test.rb

@@ -259,5 +259,34 @@ class ManagerWithDatabaseTasksTest < Test::Unit::TestCase
         assert_equal 1, @tasks_run.length
       end
     end
+
+    context "with task with :at as empty string" do
+      setup do
+        @task_with_empty_string_at = stub(:frequency => 10, :name => 'ScheduledTask:1', :at => '', :id => 1)
+        ScheduledTask.stubs(:all).returns([@task_with_empty_string_at])
+
+        @tasks_run = []
+
+        @manager.sync_database_tasks(model: ScheduledTask, every: 1.minute) do |job_name|
+          @tasks_run << job_name
+        end
+      end
+
+      def test_it_does_not_raise_an_error
+        begin
+          tick_at(Time.now, :and_every_second_for => 10.seconds)
+        rescue => e
+          assert false, "Raised an error: #{e.message}"
+        end
+      end
+
+      def test_it_runs_the_task
+        begin
+          tick_at(Time.now, :and_every_second_for => 10.seconds)
+        rescue => e
+        end
+        assert_equal 1, @tasks_run.length
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: clockwork
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.7
+  prerelease: 
 platform: ruby
 authors:
 - Adam Wiggins
@@ -9,104 +10,134 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: contest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A scheduler process to replace cron, using a more flexible Ruby syntax
@@ -121,8 +152,8 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -145,26 +176,33 @@ files:
 homepage: http://github.com/tomykaira/clockwork
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1006563675732551945
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1006563675732551945
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A scheduler process to replace cron.
 test_files:
 - test/at_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: fe114a0ae00c9b51086eed10fa3f2cf24cbbbda8
-  data.tar.gz: bf37628fb300af8eee5a21e64ceaf54c625c6e41
-SHA512:
-  metadata.gz: 86fe430ba1581ae9fad955fc603ca72cd534cf79992fb6c7835da5a32de45065e3c1412fb748d0bae6c5fb208b4c660661ca06357a54ffa071377b5327e5bc25
-  data.tar.gz: b19a6327cc02f83a875cfcb0465eb9e0fb050741007817ec5c7085a1a00a3c184f010bd7beba8bd25188e3d1e0e225c63901af28c90319bc37e2236f2794f049