rufus-scheduler 2.0.4 → 2.0.5

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 2.0.5    released 2010/03/02
+
+- fixed parse_time_string(s) issue, thanks Gonzalo Suarez
+
+
 == rufus-scheduler - 2.0.4    released 2010/02/12
 
 - addressing issue with every and timeout, thanks Tony Day

data/CREDITS.txt

@@ -10,6 +10,7 @@
 
 == Feedback
 
+- Gonzalo Suarez - parse_time_string(s) issue
 - Tony Day - http://github.com/tonyday - every and overlapping timeout issue
 - Nate Wiger (Schedulable call/trigger issue)
 - Aldric (readme errors)

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 
 
-load 'lib/rufus/sc/scheduler.rb'
+load 'lib/rufus/sc/version.rb'
 
 
 #

data/lib/rufus/sc/rtime.rb

@@ -80,6 +80,8 @@ module Rufus
     (Time.new.to_f * 1000).to_i
   end
 
+  FLOAT_DURATION = /^\d*\.\d*$/
+
   # Turns a string like '1m10s' into a float like '70.0', more formally,
   # turns a time duration expressed as a string into a Float instance
   # (millisecond count).
@@ -95,6 +97,7 @@ module Rufus
   #
   # Some examples :
   #
+  #   Rufus.parse_time_string "0.5"    # => 0.5
   #   Rufus.parse_time_string "500"    # => 0.5
   #   Rufus.parse_time_string "1000"     # => 1.0
   #   Rufus.parse_time_string "1h"     # => 3600.0
@@ -103,6 +106,8 @@ module Rufus
   #
   def Rufus.parse_time_string (string)
 
+    return string.to_f if FLOAT_DURATION.match(string)
+
     string = string.strip
 
     index = -1

data/lib/rufus/sc/scheduler.rb

@@ -23,6 +23,7 @@
 #++
 
 
+require 'rufus/sc/version'
 require 'rufus/sc/rtime'
 require 'rufus/sc/cronline'
 require 'rufus/sc/jobs'
@@ -31,10 +32,6 @@ require 'rufus/sc/jobqueues'
 
 module Rufus::Scheduler
 
-  # This gem's version
-  #
-  VERSION = '2.0.4'
-
   #
   # It's OK to pass an object responding to :trigger when scheduling a job
   # (instead of passing a block).

data/lib/rufus/sc/version.rb

@@ -0,0 +1,32 @@
+#--
+# Copyright (c) 2006-2010, John Mettraux, jmettraux@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Made in Japan.
+#++
+
+
+module Rufus
+module Scheduler
+
+  VERSION = '2.0.5'
+end
+end
+

data/rufus-scheduler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-scheduler}
-  s.version = "2.0.4"
+  s.version = "2.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-02-12}
+  s.date = %q{2010-03-02}
   s.description = %q{
     job scheduler for Ruby (at, cron, in and every jobs).
 
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "lib/rufus/sc/jobs.rb",
      "lib/rufus/sc/rtime.rb",
      "lib/rufus/sc/scheduler.rb",
+     "lib/rufus/sc/version.rb",
      "lib/rufus/scheduler.rb",
      "misc/cronline_next_time_cost.rb",
      "rufus-scheduler.gemspec",
@@ -59,7 +60,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rufus}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{job scheduler for Ruby (at, cron, in and every jobs)}
   s.test_files = [
     "spec/spec.rb"

data/spec/rtime_spec.rb

@@ -24,8 +24,13 @@ describe 'rufus/otime' do
 
   it 'should parse duration strings' do
 
+    pts('5.0').should.equal(5.0)
+    pts('0.5').should.equal(0.5)
+    pts('.5').should.equal(0.5)
+    pts('5.').should.equal(5.0)
     pts('500').should.equal(0.5)
     pts('1000').should.equal(1.0)
+    pts('1').should.equal(0.001)
     pts('1s').should.equal(1.0)
     pts('1h').should.equal(3600.0)
     pts('1h10s').should.equal(3610.0)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-scheduler
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,39 +14,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-12 00:00:00 +09:00
+date: 2010-03-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 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: []
@@ -65,6 +76,7 @@ files:
 - lib/rufus/sc/jobs.rb
 - lib/rufus/sc/rtime.rb
 - lib/rufus/sc/scheduler.rb
+- lib/rufus/sc/version.rb
 - lib/rufus/scheduler.rb
 - misc/cronline_next_time_cost.rb
 - rufus-scheduler.gemspec
@@ -98,18 +110,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rufus
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: job scheduler for Ruby (at, cron, in and every jobs)