noah 0.4-jruby → 0.6.pre-jruby

data/Rakefile

@@ -11,7 +11,6 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-
 task :default => :run
 task :test => :run
 
@@ -40,75 +39,9 @@ end
 desc "Populate database with sample dataset"
 task :sample, :redis_url do |t, args|
   require 'noah'
-
   Ohm::connect(:url => args.redis_url)
-  Ohm::redis.flushdb 
-  puts "Creating watchers..."
-  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
-    %w[redis noah].each do |service|
-      puts "Create Service entry for #{service}"
-      s = Noah::Service.create(:name => service, :status => "up", :host => h)
-      h.services << s
-    end
-  end
-
-  puts "Creating Application entry for 'noah'"
-  a = Noah::Application.create(:name => 'noah')
-  if a.save
-    puts "Creating Configuration entry for 'noah'"
-    cr = Noah::Configuration.create(:name => 'redis', :format => 'string', :body => 'redis://127.0.0.1:6379/0', :application => a)
-    ch = Noah::Configuration.create(:name => 'host', :format => 'string', :body => 'localhost', :application  => a)
-    cp = Noah::Configuration.create(:name => 'port', :format => 'string', :body => '9292', :application => a)
-    %w[cr ch cp].each do |c|
-      a.configurations << eval(c)
-    end
-  end
-
-  puts "Creating sample entries - Host and Service"
-  %w[host1.domain.com host2.domain.com host3.domain.com].each do |host|
-    h = Noah::Host.create(:name => host, :status => "up")
-    if h.save
-      %w[http https smtp mysql].each do |service|
-        s = Noah::Service.create(:name => service, :status => "pending", :host => h)
-        h.services << s
-      end
-    end
-  end
-
-  puts "Creating sample entries - Application and Configuration"
-  my_yaml = <<EOY
-  development:
-    database: development_database
-    adapter: mysql
-    username: dev_user
-    password: dev_password
-EOY
-  my_json = <<EOJ
-  {
-    "id":"hostname",
-    "data":"localhost"
-  }
-EOJ
-
-  a1 = Noah::Application.create(:name => 'myrailsapp1')
-  if a1.save
-    c1 = Noah::Configuration.create(:name => 'database.yml', :format => 'yaml', :body => my_yaml, :application => a1)
-    a1.configurations << c1
-  end
-
-  a2 = Noah::Application.create(:name => 'myrestapp1')
-  if a2.save
-    c2 = Noah::Configuration.create(:name => 'config.json', :format => 'json', :body => my_json, :application => a2)
-    a2.configurations << c2
-  end
-  puts "Sample data populated!"
+  sample_data = File.expand_path(File.join("..", "spec", "support","sample_data.rb"),__FILE__)
+  instance_eval(File.open(sample_data).read)
 end
 
 begin

data/lib/noah.rb

@@ -17,6 +17,7 @@ require 'yaml'
 require 'sinatra/base'
 
 require File.join(File.dirname(__FILE__), 'noah', 'log')
+require File.join(File.dirname(__FILE__), 'noah', 'exceptions')
 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

@@ -2,6 +2,7 @@ $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 require 'rubygems'
 require 'noah'
 require 'noah/agents/http_agent'
+require 'noah/agents/https_agent'
 require 'noah/agents/dummy_agent'
 begin
   candidates = []

data/lib/noah/agents/base_agent.rb

@@ -1,9 +1,10 @@
 module Noah::Agents
   class Base
 
-    PREFIX = "base"
+    PREFIX = "base://"
     NAME = "base-agent"
     DEFAULT_CONCURRENCY = 1
+    NEEDS_TRANSFORM = false
 
     def self.inherited(base)
       Noah::Watchers.register_agent(base)
@@ -11,12 +12,13 @@ module Noah::Agents
     end
 
     def notify(event, message, watch_list)
-      logger.info("#{self.class} worker initiated")
+      logger.info("#{self.class.to_s} worker initiated")
       worklist = []
       watch_list.select{|w| worklist << w[:endpoint] if (w[:endpoint] =~ /^#{self.class::PREFIX}/ && event =~ /^#{w[:pattern]}/) }
       if worklist.size >= 1
         logger.info("Dispatching message to #{worklist.size} #{self.class.to_s} endpoints")
         EM::Iterator.new(worklist, self.class::DEFAULT_CONCURRENCY).each do |ep, iter|
+          ep, message = transform(ep, message) if self.class::NEEDS_TRANSFORM == true
           work!(ep, message)
           iter.next
         end

data/lib/noah/agents/http_agent.rb

@@ -5,7 +5,7 @@ module Noah::Agents
 
     PREFIX = "http://"
     NAME = self.class.to_s
-    DEFAULT_CONCURRENCY = 500
+    DEFAULT_CONCURRENCY = 50
 
     def work!(ep, message)
         logger.info("Sending message to (#{ep})")

data/lib/noah/agents/https_agent.rb

@@ -0,0 +1,6 @@
+require File.join(File.dirname(__FILE__), 'http_agent')
+module Noah::Agents
+  class HttpsAgent < HttpAgent
+    PREFIX = "https://"
+  end
+end

data/lib/noah/app.rb

@@ -58,12 +58,14 @@ module Noah
       erb :'500'
     end
 
-    load File.join(File.dirname(__FILE__), 'host_routes.rb')
-    load File.join(File.dirname(__FILE__), 'service_routes.rb')
-    load File.join(File.dirname(__FILE__), 'application_routes.rb')
-    load File.join(File.dirname(__FILE__), 'configuration_routes.rb')
-    load File.join(File.dirname(__FILE__), 'watcher_routes.rb')
-    load File.join(File.dirname(__FILE__), 'ephemeral_routes.rb')
+    load File.join(File.dirname(__FILE__), 'routes/tags.rb')
+    load File.join(File.dirname(__FILE__), 'routes/hosts.rb')
+    load File.join(File.dirname(__FILE__), 'routes/services.rb')
+    load File.join(File.dirname(__FILE__), 'routes/applications.rb')
+    load File.join(File.dirname(__FILE__), 'routes/configurations.rb')
+    load File.join(File.dirname(__FILE__), 'routes/watchers.rb')
+    load File.join(File.dirname(__FILE__), 'routes/ephemerals.rb')
+    load File.join(File.dirname(__FILE__), 'routes/links.rb')
 
   end
 end

data/lib/noah/linkable.rb

@@ -0,0 +1,21 @@
+module Noah::Linkable
+  def self.included(model)
+    model.send :set, :links, ::Noah::Link
+    model.send :index, :links
+  end
+
+  def link!(link_name)
+    link = Noah::Link.find_or_create(:path => link_name)
+    link.nodes = self
+    links << link
+  end
+
+  def unlink!(link_name)
+  end
+
+  def to_hash
+    link_arr = Array.new
+    self.links.sort.each {|l| link_arr << l.path} if self.links.size != 0
+    super.merge(:links => link_arr)
+  end
+end

data/lib/noah/models.rb

@@ -10,8 +10,7 @@ module Noah
       model.send :include, Ohm::Callbacks
       model.send :include, Ohm::ExtraValidations
 
-      model.send :attribute, :tags
-      model.send :index, :tag
+      model.send :attribute, :metadata
 
       # removing this as it's simply redundant
       # model.after :save, :notify_via_redis_save
@@ -33,30 +32,24 @@ module Noah
       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
+        l = Link.find_or_create :path => p
+        l.nodes = self
       rescue Exception => e
         e.message
       end
     end
 
-    def watch!(opts={:endpoint => nil, :pattern => nil})
+    def watch!(opts={:endpoint => nil})
       base_pattern = "#{self.patternize_me}"
       opts[:endpoint].nil? ? (raise ArgumentError, "Need an endpoint") : endpoint=opts[:endpoint]
-      opts[:pattern].nil? ? pattern=base_pattern : pattern=opts[:pattern]
 
       begin
-        w = Watcher.new :pattern => pattern, :endpoint => endpoint
+        w = Watcher.new :pattern => base_pattern, :endpoint => endpoint
         w.valid? ? w.save : (raise "#{w.errors}")
         w.name
       rescue Exception => e
@@ -65,17 +58,18 @@ module Noah
     end
 
     protected
-    def patternize_me
+    def patternize_me(opts = {:namespace => nil})
+      opts[:namespace].nil? ? namespace="//noah/#{self.class_to_lower}s" : namespace="//noah/#{opts[:namespace]}/#{self.class_to_lower}s"
       name.match(/^\//) ? n = name.gsub(/^\//, '') : n = name
-      "//noah/#{self.class_to_lower}s/#{n}"
+      "#{namespace}/#{n}"
     end
 
     def stash_name
       @deleted_name = self.name
     end
 
-    def class_to_lower
-      self.class.to_s.gsub(/(.*)::(\w)/,'\2').downcase
+    def class_to_lower(class_name = self.class.to_s)
+      class_name.gsub(/(.*)::(\w)/,'\2').downcase
     end
 
     def dbnum
@@ -85,15 +79,6 @@ 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
@@ -126,7 +111,11 @@ module Noah
 
 end
 
+require File.join(File.dirname(__FILE__), 'linkable')
+require File.join(File.dirname(__FILE__), 'models','link')
+require File.join(File.dirname(__FILE__), 'taggable')
 require File.join(File.dirname(__FILE__), 'models','tags')
+require File.join(File.dirname(__FILE__), 'models','link')
 require File.join(File.dirname(__FILE__), 'models','hosts')
 require File.join(File.dirname(__FILE__), 'models','services')
 require File.join(File.dirname(__FILE__), 'models','applications')

data/lib/noah/models/applications.rb

@@ -1,30 +1,36 @@
 require File.join(File.dirname(__FILE__), 'configurations')
 module Noah
   class Application < Model
+    include Taggable
+    include Linkable
     attribute :name
-    collection :configurations, Configuration
+    set :configurations, Configuration
 
     index :name
+    index :configurations
 
     def validate
       super
       assert_present :name
+      assert_unique :name
     end
 
     def to_hash
-      arr = []
-      configurations.sort.each {|c| arr << c.to_hash}
-      super.merge(:name => name, :created_at => created_at, :updated_at => updated_at, :configurations => arr)
+      cfg_hash = Hash.new
+      configurations.sort.each do |cfg|
+        cfg_hash["#{cfg.name}"] = {:format => cfg.to_hash[:format], :body => cfg.to_hash[:body]}
+      end
+      {name => {:id => id, :created_at => created_at, :updated_at => updated_at, :configurations => cfg_hash}}
     end
 
     class << self
     def find_or_create(opts = {})
       begin
-        find(opts).first.nil? ? (app = create(opts)) : (app = find(opts).first)
-        if app.valid?
-          app.save
+        find(opts).first.nil? ? (obj = new(opts)) : (obj = find(opts).first)
+        if obj.valid?
+          obj.save
         end
-        app
+        obj
       rescue Exception => e
         e.message
       end
@@ -35,7 +41,11 @@ module Noah
 
   class Applications
     def self.all(options = {})
-      options.empty? ? Application.all.sort : Application.find(options).sort
+      app_hash = Hash.new
+      options.empty? ? apps=Application.all.sort : apps=Application.find(options).sort
+      #apps.each {|x| app_hash["#{x.name}"] = x.to_hash.reject {|k,v| k == :name} }
+      apps.each {|x| app_hash.merge!(x.to_hash) }
+      app_hash
     end
   end
 end

data/lib/noah/models/configurations.rb

@@ -1,11 +1,11 @@
+require File.join(File.dirname(__FILE__), 'applications')
 module Noah
   class Configuration < Model
-
+    include Taggable
+    include Linkable
     attribute :name
     attribute :format
     attribute :body
-    attribute :new_record
-    reference :application, Application
 
     index :name
     index :format
@@ -16,23 +16,39 @@ module Noah
       assert_present :name
       assert_present :format
       assert_present :body
-      assert_present :application_id
-      assert_unique [:name, :application_id]
+      assert_unique :name
     end
 
     def to_hash
-      Application[application_id].nil? ? app_name=nil : app_name=Application[application_id].name
-      super.merge(:name => name, :format => format, :body => body, :created_at => created_at, :updated_at => updated_at, :application => app_name)
+      super.merge(:name => name, :format => format, :body => body, :created_at => created_at, :updated_at => updated_at)
+    end
+
+    # Because we're not doing a 2-way relationship
+    # we need to clean up any applications that use 
+    # this configuration ourself
+    def delete
+      @affected_applications = Array.new
+      Noah::Application.all.each do |app|
+        if app.configurations.member?(self)
+          app.configurations.delete(self)
+          @affected_applications << app.name
+        end
+      end
+      super
+    end
+
+    def affected_applications
+      @affected_applications
     end
 
     class << self
     def find_or_create(opts={})
       begin
-        if find(opts).first.nil?
-          conf = create(opts)
-        else  
-          conf = find(opts).first
-        end  
+        find(opts).first.nil? ? (obj = new(opts)) : (obj = find(opts).first)
+        if obj.valid?
+          obj.save
+        end
+        obj
       rescue Exception => e
         e.message
       end
@@ -43,7 +59,10 @@ module Noah
 
   class Configurations
     def self.all(options = {})
-      options.empty? ? Configuration.all.sort : Configuration.find(options).sort
+      config_hash = Hash.new
+      options.empty? ? configs=Configuration.all.sort : configs=Configuration.find(options).sort
+      configs.each {|x| config_hash["#{x.name}"] = x.to_hash.reject {|k,v| k == :name} }
+      config_hash
     end
   end 
 end

data/lib/noah/models/ephemerals.rb

@@ -1,7 +1,8 @@
 module Noah
   class Ephemeral < Model
     include EphemeralValidations
-
+    include Taggable
+    include Linkable
     attribute :path
     attribute :data
     attribute :lifetime
@@ -28,12 +29,12 @@ module Noah
     def find_or_create(opts = {})
       begin
         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
+        find(:path => path).first.nil? ? (obj = new(:path => path)) : (obj = find(:path => path).first)
+        obj.data = data
+        if obj.valid?
+          obj.save
         end
-        eph
+        obj
       rescue Exception => e
         e.message
       end