tsd_client 0.0.1 → 0.1.0

data/lib/tsd_client/format.rb

@@ -1,3 +1,4 @@
+require 'socket'
 require 'uri'
 
 module TSD
@@ -6,6 +7,8 @@ module TSD
       case input.class.name
       when 'Time'
         input.strftime '%Y/%m/%d-%H:%M:%S'
+      when 'Date'
+        time input.to_time
       when 'Fixnum'
         time Time.at input
       else
@@ -36,7 +39,7 @@ module TSD
       metric_query.join ':'
     end
 
-    def self.query options
+    def self.query options, format = 'ascii'
       raise 'must provide key: :start' unless options[:start]
       options_filter = [:metric, :aggregator, :rate, :downsample, :tags]
 
@@ -55,14 +58,16 @@ module TSD
       end
 
       # assemble query
-      URI.escape '/q?' + params.map {|option, value| [option, value].join('=')}.unshift('ascii').join('&')      
+      URI.escape '/q?' + params.map {|option, value| [option, value].join('=')}.unshift(format).join('&')      
     end
 
     def self.put options
       [:metric, :value].any? {|key| raise "missing key: #{key}" unless options.has_key? key}
-      options  = {time: Time.now, tags: {}}.merge options
+
+      options[:time] ||= Time.now
+      options[:tags] ||= {host: Socket.gethostname}
 
       ['put', options[:metric], options[:time].to_i, options[:value], tags(options[:tags])].flatten.join("\s")
     end
   end
-end
+end

data/lib/tsd_client.rb

@@ -7,9 +7,7 @@ require 'tsd_client/format'
 
 module TSD
   class Client
-    attr_reader :options
-
-    def initialize options
+    def initialize options = {}
       @options = {
         host:    '0.0.0.0',
         port:    4242,
@@ -18,20 +16,18 @@ module TSD
     end
 
     def query options
-      response = nil
-
-      Timeout::timeout @options[:timeout] do
-        response = Net::HTTP.start @options[:host], @options[:port] do |http|
+      response = Timeout::timeout @options[:timeout] do
+        Net::HTTP.start @options[:host], @options[:port] do |http|
           http.request Net::HTTP::Get.new Format.query options
         end
       end
 
       if response.kind_of? Net::HTTPSuccess
-        response.body.split("\n").collect do |record|
+        response.body.split("\n").map do |record|
           metric, timestamp, value, *tags = record.split "\s"
 
           Hash[[:metric, :time, :value, :tags].zip([
-            metric, Time.at(timestamp.to_i), value.to_f, Hash[tags.collect {|tag| tag.split('=')}]])]
+            metric, Time.at(timestamp.to_i), value.to_f, Hash[tags.map {|tag| tag.split('=')}]])]
         end
       else
         raise 'query failed: ' + response.code
@@ -42,8 +38,11 @@ module TSD
       Timeout::timeout @options[:timeout] do
         TCPSocket.open @options[:host], @options[:port] do |socket|
           socket.puts Format.put options
+
+          response, _, _ = socket.recvmsg_nonblock rescue nil
+          response.chomp if response
         end
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tsd_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -45,4 +45,3 @@ signing_key:
 specification_version: 3
 summary: OpenTSDB client
 test_files: []
-has_rdoc: