noah 0.2 → 0.2.1

data/bin/noah-watcher.rb

@@ -14,7 +14,8 @@ begin
   require 'noah'
   require 'noah/agent'
   require 'json'
-rescue LoadError
+rescue LoadError => e
+  puts e.message
   puts HELP
   exit
 end

data/config.ru

@@ -1,6 +1,6 @@
 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

data/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
 

data/lib/noah/agents/base_agent.rb

@@ -0,0 +1,17 @@
+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

data/lib/noah/agents/dummy_agent.rb

@@ -1,14 +1,12 @@
+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")

data/lib/noah/agents/http_agent.rb

@@ -1,16 +1,12 @@
-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")
@@ -28,8 +24,8 @@ module Noah::Agents
           http.errback {
             logger.error("#{NAME}: Something went wrong with #{ep}")
           }
-          iter.next
         end
+        iter.next
       end
     end
 

data/lib/noah/models.rb

@@ -42,7 +42,8 @@ module Noah
       
     protected
     def patternize_me
-      "//noah/#{self.class_to_lower}/#{name}"
+      name.match(/^\//) ? n = name.gsub(/^\//, '') : n = name
+      "//noah/#{self.class_to_lower}/#{n}"
     end
 
     def stash_name

data/lib/noah/version.rb

@@ -1,3 +1,3 @@
 module Noah
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: noah
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - John E. Vincent
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -04:00
+date: 2011-03-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -264,6 +264,7 @@ files:
 - examples/websocket.rb
 - lib/noah.rb
 - lib/noah/agent.rb
+- lib/noah/agents/base_agent.rb
 - lib/noah/agents/dummy_agent.rb
 - lib/noah/agents/http_agent.rb
 - lib/noah/app.rb
@@ -332,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: noah
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Application registry based on Apache Zookeeper