riemann-client 0.0.6 → 0.0.7

data/lib/riemann/client/tcp.rb

@@ -62,7 +62,7 @@ module Riemann
         @locket.synchronize do
           begin
             tries += 1
-              yield (@socket || connect)
+              yield(@socket || connect)
           rescue IOError => e
             raise if tries > 3
             connect and retry

data/lib/riemann/client/udp.rb

@@ -54,7 +54,7 @@ module Riemann
         @locket.synchronize do
           begin
             tries += 1
-              yield (@socket || connect)
+              yield(@socket || connect)
           rescue IOError => e
             raise if tries > 3
             connect and retry

data/lib/riemann/client.rb

@@ -6,7 +6,7 @@ class Riemann::Client
   class ServerError < Error; end
   class Unsupported < Error; end
   class TooBig < Unsupported; end
-  
+
   require 'thread'
   require 'socket'
   require 'time'
@@ -72,7 +72,7 @@ class Riemann::Client
 
   # Ask for states
   def query(string = "true")
-    send_recv Riemann::Message.new(query: Riemann::Query.new(string: string))
+    send_recv Riemann::Message.new(:query => Riemann::Query.new(:string => string))
   end
 
   def send_recv(*a)

data/lib/riemann/event.rb

@@ -1,8 +1,8 @@
 module Riemann
   class Event
     include Beefcake::Message
-    
-    optional :time, :int64, 1 
+
+    optional :time, :int64, 1
     optional :state, :string,  2
     optional :service, :string, 3
     optional :host, :string, 4
@@ -21,7 +21,7 @@ module Riemann
              else
                Event.new init
              end
-      
+
       # Metric
       init.metric_f ||= states.inject(0.0) { |a, state|
           a + (state.metric || 0)
@@ -35,10 +35,10 @@ module Riemann
       init.service ||= mode states.map(&:service)
 
       # Time
-      init.time = begin 
+      init.time = begin
         times = states.map(&:time).compact
         (times.inject(:+) / times.size).to_i
-      rescue 
+      rescue
       end
       init.time ||= Time.now.to_i
 
@@ -55,7 +55,7 @@ module Riemann
              else
                Event.new init
              end
-      
+
       # Metric
       init.metric_f ||= states.inject(0.0) { |a, state|
           a + (state.metric || 0)
@@ -69,16 +69,16 @@ module Riemann
       init.service ||= mode states.map(&:service)
 
       # Time
-      init.time = begin 
+      init.time = begin
         times = states.map(&:time).compact
         (times.inject(:+) / times.size).to_i
-      rescue 
+      rescue
       end
       init.time ||= Time.now.to_i
 
       init
     end
-    
+
     # Finds the maximum of a set of states. Metric is the maximum. Event is the
     # highest, as defined by Dash.config.state_order. Time is the mean.
     def self.max(states, init = Event.new)
@@ -88,7 +88,7 @@ module Riemann
              else
                Event.new init
              end
-      
+
       # Metric
       init.metric_f ||= states.inject(0.0) { |a, state|
           a + (state.metric || 0)
@@ -103,16 +103,16 @@ module Riemann
       end
 
       # Time
-      init.time = begin 
+      init.time = begin
         times = states.map(&:time).compact
         (times.inject(:+) / times.size).to_i
-      rescue 
+      rescue
       end
       init.time ||= Time.now.to_i
 
       init
     end
-    
+
     def self.mode(array)
       array.inject(Hash.new(0)) do |counts, e|
         counts[e] += 1
@@ -152,7 +152,7 @@ module Riemann
     def initialize(hash = nil)
       if hash
         if hash[:metric]
-          super hash.merge(metric_f: hash[:metric])
+          super hash.merge(:metric_f => hash[:metric])
         else
           super hash
         end

data/lib/riemann/version.rb

@@ -1,3 +1,3 @@
 module Riemann
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/riemann.rb

@@ -1,6 +1,7 @@
 module Riemann
   $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 
+  require 'rubygems'
   require 'beefcake'
   require 'riemann/version'
   require 'riemann/state'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
-  requirement: &15270360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *15270360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &15269600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *15269600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: mtrc
-  requirement: &15268880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,23 +53,28 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *15268880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 description: 
 email: aphyr@aphyr.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/riemann/version.rb
 - lib/riemann/event.rb
-- lib/riemann/message.rb
 - lib/riemann/auto_state.rb
-- lib/riemann/metric_thread.rb
-- lib/riemann/version.rb
-- lib/riemann/state.rb
 - lib/riemann/query.rb
 - lib/riemann/client/udp.rb
 - lib/riemann/client/tcp.rb
+- lib/riemann/metric_thread.rb
 - lib/riemann/client.rb
+- lib/riemann/state.rb
+- lib/riemann/message.rb
 - lib/riemann.rb
 - LICENSE
 - README.markdown
@@ -83,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riemann-client
-rubygems_version: 1.8.10
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Client for the distributed event system Riemann.