telemetry 1.0.7 → 1.0.8

data/.gitignore

@@ -8,6 +8,8 @@ InstalledFiles
 _yardoc
 coverage
 doc/
+coverage
+InstalledFiles
 lib/bundler/man
 pkg
 rdoc
@@ -15,3 +17,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+telemetryd_config.rb
+

data/lib/telemetry/config_parser.rb

@@ -50,99 +50,99 @@ module Telemetry
  		@@end_interval.yield if @@end_interval
  	end
 
-	def barchart(tag, frequency = 0, &block)
+	def barchart(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :barchart, tag, frequency, block ]
+		@@tasks << [ :barchart, tag, frequency, offset, block ]
 	end
 
-	def countdown(tag, frequency = 0, &block)
+	def countdown(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :countdown, tag, frequency, block ]
+		@@tasks << [ :countdown, tag, frequency, offset, block ]
 	end
 
-	def gauge(tag, frequency = 0, &block)
+	def gauge(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :gauge, tag, frequency, block ]
+		@@tasks << [ :gauge, tag, frequency, offset, block ]
 	end
 
-	def graph(tag, frequency = 0, &block)
+	def graph(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :graph, tag, frequency, block ]
+		@@tasks << [ :graph, tag, frequency, offset, block ]
 	end
 
-	def icon(tag, frequency = 0, &block)
+	def icon(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :icon, tag, frequency, block ]
+		@@tasks << [ :icon, tag, frequency, offset, block ]
 	end
 
-	def iframe(tag, frequency = 0, &block)
+	def iframe(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :iframe, tag, frequency, block ]
+		@@tasks << [ :iframe, tag, frequency, offset, block ]
 	end
 
-	def log(tag, frequency = 0, &block)
+	def log(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :log, tag, frequency, block ]
+		@@tasks << [ :log, tag, frequency, offset, block ]
 	end
 
-	def map(tag, frequency = 0, &block)
+	def map(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :map, tag, frequency, block ]
+		@@tasks << [ :map, tag, frequency, offset, block ]
 	end
 
-	def multigauge(tag, frequency = 0, &block)
+	def multigauge(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :multigauge, tag, frequency, block ]
+		@@tasks << [ :multigauge, tag, frequency, offset, block ]
 	end
 
-	def multivalue(tag, frequency = 0, &block)
+	def multivalue(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :multivalue, tag, frequency, block ]
+		@@tasks << [ :multivalue, tag, frequency, offset, block ]
 	end
 
-	def servers(tag, frequency = 0, &block)
+	def servers(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :servers, tag, frequency, block ]
+		@@tasks << [ :servers, tag, frequency, offset, block ]
 	end
 
-	def table(tag, frequency = 0, &block)
+	def table(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :table, tag, frequency, block ]
+		@@tasks << [ :table, tag, frequency, offset, block ]
 	end
 
-	def text(tag, frequency = 0, &block)
+	def text(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :text, tag, frequency, block ]
+		@@tasks << [ :text, tag, frequency, offset, block ]
 	end
 
-	def tickertape(tag, frequency = 0, &block)
+	def tickertape(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :tickertape, tag, frequency, block ]
+		@@tasks << [ :tickertape, tag, frequency, offset, block ]
 	end
 
-	def timechart(tag, frequency = 0, &block)
+	def timechart(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :timechart, tag, frequency, block ]
+		@@tasks << [ :timechart, tag, frequency, offset, block ]
 	end
 
-	def timeline(tag, frequency = 0, &block)
+	def timeline(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :timeline, tag, frequency, block ]
+		@@tasks << [ :timeline, tag, frequency, offset, block ]
 	end
 
-	def timeseries(tag, frequency = 0, &block)
+	def timeseries(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :timeseries, tag, frequency, block ]
+		@@tasks << [ :timeseries, tag, frequency, offset, block ]
 	end
 
-	def upstatus(tag, frequency = 0, &block)
+	def upstatus(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :upstatus, tag, frequency, block ]
+		@@tasks << [ :upstatus, tag, frequency, offset, block ]
 	end
 
-	def value(tag, frequency = 0, &block)
+	def value(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
-		@@tasks << [ :value, tag, frequency, block ]
+		@@tasks << [ :value, tag, frequency, offset, block ]
 	end
 
 	def run_scheduled_flow_updates
@@ -154,13 +154,26 @@ module Telemetry
 
 		@@tasks.each do |task| 
 			@@h = {}
-			variant, tag, frequency, block = task
+			variant, tag, frequency, offset, block = task
+			now = Time.now
 
 			# Check whether we should wait an interval before running
 			if frequency > 0 
 				#puts "Frequency is #{frequency} now #{Time.now.to_i} next #{@@next_run_at[tag]}"
-				next if @@next_run_at[tag] && @@next_run_at[tag] >= Time.now.to_i
-				@@next_run_at[tag] = Time.now.to_i + frequency.to_i
+				next if @@next_run_at[tag] && @@next_run_at[tag] >= now.to_i
+			  @@next_run_at[tag] = now.to_i + frequency
+
+        # If an offset is defined then allign runtimes to the offset
+        # How close you can get to the desired offset depends on the global interval. So set it relatively small
+        # when using this feature
+				if offset and offset >= 0 and offset <= 86400
+					this_morning = Time.new(now.year, now.month, now.day).to_i
+					time_since_offset = now.to_i - this_morning - offset
+					time_since_offset += 86400 if time_since_offset < 0
+
+					@@next_run_at[tag] -= time_since_offset % frequency
+					# puts "#{now.to_i} #{@@next_run_at[tag]}"
+				end
 			end
 
 			# Execute the flow
@@ -172,10 +185,10 @@ module Telemetry
 			values = @@h.merge({variant: variant})
 
 			# Skip if the values haven't changed (though send 1/day regardless)
-			if @@last_values[tag] != values || @@values_expires_at[tag] < Time.now.to_i
+			if @@last_values[tag] != values || @@values_expires_at[tag] < now.to_i
 				@@buffer[tag] = values
 				@@last_values[tag] = values # Save the value so we dont update unless it changes
-				@@values_expires_at[tag] = Time.now.to_i + 86400  # Force an update 1/day
+				@@values_expires_at[tag] = now.to_i + 86400  # Force an update 1/day
 			end
 		end
 

data/lib/telemetry/version.rb

@@ -1,3 +1,3 @@
 module Telemetry
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telemetry
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -79,7 +79,6 @@ files:
 - lib/telemetry/telemetry.rb
 - lib/telemetry/version.rb
 - telemetry.gemspec
-- telemetryd_config.rb
 homepage: http://www.telemetryapp.com
 licenses: []
 post_install_message: 

data/telemetryd_config.rb

@@ -1,6 +0,0 @@
-interval 1
-api_token "130be0e02baf48892b82d41e9b7f1a19"
-
-value "demo_cadusd", 10 do 
-	set value: rand(1000)
-end