ganymed-client 0.1.0 → 0.2.0

data/lib/ganymed/client.rb

@@ -1,131 +1,3 @@
-require 'socket'
-require 'msgpack'
-
-module Ganymed
-
-  ##
-  # The Client connects to the Sampler and/or Processor and emits samples
-  # and/or events respectively.
-  #
-  class Client
-
-    # The {ProcessorSocket Processor socket}.
-    attr_reader :processor
-
-    # The {SamplerSocket Sampler socket}.
-    attr_reader :sampler
-
-    # Create a new client instance.
-    #
-    # @param [Hash] opts  Client options.
-    # @option opts [Hash] :processor  Options passed to the {ProcessorSocket}.
-    # @option opts [Hash] :sampler  Options passed to the {SamplerSocket}.
-    def initialize(opts)
-      @processor = ProcessorSocket.new(opts[:processor]) if opts[:processor]
-      @sampler = SamplerSocket.new(opts[:sampler]) if opts[:sampler]
-    end
-
-    ##
-    # A simple UDPSocket wrapper.
-    #
-    class Socket
-
-      # Create a new Socket instance.
-      #
-      # @param [Hash] opts  Socket options.
-      # @option opts [String] :host  Host to connect to.
-      # @option opts [Fixnum] :port  Port to connect to.
-      # @option opts [String] :origin Origin of Samples/Events. Defaults to the
-      #                               fully-qualified hostname.
-      def initialize(opts)
-        @host, @port = opts[:host], opts[:port]
-        @socket = UDPSocket.new
-        @origin = opts[:origin] || ::Socket.gethostbyname(::Socket.gethostname).first
-      end
-
-      # Send data to the socket.
-      #
-      # @param [String] data  The data to send.
-      # @param [Fixnum] flags  Socket flags.
-      def send(data, flags=0)
-        @socket.send(data, flags, @host, @port)
-      end
-    end
-
-    ##
-    # A {Socket} that emits samples to a Sampler.
-    #
-    class SamplerSocket < Socket
-
-      # Emit a new sample.
-      #
-      # @param [String, Symbol] ds  Sample data source.
-      # @param [String] ns  Event namespace.
-      # @param [Fixnum, Float] value  Sample value.
-      # @param [Time] now  Sample timestamp.
-      def emit(ds, ns, value, now=Time.now.utc)
-        data = [ds.to_s, ns, @origin, now.to_f, value.to_f]
-        send(data.pack("Z*Z*Z*GG"))
-      end
-    end
-
-    ##
-    # A {Socket} that emits events to a Processor.
-    #
-    class ProcessorSocket < Socket
-
-      # Emit a new Event.
-      #
-      # @param [String] ns  Event namespace.
-      # @param [Object] value  Event value.
-      # @param [Hash] opts  Options
-      # @option opts [String] cf  Consolidation function used in this event.
-      # @option opts [Time] now  Event timestamp.
-      # @option opts [Fixnum] resolution  Event resolution.
-      # @option opts [String] origin  Event origin.
-      def event(ns, value, opts={})
-        opts = {
-          :cf => nil,
-          :now => Time.now.utc,
-          :resolution => 0,
-          :origin => @origin,
-        }.merge(opts)
-
-        {
-          :_type => :event,
-          :n => ns,
-          :c => opts[:cf],
-          :o => opts[:origin],
-          :t => opts[:now].to_i,
-          :r => opts[:resolution].to_i,
-          :v => value
-        }.tap do |data|
-          send(data.to_msgpack)
-        end
-      end
-
-      # Emit a metadata object to the Processor.
-      #
-      # A metadata object contains arbitrary data related to the origin. This
-      # can be queried by Websocket clients for displaying information about
-      # origins.
-      #
-      # @param [Hash] data  Metadata object.
-      # @param [Hash] opts  Options
-      # @option opts [String] origin  Metadata origin.
-      def metadata(data, opts={})
-        opts = {
-          :origin => @origin,
-        }.merge(opts)
-
-        {
-          :_type => :metadata,
-          :origin => opts[:origin],
-          :data => data,
-        }.tap do |data|
-          send(data.to_msgpack)
-        end
-      end
-    end
-  end
-end
+require 'ganymed/client/processor'
+require 'ganymed/client/sampler'
+require 'ganymed/client/version'

data/lib/ganymed/client/processor.rb

@@ -0,0 +1,102 @@
+require 'eventmachine'
+require 'msgpack'
+
+module Ganymed
+  module Client
+
+    ##
+    # An EventMachine Protocol that can send events to a Ganymed processor.
+    #
+    module Processor
+      include EM::Deferrable
+
+      # Emit a new Event.
+      #
+      # @param [String] ns  Event namespace.
+      # @param [Object] value  Event value.
+      # @param [Hash] opts  Options
+      # @option opts [String] cf  Consolidation function used in this event.
+      # @option opts [Time] now  Event timestamp.
+      # @option opts [Fixnum] resolution  Event resolution.
+      # @option opts [String] origin  Event origin.
+      def event(ns, value, opts={})
+        opts = {
+          :cf => nil,
+          :now => Time.now.utc,
+          :resolution => 0,
+          :origin => @origin,
+        }.merge(opts)
+
+        data = {
+          :_type => :event,
+          :n => ns,
+          :c => opts[:cf],
+          :o => opts[:origin],
+          :t => opts[:now].to_i,
+          :r => opts[:resolution].to_i,
+          :v => value
+        }
+
+        send_data(data.to_msgpack)
+      end
+
+      # Emit a metadata object to the Processor.
+      #
+      # A metadata object contains arbitrary data related to the origin. This
+      # can be queried by Websocket clients for displaying information about
+      # origins.
+      #
+      # @param [Hash] data  Metadata object.
+      # @param [Hash] opts  Options
+      # @option opts [String] origin  Metadata origin.
+      def metadata(data, opts={})
+        opts = {
+          :origin => @origin,
+        }.merge(opts)
+
+        data = {
+          :_type => :metadata,
+          :origin => opts[:origin],
+          :data => data,
+        }
+
+        send_data(data.to_msgpack)
+      end
+
+      # Connect to a Ganymed processor.
+      #
+      # @param [String] host  Host to connect to.
+      # @param [Fixnum] port  Port to connect to.
+      # @param [String] origin Origin of events. Defaults to the
+      #                        fully-qualified hostname.
+      def self.connect(host, port, origin=nil)
+        EM.connect(host, port, self, host, port, origin)
+      end
+
+      # @private
+      def initialize(host, port, origin=nil)
+        @host, @port = host, port
+        @origin = origin || ::Socket.gethostbyname(::Socket.gethostname).first
+      end
+
+      # @private
+      def connection_completed
+        @reconnecting = false
+        @connected = true
+        succeed
+      end
+
+      # @private
+      def unbind
+        if @connected or @reconnecting
+          EM.add_timer(1) { reconnect(@host, @port) }
+          @connected = false
+          @reconnecting = true
+          @deferred_status = nil
+        else
+          raise "unable to connect #{@origin} to ganymed processor at #{@host}:#{@port}"
+        end
+      end
+    end
+  end
+end

data/lib/ganymed/client/sampler.rb

@@ -0,0 +1,39 @@
+require 'eventmachine'
+
+module Ganymed
+  module Client
+
+    ##
+    # An EventMachine Protocol that can send samples to a Ganymed sampler.
+    #
+    module Sampler
+      include EM::Deferrable
+
+      # Emit a new sample.
+      #
+      # @param [String, Symbol] ds  Sample data source.
+      # @param [String] ns  Event namespace.
+      # @param [Fixnum, Float] value  Sample value.
+      def emit(ds, ns, value)
+        data = [ds.to_s, ns, @origin, value.to_f]
+        send_datagram(data.pack("Z*Z*Z*G"), @host, @port)
+      end
+
+      # Connect to a Ganymed sampler.
+      #
+      # @param [String] host  Host to connect to.
+      # @param [Fixnum] port  Port to connect to.
+      # @param [String] origin Origin of events. Defaults to the
+      #                        fully-qualified hostname.
+      def self.connect(host, port, origin=nil)
+        EM.open_datagram_socket("0.0.0.0", 0, self, host, port, origin)
+      end
+
+      # @private
+      def initialize(host, port, origin=nil)
+        @host, @port = host, port
+        @origin = origin || ::Socket.gethostbyname(::Socket.gethostname).first
+      end
+    end
+  end
+end

data/lib/ganymed/client/version.rb

@@ -1,6 +1,6 @@
 module Ganymed
-  class Client
+  module Client
     # @private
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ganymed-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &9787780 !ruby/object:Gem::Requirement
+  requirement: &18990080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9787780
+  version_requirements: *18990080
 description: Client library for Ganymed
 email:
 - bb@xnull.de
@@ -39,6 +39,8 @@ files:
 - Rakefile
 - ganymed-client.gemspec
 - lib/ganymed/client.rb
+- lib/ganymed/client/processor.rb
+- lib/ganymed/client/sampler.rb
 - lib/ganymed/client/version.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -59,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1972040912805276168
+      hash: -1617282239461546353
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -68,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1972040912805276168
+      hash: -1617282239461546353
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17