periodic-scheduler 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/periodic-scheduler.rb

@@ -27,16 +27,22 @@ class PeriodicScheduler
     attr_reader :keep
     attr_reader :callback
 
-    def initialize(quantized_space, period, keep, &callback)
+    def initialize(quantized_space, now, period, keep, &callback)
 			@quantized_space = quantized_space
       @period = period
+			@run_time = now + period
       @keep = keep
       @callback = callback
 			quantatize(period)
     end
 
-		def reschedule
-			quantatize(@period + @quantum_error)
+		def reschedule(qnow)
+			# keep rescheduling until we get it scheduled in future quant
+			until @quantum_period > qnow
+				@run_time += @period
+				quantatize(@run_time)
+			end
+
 			@reschedule_hook.call(self) if @reschedule_hook
 		end
 
@@ -70,7 +76,6 @@ class PeriodicScheduler
 
 		def quantatize(period)
 			@quantum_period = @quantized_space.project(period)
-			@quantum_error = @quantized_space.projection_error(period)
 		end
   end
 
@@ -89,11 +94,11 @@ class PeriodicScheduler
   end
 
 	def after(period, &callback)
-		schedule_event Event.new(@quantized_space, period, false, &callback)
+		schedule_event Event.new(@quantized_space, real_now, period, false, &callback)
 	end
 
 	def every(period, &callback)
-		schedule_event Event.new(@quantized_space, period, true, &callback)
+		schedule_event Event.new(@quantized_space, real_now, period, true, &callback)
 	end
 
   def run!(&block)
@@ -110,16 +115,7 @@ class PeriodicScheduler
 		raise EmptyScheduleError, "no events scheduled" unless earliest_quant
 
     wait_time = @quantized_space.revers_project(earliest_quant) - real_now
-    if wait_time < 0
-      # we have missed our scheduled period
-      begin
-        # we raise it so it has proper content (backtrace)
-        raise MissedScheduleError.new("missed schedule by #{-wait_time} seconds")
-      rescue StandardError => error
-				yield error if block_given?
-      end
-      wait_time = 0
-    end
+		wait_time = 0 if wait_time < 0
     wait(wait_time)
 
 		objects = []
@@ -129,6 +125,16 @@ class PeriodicScheduler
 		# move quants to be run away to separate array
     quants = @events.keys.select{|k| k <= qnow}.sort.map{|q| @events.delete(q)}
 
+		# we have missed one or more scheduled quants
+		if quants.length > 1
+      begin
+        # we raise it so it has proper backtrace
+        raise MissedScheduleError.new("missed schedule by #{-wait_time} seconds")
+      rescue StandardError => error
+				yield error if block_given?
+      end
+    end
+
 		# Call callback for every quant and reschedule if needed
     quants.each do |events|
 			# get all events for quantum that are not stopped
@@ -139,7 +145,7 @@ class PeriodicScheduler
 					# Yield errors to block
 					yield error if block_given?
         end
-        e.reschedule if e.keep? and not e.stopped?
+        e.reschedule(quantized_now) if e.keep? and not e.stopped?
       end
     end
 
@@ -153,13 +159,13 @@ class PeriodicScheduler
 
   private
 
-	def schedule_event(event, from = quantized_now)
-		quant = from + event.quantum_period
+	def schedule_event(event)
+		quant = event.quantum_period
 		(@events[quant] ||= []) << event
 
 		event.reschedule_hook do |event|
 			unschedule_event(event, quant)
-			schedule_event(event, quant)
+			schedule_event(event)
 		end
 
 		event.stop_hook do |event|

data/periodic-scheduler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "periodic-scheduler"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2012-11-03"
+  s.date = "2012-11-06"
   s.description = "Controls execution of periodic scheduled tasks."
   s.email = "jpastuszek@gmail.com"
   s.extra_rdoc_files = [

data/spec/periodic-scheduler_spec.rb

@@ -275,7 +275,7 @@ describe PeriodicScheduler do
     @time_now.should == 3
   end
 
-  it "should execut all not reschedulable tasks if we miss them" do
+  it "should not miss any scheduled tasks" do
     s = PeriodicScheduler.new(5.0, @options)
 
     s.after(15) do
@@ -286,7 +286,7 @@ describe PeriodicScheduler do
       @got_event.call(2)
     end
 
-    s.after(45) do
+    s.after(40) do
       @got_event.call(3)
     end
 
@@ -299,21 +299,34 @@ describe PeriodicScheduler do
     @got_events.should == [1, 2, 3]
   end
 
-  it "should skpi reschedulable tasks if we miss them" do
-    #TODO: this behaviour is a bit of gary area
-    s = PeriodicScheduler.new(5.0, @options)
+  it "should call reschedulable tasks only once every run" do
+		s = PeriodicScheduler.new(5.0, @options)
 
-    s.every(15) do
-      @got_event.call(1)
-    end
+		s.every(15) do
+			@got_event.call(1)
+		end
 
-    @options[:wait_function].call(35)
+		s.every(30) do
+			@got_event.call(2)
+		end
 
-    s.run.should
-    @got_events.should == [1]
+		s.every(40) do
+			@got_event.call(3)
+		end
 
-    s.run.should
-    @got_events.should == [1, 1]
+		@options[:wait_function].call(35)
+
+		# 15, 30 executed, 15 -> 45
+		s.run.should
+		@got_events.should == [1, 2]
+
+		# 40
+		s.run.should
+		@got_events.should == [1, 2, 3]
+
+		# 45
+		s.run.should
+		@got_events.should == [1, 2, 3, 1]
   end
 
   it "should report error if the schedule was missed" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: periodic-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-03 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70289045852440 !ruby/object:Gem::Requirement
+  requirement: &70222808986940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70289045852440
+  version_requirements: *70222808986940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70289045851420 !ruby/object:Gem::Requirement
+  requirement: &70222808986460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70289045851420
+  version_requirements: *70222808986460
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70289045850520 !ruby/object:Gem::Requirement
+  requirement: &70222808985980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289045850520
+  version_requirements: *70222808985980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70289045849460 !ruby/object:Gem::Requirement
+  requirement: &70222808985500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70289045849460
+  version_requirements: *70222808985500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70289045848140 !ruby/object:Gem::Requirement
+  requirement: &70222808985020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70289045848140
+  version_requirements: *70222808985020
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70289045847660 !ruby/object:Gem::Requirement
+  requirement: &70222808984540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289045847660
+  version_requirements: *70222808984540
 description: Controls execution of periodic scheduled tasks.
 email: jpastuszek@gmail.com
 executables: []
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3007109713831198216
+      hash: -3759462292764613282
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: