rufus-scheduler 2.0.15 → 2.0.16

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 2.0.16    released 2011/12/31
+
+- hardened Rufus.parse_time_string
+- running job thread: getting rid of the job pointer once job is done
+
+
 == rufus-scheduler - 2.0.15    released 2011/12/20
 
 - Scheduler#running_jobs (Thanks Louis Coilliot)

data/lib/rufus/sc/jobs.rb

@@ -188,7 +188,12 @@ module Scheduler
 
           trigger_block
 
+          job_thread[
+            "rufus_scheduler__trigger_thread__#{@scheduler.object_id}"
+          ] = nil
+
           job_thread = nil
+
           to_job.unschedule if to_job
 
         rescue Exception => e

data/lib/rufus/sc/rtime.rb

@@ -122,42 +122,22 @@ module Rufus
   #
   def Rufus.parse_time_string(string)
 
-    return string.to_f if FLOAT_DURATION.match(string)
+    if m = string.match(/^(\d*)\.?(\d*)([A-Za-z])(.*)$/)
 
-    string = string.strip
+      number = "#{m[1]}.#{m[2]}".to_f
+      multiplier = DURATIONS[m[3]]
 
-    index = -1
-    result = 0.0
+      raise ArgumentError.new("unknown time char '#{m[3]}'") unless multiplier
 
-    number = ''
+      return number * multiplier + parse_time_string(m[4])
 
-    loop do
+    else
 
-      index = index + 1
+      return string.to_i / 1000.0 if string.match(/^\d+$/)
+      return string.to_f if string.match(/^\d*\.?\d*$/)
 
-      if index >= string.length
-        result = result + (Float(number) / 1000.0) if number.length > 0
-        break
-      end
-
-      c = string[index, 1]
-
-      if (c >= '0' and c <= '9')
-        number = number + c
-        next
-      end
-
-      value = Integer(number)
-      number = ''
-
-      multiplier = DURATIONS[c]
-
-      raise ArgumentError.new("unknown time char '#{c}'") unless multiplier
-
-      result = result + (value * multiplier)
+      raise ArgumentError.new("cannot parse '#{string}'")
     end
-
-    result
   end
 
   class << self

data/lib/rufus/sc/version.rb

@@ -26,7 +26,7 @@
 module Rufus
 module Scheduler
 
-  VERSION = '2.0.15'
+  VERSION = '2.0.16'
 end
 end
 

data/spec/rtime_spec.rb

@@ -8,7 +8,7 @@
 require 'spec_base'
 
 
-describe 'rufus/otime' do
+describe 'rufus/rtime' do
 
   def pts(s)
     Rufus.parse_time_string(s)
@@ -24,6 +24,7 @@ describe 'rufus/otime' do
 
   it 'parses duration strings' do
 
+    pts('').should == 0.0
     pts('5.0').should == 5.0
     pts('0.5').should == 0.5
     pts('.5').should == 0.5
@@ -32,10 +33,12 @@ describe 'rufus/otime' do
     pts('1000').should == 1.0
     pts('1').should == 0.001
     pts('1s').should == 1.0
+    pts('2.5s').should == 2.5
     pts('1h').should == 3600.0
     pts('1h10s').should == 3610.0
     pts('1w2d').should == 777600.0
     pts('1d1w1d').should == 777600.0
+    pts('1.0d1.0w1.0d').should == 777600.0
   end
 
   it 'generates duration strings' do
@@ -61,7 +64,7 @@ describe 'rufus/otime' do
   end
 end
 
-describe 'rufus/otime#at_to_f' do
+describe 'rufus/rtime#at_to_f' do
 
   def atf(o)
     Rufus.at_to_f(o)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000 +09:00
+date: 2011-12-31 00:00:00.000000000 +09:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &2156163440 !ruby/object:Gem::Requirement
+  requirement: &2153487720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.3.23
   type: :runtime
   prerelease: false
-  version_requirements: *2156163440
+  version_requirements: *2153487720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156163000 !ruby/object:Gem::Requirement
+  requirement: &2153487240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156163000
+  version_requirements: *2153487240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156162340 !ruby/object:Gem::Requirement
+  requirement: &2153486660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2156162340
+  version_requirements: *2153486660
 description: job scheduler for Ruby (at, cron, in and every jobs).
 email:
 - jmettraux@gmail.com