qswarm 0.0.14 → 0.0.15

data/lib/qswarm/speaker.rb

@@ -17,6 +17,7 @@ module Qswarm
       @name     = name.to_s unless name.nil?
       @block    = block
       @args     = OpenStruct.new args
+      @bind     = nil
     end
 
     def parse(metadata, payload)
@@ -32,7 +33,7 @@ module Qswarm
     rescue JSON::ParserError
       error = "JSON::ParserError on #{payload.inspect}"
       logger.error error
-      publish :errors, :text, "errors.#{@agent.name}.#{$fqdn}", error
+#      publish :errors, :text, "errors.#{@agent.name}.#{$fqdn}", error
     end
 
     def log(msg)
@@ -40,8 +41,9 @@ module Qswarm
     end
 
     def inject(format = :text, msg)
-      logger.debug "[#{@agent.name}] Sending '#{msg}' to broker #{get_broker(@broker).name}/#{@name}"
-      publish @broker, format, @name, msg
+      routing_key = @bind || @name
+      logger.debug "[#{@agent.name}] Sending '#{msg}' to broker #{get_broker(@broker).name}/#{routing_key}"
+      publish @broker, format, routing_key, msg
       log msg if format == :text
     end
 
@@ -56,6 +58,10 @@ module Qswarm
       @args[name]
     end
 
+    def bind(routing_key)
+      @bind = routing_key
+    end
+    
     private
 
     def publish(broker_name, format, routing_key, msg)

data/lib/qswarm/speakers/irc.rb

@@ -8,36 +8,58 @@ module Qswarm
 
       def initialize(listener, name, args, &block)        
         @admin_host = args[:admin_host]
+        @channels = []
+        @connected = false
         super
       end
       
       def inject(format = :text, msg)
-        logger.debug "[#{@agent.name}] Sending '#{msg}' to channel #{@name}"
-        publish format, @name, msg
+        if @connected
+          routing_key = @bind || @name
+          logger.debug "[#{@agent.name}] Sending '#{msg}' to channel #{routing_key}"
+          publish format, routing_key, msg
+        else
+          EventMachine::Timer.new(5,self.inject(format, msg))
+        end
       end
 
       def run
         @name.match(/([^#]*)(#.+)/) { irc_connect $1.empty? ? 'localhost' : $1, $2 }
       end
             
-      def join(m)
+      def on_join(m)
         unless m.user.nick == m.bot.nick
           if @admin_host && Regexp.new(@admin_host).match(m.user.host)
             m.channel.op(m.user)
           end
         end
       end
+      
+      def on_connect(m)
+        @connected = true
+      end
+      
+      def on_disconnect(m)
+        @connected = false
+      end
 
       private
+
+      def join(irc_server, channel)
+        if !@channels.include? channel
+          logger.debug "Joining channel #{channel}"
+          @@irc_servers[irc_server].channel_list.find_ensured(channel).join()
+          @channels << channel
+        end
+      end
       
       def irc_connect(irc_server, channel)
         if bot = @@irc_servers[irc_server]
-          logger.debug "Joining channel #{channel}"
-          @@irc_servers[irc_server].config.channels << channel
+          join irc_server, channel
         else
           logger.debug "Connecting to IRC server #{irc_server} channel #{channel}"
           
-          @@irc_servers[irc_server]               = Cinch::Bot.new do
+          @@irc_servers[irc_server] = Cinch::Bot.new do
             on :channel do |m|
               if m.message =~ /^#{m.bot.nick}/
                 EM.defer do
@@ -47,7 +69,15 @@ module Qswarm
             end
             
             on :join do |m|
-              m.bot.config.shared['speaker'].join(m)
+              m.bot.config.shared['speaker'].on_join(m)
+            end
+            
+            on :connect do |m|
+              m.bot.config.shared['speaker'].on_connect(m)
+            end
+            
+            on :disconnect do |m|
+              m.bot.config.shared['speaker'].on_disconnect(m)
             end
           end
           
@@ -55,6 +85,8 @@ module Qswarm
           @@irc_servers[irc_server].config.nick   = @agent.name
           @@irc_servers[irc_server].config.channels << channel
           @@irc_servers[irc_server].config.shared['speaker'] = self
+
+          @channels << channel
           
           EM.defer do
             @@irc_servers[irc_server].start
@@ -63,13 +95,13 @@ module Qswarm
       end
 
       def publish(format, name, msg)
-        @name.match(/([^#]*)(#.+)/) do
-          @@irc_servers[$1.empty? ? 'localhost' : $1].channel_list.find_ensured($2).andand.send(
-            format == :json ? JSON.generate(msg) : msg
-          )
+        name.match(/([^#]*)(#.+)/) do
+          irc_server = $1.empty? ? 'localhost' : $1
+          join(irc_server, $2)
+          @@irc_servers[irc_server].channel_list.find($2).andand.send( format == :json ? JSON.generate(msg) : msg )
         end  
       end
         
     end
   end
-end
+end

data/lib/qswarm/version.rb

@@ -1,3 +1,3 @@
 module Qswarm
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qswarm
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000Z
+date: 2012-04-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70096253650400 !ruby/object:Gem::Requirement
+  requirement: &70205369152540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096253650400
+  version_requirements: *70205369152540
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70096253649860 !ruby/object:Gem::Requirement
+  requirement: &70205369152020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096253649860
+  version_requirements: *70205369152020
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70096253649440 !ruby/object:Gem::Requirement
+  requirement: &70205369151420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096253649440
+  version_requirements: *70205369151420
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70096253649020 !ruby/object:Gem::Requirement
+  requirement: &70205369150900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096253649020
+  version_requirements: *70205369150900
 - !ruby/object:Gem::Dependency
   name: andand
-  requirement: &70096253648600 !ruby/object:Gem::Requirement
+  requirement: &70205369150080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096253648600
+  version_requirements: *70205369150080
 description: Framework for writing distributed agents hanging off an AMQP message
   bus
 email: