more modularization on agent framework

config.ru

 require 'rubygems'
 require File.join('.', 'lib','noah')
 ## Uncomment the following to hardcode a redis url
-ENV['REDIS_URL'] = "redis://localhost:6379/1"
+ENV['REDIS_URL'] = "redis://localhost:6379/0"
 noah = Noah::App.new
 run noah

lib/noah/agent.rb

@@ -9,9 +9,6 @@ module Noah
   class Agent
     include EM::Deferrable
 
-    Noah::Agents::HttpAgent.register
-    Noah::Agents::DummyAgent.register
-
     @@watchers = Noah::Watcher.watch_list
     @@agents = Noah::Watchers.agents
 

lib/noah/agents/base_agent.rb

+require 'logger'
+require 'logger'
+
+module Noah::Agents
+  module Base
+    class << self
+      include EM::Deferrable
+
+      PREFIX = "base"
+      NAME = "base-agent"
+    end
+
+    def self.included(base)
+      Noah::Watchers.register_agent(base)
+    end
+  end
+end

lib/noah/agents/dummy_agent.rb

+require File.join(File.dirname(__FILE__), 'base_agent')
+
 module Noah::Agents
   class DummyAgent
-    include EM::Deferrable
+    include Noah::Agents::Base
 
     PREFIX = "dummy"
     NAME = "dummy"
 
-    def self.register
-      Noah::Watchers.register_agent(self)
-    end
-
     def self.notify(event, message, watch_list)
       logger = LOGGER
       logger.info("#{NAME}: Worker initiated")
@@ -21,8 +19,8 @@ module Noah::Agents
           logger.info("#{NAME}: Sending message to: #{ep} for pattern: #{p}")
           logger.debug("#{NAME}: message received: #{message}")
         end
+        iter.next
       end
-      iter.next
     end
 
   end

lib/noah/agents/http_agent.rb

-require 'logger'
+require File.join(File.dirname(__FILE__), 'base_agent')
 
 module Noah::Agents
   class HttpAgent
-    include EM::Deferrable
+    include Noah::Agents::Base
 
     PREFIX = "http"
     NAME = "http"
 
-    def self.register
-      Noah::Watchers.register_agent(self)
-    end
-
     def self.notify(event, message, watch_list)
       logger = LOGGER
       logger.info("#{NAME}: Worker initiated")