symphony-metronome 0.1.0 → 0.2.1

data/lib/symphony/metronome/scheduledevent.rb

@@ -24,8 +24,8 @@ class Symphony::Metronome::ScheduledEvent
 	# Configure defaults.
 	#
 	CONFIG_DEFAULTS = {
-		db: 'sqlite:///tmp/metronome.db',
-		splay: 0
+		:db    => 'sqlite:///tmp/metronome.db',
+		:splay => 0
 	}
 
 	class << self
@@ -52,6 +52,7 @@ class Symphony::Metronome::ScheduledEvent
 		#
 		migrations_dir = Symphony::Metronome::DATADIR + 'migrations'
 		unless Sequel::Migrator.is_current?( self.db, migrations_dir.to_s )
+			Loggability[ Symphony ].info "Installing database schema..."
 			Sequel::Migrator.apply( self.db, migrations_dir.to_s )
 		end
 	end
@@ -97,6 +98,8 @@ class Symphony::Metronome::ScheduledEvent
 		@event    = Symphony::Metronome::IntervalExpression.parse( row[:expression], row[:created] )
 		@options  = row.delete( :options )
 		@id       = row.delete( :id )
+		@ds       = self.class.db[ :metronome ].filter( :id => self.id )
+
 		self.reset_runtime
 
 		unless self.class.splay.zero?
@@ -105,6 +108,9 @@ class Symphony::Metronome::ScheduledEvent
 		end
 	end
 
+	# The sequel dataset representing this event.
+	attr_reader :ds
+
 	# The parsed interval expression.
 	attr_reader :event
 
@@ -133,7 +139,21 @@ class Symphony::Metronome::ScheduledEvent
 		# Otherwise, the event should already be running (start time has already
 		# elapsed), so schedule it forward on it's next interval iteration.
 		#
-		@runtime = now + self.event.interval
+		# If it's a recurring event that has run before, consider the elapsed time
+		# as part of the next calculation.
+		#
+		row = self.ds.first
+		if self.event.recurring && row
+			last = row[ :lastrun ]
+			if last && now > last
+				@runtime = now + self.event.interval - ( now - last )
+			else
+				@runtime = now + self.event.interval
+			end
+
+		else
+			@runtime = now + self.event.interval
+		end
 	end
 
 
@@ -141,13 +161,36 @@ class Symphony::Metronome::ScheduledEvent
 	### deserialized options, the action ID to the supplied block if
 	### this event is okay to execute.
 	###
+	### If the event is recurring, perform additional checks against the
+	### last run time.
+	###
 	### Automatically remove the event if it has expired.
 	###
 	def fire
 		rv = self.event.fire?
 
+		# Just based on the expression parser, is this event ready to fire?
+		#
 		if rv
 			opts = Yajl.load( self.options )
+
+			# Don't fire recurring events unless their interval has elapsed.
+			# This prevents events from triggering when the daemon receives
+			# a HUP.
+			#
+			if self.event.recurring
+				now = Time.now
+				row = self.ds.first
+
+				if row
+					last = row[ :lastrun ]
+					return false if last && now - last < self.event.interval
+				end
+
+				# Mark the time this recurring event was fired.
+				self.ds.update( :lastrun => Time.now )
+			end
+
 			yield opts, self.id
 		end
 
@@ -160,7 +203,7 @@ class Symphony::Metronome::ScheduledEvent
 	###
 	def delete
 		self.log.debug "Removing action %p" % [ self.id ]
-		self.class.db[ :metronome ].filter( :id => self.id ).delete
+		self.ds.delete
 	end
 
 

data/lib/symphony/metronome/scheduler.rb

@@ -18,7 +18,7 @@ class Symphony::Metronome::Scheduler
 	SIGNALS = [ :HUP, :INT, :TERM ]
 
 	CONFIG_DEFAULTS = {
-		:listen => true
+		:listen => false
 	}
 
 	class << self
@@ -126,7 +126,7 @@ class Symphony::Metronome::Scheduler
 	end
 
 
-	### Process all event that have reached their runtime.
+	### Process all events that have reached their runtime.
 	###
 	def process_events
 		now = Time.now

metadata

@@ -1,97 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: symphony-metronome
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mahlon E. Smith <mahlon@martini.nu>
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQ8wDQYDVQQDDAZtYWhs
+  b24xFzAVBgoJkiaJk/IsZAEZFgdtYXJ0aW5pMRIwEAYKCZImiZPyLGQBGRYCbnUw
+  HhcNMTUwMzI3MjIwNzQ0WhcNMTYwMzI2MjIwNzQ0WjA+MQ8wDQYDVQQDDAZtYWhs
+  b24xFzAVBgoJkiaJk/IsZAEZFgdtYXJ0aW5pMRIwEAYKCZImiZPyLGQBGRYCbnUw
+  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDpXGN0YbMVpYv4EoiCxpQw
+  sxKdyhlkvpvENUkpEhbpnEuMKXgUfRHO4T/vBZf0h8eYgwnrHCRhAeIqesFKfoj9
+  mpEJk5JUuADOAz18aT+v24UqAtJdiwBJLuqhslSNB6CFXZv3OOMny9bjoJegz0hI
+  Fht9ppCuNmxJNd+L3zAX8lD01RUWNRC+8L5QLCjViJtjFDDCFfh9NCirs+XnTCzo
+  AJgFbsZIzFJtSiXUtFgscKr4Ik8ruhRbPbYbmx9rf6W74aTMPxggq/d3gj0Eh32y
+  WsXsQ5giVnmkbsRkBNu3QyZ8Xr5+7mvy5AWyqXKOrcW7lnYaob6Z9x/MGXGNeD6j
+  AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRY8ea6
+  +6kAaW7ukKph2/4MTAD8/TAcBgNVHREEFTATgRFtYWhsb25AbWFydGluaS5udTAc
+  BgNVHRIEFTATgRFtYWhsb25AbWFydGluaS5udTANBgkqhkiG9w0BAQUFAAOCAQEA
+  DP5Nkbz/Cn9CWZo19MCUJCl7UXTjhiYrCler/JsbZJq0+BFIV+bDWuVxyaNyv3Tn
+  lqV+TmIUwv1MAklenb0wLRzCV2Z7AV3DbSIRfN40G9xc87MOG+8zx4SaMbw9EloP
+  3rubBnAGvTBaNy1+0byAwhF8sx8chhJDDayusdg2auErvAWgQk4t3c6IH6wU2rt2
+  NlO8QBa0U0D1hzwuiDPsuNQoLQnn8+E/Osz7RyMN4FmhGdaFg4hdlbo6bWRofZL7
+  R1mvNMxDDunWP1mKW80U5LUAU5SpqoLczW5QBLQUZUResTbNGSWW8EbngbTrseOz
+  6uw87VFLpcRJxE/HNXJMSg==
+  -----END CERTIFICATE-----
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: symphony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: "\t\tMetronome is a scheduler and task runner.  It can be used locally
@@ -108,8 +130,10 @@ files:
 - README.rdoc
 - bin/metronome-exp
 - data/symphony-metronome/migrations/20140419_initial.rb
+- data/symphony-metronome/migrations/20141028_lastrun.rb
 - lib/symphony/metronome.rb
 - lib/symphony/metronome/intervalexpression.rb
+- lib/symphony/metronome/intervalexpression.rl
 - lib/symphony/metronome/mixins.rb
 - lib/symphony/metronome/scheduledevent.rb
 - lib/symphony/metronome/scheduler.rb
@@ -124,12 +148,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.3
 requirements: []

metadata.gz.sig

@@ -0,0 +1,4 @@
+M5P/s�r��-�u���Qv��.����Fk)���V������q��Eu�����f=�2�
+��0U����PS�
+��33��	oe�Mƣ^�G�׳�u���|�����؊RN��]����n=��F�́%#���>�5<�'C$�
+;�c�ݳy����{�8��W�Ƚ*�t�05���P���![��'����B�U��)�)�'�z��9rl�oD��b2�[��U�W����_k0Y���d"pE�4�	ז�q��ո