qswarm 0.0.9 → 0.0.10

data/lib/qswarm/speakers/irc.rb

@@ -1,10 +1,16 @@
 require 'cinch'
+require 'ostruct'
 
 module Qswarm
   module Speakers
     class Irc < Qswarm::Speaker
       @@irc_servers = {}
-        
+
+      def initialize(listener, name, args, &block)        
+        @admin_host = args[:admin_host]
+        super
+      end
+      
       def inject(format = :text, msg)
         logger.debug "[#{@agent.name}] Sending '#{msg}' to channel #{@name}"
         publish format, @name, msg
@@ -13,7 +19,20 @@ module Qswarm
       def run
         @name.match(/([^#]*)(#.+)/) { irc_connect $1.empty? ? 'localhost' : $1, $2 }
       end
-      
+            
+      def parse(m)
+       logger.debug "Received message: #{m.channel}/#{m.message}"
+       super( OpenStruct.new( :routing_key => '__', :message => m, :channel => m.channel ), m.message )
+      end
+
+      def 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
+
       private
       
       def irc_connect(irc_server, channel)
@@ -22,10 +41,25 @@ module Qswarm
           @@irc_servers[irc_server].config.channels << channel
         else
           logger.debug "Connecting to IRC server #{irc_server} channel #{channel}"
-          @@irc_servers[irc_server]               = Cinch::Bot.new
+          
+          @@irc_servers[irc_server]               = Cinch::Bot.new do
+            on :channel do |m|
+              if m.message =~ /^#{m.bot.nick}/
+                EM.defer do
+                  m.bot.config.shared['speaker'].parse(m)
+                end
+              end
+            end
+            
+            on :join do |m|
+              m.bot.config.shared['speaker'].join(m)
+            end
+          end
+          
           @@irc_servers[irc_server].config.server = irc_server
           @@irc_servers[irc_server].config.nick   = @agent.name
           @@irc_servers[irc_server].config.channels << channel
+          @@irc_servers[irc_server].config.shared['speaker'] = self
           
           EM.defer do
             @@irc_servers[irc_server].start
@@ -35,11 +69,12 @@ module Qswarm
 
       def publish(format, name, msg)
         @name.match(/([^#]*)(#.+)/) do
-          @@irc_servers[$1.empty? ? 'localhost' : $1].channel_manager.find_ensured($2).andand.send(
+          @@irc_servers[$1.empty? ? 'localhost' : $1].channel_list.find_ensured($2).andand.send(
             format == :json ? JSON.generate(msg) : msg
           )
         end  
       end
+        
     end
   end
 end

data/lib/qswarm/version.rb

@@ -1,3 +1,3 @@
 module Qswarm
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qswarm
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000Z
+date: 2012-04-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70108044269260 !ruby/object:Gem::Requirement
+  requirement: &70139061598600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70108044269260
+  version_requirements: *70139061598600
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70108044268740 !ruby/object:Gem::Requirement
+  requirement: &70139061598180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70108044268740
+  version_requirements: *70139061598180
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70108044268260 !ruby/object:Gem::Requirement
+  requirement: &70139061597660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70108044268260
+  version_requirements: *70139061597660
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70108044267760 !ruby/object:Gem::Requirement
+  requirement: &70139061597120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70108044267760
+  version_requirements: *70139061597120
 - !ruby/object:Gem::Dependency
   name: andand
-  requirement: &70108044267260 !ruby/object:Gem::Requirement
+  requirement: &70139061596640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70108044267260
+  version_requirements: *70139061596640
 description: Framework for writing distributed agents hanging off an AMQP message
   bus
 email: