noah 0.2.1-jruby → 0.3-jruby

data/Rakefile

@@ -44,10 +44,11 @@ task :sample, :redis_url do |t, args|
   Ohm::connect(:url => args.redis_url)
   Ohm::redis.flushdb 
   puts "Creating watchers..."
-  Noah::Watcher.create :endpoint => "http://localhost:3000/webhook", :pattern => "//noah/application"
-  Noah::Watcher.create :endpoint => "http://localhost:3001/webhook", :pattern => "//noah/configuration"
-  Noah::Watcher.create :endpoint => "http://localhost:3002/webhook", :pattern => "//noah/host"
-  Noah::Watcher.create :endpoint => "http://localhost:3003/webhook", :pattern => "//noah/service"
+  Noah::Watcher.create :endpoint => "dummy://applications", :pattern => "//noah/applications"
+  Noah::Watcher.create :endpoint => "dummy://configurations", :pattern => "//noah/configurations"
+  Noah::Watcher.create :endpoint => "dummy://hosts", :pattern => "//noah/hosts"
+  Noah::Watcher.create :endpoint => "dummy://services", :pattern => "//noah/services"
+  Noah::Watcher.create :endpoint => "dummy://ephemerals", :pattern => "//noah/ephemerals"
   puts "Creating Host entry for 'localhost'"
   h = Noah::Host.create(:name => 'localhost', :status => "up")
   if h.save
@@ -127,3 +128,8 @@ end
 task :start_demo do
   puts "Soon, young padawan"
 end
+
+desc "Start an irb session with all libraries loaded"
+task :shell do
+  sh "irb -r./lib/noah.rb"
+end

data/bin/noah-watcher.rb

@@ -20,7 +20,9 @@ rescue LoadError => e
   exit
 end
 
-LOGGER = Logger.new(STDOUT)
+Noah::Log.logger = Logger.new(STDOUT)
+LOGGER = Noah::Log.logger
+LOGGER.progname = __FILE__
 
 EventMachine.run do
   EM.error_handler do |e|
@@ -32,19 +34,20 @@ EventMachine.run do
   noah.errback{|x| logger.error("Errback: #{x}")}
   noah.callback{|y| logger.info("Callback: #{y}")}
   # Passing messages...like a boss
-  master_channel = EventMachine::Channel.new
+  #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.psubscribe("*")
   r.on(:pmessage) do |pattern, event, message|
-    noah.reread_watchers if event =~ /^\/\/noah\/watcher\/.*/
-    master_channel.push "#{event}|#{message}"
+    noah.reread_watchers if event =~ /^\/\/noah\/watchers\/.*/
+    noah.broker("#{event}|#{message}") unless noah.watchers == 0
+    #master_channel.push "#{event}|#{message}"
   end
 
-  sub = master_channel.subscribe {|msg|
+  #sub = master_channel.subscribe {|msg|
     # We short circuit if we have no watchers
-    noah.broker(msg) unless noah.watchers == 0
-  }
+  #  noah.broker(msg) unless noah.watchers == 0
+  #}
 end

data/lib/noah.rb

@@ -1,5 +1,11 @@
 module Noah
-  PROTECTED_PATHS = %w[a c h s w]
+  PROTECTED_PATHS = %w[applications configurations hosts services watches ark noah]
+  PATH_MAPPING = {"applications" => "Application",
+                  "services" => "Service",
+                  "configurations" => "Configuration",
+                  "hosts" => "Host",
+                  "tags" => "Tag",
+                  "ephemeral" => "Ephemeral"}
 end
 begin
   require 'yajl'
@@ -10,6 +16,7 @@ require 'haml'
 require 'yaml'
 require 'sinatra/base'
 
+require File.join(File.dirname(__FILE__), 'noah', 'log')
 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')

data/lib/noah/agent.rb

@@ -1,9 +1,18 @@
 $:.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'
+begin
+  candidates = []
+  Gem.source_index.find_all {|g| candidates << g[1].name if g[1].name =~ /^noah-agents-.*/}
+  candidates.each do |c|
+    require c
+  end
+rescue LoadError
+  puts "Unable to load #{c}"
+end
+
 
 module Noah
   class Agent
@@ -11,9 +20,10 @@ module Noah
 
     @@watchers = Noah::Watcher.watch_list
     @@agents = Noah::Watchers.agents
-
+    
     def initialize
-      @logger = LOGGER
+      @logger = Noah::Log.logger
+      @logger.progname = self.class.name
       @logger.debug("Initializing with #{@@watchers.size} registered watches")
       @logger.debug("#{@@agents} agents registered")
       if EventMachine.reactor_running?
@@ -40,11 +50,26 @@ module Noah
 
     def broker(msg)
       e,m = msg.split("|")
-      be = Base64.encode64(e).gsub("\n","")
-      EM::Iterator.new(@@agents).each do |agent, iter|
+      # Below isn't being used right now
+      #be = Base64.encode64(e).gsub("\n","")
+      EM::Iterator.new(@@agents, @@agents.size).each do |agent, iter|
         agent.send(:notify, e, m, @@watchers.clone)
         iter.next
       end
     end
+
+    private
+    def find_and_register_agents
+      candidates = []
+      Gem.source_index.find_all {|g| candidates << g[1].name if g[1].name =~ /^noah-agent-.*/}
+      candidates.each do |c|
+        begin
+          require c
+        rescue LoadError
+          Noah::Log.logger.warn("Unable to load #{c}")
+        end
+      end
+    end
+
   end
 end

data/lib/noah/agents/base_agent.rb

@@ -1,17 +1,41 @@
-require 'logger'
-require 'logger'
-
 module Noah::Agents
   module Base
-    class << self
-      include EM::Deferrable
-
+    class <<self
       PREFIX = "base"
       NAME = "base-agent"
     end
 
     def self.included(base)
       Noah::Watchers.register_agent(base)
+      base.send :include, EM::Deferrable
+      base.send :extend, AgentClassMethods
+    end
+  end
+
+  module AgentClassMethods
+
+    def logger
+      Noah::Log.logger.progname = self.name
+      Noah::Log.logger
     end
+
+    def find_watched_patterns!(watchlist)
+      watched_patterns = []
+      watchlist.find_all do |w|
+        p, ep = Base64.decode64(w).split('|')
+        watched_patterns << "#{p}|#{ep}" if ep =~ /^#{self.const_get("PREFIX")}/
+      end
+      watched_patterns
+    end
+
+    def notify(event, message, watch_list)
+      logger.info("Worker Initiated")
+      logger.debug("got event - #{event}")
+      watched_patterns = find_watched_patterns!(watch_list)
+      matches = watched_patterns.find_all {|w| event =~ /^#{w}/}
+      logger.debug("Found #{matches.size} matches for #{event}")
+      self.callback!(matches, message)
+    end
+
   end
 end

data/lib/noah/agents/dummy_agent.rb

@@ -4,21 +4,14 @@ module Noah::Agents
   class DummyAgent
     include Noah::Agents::Base
 
-    PREFIX = "dummy"
-    NAME = "dummy"
+    PREFIX = "dummy://"
+    NAME = self.name
 
-    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}")
+    def self.callback!(matches, message)
       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
+        p, ep = watch.split("|")
+        logger.info("Sending message to: #{ep} for pattern: #{p}")
+        logger.debug("message received: #{message}")
         iter.next
       end
     end

data/lib/noah/agents/http_agent.rb

@@ -4,27 +4,20 @@ module Noah::Agents
   class HttpAgent
     include Noah::Agents::Base
 
-    PREFIX = "http"
-    NAME = "http"
+    PREFIX = "http://"
+    NAME = self.name
 
-    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}")
-          }
-        end
+    def self.callback!(matches, message)
+      EM::Iterator.new(matches, 100).each do |watch, iter|
+        p, ep = 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.info("Message posted to #{ep} successfully")
+        }
+        http.errback {
+          logger.error("Something went wrong with #{ep}")
+        }
         iter.next
       end
     end

data/lib/noah/application_routes.rb

@@ -1,6 +1,6 @@
 class Noah::App
   # Application URIs
-  get '/a/:appname/:config/?' do |appname, config|
+  get '/applications/:appname/:config/?' do |appname, config|
     app = Noah::Application.find(:name => appname).first
     if app.nil?
       halt 404
@@ -10,7 +10,7 @@ class Noah::App
     end  
   end
 
-  get '/a/:appname/?' do |appname|
+  get '/applications/:appname/?' do |appname|
     app = Noah::Application.find(:name => appname).first
     if app.nil?
       halt 404
@@ -19,7 +19,7 @@ class Noah::App
     end
   end
 
-  put '/a/:appname/watch' do |appname|
+  put '/applications/:appname/watch' do |appname|
     required_params = ["endpoint"]
     data = JSON.parse(request.body.read)
     (data.keys.sort == required_params.sort) ? (a = Noah::Application.find(:name => appname).first) : (raise "Missing Parameters")
@@ -27,7 +27,7 @@ class Noah::App
     w.to_json
   end
 
-  put '/a/:appname/?' do |appname|
+  put '/applications/:appname/?' do |appname|
     required_params = ["name"]
     data = JSON.parse(request.body.read)
     if data.keys.sort == required_params.sort && data['name'] == appname
@@ -45,7 +45,7 @@ class Noah::App
     end
   end
 
-  delete '/a/:appname/?' do |appname|
+  delete '/applications/:appname/?' do |appname|
     app = Noah::Application.find(:name => appname).first
     if app.nil?
       halt 404
@@ -58,7 +58,7 @@ class Noah::App
     end
   end
 
-  get '/a/?' do
+  get '/applications/?' do
     apps = []
     Noah::Application.all.sort.each {|a| apps << a.to_hash}
     if apps.empty?

data/lib/noah/configuration_routes.rb

@@ -6,7 +6,7 @@ class Noah::App
             :string => "text/plain"
   }
   # Configuration URIs
-  get '/c/:appname/:element/?' do |appname, element|
+  get '/configurations/:appname/:element/?' do |appname, element|
     a = Noah::Application.find(:name => appname).first
     if a.nil?
       halt 404
@@ -17,7 +17,7 @@ class Noah::App
     end  
   end
 
-  get '/c/:appname/?' do |appname|
+  get '/configurations/:appname/?' do |appname|
     config = []
     a = Noah::Application.find(:name => appname).first
     if a.nil?
@@ -28,7 +28,7 @@ class Noah::App
     end  
   end
 
-  get '/c/?' do
+  get '/configurations/?' do
     configs = []
     Noah::Configuration.all.sort.each {|c| configs << c.to_hash}
     if configs.empty?
@@ -38,7 +38,7 @@ class Noah::App
     end  
   end
 
-  put '/c/:configname/watch' do |configname|
+  put '/configurations/:configname/watch' do |configname|
     required_params = ["endpoint"]
     data = JSON.parse(request.body.read)
     (data.keys.sort == required_params.sort) ? (c = Noah::Configuration.find(:name => configname).first) : (raise "Missing Parameters")
@@ -46,7 +46,7 @@ class Noah::App
     w.to_json
   end
 
-  put '/c/:appname/:element?' do |appname, element|
+  put '/configurations/:appname/:element?' do |appname, element|
     app = Noah::Application.find_or_create(:name => appname)
     config = Noah::Configuration.find_or_create(:name => element, :application_id => app.id)
     required_params = ["format", "body"]
@@ -63,7 +63,7 @@ class Noah::App
     end
   end
 
-  delete '/c/:appname/:element?' do |appname, element|
+  delete '/configurations/:appname/:element?' do |appname, element|
     app = Noah::Application.find(:name => appname).first
     if app
       config = Noah::Configuration.find(:name=> element, :application_id => app.id).first

data/lib/noah/helpers.rb

@@ -22,6 +22,7 @@ module Noah
         # Custom exceptions
         e.on [:pattern, :already_provided], "Pattern is already provided"
         e.on [:pattern, :replaces_existing], "Pattern would overwrite existing"
+        e.on [:path, :reserved_path], "Path is reserved"
       end
       error_messages.first
     end

data/lib/noah/host_routes.rb

@@ -2,7 +2,7 @@ class Noah::App
 # Host URIs
 
   # GET named {Service} for named {Host}
-  get '/h/:hostname/:servicename/?' do |hostname, servicename|
+  get '/hosts/:hostname/:servicename/?' do |hostname, servicename|
     h = host_service(hostname, servicename)
     if h.nil?
       halt 404
@@ -14,7 +14,7 @@ class Noah::App
   # GET named {Host}
   # @param :hostname name of {Host}
   # @return [JSON] representation of {Host}
-  get '/h/:hostname/?' do |hostname|
+  get '/hosts/:hostname/?' do |hostname|
     h = host(:name => hostname)
     if h.nil?
       halt 404
@@ -24,7 +24,7 @@ class Noah::App
   end
 
   # GET all {Hosts}
-  get '/h/?' do
+  get '/hosts/?' do
     hosts.map {|h| h.to_hash}
     if hosts.size == 0
       halt 404
@@ -33,7 +33,7 @@ class Noah::App
     end
   end
 
-  put '/h/:hostname/watch' do |hostname|
+  put '/hosts/:hostname/watch' do |hostname|
     required_params = ["endpoint"]
     data = JSON.parse(request.body.read)
     (data.keys.sort == required_params.sort) ? (h = Noah::Host.find(:name => hostname).first) : (raise "Missing Parameters")
@@ -41,7 +41,7 @@ class Noah::App
     w.to_json
   end
 
-  put '/h/:hostname/?' do |hostname|
+  put '/hosts/:hostname/?' do |hostname|
     required_params = ["name", "status"]
     data = JSON.parse(request.body.read)
     (data.keys.sort == required_params.sort && data['name'] == hostname) ? (host = Noah::Host.find_or_create(:name => data['name'], :status => data['status'])) : (raise "Missing Parameters")
@@ -53,7 +53,7 @@ class Noah::App
     end
   end
 
-  delete '/h/:hostname/?' do |hostname|
+  delete '/hosts/:hostname/?' do |hostname|
     host = Noah::Host.find(:name => hostname).first
     if host
       services = []

data/lib/noah/log.rb

@@ -0,0 +1,6 @@
+require 'logger'
+module Noah::Log
+  class <<self
+    attr_accessor :logger
+  end
+end

data/lib/noah/models.rb

@@ -2,6 +2,7 @@ require 'ohm'
 require 'ohm/contrib'
 module Noah
   class Model < Ohm::Model
+
     def self.inherited(model)
 
       model.send :include, Ohm::Timestamping
@@ -9,6 +10,9 @@ module Noah
       model.send :include, Ohm::Callbacks
       model.send :include, Ohm::ExtraValidations
 
+      model.send :attribute, :tags
+      model.send :index, :tag
+
       # removing this as it's simply redundant
       # model.after :save, :notify_via_redis_save
       model.after :create, :notify_via_redis_create
@@ -21,10 +25,30 @@ module Noah
 
   module ModelClassMethods
 
+    def self.included(base)
+      Noah::RegisteredModels.register_model(base)
+    end
+
     def is_new?
       self.created_at == self.updated_at
     end
 
+    def tag(tags = self.tags)
+      tags.to_s.split(/\s*,\s*/).uniq
+    end
+
+    def link!(path)
+      base_pattern = "#{self.patternize_me}"
+      path.nil? ? (raise ArgumentError, "Must provide a path") : p=path
+
+      begin
+        l = Link.new :path => p, :source => base_pattern
+        l.valid? ? l.save : (raise "#{l.errors}")
+        l.name
+      rescue Exception => e
+        e.message
+      end
+    end
 
     def watch!(opts={:endpoint => nil, :pattern => nil})
       base_pattern = "#{self.patternize_me}"
@@ -39,11 +63,11 @@ module Noah
         e.message
       end
     end
-      
+
     protected
     def patternize_me
       name.match(/^\//) ? n = name.gsub(/^\//, '') : n = name
-      "//noah/#{self.class_to_lower}/#{n}"
+      "//noah/#{self.class_to_lower}s/#{n}"
     end
 
     def stash_name
@@ -53,6 +77,7 @@ module Noah
     def class_to_lower
       self.class.to_s.gsub(/(.*)::(\w)/,'\2').downcase
     end
+
     def dbnum
       o = Ohm.options.first
       return "0" if o.nil?
@@ -60,6 +85,15 @@ module Noah
       o[:db].nil? ? "#{o[:url].split('/').last}" : "#{o[:db]}"
     end
 
+    def before_update
+      return if new?
+      tag(read_remote(:tags)).map(&Tag).each {|t| t.decr :total}
+    end
+
+    def after_save
+      tag.map(&Tag).each {|t| t.incr :total }
+    end
+
     ["create", "update", "delete"].each do |meth|
       class_eval do
         define_method("notify_via_redis_#{meth}".to_sym) do
@@ -78,7 +112,21 @@ module Noah
     end
 
   end
+
+  class RegisteredModels
+    @@models = []
+    def self.register_model(model)
+      @@models << model
+    end
+
+    def self.models
+      @@models
+    end
+  end
+
 end
+
+require File.join(File.dirname(__FILE__), 'models','tags')
 require File.join(File.dirname(__FILE__), 'models','hosts')
 require File.join(File.dirname(__FILE__), 'models','services')
 require File.join(File.dirname(__FILE__), 'models','applications')