noah 0.0.5 → 0.0.9

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

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

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

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

data/noah.gemspec

@@ -5,8 +5,8 @@ require "noah/version"
 Gem::Specification.new do |s|
   s.name        = "noah"
   s.version     = Noah::VERSION
-  s.platform    = RUBY_ENGINE
-  s.authors     = ["lusis"]
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["John E. Vincent"]
   s.email       = ["lusis.org+rubygems.org@gmail.com"]
   s.homepage    = "https://github.com/lusis/noah"
   s.summary     = %q{Application registry based on Apache Zookeeper}
@@ -19,26 +19,30 @@ 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("rake", ["= 0.8.7"])
+  s.add_dependency("hiredis", ["= 0.3.1"])
+  s.add_dependency("redis", ["= 2.1.1"])
+  s.add_dependency("nest", ["= 1.1.0"])
+  s.add_dependency("rack", ["= 1.2.1"])
+  s.add_dependency("tilt", ["= 1.2.2"])
   s.add_dependency("sinatra", ["= 1.1.2"])
-  s.add_dependency("sinatra-namespace", ["0.6.1"])
   s.add_dependency("ohm", ["= 0.1.3"])
-  s.add_dependency("ohm-contrib", ["= 0.1.0"])
+  s.add_dependency("ohm-contrib", ["= 0.1.1"])
   s.add_dependency("haml", ["= 3.0.25"])
   s.add_dependency("vegas", ["= 0.1.8"])
-  s.add_dependency("yajl-ruby", ["= 0.7.9"]) if s.platform.to_s == 'ruby'
-  s.add_dependency("jruby-json", ["= 1.5.0"]) if s.platform.to_s == 'jruby'
-  s.add_dependency("thin", ["= 1.2.7"]) if s.platform.to_s == 'ruby'
-  s.add_dependency("json-jruby", ["= 1.4.6"]) if s.platform.to_s == 'jruby'
-  s.add_dependency("jruby-openssl", ["= 0.7.3"]) if s.platform.to_s == 'jruby'
 
+
+  if RUBY_PLATFORM =~ /java/
+    s.add_dependency("jruby-openssl")
+    s.add_dependency("json")
+    s.add_development_dependency("warbler", ["= 1.2.1"])
+  else
+    s.add_dependency("yajl-ruby") 
+    s.add_dependency("thin")
+  end
+
+  s.add_development_dependency("diff-lcs", ["= 1.1.2"])
   s.add_development_dependency("sinatra-reloader", ["= 0.5.0"])
-  s.add_development_dependency("rspec", ["= 2.4.0"])
-  s.add_development_dependency("rcov", ["= 0.9.9"]) if s.platform.to_s == 'ruby'
+  s.add_development_dependency("rspec", ["~> 2.5"])
+  s.add_development_dependency("rcov", ["= 0.9.9"])
   s.add_development_dependency("rack-test", ["= 0.5.7"])
-  s.add_development_dependency("ZenTest", ["= 4.4.2"])
-  s.add_development_dependency("autotest", ["= 4.4.6"])
-  s.add_development_dependency("autotest-growl", ["= 0.2.9"])
-  s.add_development_dependency("warbler", ["= 1.2.1"]) if s.platform.to_s == 'java'
-
 end

data/spec/application_spec.rb

@@ -14,52 +14,52 @@ describe "Using the Application Model", :reset_redis => true do
     Ohm.redis.flushdb
   end  
   describe "should" do
-    it "create a new Application" do
-      a = Application.create(@appdata1)
+    it "create a new Noah::Application" do
+      a = Noah::Application.create(@appdata1)
       a.valid?.should == true
       a.is_new?.should == true
-      b = Application.find(@appdata1).first
+      b = Noah::Application.find(@appdata1).first
       b.should == a
     end
-    it "create a new Application with Configurations" do
-      a = Application.create(@appdata1)
-      a.configurations << Configuration.create(@appconf_string.merge({:application => a}))
+    it "create a new Noah::Application with Configurations" do
+      a = Noah::Application.create(@appdata1)
+      a.configurations << Noah::Configuration.create(@appconf_string.merge({:application => a}))
       a.valid?.should == true
       a.is_new?.should == true
       a.save
-      b = Application.find(@appdata1).first
+      b = Noah::Application.find(@appdata1).first
       b.should == a
       b.configurations.size.should == 1
       b.configurations.first.name.should == @appconf_string[:name]
       b.configurations.first.format.should == @appconf_string[:format]
       b.configurations.first.body.should == @appconf_string[:body]
     end  
-    it "create a new Application via find_or_create" do
-      a = Application.find_or_create(@appdata2)
+    it "create a new Noah::Application via find_or_create" do
+      a = Noah::Application.find_or_create(@appdata2)
       a.valid?.should == true
       a.is_new?.should == true
-      b = Application.find(@appdata2).first
+      b = Noah::Application.find(@appdata2).first
       b.should == a
     end
-    it "update an existing Application via find_or_create" do
-      a = Application.create(@appdata1)
+    it "update an existing Noah::Application via find_or_create" do
+      a = Noah::Application.create(@appdata1)
       a.is_new?.should == true
       sleep 2
-      b = Application.find_or_create(@appdata1)
+      b = Noah::Application.find_or_create(@appdata1)
       b.is_new?.should == false
     end
-    it "delete an existing Application" do
-      a = Application.create(@appdata1)
-      b = Application.find(@appdata1).first
+    it "delete an existing Noah::Application" do
+      a = Noah::Application.create(@appdata1)
+      b = Noah::Application.find(@appdata1).first
       b.should == a
       b.delete
-      c = Application.find(@appdata1).first
+      c = Noah::Application.find(@appdata1).first
       c.nil?.should == true
     end  
-    it "return all Applications" do
-      a = Application.create(@appdata1)
-      b = Application.create(@appdata2)
-      c = Applications.all
+    it "return all Noah::Applications" do
+      a = Noah::Application.create(@appdata1)
+      b = Noah::Application.create(@appdata2)
+      c = Noah::Applications.all
       c.size.should == 2
       c.member?(a).should == true
       c.member?(b).should == true
@@ -67,17 +67,17 @@ describe "Using the Application Model", :reset_redis => true do
   end
 
   describe "should not" do
-    it "should not create a new Application without a name" do
-      a = Application.create
+    it "should not create a new Noah::Application without a name" do
+      a = Noah::Application.create
       a.valid?.should == false
       a.errors.should == [[:name, :not_present]]
     end
-    it "should not create a duplicate Application" do
-      a = Application.create(@appdata1)
-      a.valid?.should == true
-      b = Application.create(@appdata1)
-      b.valid?.should == false
-      b.errors.should == [[:name, :not_unique]]
-    end
+#    it "should not create a duplicate Noah::Application" do
+#      a = Noah::Application.create(@appdata1)
+#      a.valid?.should == true
+#      b = Noah::Application.create(@appdata1)
+#      b.valid?.should == false
+#      b.errors.should == [[:name, :not_unique]]
+#    end
   end
 end  

data/spec/configuration_spec.rb

@@ -1,25 +1,92 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Using the Configuration Model", :reset_redis => true do
+  before(:all) do
+    app = Noah::Application.create(:name => "my_application")
+    app.save
+    @appconf_string = {:name => "mystringconf", :format => "string", :body => "some_var", :application_id => app.id}
+    @appconf_json = {:name => "myjsonconf", :format => "json", :body => @appconf_string.to_json, :application_id => app.id}
+    @appconf_missing_name = @appconf_string.reject {|x| x == :name}
+    @appconf_missing_format = @appconf_string.reject {|x| x == :format}
+    @appconf_missing_body = @appconf_string.reject {|x| x == :body}
+    @appconf_missing_application = @appconf_string.reject {|x| x == :application_id}
+  end
+  before(:each) do
+    Ohm.redis.flushdb
+  end
+  after(:each) do
+    Ohm.redis.flushdb
+  end
 
   describe "should" do
-    
-    it "create a new Configuration"
-    it "create a new Configuration via find_or_create"
-    it "update an existing Configuration via find_or_create"
-    it "delete an existing Configuration"
-    it "return all Configurations"
-  
+    it "create a new Configuration" do
+      c = Noah::Configuration.create(@appconf_string)
+      c.valid?.should == true
+      c.is_new?.should == true
+      b = Noah::Configuration[c.id]
+      b.should == c
+    end
+    it "create a new Configuration via find_or_create" do
+      c = Noah::Configuration.find_or_create(@appconf_string)
+      c.valid?.should == true
+      c.is_new?.should == true
+      a = Noah::Configuration[c.id]
+      a.should == c
+    end
+    it "update an existing Configuration via find_or_create" do
+      c = Noah::Configuration.find_or_create(@appconf_string)
+      c.valid?.should == true
+      c.is_new?.should == true
+      sleep(3)
+      c.body = "some_other_var"
+      c.save
+      c.body.should == "some_other_var"
+      c.is_new?.should == false
+    end
+    it "delete an existing Configuration" do
+      a = Noah::Configuration.find_or_create(@appconf_string)
+      b = Noah::Configuration.find(@appconf_string).first
+      b.should == a
+      a.delete
+      c = Noah::Configuration.find(@appconf_string).first
+      c.nil?.should == true
+    end
+    it "return all Configurations" do
+      a = Noah::Configuration.find_or_create(@appconf_string)
+      b = Noah::Configuration.find_or_create(@appconf_json)
+      c = Noah::Configurations.all
+      c.size.should == 2
+      c.member?(a).should == true
+      c.member?(b).should == true
+    end
   end
 
   describe "should not" do
-
-    it "create a new Configuration without a name"
-    it "create a new Configuration without a format"
-    it "create a new Configuration without a body"
-    it "create a new Configuration without an Application"
-    it "create a duplicate Configuration"
-
+    it "create a new Configuration without a name" do
+      a = Noah::Configuration.create(@appconf_missing_name)
+      a.valid?.should == false
+      a.errors.should == [[:name, :not_present]]
+    end
+    it "create a new Configuration without a format" do
+      a = Noah::Configuration.create(@appconf_missing_format)
+      a.valid?.should == false
+      a.errors.should == [[:format, :not_present]]
+    end
+    it "create a new Configuration without a body" do
+      a = Noah::Configuration.create(@appconf_missing_body)
+      a.valid?.should == false
+      a.errors.should == [[:body, :not_present]]
+    end
+    it "create a new Confguration without an application" do
+      a = Noah::Configuration.create(@appconf_missing_application)
+      a.valid?.should == false
+      a.errors.should == [[:application_id, :not_present]]
+    end      
+    it "create a duplicate Configuration" do
+      a = Noah::Configuration.create(@appconf_string)
+      b = Noah::Configuration.create(@appconf_string)
+      b.errors.should == [[[:name, :application_id], :not_unique]]
+    end
   end
 
 end

data/spec/ephemeral_spec.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Using the Ephemeral Model", :reset_redis => true do
+  before(:all) do
+    @edata = {:path => "/foo/bar/baz", :data => "some_value"}
+    @emissing_path = @edata.reject {|x| x == :path}
+    @emissing_data = @edata.reject {|x| x == :data}
+    @good_ephemeral = Noah::Ephemeral.new(@edata)
+    @missing_path = Noah::Ephemeral.new(@emissing_path)
+    @missing_data = Noah::Ephemeral.new(@emissing_data)
+  end
+  before(:each) do
+    Ohm.redis.flushdb
+  end
+  after(:each) do
+    Ohm.redis.flushdb
+  end
+  describe "should" do
+    it "create a new Noah::Ephemeral" do
+      @good_ephemeral.valid?.should == true
+      @good_ephemeral.save
+      b = Noah::Ephemeral[@good_ephemeral.id]
+      b.should == @good_ephemeral
+    end
+    it "create a new Noah::Ephemeral with missing data" do
+      @missing_data.valid?.should == true
+      @missing_data.save
+      b = Noah::Ephemeral[@missing_data.id]
+      b.should == @missing_data
+    end
+#    it "update an existing Noah::Ephemeral" do
+#      @good_ephemeral.save
+#      Noah::Ephemeral.all.size.should == 1
+#      c = Noah::Ephemeral[@good_ephemeral.id]
+#      c.data = "updated_data"
+#      c.save
+#      sleep(2)
+#      c.is_new?.should == false
+#    end
+    it "delete an existing Noah::Ephemeral" do
+      @good_ephemeral.save
+      @good_ephemeral.delete
+      Noah::Ephemeral[@good_ephemeral.id].should == nil
+    end
+  end
+  describe "should not" do
+    it "create a new Noah::Ephemeral with missing path" do
+      @missing_path.valid?.should == false
+      @missing_path.errors.should == [[:path, :not_present]]
+    end
+  end
+end

data/spec/host_spec.rb

@@ -6,7 +6,7 @@ describe "Using the Host Model", :reset_redis => true do
     it "create a new Host with no services" do
       hostname = "host1.domain.com"
       hoststatus = "up"
-      host = Host.create(:name => hostname, :status => hoststatus)
+      host = Noah::Host.create(:name => hostname, :status => hoststatus)
       host.valid?.should == true
       host.save
       host.name.should == hostname
@@ -19,10 +19,10 @@ describe "Using the Host Model", :reset_redis => true do
       hoststatus = "down"
       servicename = 'myservice'
       servicestatus = 'pending'
-      host = Host.create(:name => hostname, :status => hoststatus)
+      host = Noah::Host.create(:name => hostname, :status => hoststatus)
       host.valid?.should == true
       host.save
-      host.services << Service.create(:name => servicename, :status => servicestatus, :host => host)
+      host.services << Noah::Service.create(:name => servicename, :status => servicestatus, :host => host)
       host.name.should == hostname
       host.status.should == hoststatus
       host.services.size.should == 1
@@ -35,7 +35,7 @@ describe "Using the Host Model", :reset_redis => true do
     it "create a Host via find_or_create" do
       hostname = "host3.domain.com"
       hoststatus = "up"
-      host = Host.find_or_create(:name => hostname, :status => hoststatus)
+      host = Noah::Host.find_or_create(:name => hostname, :status => hoststatus)
       host.valid?.should == true
       host.save
       host.is_new?.should == true
@@ -45,12 +45,12 @@ describe "Using the Host Model", :reset_redis => true do
       hostname = "host3.domain.com"
       hoststatus = "pending"
       newstatus = "down"
-      host = Host.find_or_create(:name => hostname, :status => hoststatus)
+      host = Noah::Host.find_or_create(:name => hostname, :status => hoststatus)
       host.valid?.should == true
       host.save
       host.is_new?.should == true
       sleep 1
-      host1 = Host.find_or_create(:name => hostname, :status => newstatus)
+      host1 = Noah::Host.find_or_create(:name => hostname, :status => newstatus)
       host1.save
       host1.is_new?.should == false
     end
@@ -58,10 +58,10 @@ describe "Using the Host Model", :reset_redis => true do
     it "delete a Host" do
       hostname = "host3.domain.com"
       hoststatus = "pending"
-      host = Host.create(:name => hostname, :status => hoststatus)
+      host = Noah::Host.create(:name => hostname, :status => hoststatus)
       host.save
       host.delete
-      Host.find(:name => hostname).empty?.should == true
+      Noah::Host.find(:name => hostname).empty?.should == true
     end  
 
     it "should return all Hosts" do
@@ -69,30 +69,30 @@ describe "Using the Host Model", :reset_redis => true do
       status1 = "up"
       hostname2 = "host2.domain.com"
       status2= "down"
-      host1 = Host.create(:name => hostname1, :status => status1)
-      host2 = Host.create(:name => hostname2, :status => status2)
+      host1 = Noah::Host.create(:name => hostname1, :status => status1)
+      host2 = Noah::Host.create(:name => hostname2, :status => status2)
       host1.save
       host2.save
-      Hosts.all.class.should == Array
-      Hosts.all.size.should == 2
-      Hosts.all.first.name.should == hostname1
-      Hosts.all.first.status.should == status1
-      Hosts.all.last.name.should == hostname2
-      Hosts.all.last.status.should == status2
+      Noah::Hosts.all.class.should == Array
+      Noah::Hosts.all.size.should == 2
+      Noah::Hosts.all.first.name.should == hostname1
+      Noah::Hosts.all.first.status.should == status1
+      Noah::Hosts.all.last.name.should == hostname2
+      Noah::Hosts.all.last.status.should == status2
     end
   end
 
   describe "should not" do
     it "create a new Host with missing status" do
       hostname ="host3.domain.com"
-      host = Host.create(:name => hostname)
+      host = Noah::Host.create(:name => hostname)
       host.valid?.should == false
       host.errors.should == [[:status, :not_present], [:status, :not_member]]
     end
 
     it "create a new Host with missing hostname" do
       status = "up"
-      host = Host.create(:status => status)
+      host = Noah::Host.create(:status => status)
       host.valid?.should == false
       host.errors.should == [[:name, :not_present]]
     end
@@ -100,7 +100,7 @@ describe "Using the Host Model", :reset_redis => true do
     it "create a new Host with an invalid status" do
       hostname = "host3.domain.com"
       status = "online"
-      host = Host.create(:name => hostname, :status => status)
+      host = Noah::Host.create(:name => hostname, :status => status)
       host.valid?.should == false
       host.errors.should == [[:status, :not_member]]
     end
@@ -108,9 +108,9 @@ describe "Using the Host Model", :reset_redis => true do
     it "create a duplicate Host" do
       hostname = "host1.domain.com"
       status = "up"
-      host1 = Host.create(:name => hostname, :status => status)
+      host1 = Noah::Host.create(:name => hostname, :status => status)
       host1.save
-      host2 = Host.create(:name => hostname, :status => status)
+      host2 = Noah::Host.create(:name => hostname, :status => status)
       host2.valid?.should == false
       host2.errors.should == [[:name, :not_unique]]
     end