rufus-scheduler 2.0.5 → 2.0.6

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 2.0.6    released 2010/05/01
+
+- timeout jobs not outliving their parent job anymore, thanks Joel Wood
+
+
 == rufus-scheduler - 2.0.5    released 2010/03/02
 
 - fixed parse_time_string(s) issue, thanks Gonzalo Suarez

data/Rakefile

@@ -38,9 +38,10 @@ Jeweler::Tasks.new do |gem|
   gem.test_file = 'spec/spec.rb'
 
   #gem.add_dependency 'yajl-ruby'
-  gem.add_development_dependency 'yard', '>= 0'
-  gem.add_development_dependency 'bacon', '>= 0'
-  gem.add_development_dependency 'jeweler', '>= 0'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'bacon'
+  gem.add_development_dependency 'jeweler'
 
   # gemspec spec : http://www.rubygems.org/read/chapter/20
 end

data/TODO.txt

@@ -52,3 +52,6 @@
 [o] unify cron_jobs#trigger_matching_jobs(now) and jobs#job_to_trigger
 [o] pluggable job queues
 
+[ ] Joel's complaint about timeout jobs gone ballistic
+[x] move trigger_job out of the scheduler
+

data/lib/rufus/sc/jobs.rb

@@ -117,6 +117,7 @@ module Scheduler
 
       @last = t
       job_thread = nil
+      to_job = nil
 
       @scheduler.send(:trigger_job, @params[:blocking]) do
         #
@@ -131,6 +132,7 @@ module Scheduler
           trigger_block
 
           job_thread = nil
+          to_job.unschedule if to_job
 
         rescue Exception => e
 
@@ -143,12 +145,13 @@ module Scheduler
 
       if to = @params[:timeout]
 
-        @scheduler.in(to, :tags => 'timeout') do
+        to_job = @scheduler.in(to, :parent => self, :tags => 'timeout') do
 
           # at this point, @job_thread might be set
 
-          job_thread.raise(Rufus::Scheduler::TimeOutError) \
-            if job_thread && job_thread.alive?
+          if job_thread && job_thread.alive?
+            job_thread.raise(Rufus::Scheduler::TimeOutError)
+          end
         end
       end
     end
@@ -168,26 +171,6 @@ module Scheduler
 
       @scheduler.unschedule(self.job_id)
     end
-
-    #--
-    #protected
-    #
-    # Prepare the args given the triggered block arity.
-    #
-    #def prepare_args
-    #  if @scheduler.options[:onezero_block_arity]
-    #    case @block.arity
-    #      when 0 then []
-    #      when 1 then [ @params ]
-    #      when 2 then [ @job_id, @params ]
-    #      #else [ @job_id, schedule_info, @params ]
-    #      else [ @job_id, self, @params ]
-    #    end
-    #  else
-    #    [ self ]
-    #  end
-    #end
-    #++
   end
 
   #
@@ -219,6 +202,16 @@ module Scheduler
   #
   class InJob < SimpleJob
 
+    # If this InJob is a timeout job, parent points to the job that
+    # is subject to the timeout.
+    #
+    attr_reader :parent
+
+    def initialize (scheduler, t, params)
+      @parent = params[:parent]
+      super
+    end
+
     protected
 
     def determine_at
@@ -258,9 +251,6 @@ module Scheduler
       schedule_next
 
       super
-
-      #unschedule if @params[:dont_reschedule]
-        # obsolete
     end
 
     protected

data/lib/rufus/sc/version.rb

@@ -26,7 +26,7 @@
 module Rufus
 module Scheduler
 
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end
 end
 

data/rufus-scheduler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-scheduler}
-  s.version = "2.0.5"
+  s.version = "2.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-03-02}
+  s.date = %q{2010-05-01}
   s.description = %q{
     job scheduler for Ruby (at, cron, in and every jobs).
 
@@ -71,15 +71,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<bacon>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<bacon>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/spec/timeout_spec.rb

@@ -99,5 +99,27 @@ describe "#{SCHEDULER_CLASS} timeouts" do
     timeouts.size.should.equal(3)
     timeouts.each { |to| (to * 10).to_i.should.equal(16) }
   end
+
+  it 'should point to their "parent" job' do
+
+    @s.in '1s', :timeout => '3s', :job_id => 'nada' do
+      sleep 4
+    end
+
+    sleep 2
+
+    @s.jobs.values.first.parent.job_id.should.equal('nada')
+  end
+
+  it 'should not survive their job' do
+
+    @s.in '1s', :timeout => '3s' do
+      sleep 0.100
+    end
+
+    sleep 2
+
+    @s.jobs.size.should.equal(0)
+  end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 +09:00
+date: 2010-05-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -30,7 +30,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bacon
+  name: yard
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -42,7 +42,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bacon
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -53,6 +53,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: "\n    job scheduler for Ruby (at, cron, in and every jobs).\n\n    By default uses a Ruby thread, if EventMachine is present, it will rely on it.\n  "
 email: jmettraux@gmail.com
 executables: []