noah 0.1 → 0.2

data/.gitignore

@@ -14,3 +14,4 @@ Gemfile.lock
 doc
 .yardoc/*
 examples/log/*
+examples/tmp/*

data/bin/noah-watcher.rb

@@ -12,6 +12,7 @@ begin
   require 'eventmachine'
   require 'em-http-request'
   require 'noah'
+  require 'noah/agent'
   require 'json'
 rescue LoadError
   puts HELP
@@ -20,78 +21,25 @@ end
 
 LOGGER = Logger.new(STDOUT)
 
-class EventMachine::NoahAgent
-  include EM::Deferrable
-
-  @@watchers = Noah::Watcher.watch_list
-
-  def initialize
-    @logger = LOGGER
-    @logger.debug("Initializing with #{@@watchers.size} registered watches")
-    if EventMachine.reactor_running?
-      @worker = EM.spawn {|event, message, watch_list|
-        logger = LOGGER
-        logger.debug("Worker initiated")
-        logger.info("got event on http worker: #{event}")
-        logger.info("got message on http worker: #{message}")
-        matches = watch_list.find_all{|w| event =~ /^#{Base64.decode64(w)}/}
-        logger.debug("Found #{matches.size} matches for #{event}")
-        EM::Iterator.new(matches).each do |watch, iter|
-          p, ep = Base64.decode64(watch).split("|")
-          logger.info("Sending message to: #{ep} for pattern: #{p}")
-          http = EM::HttpRequest.new(ep, :connection_timeout => 2, :inactivity_timeout => 4).post :body => message
-          http.callback {
-            LOGGER.debug("Message posted to #{ep} successfully")
-            #iter.next
-          }
-          http.errback {
-            LOGGER.debug("Something went wrong")
-            #iter.net
-          }
-          iter.next
-        end
-      }
-    else
-      logger.fatal("Must be inside a reactor!")
-    end
-  end
-
-  def watchers
-    @@watchers.size
-  end
-
-  def reread_watchers
-    @logger.debug("Found new watches")
-    @logger.debug("Current watch count: #{@@watchers.size}")
-    @@watchers = Noah::Watcher.watch_list
-    @logger.debug("New watch count: #{@@watchers.size}")
-    #@logger.debug(@@watchers)
-  end
-
-  def broker(msg)
-    # This is just for testing for now
-    @logger.warn(msg)
-    e,m = msg.split("|")
-    be = Base64.encode64(e).gsub("\n","")
-    @logger.info("Encoded event: #{be}")
-    @worker.notify e, m, @@watchers.clone
-  end
-end
-
 EventMachine.run do
+  EM.error_handler do |e|
+    LOGGER.warn(e)
+  end
   logger = LOGGER
   trap("INT") { logger.debug("Shutting down. Watches will not be fired");EM.stop }
-  noah = EventMachine::NoahAgent.new
+  noah = Noah::Agent.new
+  noah.errback{|x| logger.error("Errback: #{x}")}
+  noah.callback{|y| logger.info("Callback: #{y}")}
   # Passing messages...like a boss
   master_channel = EventMachine::Channel.new
 
   r = EventMachine::Hiredis::Client.connect
+  r.errback{|x| logger.error("Unable to connect to redis: #{x}")}
   logger.debug("Starting up")
   r.psubscribe("//noah/*")
   r.on(:pmessage) do |pattern, event, message|
     noah.reread_watchers if event =~ /^\/\/noah\/watcher\/.*/
     master_channel.push "#{event}|#{message}"
-    logger.debug("Saw[#{event}]")
   end
 
   sub = master_channel.subscribe {|msg|

data/config/warble.rb

@@ -8,7 +8,7 @@ Warbler::Config.new do |config|
   config.includes = FileList["config.ru"]
   config.excludes = FileList["noah.gemspec", "Gemfile", "Gemfile.lock"]
   config.bundler = false
-  config.gems += ["json", "ohm", "ohm-contrib", "sinatra", "sinatra-namespace", "haml"]
+  config.gems += ["json", "ohm", "ohm-contrib", "sinatra", "haml"]
   config.gem_excludes = [/^(test|spec)\//]
   config.public_html = FileList["views/**/*"]
   config.webxml.booter = :rack

data/examples/custom-watcher.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..','lib','noah','watcher')
+require File.join(File.dirname(__FILE__), '..','lib','noah','custom_watcher')
 
-class StdoutWatcher < Noah::Watcher
+class StdoutWatcher < Noah::CustomWatcher
   redis_host "redis://127.0.0.1:6379/0"
-  pattern "//noah/configuration/redis_server"
+  pattern "//noah/configuration/redis"
   destination Proc.new {|x| puts x}
   run!
 end

data/examples/httpclient.rb

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..','lib','noah','watcher')
-require 'excon'
+require File.join(File.dirname(__FILE__), '..','lib','noah','custom_watcher')
+require 'em-http-request'
 
 
-class HttpPostWatch < Noah::Watcher
+class HttpPostWatch < Noah::CustomWatcher
   redis_host "redis://127.0.0.1:6379/0"
   pattern "//noah/configuration"
-  destination Proc.new {|x| ::Excon.post("http://localhost:4567/webhook", :headers => {"Content-Type" => "application/json"}, :body => x)}
+  destination Proc.new {|x| ::EM::HttpRequest.new('http://localhost:4567/webhook', :connection_timeout => 2, :inactivity_timeout => 4).post :body => x}
   run!
 end

data/examples/logger.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..','lib','noah','watcher')
+require File.join(File.dirname(__FILE__), '..','lib','noah','custom_watcher')
 require 'logger'
 
-class LoggingWatcher < Noah::Watcher
-  redis_host "redis://127.0.0.1:6379/5"
-  pattern "//noah/application"
+class LoggingWatcher < Noah::CustomWatcher
+  redis_host "redis://127.0.0.1:6379/0"
+  pattern "//noah"
   destination Proc.new {|x| log = Logger.new(STDOUT); log.debug(x)}
   run!
 end

data/examples/reconfiguring-sinatra-watcher.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..','lib','noah','watcher')
-require 'excon'
+require File.join(File.dirname(__FILE__), '..','lib','noah','custom_watcher')
+require 'em-http-request'
 
-class HttpPostWatch < Noah::Watcher
+class HttpPostWatch < Noah::CustomWatcher
   redis_host "redis://127.0.0.1:6379/0"
   pattern "//noah/configuration/redis_server"
-  destination Proc.new {|x| puts x; ::Excon.put("http://localhost:4567/webhook", :headers => {"Content-Type" => "application/json"}, :body => x)}
+  destination Proc.new {|x| ::EM::HttpRequest.new('http://localhost:4567/webhook', :connection_timeout => 2, :inactivity_timeout => 4).post :body => x}
   run!
 end

data/examples/reconfiguring-sinatra.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'sinatra'
 require 'ohm'
 require 'open-uri'

data/examples/websocket.html

@@ -8,7 +8,7 @@
       $(document).ready(function(){
         function debug(str){ $("#debug").append("<p>" +  str); };
 
-        ws = new WebSocket("ws://localhost:3001/");
+        ws = new WebSocket("ws://localhost:3009/");
         ws.onmessage = function(evt) { $("#msg").append("<p>"+evt.data+"</p>"); };
         ws.onclose = function() { debug("socket closed"); };
         ws.onopen = function() {

data/examples/websocket.rb

@@ -20,7 +20,7 @@ EventMachine.run do
     @channel.push "(#{event}) #{message}"
   end
 
-  EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 3001) do |ws|
+  EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 3009) do |ws|
     ws.onopen {
       sub = @channel.subscribe { |msg| 
         ws.send msg 

data/lib/noah.rb

@@ -10,6 +10,7 @@ require 'haml'
 require 'yaml'
 require 'sinatra/base'
 
+require File.join(File.dirname(__FILE__), 'noah', 'custom_watcher')
 require File.join(File.dirname(__FILE__), 'noah','validations')
 require File.join(File.dirname(__FILE__), 'noah','models')
 require File.join(File.dirname(__FILE__), 'noah','app')

data/lib/noah/agent.rb

@@ -0,0 +1,53 @@
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'rubygems'
+require 'logger'
+require 'noah'
+require 'noah/agents/http_agent'
+require 'noah/agents/dummy_agent'
+
+module Noah
+  class Agent
+    include EM::Deferrable
+
+    Noah::Agents::HttpAgent.register
+    Noah::Agents::DummyAgent.register
+
+    @@watchers = Noah::Watcher.watch_list
+    @@agents = Noah::Watchers.agents
+
+    def initialize
+      @logger = LOGGER
+      @logger.debug("Initializing with #{@@watchers.size} registered watches")
+      @logger.debug("#{@@agents} agents registered")
+      if EventMachine.reactor_running?
+        self.succeed("Succeed callback")
+      else
+        logger.fatal("Must be inside a reactor!")
+      end
+    end
+
+    def watchers
+      @@watchers.size
+    end
+
+    def http_worker
+      @http_worker
+    end
+
+    def reread_watchers
+      @logger.debug("Found new watches")
+      @logger.debug("Current watch count: #{@@watchers.size}")
+      @@watchers = Noah::Watcher.watch_list
+      @logger.debug("New watch count: #{@@watchers.size}")
+    end
+
+    def broker(msg)
+      e,m = msg.split("|")
+      be = Base64.encode64(e).gsub("\n","")
+      EM::Iterator.new(@@agents).each do |agent, iter|
+        agent.send(:notify, e, m, @@watchers.clone)
+        iter.next
+      end
+    end
+  end
+end

data/lib/noah/agents/dummy_agent.rb

@@ -0,0 +1,29 @@
+module Noah::Agents
+  class DummyAgent
+    include EM::Deferrable
+
+    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")
+      logger.debug("#{NAME}: got event -  #{event}")
+      matches = watch_list.find_all{|w| event =~ /^#{Base64.decode64(w)}/} 
+      logger.debug("#{NAME}: Found #{matches.size} possible matches for #{event}")
+      EM::Iterator.new(matches).each do |watch, iter|
+        p, ep = Base64.decode64(watch).split("|")
+        if ep =~ /^#{PREFIX}/
+          logger.info("#{NAME}: Sending message to: #{ep} for pattern: #{p}")
+          logger.debug("#{NAME}: message received: #{message}")
+        end
+        iter.next
+      end
+    end
+
+  end
+end

data/lib/noah/agents/http_agent.rb

@@ -0,0 +1,37 @@
+require 'logger'
+
+module Noah::Agents
+  class HttpAgent
+    include EM::Deferrable
+
+    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")
+      logger.debug("#{NAME}: got event - #{event}")
+      matches = watch_list.find_all{|w| event =~ /^#{Base64.decode64(w)}/}
+      logger.debug("#{PREFIX}: Found #{matches.size} possible matches for #{event}")
+      EM::Iterator.new(matches).each do |watch, iter|
+        p, ep = Base64.decode64(watch).split("|")
+        if ep =~ /^#{PREFIX}/
+          logger.info("#{NAME}: Sending message to (#{ep}) for pattern (#{p})")
+          http = EM::HttpRequest.new(ep, :connection_timeout => 2, :inactivity_timeout => 4).post :body => message
+          http.callback {
+            logger.info("#{NAME}: Message posted to #{ep} successfully")
+          }
+          http.errback {
+            logger.error("#{NAME}: Something went wrong with #{ep}")
+          }
+          iter.next
+        end
+      end
+    end
+
+  end
+end

data/lib/noah/{watcher.rb → custom_watcher.rb}

@@ -1,16 +1,20 @@
 require 'eventmachine'
 require 'uri'
 require 'logger'
+begin
+  require 'em-hiredis'
+rescue LoadError
+  puts "Please install: em-hiredis"
+end
 
 @log = Logger.new(STDOUT)
 @log.level = Logger::DEBUG
 
 require File.join(File.dirname(__FILE__), 'passthrough')
-require File.join(File.dirname(__FILE__), '..','vendor','em-hiredis','lib','em-hiredis')
 
 module Noah
 
-  class Watcher
+  class CustomWatcher
     extend Passthrough
 
     passthrough :redis_host, :pattern, :destination, :run!, :run_watcher

data/lib/noah/ephemeral_routes.rb

@@ -21,10 +21,9 @@ class Noah::App
   put '/e/*' do
     raise("Data too large") if request.body.size > 512
     d = request.body.read  || nil
-    e = Noah::Ephemeral.find_or_create(:path => "/#{params[:splat][0]}")
-    e.data = d
+    opts = {:path => "/#{params[:splat][0]}", :data => d}
+    e = Noah::Ephemeral.find_or_create(opts)
     if e.valid?
-      e.save
       action = e.is_new? ? "create" : "update"
       r = {"action" => action, "result" => "success", "id" => e.id, "path" => e.path, "data" => e.data}
       r.to_json

data/lib/noah/models/ephemerals.rb

@@ -1,5 +1,5 @@
 module Noah
-  class Ephemeral < Model #NYI
+  class Ephemeral < Model
 
     attribute :path
     attribute :data
@@ -18,14 +18,16 @@ module Noah
     end
 
     def to_hash
-      h = {:path => path, :data => data, :created_at => created_at, :updated_at => :updated_at}
+      h = {:path => path, :data => data, :created_at => created_at, :updated_at => updated_at}
       super.merge(h)
     end
 
     class << self
     def find_or_create(opts = {})
       begin
-        find(opts).first.nil? ? (eph = create(opts)) : (eph = find(opts).first)
+        path, data = opts[:path], opts[:data]
+        find(:path => path).first.nil? ? (eph = new(:path => path)) : (eph = find(:path => path).first)
+        eph.data = data
         if eph.valid?
           eph.save
         end

data/lib/noah/models/watchers.rb

@@ -55,8 +55,17 @@ module Noah
   end
 
   class Watchers
+    @@agents = []
     def self.all(options = {})
       options.empty? ? Watcher.all.sort : Watcher.find(options).sort
     end
+
+    def self.register_agent(agent_class)
+      @@agents << agent_class
+    end
+
+    def self.agents
+      @@agents
+    end
   end
 end

data/lib/noah/version.rb

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

data/noah.gemspec

@@ -6,6 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "noah"
   s.version     = Noah::VERSION
   s.platform    = Gem::Platform::RUBY
+  #s.platform    = "jruby"
   s.authors     = ["John E. Vincent"]
   s.email       = ["lusis.org+rubygems.org@gmail.com"]
   s.homepage    = "https://github.com/lusis/noah"
@@ -19,7 +20,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("hiredis", ["= 0.3.1"])
+  s.add_dependency("eventmachine", ["1.0.0.beta.3"])
+  s.add_dependency("em-http-request", ["1.0.0.beta.3"])
   s.add_dependency("redis", ["= 2.1.1"])
   s.add_dependency("nest", ["= 1.1.0"])
   s.add_dependency("rack", ["= 1.2.1"])
@@ -36,6 +38,7 @@ Gem::Specification.new do |s|
     s.add_dependency("json")
     s.add_development_dependency("warbler", ["= 1.2.1"])
   else
+    s.add_dependency("hiredis", ["= 0.3.1"])
     s.add_dependency("yajl-ruby") 
     s.add_dependency("SystemTimer") if RUBY_VERSION =~ /1.8/
     s.add_dependency("thin")

metadata

@@ -2,7 +2,7 @@
 name: noah
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - John E. Vincent
@@ -10,196 +10,218 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -05:00
+date: 2011-03-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hiredis
+  name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 1.0.0.beta.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: em-http-request
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.1
+        version: 1.0.0.beta.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: nest
+  name: redis
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 2.1.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: nest
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.1.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: tilt
+  name: rack
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.2.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: tilt
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.2
+        version: 1.2.2
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: ohm
+  name: sinatra
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.3
+        version: 1.1.2
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: ohm-contrib
+  name: ohm
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: ohm-contrib
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.0.25
+        version: 0.1.1
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: vegas
+  name: haml
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.8
+        version: 3.0.25
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: vegas
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.1.8
+  type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: hiredis
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.3.1
+  type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: thin
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 1.1.2
   type: :development
-  version_requirements: *id013
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: sinatra-reloader
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.5.0
   type: :development
-  version_requirements: *id014
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "2.5"
   type: :development
-  version_requirements: *id015
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.9.9
   type: :development
-  version_requirements: *id016
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.5.7
   type: :development
-  version_requirements: *id017
+  version_requirements: *id019
 description: Application registry based on Apache Zookeeper
 email: 
 - lusis.org+rubygems.org@gmail.com
@@ -241,10 +263,14 @@ files:
 - examples/websocket.html
 - examples/websocket.rb
 - lib/noah.rb
+- lib/noah/agent.rb
+- lib/noah/agents/dummy_agent.rb
+- lib/noah/agents/http_agent.rb
 - lib/noah/app.rb
 - lib/noah/application_routes.rb
 - lib/noah/ark.rb
 - lib/noah/configuration_routes.rb
+- lib/noah/custom_watcher.rb
 - lib/noah/ephemeral_routes.rb
 - lib/noah/helpers.rb
 - lib/noah/host_routes.rb
@@ -260,17 +286,7 @@ files:
 - lib/noah/validations.rb
 - lib/noah/validations/watcher_validations.rb
 - lib/noah/version.rb
-- lib/noah/watcher.rb
 - lib/noah/watcher_routes.rb
-- lib/vendor/em-hiredis/Gemfile
-- lib/vendor/em-hiredis/README.md
-- lib/vendor/em-hiredis/Rakefile
-- lib/vendor/em-hiredis/em-hiredis.gemspec
-- lib/vendor/em-hiredis/lib/em-hiredis.rb
-- lib/vendor/em-hiredis/lib/em-hiredis/client.rb
-- lib/vendor/em-hiredis/lib/em-hiredis/connection.rb
-- lib/vendor/em-hiredis/lib/em-hiredis/event_emitter.rb
-- lib/vendor/em-hiredis/lib/em-hiredis/version.rb
 - noah.gemspec
 - spec/application_spec.rb
 - spec/configuration_spec.rb

data/lib/vendor/em-hiredis/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in em-hiredis.gemspec
-gemspec

data/lib/vendor/em-hiredis/README.md

@@ -1,61 +0,0 @@
-Getting started
-===============
-
-Connect to redis
-
-    redis_client = EM::Hiredis.connect
-
-The client is a deferrable which succeeds when the underlying connection is established so you can bind to this. This isn't necessary however - any commands sent before the connection is established (or while reconnecting) will be sent to redis on connect.
-
-    redis_client.callback { puts "Redis now connected" }
-
-All redis commands are available without any remapping of names
-
-    redis.set('foo', 'bar').callback {
-      redis.get('foo').callback { |value|
-        p [:returned, value]
-      }
-    }
-
-As a shortcut, if you're only interested in binding to the success case you can simply provide a block to any command
-
-    redis.get('foo') { |value|
-      p [:returned, value]
-    }
-
-Handling failure
-----------------
-
-All commands return a deferrable. In the case that redis replies with an error (for example you called a hash operation against a set), or in the case that the redis connection is broken before the command returns, the deferrable will fail. If you care about the failure case you should bind to the errback - for example:
-
-    redis.sadd('aset', 'member').callback {
-      response_deferrable = redis.hget('aset', 'member')
-      response_deferrable.errback { |e|
-        p e # => #<RuntimeError: ERR Operation against a key holding the wrong kind of value>
-      }
-    }
-
-Pubsub
-------
-
-This example should explain things. Once a redis connection is in a pubsub state, you must make sure you only send pubsub commands.
-
-    redis = EM::Hiredis::Client.connect
-    subscriber = EM::Hiredis::Client.connect
-
-    subscriber.subscribe('bar.0')
-    subscriber.psubscribe('bar.*')
-
-    subscriber.on(:message) { |channel, message|
-      p [:message, channel, message]
-    }
-
-    subscriber.on(:pmessage) { |key, channel, message|
-      p [:pmessage, key, channel, message]
-    }
-
-    EM.add_periodic_timer(1) {
-      redis.publish("bar.#{rand(2)}", "hello").errback { |e|
-        p [:publisherror, e]
-      }
-    }

data/lib/vendor/em-hiredis/Rakefile

@@ -1,2 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks

data/lib/vendor/em-hiredis/em-hiredis.gemspec

@@ -1,23 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "em-hiredis/version"
-
-Gem::Specification.new do |s|
-  s.name        = "em-hiredis"
-  s.version     = EM::Hiredis::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Martyn Loughran"]
-  s.email       = ["me@mloughran.com"]
-  s.homepage    = "http://github.com/mloughran/em-hiredis"
-  s.summary     = %q{Eventmachine redis client}
-  s.description = %q{Eventmachine redis client using hiredis native parser}
-
-  s.add_dependency 'hiredis', '~> 0.2.0'
-
-  s.rubyforge_project = "em-hiredis"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end

data/lib/vendor/em-hiredis/lib/em-hiredis.rb

@@ -1,22 +0,0 @@
-require 'eventmachine'
-
-module EM
-  module Hiredis
-    class << self
-      attr_writer :logger
-
-      def logger
-        @logger ||= begin
-          require 'logger'
-          log = Logger.new(STDOUT)
-          log.level = Logger::WARN
-          log
-        end
-      end
-    end
-  end
-end
-
-require 'em-hiredis/event_emitter'
-require 'em-hiredis/connection'
-require 'em-hiredis/client'

data/lib/vendor/em-hiredis/lib/em-hiredis/client.rb

@@ -1,131 +0,0 @@
-module EM::Hiredis
-  class Client
-    PUBSUB_MESSAGES = %w{message pmessage}.freeze
-
-    include EM::Hiredis::EventEmitter
-    include EM::Deferrable
-
-    def self.connect(host = 'localhost', port = 6379)
-      new(host, port)
-    end
-
-    def initialize(host, port)
-      @host, @port = host, port
-      @subs, @psubs = [], []
-      @defs = []
-      @connection = EM.connect(host, port, Connection, host, port)
-
-      @connection.on(:closed) {
-        if @connected
-          @defs.each { |d| d.fail("Redis disconnected") }
-          @defs = []
-          @deferred_status = nil
-          @connected = false
-          @reconnecting = true
-          reconnect
-        else
-          EM.add_timer(1) { reconnect }
-        end
-      }
-
-      @connection.on(:connected) {
-        @connected = true
-        select(@db) if @db
-        @subs.each { |s| method_missing(:subscribe, s) }
-        @psubs.each { |s| method_missing(:psubscribe, s) }
-        succeed
-
-        if @reconnecting
-          @reconnecting = false
-          emit(:reconnected)
-        end
-      }
-
-      @connection.on(:message) { |reply|
-        if RuntimeError === reply
-          raise "Replies out of sync: #{reply.inspect}" if @defs.empty?
-          deferred = @defs.shift
-          deferred.fail(reply) if deferred
-        else
-          if reply && PUBSUB_MESSAGES.include?(reply[0]) # reply can be nil
-            kind, subscription, d1, d2 = *reply
-
-            case kind.to_sym
-            when :message
-              emit(:message, subscription, d1)
-            when :pmessage
-              emit(:pmessage, subscription, d1, d2)
-            end
-          else
-            raise "Replies out of sync: #{reply.inspect}" if @defs.empty?
-            deferred = @defs.shift
-            deferred.succeed(reply) if deferred
-          end
-        end
-      }
-
-      @connected = false
-      @reconnecting = false
-    end
-
-    # Indicates that commands have been sent to redis but a reply has not yet 
-    # been received.
-    # 
-    # This can be useful for example to avoid stopping the 
-    # eventmachine reactor while there are outstanding commands
-    # 
-    def pending_commands?
-      @connected && @defs.size > 0
-    end
-
-    def subscribe(channel)
-      @subs << channel
-      method_missing(:subscribe, channel)
-    end
-
-    def unsubscribe(channel)
-      @subs.delete(channel)
-      method_missing(:unsubscribe, channel)
-    end
-
-    def psubscribe(channel)
-      @psubs << channel
-      method_missing(:psubscribe, channel)
-    end
-
-    def punsubscribe(channel)
-      @psubs.delete(channel)
-      method_missing(:punsubscribe, channel)
-    end
-
-    def select(db)
-      @db = db
-      method_missing(:select, db)
-    end
-
-    def method_missing(sym, *args)
-      deferred = EM::DefaultDeferrable.new
-      # Shortcut for defining the callback case with just a block
-      deferred.callback { |result| yield(result) } if block_given?
-
-      if @connected
-        @connection.send_command(sym, *args)
-        @defs.push(deferred)
-      else
-        callback {
-          @connection.send_command(sym, *args)
-          @defs.push(deferred)
-        }
-      end
-
-      return deferred
-    end
-
-    private
-
-    def reconnect
-      EM::Hiredis.logger.debug("Trying to reconnect to Redis")
-      @connection.reconnect @host, @port
-    end
-  end
-end

data/lib/vendor/em-hiredis/lib/em-hiredis/connection.rb

@@ -1,61 +0,0 @@
-require 'hiredis/reader'
-
-module EM::Hiredis
-  class Connection < EM::Connection
-    include EM::Hiredis::EventEmitter
-
-    def initialize(host, port)
-      super
-      @host, @port = host, port
-    end
-
-    def connection_completed
-      EM::Hiredis.logger.info("Connected to Redis")
-      @reader = ::Hiredis::Reader.new
-      emit(:connected)
-    end
-
-    def receive_data(data)
-      @reader.feed(data)
-      until (reply = @reader.gets) == false
-        emit(:message, reply)
-      end
-    end
-
-    def unbind
-      EM::Hiredis.logger.info("Disconnected from Redis")
-      emit(:closed)
-    end
-
-    def send_command(sym, *args)
-      send_data(command(sym, *args))
-    end
-
-    protected
-
-    COMMAND_DELIMITER = "\r\n"
-
-    def command(*args)
-      command = []
-      command << "*#{args.size}"
-
-      args.each do |arg|
-        arg = arg.to_s
-        command << "$#{string_size arg}"
-        command << arg
-      end
-
-      command.join(COMMAND_DELIMITER) + COMMAND_DELIMITER
-    end
-
-    if "".respond_to?(:bytesize)
-      def string_size(string)
-        string.to_s.bytesize
-      end
-    else
-      def string_size(string)
-        string.to_s.size
-      end
-    end
-  end
-end

data/lib/vendor/em-hiredis/lib/em-hiredis/event_emitter.rb

@@ -1,29 +0,0 @@
-module EM::Hiredis
-  module EventEmitter
-    def on(event, &listener)
-      _listeners[event] << listener
-    end
-
-    def emit(event, *args)
-      _listeners[event].each { |l| l.call(*args) }
-    end
-
-    def remove_listener(event, &listener)
-      _listeners[event].delete(listener)
-    end
-
-    def remove_all_listeners(event)
-      _listeners.delete(event)
-    end
-
-    def listeners(event)
-      _listeners[event]
-    end
-
-    private
-
-    def _listeners
-      @_listeners ||= Hash.new { |h,k| h[k] = [] }
-    end
-  end
-end

data/lib/vendor/em-hiredis/lib/em-hiredis/version.rb

@@ -1,5 +0,0 @@
-module EM
-  module Hiredis
-    VERSION = "0.0.1"
-  end
-end