riemann-client 0.0.8 → 0.2.0

data/lib/riemann.rb

@@ -5,6 +5,7 @@ module Riemann
   require 'beefcake'
   require 'riemann/version'
   require 'riemann/state'
+  require 'riemann/attribute'
   require 'riemann/event'
   require 'riemann/query'
   require 'riemann/message'

data/lib/riemann/attribute.rb

@@ -0,0 +1,8 @@
+module Riemann
+  class Attribute
+    include Beefcake::Message
+
+    required :key, :string, 1
+    optional :value, :string, 2
+  end
+end

data/lib/riemann/event.rb

@@ -9,6 +9,7 @@ module Riemann
     optional :description, :string, 5
     repeated :tags, :string, 7
     optional :ttl, :float, 8
+    repeated :attributes, Attribute, 9
 
     optional :metric_sint64, :sint64, 13
     optional :metric_d, :double, 14
@@ -160,6 +161,11 @@ module Riemann
         else
           super hash
         end
+
+        # Add extra attributes to the event as Attribute instances with values converted to String
+        keys = hash.keys.map {|k| k.to_sym } - self.fields.values.map {|f| f.name.to_sym }
+        self.attributes = keys.map {|key| Attribute.new(:key => key.to_s, :value => (hash[key] || hash[key.to_sym]).to_s) }
+
       else
         super()
       end
@@ -183,5 +189,31 @@ module Riemann
         self.metric_f = m.to_f
       end
     end
+
+    # Look up attributes
+    def [](k)
+      if(respond_to? k)
+        super
+      else
+        r = attributes.select {|a| a.key.to_sym == k.to_sym }.map {|a| a.value}
+        r.size > 1 ? r : r.first
+      end
+    end
+
+    # Set attributes
+    def []=(k, v)
+      if(respond_to?("#{k}="))
+        super
+      else
+        a = self.attributes.select {|a| a.key.to_sym == k.to_sym }.first
+        if(a)
+          a.value = v.to_s
+        else
+          self.attributes << Attribute.new(:key => k.to_s, :value => v.to_s)
+        end
+      end
+    end
+
   end
+
 end

data/lib/riemann/version.rb

@@ -1,3 +1,3 @@
 module Riemann
-  VERSION = '0.0.8'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-client
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
-  requirement: &5515060 !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: *5515060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &5514260 !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: *5514260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: mtrc
-  requirement: &5513580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,25 +53,31 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *5513580
+  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/state.rb
-- lib/riemann/repl-port
+- lib/riemann.rb
+- lib/riemann/attribute.rb
 - lib/riemann/auto_state.rb
 - lib/riemann/client.rb
 - lib/riemann/client/tcp.rb
 - lib/riemann/client/udp.rb
 - lib/riemann/event.rb
-- lib/riemann/query.rb
-- lib/riemann/metric_thread.rb
 - lib/riemann/message.rb
-- lib/riemann.rb
+- lib/riemann/metric_thread.rb
+- lib/riemann/query.rb
+- lib/riemann/repl-port
+- lib/riemann/state.rb
+- lib/riemann/version.rb
 - LICENSE
 - README.markdown
 homepage: https://github.com/aphyr/riemann-ruby-client
@@ -84,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riemann-client
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Client for the distributed event system Riemann.