noah 0.2-jruby → 0.2.1-jruby

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

@@ -1,11 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: noah
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 2
-  version: "0.2"
+  prerelease: 
+  version: 0.2.1
 platform: jruby
 authors: 
   - John E. Vincent
@@ -13,22 +10,17 @@ 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 
     name: eventmachine
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 0
-              - 0
-              - beta
-              - 3
             version: 1.0.0.beta.3
     type: :runtime
     version_requirements: *id001
@@ -36,15 +28,10 @@ dependencies:
     name: em-http-request
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 0
-              - 0
-              - beta
-              - 3
             version: 1.0.0.beta.3
     type: :runtime
     version_requirements: *id002
@@ -52,13 +39,10 @@ dependencies:
     name: redis
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 1
-              - 1
             version: 2.1.1
     type: :runtime
     version_requirements: *id003
@@ -66,13 +50,10 @@ dependencies:
     name: nest
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 1
-              - 0
             version: 1.1.0
     type: :runtime
     version_requirements: *id004
@@ -80,13 +61,10 @@ dependencies:
     name: rack
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 2
-              - 1
             version: 1.2.1
     type: :runtime
     version_requirements: *id005
@@ -94,13 +72,10 @@ dependencies:
     name: tilt
     prerelease: false
     requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 2
-              - 2
             version: 1.2.2
     type: :runtime
     version_requirements: *id006
@@ -108,13 +83,10 @@ dependencies:
     name: sinatra
     prerelease: false
     requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 1
-              - 2
             version: 1.1.2
     type: :runtime
     version_requirements: *id007
@@ -122,13 +94,10 @@ dependencies:
     name: ohm
     prerelease: false
     requirement: &id008 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 1
-              - 3
             version: 0.1.3
     type: :runtime
     version_requirements: *id008
@@ -136,13 +105,10 @@ dependencies:
     name: ohm-contrib
     prerelease: false
     requirement: &id009 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 1
-              - 1
             version: 0.1.1
     type: :runtime
     version_requirements: *id009
@@ -150,13 +116,10 @@ dependencies:
     name: haml
     prerelease: false
     requirement: &id010 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 3
-              - 0
-              - 25
             version: 3.0.25
     type: :runtime
     version_requirements: *id010
@@ -164,13 +127,10 @@ dependencies:
     name: vegas
     prerelease: false
     requirement: &id011 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 1
-              - 8
             version: 0.1.8
     type: :runtime
     version_requirements: *id011
@@ -178,11 +138,10 @@ dependencies:
     name: jruby-openssl
     prerelease: false
     requirement: &id012 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id012
@@ -190,11 +149,10 @@ dependencies:
     name: json
     prerelease: false
     requirement: &id013 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id013
@@ -202,13 +160,10 @@ dependencies:
     name: warbler
     prerelease: false
     requirement: &id014 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 2
-              - 1
             version: 1.2.1
     type: :development
     version_requirements: *id014
@@ -216,13 +171,10 @@ dependencies:
     name: diff-lcs
     prerelease: false
     requirement: &id015 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 1
-              - 2
             version: 1.1.2
     type: :development
     version_requirements: *id015
@@ -230,13 +182,10 @@ dependencies:
     name: sinatra-reloader
     prerelease: false
     requirement: &id016 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 5
-              - 0
             version: 0.5.0
     type: :development
     version_requirements: *id016
@@ -244,12 +193,10 @@ dependencies:
     name: rspec
     prerelease: false
     requirement: &id017 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 5
             version: "2.5"
     type: :development
     version_requirements: *id017
@@ -257,13 +204,10 @@ dependencies:
     name: rcov
     prerelease: false
     requirement: &id018 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 9
-              - 9
             version: 0.9.9
     type: :development
     version_requirements: *id018
@@ -271,13 +215,10 @@ dependencies:
     name: rack-test
     prerelease: false
     requirement: &id019 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 5
-              - 7
             version: 0.5.7
     type: :development
     version_requirements: *id019
@@ -323,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
@@ -377,23 +319,21 @@ rdoc_options: []
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: noah
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Application registry based on Apache Zookeeper