rufus-scheduler 2.0.22 → 2.0.23

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 2.0.23    released 2013/07/26
+
+- mutex vs timeout fix by Tobias Kraze
+
+
 == rufus-scheduler - 2.0.22    released 2013/07/16
 
 - parse "/10 * * * *" again (like <= 2.0.19 did), thanks @skrd

data/CREDITS.txt

@@ -4,6 +4,7 @@
 
 == Contributors
 
+- Tobias Kraze (https://github.com/kratob) timeout vs mutex fix
 - Thomas Sevestre (https://github.com/thomassevestre) :exception option
 - Matteo Cerutti - last_time / previous_time idea (and initial implementation)
 - Aimee Rose (https://github.com/AimeeRose) cronline and > 24

data/lib/rufus/sc/jobs.rb

@@ -186,6 +186,19 @@ module Scheduler
 
         @last_job_thread = job_thread
 
+        # note that add_job and add_cron_job ensured that :blocking is
+        # not used along :timeout
+
+        if to = @params[:timeout]
+
+          to_job = @scheduler.in(to, :parent => self, :tags => 'timeout') do
+
+            if job_thread && job_thread.alive?
+              job_thread.raise(Rufus::Scheduler::TimeOutError)
+            end
+          end
+        end
+
         begin
 
           trigger_block
@@ -206,20 +219,6 @@ module Scheduler
         @running = false
       end
 
-      # note that add_job and add_cron_job ensured that :blocking is
-      # not used along :timeout
-
-      if to = @params[:timeout]
-
-        to_job = @scheduler.in(to, :parent => self, :tags => 'timeout') do
-
-          # at this point, @job_thread might be set
-
-          if job_thread && job_thread.alive?
-            job_thread.raise(Rufus::Scheduler::TimeOutError)
-          end
-        end
-      end
     end
 
     # Simply encapsulating the block#call/trigger operation, for easy

data/lib/rufus/sc/version.rb

@@ -26,7 +26,7 @@
 module Rufus
 module Scheduler
 
-  VERSION = '2.0.22'
+  VERSION = '2.0.23'
 end
 end
 

data/spec/timeout_spec.rb

@@ -121,5 +121,28 @@ describe "#{SCHEDULER_CLASS} timeouts" do
 
     @s.jobs.size.should == 0
   end
+
+  it 'times out properly after waiting for a mutex' do
+
+    mutex = Mutex.new
+    timedout = false
+
+    @s.in '0s', :mutex => mutex do
+      sleep 1
+    end
+
+    @s.in '0s', :mutex => mutex, :timeout => 0.1 do
+      begin
+        sleep 2
+      rescue Rufus::Scheduler::TimeOutError => e
+        timedout = true
+      end
+    end
+
+    sleep 2
+
+    @s.jobs.size.should == 0
+    timedout.should be_true
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -113,12 +113,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4294250464389651443
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4294250464389651443
 requirements: []
 rubyforge_project: rufus
 rubygems_version: 1.8.23