telemetry 1.0.10 → 1.1.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjQxNzM4Y2E3NWE4ZGE1MGRhZjZmZGYwYWVjOGViYWI1NDc1MGFmOQ==
+  data.tar.gz: !binary |-
+    ZDg3MjY5N2MwNWM2YTQwN2EzOGM4NGNkNGFiMWYzNzkxN2E4MGY2Yg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NmYyYTE3MjVjZmNjMzM0OTFkMDkxZDI2M2JiOWM1NWMyZjQxMDdhYjE3ZDE0
+    MThhZTQzNTgyZGUyNTliNzU4OGM3MjA3OWY4YmVhZjZmM2JjMGYwZGE1Njdl
+    N2UzOTA5MDA5ODZmNWE2ODFiNzFlNmRhOTMwYjJkYzE3YmQ3N2Q=
+  data.tar.gz: !binary |-
+    ZjFkZTMxZDJkYzczODZmZmIwZDE5NDg4MTE2MzcxOGE0NGQyODM1MDlhN2Fj
+    OGIzZGIwNGFiNjkzZTRiMjMyMjQwNTIxYWRmMDE2YmEyZDBjM2ZjYzIyZWQ5
+    OWZjMzNlN2Q4NmE2OWQ3YjM1YmM5ZGY5ZThhYWE3OWMxYzc5N2M=

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format progress
+--fail-fast

data/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in telemetry.gemspec
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 W. Gersham Meharg
+Copyright (c) 2013 W. Etosi Inc
 
 MIT License
 

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new('spec')
+
+task :default => :spec
+task :test => :spec

data/bin/telemetryd

@@ -1,16 +1,21 @@
 #!/usr/bin/env ruby
 
 require "dante"
-require_relative "../lib/telemetry.rb"
+
+require_relative "../lib/telemetry"
+require_relative "../lib/telemetry/daemon_config_parser"
 
 include Telemetry
 
 runner = Dante::Runner.new('telemetryd', :port => 9990)
-runner.description = "telemetryd #{Telemetry::VERSION}, a daemon for sending data to www.telemetryapp.com"
+runner.description = "telemetryd #{Telemetry::TELEMETRY_VERSION}, a daemon for sending data to www.telemetryapp.com"
 runner.with_options do |opts|
   opts.on("-c", "--config PATH", String, "Config file location") do |config|
     options[:config] = config
   end
+  opts.on("-o", "--once", "Run once") do |o|
+    options[:once] = o
+  end
 end
 
 runner.execute do |opts|
@@ -22,7 +27,7 @@ runner.execute do |opts|
 	if File.exist?(config_file_path)
 		require_relative config_file_path
 	else
-		puts "Config file not found, please create /etc/telemetryd_config.rb or specify its location with -c"
+		Telemetry::logger.error "Config file not found, please create /etc/telemetryd_config.rb or specify its location with -c"
 		exit
 	end
 
@@ -31,7 +36,30 @@ runner.execute do |opts|
 		start_timestamp = Time.now.to_f
 		Telemetry.run_begin_interval
 		output = Telemetry.run_scheduled_flow_updates
-		Telemetry::Api.send(output)
+
+		begin
+			Telemetry::Api.send(:post, "/flows", {:data => output})
+
+		rescue Telemetry::RateLimited
+			Telemetry::logger.error "Rate limited: sleeping for 3600s"
+			sleep 3600
+
+		rescue Telemetry::AuthenticationFailed => e
+			raise e
+
+		rescue Telemetry::AuthorizationError => e
+			raise e
+
+		rescue Telemetry::FormatError => e
+			raise e
+
+		rescue Exception => e
+			Telemetry::logger.error "Temporary exception (#{e}): sleeping for 60s"
+			sleep 60
+		end
+
+		exit if opts[:once]
+
 		Telemetry.run_end_interval
 		Telemetry.wait_for_interval_from(start_timestamp)
 	end

data/lib/telemetry/api.rb

@@ -0,0 +1,209 @@
+#/usr/bin/env ruby
+
+require 'multi_json'
+require 'oj'
+require 'net/http'
+require 'uri'
+require 'logger'
+
+module Telemetry
+
+	@affiliate_id
+	@token = nil
+
+	def self.api_host
+		if ENV["RACK_ENV"] == 'development' || ENV["RACK_ENV"] == 'test'
+			"http://data.test.telemetryapp.com"
+		else
+			"https://data.telemetryapp.com"
+		end
+	end
+
+	def self.logger
+		@logger ||= Logger.new(STDOUT)
+		if ENV['RACK_ENV'] == 'development'
+			@logger.level = Logger::DEBUG
+		else
+			@logger.level = Logger::WARN
+		end
+		@logger
+	end
+
+	def self.token
+		@token
+	end
+
+	def self.token=(token)
+		@token = token
+	end
+
+	def self.affiliate_id
+		@token
+	end
+
+	def self.affiliate_id=(affiliate_id)
+		@affiliate_id = affiliate_id
+	end
+
+	class Api
+		
+		def self.get_flow(id)
+			Telemetry::Api.send(:get, "/flows/#{id}")
+		end
+
+		def self.get_flow_data(id)
+			Telemetry::Api.send(:get, "/flows/#{id}/data")
+		end
+
+		def self.delete_flow_data(id)
+			Telemetry::Api.send(:delete, "/flows/#{id}/data")
+		end
+
+		def self.flow_update(flow)
+			raise Telemetry::AuthenticationFailed, "Please set your Telemetry.token" unless Telemetry.token
+			values = flow.to_hash
+			tag = values.delete('tag')
+			result = Telemetry::Api.send(:put, "/flows/#{tag}", values)
+			raise ResponseError, "API Response: #{result['errors'].join(', ')}" unless result["updated"].include?(tag)
+			result
+		end
+
+		def self.flow_update_batch(flows)
+			raise Telemetry::AuthenticationFailed, "Please set your Telemetry.token" unless Telemetry.token
+			raise RuntimeError, "Must supply flows to send" if flows == 0 || flows.count == 0
+			data = {}
+			flows.each do |flow|
+				values = flow.to_hash
+				tag = values.delete('tag')
+				data[tag] = values
+			end
+			return Telemetry::Api.send(:post, "/flows", {:data => data})
+		end
+
+		def self.send(method, endpoint, data = nil)
+
+			uri = URI("#{Telemetry.api_host}#{endpoint}")
+
+			Telemetry::logger.debug "REQ #{uri} - #{MultiJson.dump(data)}"
+
+			if method == :post
+				request = Net::HTTP::Post.new(uri.path)
+				request.body = MultiJson.dump(data) 
+			elsif method == :put
+				request = Net::HTTP::Put.new(uri.path)
+				request.body = MultiJson.dump(data) 
+			elsif method == :get 
+				request = Net::HTTP::Get.new(uri.path)
+			elsif method == :delete
+				request = Net::HTTP::Delete.new(uri.path)
+			end
+
+			request.basic_auth(Telemetry.token, "") if Telemetry.token
+			request['Content-Type'] = 'application/json'
+			request['Accept-Version'] = '~ 1'
+			request['User-Agent'] = "Telemetry Ruby Gem (#{Telemetry::TELEMETRY_VERSION})"
+				
+			begin
+				ssl = true if Telemetry.api_host.match(/^https/)
+				result = Net::HTTP.start(uri.host, uri.port, :use_ssl => ssl) do |http|
+					response = http.request(request)
+					code = response.code
+
+					Telemetry::logger.debug "RESP: #{response.code}:#{response.body}"
+
+					case response.code
+					when "200"
+						return MultiJson.load(response.body)
+					when "400"
+						json = MultiJson.load(response.body)
+						error = "#{Time.now} (HTTP 400): #{json['code'] if json} #{json['message'] if json}"
+						Telemetry::logger.error error
+						raise Telemetry::FormatError, error
+					when "401"
+						if Telemetry.token == nil
+							error = "#{Time.now} (HTTP 401): Authentication failed, please set Telemetry.token to your API Token."
+							Telemetry::logger.error error
+							raise Telemetry::AuthenticationFailed, error
+						else
+							error = "#{Time.now} (HTTP 401): Authentication failed, please verify your token."
+							Telemetry::logger.error error
+							raise Telemetry::AuthenticationFailed, error
+						end
+					when "403"
+						error = "#{Time.now} (HTTP 403): Authorization failed, please check your account access."
+						Telemetry::logger.error error
+						raise Telemetry::AuthorizationError, error
+					when "404"
+						error = "#{Time.now} (HTTP 404): Requested object not found."
+						Telemetry::logger.error error
+						raise Telemetry::FlowNotFound, error
+					when "429"
+						error = "#{Time.now} (HTTP 429): Rate limited. Please reduce your update interval."
+						Telemetry::logger.error error
+						raise Telemetry::RateLimited, error
+					when "500"
+						error = "#{Time.now} (HTTP 500): Data API server error."
+						Telemetry::logger.error error
+						raise Telemetry::ServerException, error
+					when "502"
+						error = "#{Time.now} (HTTP 502): Data API server is down."
+						Telemetry::logger.error error
+						raise Telemetry::Unavailable, error
+					when "503"
+						error = "#{Time.now} (HTTP 503): Data API server is down."
+						Telemetry::logger.error error
+						raise Telemetry::Unavailable, error
+					else
+						error = "#{Time.now} ERROR UNK: #{response.body}."
+						raise Telemetry::UnknownError, error
+					end
+				end
+
+			rescue Errno::ETIMEDOUT => e
+				error = "#{Time.now} ERROR #{e}"
+				Telemetry::logger.error error
+				raise Telemetry::ConnectionError, error
+
+			rescue Errno::ECONNREFUSED => e 
+				error = "#{Time.now} ERROR #{e}"
+				Telemetry::logger.error error
+				raise Telemetry::ConnectionError, error
+
+			rescue Exception => e
+				raise e
+			end
+		end
+	end
+
+	class FormatError < Exception
+	end
+
+	class AuthenticationFailed < Exception
+	end
+
+	class AuthorizationError < Exception
+	end
+	
+	class FlowNotFound < Exception
+	end
+
+	class RateLimited < Exception
+	end
+
+	class ServerException < Exception
+	end
+
+	class Unavailable < Exception
+	end
+
+	class UnknownError < Exception
+	end
+
+	class ConnectionError < Exception
+	end
+
+	class ResponseError < Exception
+	end
+
+
+end

data/lib/telemetry/{config_parser.rb → daemon_config_parser.rb}

@@ -2,12 +2,8 @@
 
 module Telemetry
 
-	def token
-		@@token
-	end
-
 	def api_token(token)
-		@@token = token
+		Telemetry.token = token
 	end
 
 	def interval(interval)
@@ -55,6 +51,11 @@ module Telemetry
 		@@tasks << [ :barchart, tag, frequency, offset, block ]
 	end
 
+	def bulletchart(tag, frequency = 0, offset=nil, &block)
+		@@tasks ||= []
+		@@tasks << [ :value, tag, frequency, offset, block ]
+	end
+
 	def countdown(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
 		@@tasks << [ :countdown, tag, frequency, offset, block ]
@@ -105,6 +106,11 @@ module Telemetry
 		@@tasks << [ :servers, tag, frequency, offset, block ]
 	end
 
+	def status(tag, frequency = 0, offset=nil, &block)
+		@@tasks ||= []
+		@@tasks << [ :servers, tag, frequency, offset, block ]
+	end
+
 	def table(tag, frequency = 0, offset=nil, &block)
 		@@tasks ||= []
 		@@tasks << [ :table, tag, frequency, offset, block ]
@@ -159,20 +165,20 @@ module Telemetry
 
 			# 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]}"
+				#Telemetry::logger.debug "Update frequency is #{frequency} now #{Time.now.to_i} next #{@@next_run_at[tag]}"
 				next if @@next_run_at[tag] && @@next_run_at[tag] >= now.to_i
-			  @@next_run_at[tag] = now.to_i + frequency
+				@@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 an offset is defined then align 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]}"
+					#Telemetry::logger.debug "#{now.to_i} #{@@next_run_at[tag]}"
 				end
 			end
 

data/lib/telemetry/flows.rb

@@ -0,0 +1,189 @@
+#/usr/bin/env ruby
+
+require 'hashie'
+
+module TelemetryFlows
+	def emit
+		Telemetry::Api.flow_update(self)
+	end
+end
+
+module Telemetry
+
+	# Barchart
+	class Barchart < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+  		property :bars, :default => []
+	end
+
+	# Bulletchart
+	class Bulletchart < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+  		property :bulletcharts, :default => []
+	end
+
+	# Countdown
+	class Countdown < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :time, :required => true
+		property :message, :required => true
+	end
+
+	# Gauge
+	class Gauge < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :value, :required => true
+		property :value_color
+		property :max
+		property :range
+		property :value_2
+		property :value_2_color
+		property :value_2_label
+	end
+
+	# Graph
+	class Graph < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :renderer
+		property :series, :default => []
+		property :min_scale
+		property :unstack
+		property :x_labels
+	end
+
+	# Icons
+	class Icons < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :icons, :default => []
+	end
+
+	# iFrame
+	class Iframe < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :url, :required => true
+	end
+
+	# Log
+	class Log < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :messages, :default => []
+	end
+
+	# Map
+	class Map < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :map_type, :required => true
+		property :points, :default => []
+	end
+
+	# Multigauge
+	class Multigauge < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :gauges, :default => []
+	end
+
+	# Multivalue
+	class Multivalue < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :values, :default => []
+	end
+
+	# Servers
+	class Servers < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :servers, :default => []
+		property :orange
+		property :red
+	end
+
+	# Status
+	class Status < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :statuses, :default => []
+	end
+
+	# Table
+	class Table < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :table, :default => []
+		property :headers, :default => []
+		property :colors, :default => []
+	end
+
+	# Text
+	class Text < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :text, :required => true
+		property :alignment
+	end
+
+	# Tickertape
+	class Tickertape < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :messages, :default => []
+	end
+
+	# Timechart
+	class Timechart < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :values, :default => []
+		property :type, :required => true
+	end
+
+	# Timeline
+	class Timeline < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :messages, :default => []
+	end
+
+	# Timeseries
+	class Timeseries < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :value, :required => true
+		property :type, :required => true
+		property :label, :required => true
+		property :color
+		property :smoothing
+		property :value_type
+	end
+
+	# Upstatus
+	class Upstatus < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :up, :default => []
+		property :down, :default => []
+		property :uptime
+		property :last_down
+	end
+
+	# Value
+	class Value < Hashie::Dash
+		include TelemetryFlows
+		property :tag, :required => true
+		property :value, :required => true
+		property :color
+		property :delta
+		property :value_type
+		property :delta_type
+	end
+end

data/lib/telemetry/version.rb

@@ -1,3 +1,3 @@
 module Telemetry
-  VERSION = "1.0.10"
-end
+  TELEMETRY_VERSION = "1.1.1"
+end

data/lib/telemetry.rb

@@ -1,6 +1,3 @@
-require "rubygems"
-require "bundler/setup"
-
 require_relative "telemetry/version"
-require_relative "telemetry/telemetry"
-require_relative "telemetry/config_parser"
+require_relative "telemetry/flows"
+require_relative "telemetry/api"

data/spec/batch_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe "Batch" do
+	before(:all) do
+		Telemetry.token = "test-api-token"
+	end
+
+	it "should perform a batch update" do
+
+		flows = []
+
+		barchart_properties = {
+			tag: "test-flow-barchart",
+			bars: [{value:1000, label:'test', color:'red'}]
+		}
+		flows << Telemetry::Barchart.new(barchart_properties)
+
+		gauge_properties = {
+			tag: "test-flow-gauge",
+			value: 3434
+		}
+		flows << Telemetry::Gauge.new(gauge_properties)
+
+		value_properties = {
+			tag: "test-flow-value",
+			value: 3434
+		}
+		flows << Telemetry::Value.new(value_properties)
+
+		result = Telemetry::Api.flow_update_batch(flows)
+
+		result["skipped"].should eql([])
+		result["errors"].should eql([])
+	end
+end

data/spec/daemon_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require_relative "../lib/telemetry/daemon_config_parser"
+
+describe "Daemon" do
+	before(:all) do
+		Telemetry.token = "test-api-token"
+	end
+
+    it "should run the daemon" do
+    	`bin/telemetryd -c telemetryd_config.rb -o`
+	end
+end

data/spec/flows_spec.rb

@@ -0,0 +1,182 @@
+require 'spec_helper'
+
+describe "Flows" do
+  before(:all) do
+  	Telemetry.token = "test-api-token"
+  end
+
+  it "should update a Barchart", flows: true do
+  	properties = {
+  		tag: "test-flow-barchart",
+  		bars: [{value:1000, label:'test', color:'red'}]
+  	}
+  	Telemetry::Barchart.new(properties).emit
+  end
+
+  it "should update a Bulletchart", flows: true  do
+  	properties = {
+  		tag: "test-flow-bulletchart",
+  		bulletcharts: [{value: 34, max: 4434}]
+  	}
+  	Telemetry::Bulletchart.new(properties).emit
+  end
+
+  it "should update a Countdown", flows: true  do
+  	properties = {
+  		tag: "test-flow-countdown",
+  		time: 1373664109, 
+  		message: "Party Time"
+  	}
+  	Telemetry::Countdown.new(properties).emit
+  end
+
+  it "should update a Gauge" do
+  	properties = {
+  		tag: "test-flow-gauge",
+  		value: 3434
+  	}
+  	Telemetry::Gauge.new(properties).emit
+  end
+
+  it "should update a Graph" do
+  	properties = {
+  		tag: "test-flow-graph",
+  		series: [{values:[4,3,53,3,54,33,21]}]
+  	}
+  	Telemetry::Graph.new(properties).emit
+  end
+
+  it "should update a Icons" do
+  	properties = {
+  		tag: "test-flow-icons",
+  		icons: [{type: "icon-dashboard", label: "Alert", color: "red"}]
+  	}
+  	Telemetry::Icons.new(properties).emit
+  end
+
+  it "should update a Iframe" do
+  	properties = {
+  		tag: "test-flow-iframe",
+  		url: "http://www.telemetryapp.com"
+  	}
+  	Telemetry::Iframe.new(properties).emit
+  end
+
+  it "should update a Log" do
+  	properties = {
+  		tag: "test-flow-log",
+  		messages: [{timestamp: 1373664109, text: "This is a first message", color: "red"}]
+  	}
+  	Telemetry::Log.new(properties).emit
+  end
+
+  it "should update a Map" do
+  	properties = {
+  		tag: "test-flow-map",
+  		map_type: "asia",
+  		points: [[34.344,129.344],[55.233,121.233]]
+  	}
+  	Telemetry::Map.new(properties).emit
+  end
+
+  it "should update a Multigauge" do
+  	properties = {
+  		tag: "test-flow-multigauge",
+  		gauges: [{value: 34, label: "Alpha"},{value: 23, label: "Alpha"}]
+  	}
+  	Telemetry::Multigauge.new(properties).emit
+  end
+
+  it "should update a Multivalue" do
+  	properties = {
+  		tag: "test-flow-multivalue",
+  		values: [{value: 34, label: "Alpha"},{value: 344, label: "Bravo"}]
+  	}
+  	Telemetry::Multivalue.new(properties).emit
+  end
+
+  it "should update a Servers" do
+  	properties = {
+  		tag: "test-flow-servers",
+  		servers: [{values: [33,22,55], title: "Alpha"}]
+  	}
+  	Telemetry::Servers.new(properties).emit
+  end
+
+  it "should update a Status" do
+  	properties = {
+  		tag: "test-flow-status",
+  		statuses: [{label: "Alpha", color: "red"}]
+  	}
+  	Telemetry::Status.new(properties).emit
+  end
+
+  it "should update a Table" do
+  	properties = {
+  		tag: "test-flow-table",
+  		table: [["Row1Col1", "Row1Col2", "Row1Col3"]]
+  	}
+  	Telemetry::Table.new(properties).emit
+  end
+
+  it "should update a Text" do
+  	properties = {
+  		tag: "test-flow-text",
+  		text: "testing"
+  	}
+  	Telemetry::Text.new(properties).emit
+  end
+
+  it "should update a Tickertape" do
+  	properties = {
+  		tag: "test-flow-tickertape",
+  		messages: ["Hello World!"]
+  	}
+  	Telemetry::Tickertape.new(properties).emit
+  end
+
+  it "should update a Timechart" do
+  	properties = {
+  		tag: "test-flow-timechart",
+  		type: "week",
+  		values: [34,123,76,43,45,16,48]
+  	}
+  	Telemetry::Timechart.new(properties).emit
+  end
+
+  it "should update a Timeline" do
+  	properties = {
+  		tag: "test-flow-timeline",
+  		messages: [{timestamp: 1373665284, from: "Telemetry", text: "This is the second message"}]
+  	}
+  	Telemetry::Timeline.new(properties).emit
+  end
+
+   it "should update a Timeseries" do
+  	properties = {
+      tag: "test-flow-timeseries",
+      value: 33, 
+      type: "hour", 
+      label: "Alpha" 		
+   	}
+  	Telemetry::Timeseries.new(properties).emit
+  end
+
+  it "should update a Upstatus" do
+  	properties = {
+      tag: "test-flow-upstatus",
+      up: ["www.telemetryapp.com"] 		
+   	}
+  	Telemetry::Upstatus.new(properties).emit
+  end
+
+  it "should update a Value" do
+  	properties = {
+  		tag: "test-flow-value",
+  		value: 3434
+   	}
+  	Telemetry::Value.new(properties).emit
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require 'telemetry'
+
+ENV['RACK_ENV'] = "test"
+
+RSpec.configure do |config|
+	config.treat_symbols_as_metadata_keys_with_true_values = true
+	config.run_all_when_everything_filtered = true
+	config.order = 'random'
+end

data/telemetry.gemspec

@@ -5,7 +5,7 @@ require 'telemetry/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "telemetry"
-  gem.version       = Telemetry::VERSION
+  gem.version       = Telemetry::TELEMETRY_VERSION
   gem.authors       = ["W. Gersham Meharg"]
   gem.email         = ["gersham@etosi.com"]
   gem.description   = %q{Telemetry Data Submission API Gem.  See our website for a more detailed description.}
@@ -19,4 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "oj"
   gem.add_dependency "multi_json"
   gem.add_dependency "dante"
+  gem.add_dependency "hashie"
+  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rake"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: telemetry
 version: !ruby/object:Gem::Version
-  version: 1.0.10
-  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors:
 - W. Gersham Meharg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,48 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,38 +104,47 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/telemetryd
 - lib/telemetry.rb
-- lib/telemetry/config_parser.rb
-- lib/telemetry/telemetry.rb
+- lib/telemetry/api.rb
+- lib/telemetry/daemon_config_parser.rb
+- lib/telemetry/flows.rb
 - lib/telemetry/version.rb
+- spec/batch_spec.rb
+- spec/daemon_spec.rb
+- spec/flows_spec.rb
+- spec/spec_helper.rb
 - telemetry.gemspec
 homepage: http://www.telemetryapp.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Telemetry Data Submission API Gem
-test_files: []
+test_files:
+- spec/batch_spec.rb
+- spec/daemon_spec.rb
+- spec/flows_spec.rb
+- spec/spec_helper.rb

data/lib/telemetry/telemetry.rb

@@ -1,71 +0,0 @@
-#/usr/bin/env ruby
-
-module Telemetry
-	class Api
-		require 'multi_json'
-		require 'net/http'
-		require 'uri'
-
-		def self.send(data)
-			return unless Telemetry.token
-			return unless data.size > 0
-
-			body = MultiJson.dump({:data => data})
-
-			uri = URI("https://data.telemetryapp.com/flows")
-			request = Net::HTTP::Post.new(uri.path)
-			request.basic_auth(Telemetry.token, "")
-			request['Content-Type'] = 'application/json'
-			request['User-Agent'] = "Telemetry Ruby Gem (#{Telemetry::VERSION})"
-			request.body = body 
-
-			begin
-				result = Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
-				  response = http.request(request)
-				  case response.code
-				 	when "200"
-				 		json = MultiJson.load(response.body)
-				 		if json
-				    		puts "#{Time.now} Update OK: Updated #{json["updated"].count} flows" if json["updated"] && json["updated"].count > 0
-				    		puts "#{Time.now} Update OK: Skipped #{json["skipped"].count} flows (#{json["skipped"].join(", ")})" if json["skipped"] && json["skipped"].count > 0
-				    		puts "#{Time.now} Update OK: Errors with #{json["errors"].count} flows (#{json["errors"].join(", ")})" if json["errors"] && json["errors"].count > 0
-				    	end
-				    when "400"
-				    	puts "#{Time.now} ERROR 400: Request error. #{response.body}. Exiting."
-				    	exit
-					when "401"
-				    	puts "#{Time.now} ERROR 401: Authentication failed, please check your api_token. Exiting."
-				    	exit
-				    when "403"
-				    	puts "#{Time.now} ERROR 403: Authorization failed, please check your account access. Exiting."
-				    	exit
-				    when "429"
-				    	puts "#{Time.now} ERROR 429: Rate limited. Please reduce your update interval. Pausing updates for 300s."
-				    	sleep 300
-				    when "500"
-				    	puts "#{Time.now} ERROR 500: Data API server error.  Pausing updates for 60s."
-				    	sleep 60
-				    when "503"
-				    	puts "#{Time.now} ERROR 503: Data API server is down.  Pausing updates for 60s."
-				    	sleep 60
-				    else
-				    	puts "#{Time.now} ERROR UNK: #{response.body}.  Exiting."
-				    	exit
-				  	end
-				end
-
-			rescue Errno::ETIMEDOUT => e
-				puts "#{Time.now} ERROR #{e}"
-				sleep 60
-
-			rescue Errno::ECONNREFUSED => e 
-				puts "#{Time.now} ERROR #{e}"
-				sleep 60
-
-			rescue Exception => e
-				puts "#{Time.now} ERROR #{e}"
-				sleep 60
-			end
-		end
-	end
-end