noah 0.8.4 → 0.8.5

data/.gitignore

@@ -15,3 +15,4 @@ doc
 .yardoc/*
 examples/log/*
 examples/tmp/*
+*.rbc

data/bin/noah-watcher.rb

@@ -1,25 +1,67 @@
 #!/usr/bin/env ruby
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+CONNERRHELP = <<EOC
+
+---------------------------------------------------------------------------
+Apparently we could not connect to the redis instance.
+
+By default the watcher will attempt to connect to "redis://localhost:6379/0"
+If your redis instance is listening elsewhere, please start like so:
+
+REDIS_URL="redis://hostname:port/dbnum" noah-watcher.rb
+
+This will be rectified in a future release. Sorry about that.
+----------------------------------------------------------------------------
+EOC
+
   HELP = <<-EOH
+  ---------------------------------------------------------------------------------------
   Unfortunately, the agent script has some difficult requirements right now.
-  Please see https://github.com/lusis/Noah/Watcher-Agent for details.
+  Please rerun with the '--depinstall' option to have them installed for you and try again
+  ---------------------------------------------------------------------------------------
   EOH
+require 'rubygems'
+require 'slop'
+require 'logger'
+require 'json'
+
+opts = Slop.parse do
+  banner "Usage: noah-watcher.rb [options]"
+  on '--depinstall', "Installs additional dependencies" do
+    puts "Installing dependencies"
+    puts "em-hiredis..."
+    `gem install em-hiredis`
+    puts "em-http-request prerelease..."
+    `gem install em-http-request --pre`
+    puts "cookiejar...."
+    `gem install cookiejar`
+    exit
+  end
+  on :h, :help, 'Print help', :tail => true do
+    puts help
+    exit
+  end
+end
+
 begin
-  require 'rubygems'
-  require 'logger'
-  require 'optparse'
   require 'em-hiredis'
   require 'eventmachine'
   require 'em-http-request'
-  require 'noah'
-  require 'noah/agent'
-  require 'json'
+  require 'cookiejar'
 rescue LoadError => e
   puts e.message
   puts HELP
   exit
 end
 
+begin
+  require 'noah'
+  require 'noah/agent'
+rescue Errno::ECONNREFUSED
+  puts CONNERRHELP
+  exit
+end
+
 Noah::Log.logger = Logger.new(STDOUT)
 LOGGER = Noah::Log.logger
 LOGGER.progname = __FILE__
@@ -32,21 +74,14 @@ EventMachine.run do
   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 = EventMachine::Hiredis.connect(ENV["REDIS_URL"])
   r.errback{|x| LOGGER.error("Unable to connect to redis: #{x}")}
   LOGGER.info("Attaching to Redis Pubsub")
   r.psubscribe("*")
   r.on(:pmessage) do |pattern, 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|
-    # We short circuit if we have no watchers
-  #  noah.broker(msg) unless noah.watchers == 0
-  #}
 end

data/lib/noah/app.rb

@@ -5,6 +5,7 @@ require File.join(File.dirname(__FILE__), 'models')
 module Noah
   class App < Sinatra::Base
     helpers Noah::SinatraBaseHelpers
+    helpers Noah::SinatraTagHelpers
 
     configure do
       set :app_file, __FILE__

data/lib/noah/helpers/tag_helpers.rb

@@ -0,0 +1,46 @@
+module Noah
+  module SinatraTagHelpers
+  # TODO DRY this sumbitch up
+  # TODO add status in json response
+
+    def tag(primitive, name, tags)
+      case primitive
+      when "services"
+        servicename, hostname = name.split('/')
+        obj = host_service(hostname, servicename)
+      when "hosts"
+        obj = Noah::Host.find(:name=>name).first
+      when "configurations"
+        obj = Noah::Configuration.find(:name=>name).first
+      when "applications"
+        obj = Noah::Application.find(:name=>name).first
+      when "ephemerals"
+        obj = Noah::Ephemeral.find(:path=>"/#{name}").first
+      else
+        halt 404
+      end
+      obj.nil? ? (halt 404) : (obj.tag!(tags))
+      obj.to_json
+    end
+
+    def untag(primitive, name, tags)
+      case primitive
+      when "services"
+        servicename, hostname = name.split('/')
+        obj = host_service(hostname, servicename)
+      when "hosts"
+        obj = Noah::Host.find(:name=>name).first
+      when "configurations"
+        obj = Noah::Configuration.find(:name=>name).first
+      when "applications"
+        obj = Noah::Application.find(:name=>name).first
+      when "ephemerals"
+        obj = Noah::Ephemeral.find(:path=>"/#{name}").first
+      else
+        halt 404
+      end
+      obj.to_json
+    end
+
+  end
+end

data/lib/noah/models.rb

@@ -129,3 +129,4 @@ require File.join(File.dirname(__FILE__), 'models','applications')
 require File.join(File.dirname(__FILE__), 'models','configurations')
 require File.join(File.dirname(__FILE__), 'models','watchers')
 require File.join(File.dirname(__FILE__), 'models','ephemerals')
+require File.join(File.dirname(__FILE__), 'models','tokens')

data/lib/noah/models/tokens.rb

@@ -0,0 +1,41 @@
+module Noah
+  class Token < Model
+    include Taggable
+    include Linkable
+    attribute :name
+    attribute :token
+    attribute :lifetime
+
+    index :name
+    index :token
+    index :lifetime
+
+    before :save, :generate_api_token
+
+    def validate
+      super
+      assert_present :name
+      assert_unique :name
+      assert_unique :token
+    end
+
+    def to_hash
+      h = {:token => token, :lifetime => lifetime, :created_at => created_at, :updated_at => updated_at}
+      super.merge(h)
+    end
+
+    protected
+    def generate_api_token
+      # Wicked hot logic to generate an API token
+      random_string = (0...50).map{ ('a'..'z').to_a[rand(26)] }.join
+      self.token.nil? ? self.token = OpenSSL::Digest::SHA256.hexdigest(random_string << self.name << Time.now.to_s) : self.token
+    end
+
+    def save_hook
+      # called after any create,update,delete
+      # logic needed to expire any orphaned ephemerals
+    end
+
+  end
+
+end

data/lib/noah/routes/applications.rb

@@ -13,22 +13,6 @@ class Noah::App
     app.to_json
   end
 
-  put '/applications/:appname/tag' do |appname|
-    required_params = ["tags"]
-    data = JSON.parse(request.body.read)
-    (data.keys.sort == required_params.sort) ? (a=Noah::Application.find(:name=>appname).first) : (raise "Missing Parameters")
-    a.nil? ? (halt 404) : (a.tag!(data['tags']))
-    a.to_json
-  end
-
-  delete '/applications/:appname/tag' do |appname|
-    required_params = ["tags"]
-    data = JSON.parse(request.body.read)
-    (data.keys.sort == required_params.sort) ? (a=Noah::Application.find(:name=>appname).first) : (raise "Missing Parameters")
-    a.nil? ? (halt 404) : (a.untag!(data['tags']))
-    a.to_json
-  end
-
   put '/applications/:appname/watch' do |appname|
     required_params = ["endpoint"]
     data = JSON.parse(request.body.read)

data/lib/noah/routes/configurations.rb

@@ -31,22 +31,7 @@ class Noah::App
     a.nil? ? (halt 404) : (a.link! data["link_name"])
     a.to_json
   end
-  # Add a tag to a configuration object
-  put '/configurations/:configname/tag' do |configname|
-    required_params = ["tags"]
-    data = JSON.parse(request.body.read)
-    (data.keys.sort == required_params.sort) ? (c=Noah::Configuration.find(:name=>configname).first) : (raise "Missing Parameters")
-    c.nil? ? (halt 404) : (c.tag!(data['tags']))
-    c.to_json
-  end
-  # Delete a tag[s] from a configuration object
-  delete '/configurations/:configname/tag' do |configname|
-    required_params = ["tags"]
-    data = JSON.parse(request.body.read)
-    (data.keys.sort == required_params.sort) ? (c=Noah::Configuration.find(:name=>configname).first) : (raise "Missing Parameters")
-    c.nil? ? (halt 404) : (c.untag!(data['tags']))
-    c.to_json
-  end
+
   # Add a watch to a configuration object
   put '/configurations/:configname/watch' do |configname|
     required_params = ["endpoint"]

data/lib/noah/routes/hosts.rb

@@ -32,24 +32,6 @@ class Noah::App
     end
   end
 
-  put '/hosts/:hostname/tag' do |hostname|
-    required_params = ["tags"]
-    data = JSON.parse(request.body.read)
-    raise "Missing parameters" if data.nil?
-    (data.keys.sort == required_params.sort) ? (a=Noah::Host.find(:name=>hostname).first) : (raise "Missing Parameters")
-    a.nil? ? (halt 404) : (a.tag!(data['tags']))
-    a.to_json
-  end
-
-  delete '/hosts/:hostname/tag' do |hostname|
-    required_params = ["tags"]
-    data = JSON.parse(request.body.read)
-    raise "Missing parameters" if data.nil?
-    (data.keys.sort == required_params.sort) ? (a=Noah::Host.find(:name=>hostname).first) : (raise "Missing Parameters")
-    a.nil? ? (halt 404) : (a.untag!(data['tags']))
-    a.to_json
-  end
-
   put '/hosts/:hostname/watch' do |hostname|
     required_params = ["endpoint"]
     data = JSON.parse(request.body.read)

data/lib/noah/routes/services.rb

@@ -38,22 +38,6 @@ class Noah::App
     a.to_json
   end
 
-  put '/services/:servicename/:hostname/tag' do |servicename, hostname|
-    required_params = ["tags"]
-    data = JSON.parse(request.body.read)
-    (data.keys.sort == required_params.sort) ? (a=host_service(hostname, servicename)) : (raise "Missing Parameters")
-    a.nil? ? (halt 404) : (a.tag!(data['tags']))
-    a.to_json
-  end
-
-  delete '/services/:servicename/:hostname/tag' do |servicename, hostname|
-    required_params = ["tags"]
-    data = JSON.parse(request.body.read)
-    (data.keys.sort == required_params.sort) ? (a=host_service(hostname, servicename)) : (raise "Missing Parameters")
-    a.nil? ? (halt 404) : (a.untag!(data['tags']))
-    a.to_json
-  end
-
   put '/services/:servicename/watch' do |servicename|
     required_params = ["endpoint"]
     data = JSON.parse(request.body.read)

data/lib/noah/routes/tags.rb

@@ -1,5 +1,17 @@
 class Noah::App
 
+  put '/:primitive/*/tag' do |primitive, name|
+    required_params = ["tags"]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (tag(primitive, name, data["tags"])) : (raise "Missing Parameters")
+  end
+
+  delete '/:primitive/*/tag' do |primitive, name|
+    required_params = ["tags"]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (untag(primitive, name, data["tags"])) : (raise "Missing Parameters")
+  end
+
   get '/tags/:tagname/?' do |tagname|
     tags = Noah::Tags.all(:name => tagname).to_hash
     (halt 404) if tags.size == 0

data/lib/noah/version.rb

@@ -1,3 +1,3 @@
 module Noah
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/noah.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   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}
-  s.description = %q{Application registry based on Apache Zookeeper}
+  s.summary     = %q{Application registry inspired by Apache Zookeeper}
+  s.description = %q{Application registry inspired by Apache Zookeeper}
 
   s.rubyforge_project = "noah"
 
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency("haml", ["= 3.0.25"])
   s.add_dependency("vegas", ["= 0.1.8"])
   s.add_dependency("guid", ["= 0.1.1"])
+  s.add_dependency("slop", ["= 2.1.0"])
 
 
   if RUBY_PLATFORM =~ /java/
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("diff-lcs", ["= 1.1.2"])
   s.add_development_dependency("sinatra-reloader", ["= 0.5.0"])
   s.add_development_dependency("rspec", ["~> 2.5"])
-  s.add_development_dependency("rcov", ["= 0.9.9"])
+#  s.add_development_dependency("rcov", ["= 0.9.9"])
   s.add_development_dependency("rack-test", ["= 0.5.7"])
+  s.add_development_dependency("rake", ["= 0.8.7"])
 end

data/spec/link_spec.rb

@@ -59,15 +59,16 @@ describe "Using the Link Model", :reset_redis => true do
       h[:updated_at].should == l.updated_at
       h[:created_at].should == l.created_at
       h[:hosts].has_key?(@host.name).should == true
-      h[:hosts][@host.name].keys.sort.should == [:id, :status, :tags, :services].sort
+      h[:hosts][@host.name].keys.map {|k| k.to_s}.sort.should == [:id, :status, :tags, :services].map {|k| k.to_s}.sort
       h[:services].has_key?(@service.name).should == true
-      h[:services][@service.name][@host.name].keys.sort.should == [:id, :status, :tags].sort
+      h[:services][@service.name][@host.name].keys.map {|k| k.to_s}.sort.should == [:id, :status, :tags].map {|k| k.to_s}.sort
       h[:applications].has_key?(@application.name).should == true
-      h[:applications][@application.name].keys.sort.should == [:id, :tags, :configurations].sort
+      h[:applications][@application.name].keys.map {|k| k.to_s}.sort.should == [:id, :tags, :configurations].map {|k| k.to_s}.sort
       h[:configurations].has_key?(@configuration.name).should == true
-      h[:configurations][@configuration.name].keys.sort.should == [:id, :tags, :format, :body].sort
+      h[:configurations][@configuration.name].keys.map {|k| k.to_s }.sort.should == [:id, :tags, :format, :body].map {|k| k.to_s}.sort
       h[:ephemerals].has_key?(@ephemeral.name).should == true
-      h[:ephemerals][@ephemeral.name].keys.sort.should == [:id, :tags, :path, :data].sort
+      h[:ephemerals][@ephemeral.name].keys.map {|k| k.to_s}.sort.should == [:id, :tags, :path, :data].map {|k| k.to_s}.sort
+
     end
   end
   describe "should not" do
@@ -84,5 +85,3 @@ describe "Using the Link Model", :reset_redis => true do
     end
   end
 end
-
-

data/spec/noahapp_tag_spec.rb

@@ -0,0 +1,94 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Using the Tag API", :reset_redis => true do
+  before(:each) do
+    Ohm.redis.flushdb
+    @multi_tags = {"tags"=>["production", "databases", "in-service"]}
+    @single_tag = {"tags"=>"out-of-service"}
+    @host = Noah::Host.create(:name => 'tagged_host', :status => 'up')
+    @service = Noah::Service.create(:name => 'tagged_service', :status => 'down', :host_id => @host.id)
+    @application = Noah::Application.create(:name => 'tagged_application')
+    @configuration = Noah::Configuration.create(:name => 'tagged_configuration', :format => 'string', :body => 'some_string')
+    @ephemeral = Noah::Ephemeral.create(:path => '/tagged/ephemeral')
+  end
+  after(:each) do
+    Ohm.redis.flushdb
+  end  
+
+  describe "calling" do
+
+    describe "PUT" do
+      ['host', 'service', 'application', 'configuration', 'ephemeral'].each do |primitive|
+        it "multiple tags to #{primitive} should work" do
+          obj = instance_variable_get("@#{primitive}")
+          case primitive
+          when "ephemeral"
+            put "/#{primitive}s#{obj.path}/tag", @multi_tags.to_json
+          when "service"
+            put "/#{primitive}s/#{obj.name}/#{@host.name}/tag", @multi_tags.to_json
+          else
+            put "/#{primitive}s/#{obj.name}/tag", @multi_tags.to_json
+          end
+          last_response.should be_ok
+          response = last_response.should return_json
+          response['tags'].sort.should == @multi_tags["tags"].sort
+        end
+      end
+
+      ['host', 'service', 'application', 'configuration', 'ephemeral'].each do |primitive|
+        it "single tag to #{primitive} should work" do
+          obj = instance_variable_get("@#{primitive}")
+          case primitive
+          when "ephemeral"
+            put "/#{primitive}s#{obj.path}/tag", @single_tag.to_json
+          when "service"
+            put "/#{primitive}s/#{obj.name}/#{@host.name}/tag", @single_tag.to_json
+          else
+            put "/#{primitive}s/#{obj.name}/tag", @single_tag.to_json
+          end
+          last_response.should be_ok
+          response = last_response.should return_json
+          response['tags'].should == [@single_tag["tags"]]
+        end
+      end
+    end
+
+    describe "DELETE" do
+      ['host', 'service', 'application', 'configuration', 'ephemeral'].each do |primitive|
+        it "multiple tags from #{primitive} should work" do
+          obj = instance_variable_get("@#{primitive}")
+          case primitive
+          when "ephemeral"
+            delete "/#{primitive}s#{obj.path}/tag", @multi_tags.to_json
+          when "service"
+            delete "/#{primitive}s/#{obj.name}/#{@host.name}/tag", @multi_tags.to_json
+          else
+            delete "/#{primitive}s/#{obj.name}/tag", @multi_tags.to_json
+          end
+          last_response.should be_ok
+          response = last_response.should return_json
+          response['tags'].sort.should_not == @multi_tags["tags"].sort
+          response['tags'].size.should == 0
+        end
+      end
+
+      ['host', 'service', 'application', 'configuration', 'ephemeral'].each do |primitive|
+        it "single tag from #{primitive} should work" do
+          obj = instance_variable_get("@#{primitive}")
+          case primitive
+          when "ephemeral"
+            delete "/#{primitive}s#{obj.path}/tag", @single_tag.to_json
+          when "service"
+            delete "/#{primitive}s/#{obj.name}/#{@host.name}/tag", @single_tag.to_json
+          else
+            delete "/#{primitive}s/#{obj.name}/tag", @single_tag.to_json
+          end
+          last_response.should be_ok
+          response = last_response.should return_json
+          response['tags'].should_not == [@single_tag["tags"]]
+          response['tags'].size.should == 0
+        end
+      end
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: noah
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - John E. Vincent
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -04:00
+date: 2011-08-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,29 +146,29 @@ dependencies:
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: hiredis
+  name: slop
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 2.1.0
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: hiredis
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.3.1
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: yajl-ruby
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
@@ -179,47 +179,47 @@ dependencies:
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: diff-lcs
+  name: thin
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.2
-  type: :development
+        version: "0"
+  type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: sinatra-reloader
+  name: diff-lcs
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: 1.1.2
   type: :development
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sinatra-reloader
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "2.5"
+        version: 0.5.0
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rspec
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: "2.5"
   type: :development
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
@@ -233,7 +233,18 @@ dependencies:
         version: 0.5.7
   type: :development
   version_requirements: *id020
-description: Application registry based on Apache Zookeeper
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  version_requirements: *id021
+description: Application registry inspired by Apache Zookeeper
 email: 
 - lusis.org+rubygems.org@gmail.com
 executables: 
@@ -302,6 +313,7 @@ files:
 - lib/noah/models/link.rb
 - lib/noah/models/services.rb
 - lib/noah/models/tags.rb
+- lib/noah/models/tokens.rb
 - lib/noah/models/watchers.rb
 - lib/noah/passthrough.rb
 - lib/noah/routes/applications.rb
@@ -329,6 +341,7 @@ files:
 - spec/noahapp_host_spec.rb
 - spec/noahapp_service_spec.rb
 - spec/noahapp_spec.rb
+- spec/noahapp_tag_spec.rb
 - spec/noahapp_watcher_spec.rb
 - spec/service_spec.rb
 - spec/spec_helper.rb
@@ -368,6 +381,6 @@ rubyforge_project: noah
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Application registry based on Apache Zookeeper
+summary: Application registry inspired by Apache Zookeeper
 test_files: []