noah 0.8.5-jruby → 0.8.7-jruby

data/.gitignore

@@ -16,3 +16,4 @@ doc
 examples/log/*
 examples/tmp/*
 *.rbc
+*.gem

data/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Noah Changelog
+
+## 0.8.6
+- Issue #7 *Provide url for key-only enumeration*
+
+    - top-level configurations url now accepts `?short=true` to return shortened display of entries
+
+- Issue #10 *noah-watcher daemon doesn't support REDIS_URL env*
+
+    - **BREAKING CHANGE** noah-watcher.rb renamed to noah-watcher
+    - noah-watcher now supports `-r redis://host:port/dbnum` to use alternate redis server
+    - noah-watcher now supports `-l logfile` for logging to file
+
+## 0.8.5
+- Issue #9 *Ephemeral Tagging is broken*
+
+    - All tagging now moved from route files to Sinatra helper
+
+# Historical
+This changelog started being maintained at 0.8.5. Previous changes can be viewed in the commit history.

data/README.md

@@ -1,13 +1,43 @@
 # Noah
 _"look at this effing rainbow I just made for you"_
 
-Noah is an application registry loosely based on [Apache ZooKeeper](http://zookeeper.apache.org)
+Noah is an application registry inspired by [Apache ZooKeeper](http://zookeeper.apache.org)
 
 What does that mean? From the ZooKeeper Home Page:
 
 > ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications.
 
-Essentially Noah, is a port of those concepts into a stateless RESTful application.
+Essentially Noah is a port of parts of that functionality into a stateless RESTish application.
+
+## Some background
+It's probably worth reading the following blog posts before going any further to clear up any possible misunderstandings.
+Noah is not a direct replacement for ZK. It's a conceptual port. More than anything, it was an itch I needed to scratch:
+
+- [On Noah - Part 1](http://blog.lusis.org/blog/2011/05/16/on-noah-part-1/)
+- [On Noah - Part 2](http://blog.lusis.org/blog/2011/05/17/on-noah-part-2/)
+- [On Noah - Part 3](http://blog.lusis.org/blog/2011/05/18/on-noah-part-3/)
+- [On Noah - Part 4](http://blog.lusis.org/blog/2011/05/20/on-noah-part-4/)
+
+Also the following post was where I sort of discussed it early on:
+
+- [Ad-hoc configuration and Coordination](http://lusislog.blogspot.com/2011/03/ad-hoc-configuration-coordination-and.html)
+
+## Things Noah does not do
+
+- Paxos, ZAB or any other sort of consensus protocol
+- Noah itself is not distributed (yet).
+- ACLs (yet)
+- Leader election of any kind
+
+## Things Noah can do
+_note that these terms are fairly overloaded depending on who you talk to_
+
+- Service registry
+- Node registry
+- Configuration Registry
+- Group Services
+- Watches (albeit differently)
+
 
 ## Quick Start
 The quickstart guide has been moved to the wiki:
@@ -68,4 +98,4 @@ Here are a list of some key [wiki](https://github.com/lusis/Noah/wiki) pages:
 * [Watchers and Callbacks](https://github.com/lusis/Noah/wiki/Watchers-and-Callbacks)
     The general idea behind how Noah would implement watches
 * [Watcher/Callback Examples](https://github.com/lusis/Noah/blob/master/examples/README.md)
-    Some example callbacks.
+    Some example callbacks.

data/bin/noah

@@ -6,4 +6,5 @@ require 'vegas'
 
 Vegas::Runner.new(Noah::App, 'noah') do |runner, opts, app|
   opts.on("-r", "--redis URL", "redis url to connect to (default: redis://localhost:6379/0)") {|r| ENV["REDIS_URL"] = r; Noah::App.set :redis_url, r }
+  opts.on("--esize SIZE", Integer, "Max allowed ephemeral size in bytes") {|esize| Noah::App.set :ephemeral_size, esize }
 end

data/bin/{noah-watcher.rb → noah-watcher}

@@ -8,10 +8,9 @@ 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.
+noah-watcher.rb -r redis://hostname:port/dbnum
 ----------------------------------------------------------------------------
+
 EOC
 
   HELP = <<-EOH
@@ -27,6 +26,8 @@ require 'json'
 
 opts = Slop.parse do
   banner "Usage: noah-watcher.rb [options]"
+  on :r, :redis_url, 'Redis URL to use. This MUST match what the Noah server is using for now', :default => 'redis://localhost:6379/0', :argument => true
+  on :o, :output, 'Log destination - full file path. Default is STDOUT', :default => STDOUT, :argument => true
   on '--depinstall', "Installs additional dependencies" do
     puts "Installing dependencies"
     puts "em-hiredis..."
@@ -54,6 +55,8 @@ rescue LoadError => e
   exit
 end
 
+ENV['REDIS_URL'] = opts[:redis_url]
+
 begin
   require 'noah'
   require 'noah/agent'
@@ -62,7 +65,7 @@ rescue Errno::ECONNREFUSED
   exit
 end
 
-Noah::Log.logger = Logger.new(STDOUT)
+Noah::Log.logger = Logger.new(opts[:output])
 LOGGER = Noah::Log.logger
 LOGGER.progname = __FILE__
 
@@ -78,10 +81,10 @@ EventMachine.run do
   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|
+  proc = Proc.new{ |event, message|
     noah.reread_watchers if event =~ /^\/\/noah\/watchers\/.*/
     noah.broker("#{event}|#{message}") unless noah.watchers == 0
-  end
+  }
+  r.pubsub.psubscribe("*", proc)
 
 end

data/examples/reconfiguring-sinatra-watcher.rb

@@ -5,7 +5,7 @@ require 'em-http-request'
 
 class HttpPostWatch < Noah::CustomWatcher
   redis_host "redis://127.0.0.1:6379/0"
-  pattern "//noah/configuration/redis_server"
+  pattern "//noah/configurations/redis_server"
   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

@@ -9,7 +9,7 @@ set :noah_client_name, 'my_sinatra_app'
 
 def get_config_from_noah(setting)
   begin
-    c = open("#{settings.noah_server}/c/#{settings.noah_client_name}/#{setting}").read
+    c = open("#{settings.noah_server}/applications/#{settings.noah_client_name}/configurations/#{setting}").read
     set setting.to_sym, c
   end
 end
@@ -17,7 +17,7 @@ end
 get_config_from_noah('redis_server')
 
 def get_redis_version
-  Ohm.connect :url => settings.redis_server
+  Ohm.connect :url => settings.redis_server['body']
   Ohm.redis.info["redis_version"]
 end
 
@@ -25,9 +25,10 @@ get "/" do
   "Redis version: #{get_redis_version}"
 end
 
-put "/webhook" do
+post "/webhook" do
   data = JSON.parse(request.body.read)
-  settings.redis_server = data["body"]
+  settings.redis_server = data
+  puts data["body"]
   resp = {:message => "reconfigured", :setting => data["name"], :body => data["body"]}.to_json
   "#{resp}"
 end

data/lib/noah/app.rb

@@ -16,6 +16,8 @@ module Noah
       set :show_exceptions, false
       set :run, false
       set :redis_url, ENV['REDIS_URL'] || 'redis://localhost:6379/0'
+      set :ephemeral_size, ENV['NOAH_ESIZE'] || 512
+      disable :protection
     end
 
     configure(:development) do
@@ -43,12 +45,21 @@ module Noah
     end
 
     # Displays an overview page of all registered objects
-    get '/' do
+    get '/', :provides => :html do
       content_type "text/html"
-
       haml :index, :format => :html5, :locals => {:redis_version => Ohm.redis.info["redis_version"].to_s, :noah_version => Noah::VERSION}
     end
 
+    get '/', :provides => :json  do
+      content_type "application/json"
+      erb :'index.json', :locals => {:redis_version => Ohm.redis.info["redis_version"].to_s, :noah_version => Noah::VERSION}
+    end
+
+    get '/version', :provides => :json do
+      content_type "application/json"
+      {:redis_version => Ohm.redis.info["redis_version"].to_s, :noah_version => Noah::VERSION}.to_json
+    end
+
     not_found do
       content_type "application/json"
       erb :'404'

data/lib/noah/models.rb

@@ -88,8 +88,11 @@ module Noah
           self.name.nil? ? name=@deleted_name : name=self.name
           # Pulling out dbnum for now. Need to rethink it
           #pub_category = "#{db}:noah.#{self.class.to_s}[#{name}].#{meth}"
+          # TODO
+          # Add a url in the message body containing the URL to the item
+          url = "/#{self.class_to_lower}s/#{name}"
           pub_category = "#{self.patternize_me}"
-          Ohm.redis.publish(pub_category, self.to_hash.merge({"action" => meth, "pubcategory" => pub_category}).to_json)
+          Ohm.redis.publish(pub_category, self.to_hash.merge({"action" => meth, "pubcategory" => pub_category, "path" => url}).to_json)
 
           # The following provides a post post-action hook. It allows a class to provide it's own handling after the fact
           # good example is in [Noah::Ephemeral] where it's used to check for/clean up expired ephemeral nodes entries

data/lib/noah/models/applications.rb

@@ -31,7 +31,7 @@ module Noah
         if obj.valid?
           obj.save
         end
-        obj
+        obj if obj.valid?
       rescue Exception => e
         e.message
       end

data/lib/noah/models/configurations.rb

@@ -62,10 +62,25 @@ module Noah
   end
 
   class Configurations
-    def self.all(options = {})
+    def self.all(options = {}, short=false)
+      short_keys = [:format, :created_at, :updated_at]
       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} }
+      if short == false
+        configs.each {|x| config_hash["#{x.name}"] = x.to_hash.reject {|k,v| k == :name} }
+      else
+        configs.each do |x|
+          items = x.to_hash.select {|k,v| k if short_keys.include?(k)}
+          # 1.8 fix for Hash#select
+          if items.is_a?(Array)
+            items_hash = {}
+            items.each {|item| items_hash.merge!(Hash[*item])}
+          else
+            items_hash = items
+          end
+          config_hash["#{x.name}"] = items_hash
+        end
+      end
       config_hash
     end
   end 

data/lib/noah/routes/applications.rb

@@ -47,7 +47,7 @@ class Noah::App
     end  
     if app.valid?
       action = app.is_new? ? "create" : "update"
-      app.save
+      #app.save
       r = {"result" => "success","id" => app.id, "action" => action, "name" => app.name }
       r.to_json
     else

data/lib/noah/routes/configurations.rb

@@ -13,16 +13,23 @@ class Noah::App
   get '/configurations/:configname/?' do |configname|
     c = Noah::Configuration.find(:name => configname).first
     (halt 404) if c.nil?
+    #content_type c.format.to_sym
     content_type content_type_mapping[c.format.to_sym] if content_type_mapping[c.format.to_sym]
-    #response.headers['Content-Disposition'] = "attachment; filename=#{configname}"
-    c.body
+    c.body.to_s
   end
+
   # GET all configurations
   get '/configurations/?' do
-    configs = Noah::Configurations.all.to_hash
+    params[:short] ||= false
+    configs = Noah::Configurations.all({},params[:short])
     (halt 404) if configs.size == 0
+    configs.each do |config, values|
+      u = request.url.gsub(/(\/\?short=true|\?short=true)/,'/'+config)
+      values.merge!({:location=>u}) if params[:short]
+    end
     configs.to_json
   end
+
   # Add configuration object to a custom link hierarchy
   put '/configurations/:configname/link' do |configname|
     required_params = ["link_name"]

data/lib/noah/routes/ephemerals.rb

@@ -19,7 +19,7 @@ class Noah::App
   end
 
   put '/ephemerals/*' do
-    raise("Data too large") if request.body.size > 512
+    raise("Data too large") if request.body.size > settings.ephemeral_size
     d = request.body.read  || nil
     opts = {:path => "/#{params[:splat][0]}", :data => d}
     e = Noah::Ephemeral.find_or_create(opts)

data/lib/noah/version.rb

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

data/noah.gemspec

@@ -21,36 +21,37 @@ 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("eventmachine", ["1.0.0.beta.3"])
-  s.add_dependency("em-http-request", ["1.0.0.beta.4"])
-  s.add_dependency("redis", ["= 2.2.0"])
-  s.add_dependency("nest", ["= 1.1.0"])
-  s.add_dependency("rack", ["= 1.2.2"])
-  s.add_dependency("tilt", ["= 1.2.2"])
-  s.add_dependency("sinatra", ["= 1.2.3"])
-  s.add_dependency("ohm", ["= 0.1.3"])
-  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("guid", ["= 0.1.1"])
-  s.add_dependency("slop", ["= 2.1.0"])
+  s.add_dependency("eventmachine", "1.0.0.beta.4")
+  s.add_dependency("em-http-request", "1.0.0.beta.4")
+  s.add_dependency("cookiejar")
+  s.add_dependency("redis", "~> 2.2")
+  s.add_dependency("nest", "= 1.1.0")
+  s.add_dependency("rack", "~> 1.4")
+  s.add_dependency("tilt", "~> 1.3")
+  s.add_dependency("sinatra", "~> 1.3")
+  s.add_dependency("rack-protection", "~> 1.2")
+  s.add_dependency("ohm", "= 0.1.3")
+  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("guid", "= 0.1.1")
+  s.add_dependency("slop", "= 2.1.0")
+  s.add_dependency("hiredis", "0.4.5")
+  s.add_dependency("cs-em-hiredis", "0.1.2")
 
 
   if RUBY_PLATFORM =~ /java/
     s.add_dependency("jruby-openssl")
     s.add_dependency("json")
-    s.add_development_dependency("warbler", ["= 1.2.1"])
+    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")
   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.5"])
-#  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"])
+  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("rack-test", "= 0.6.1")
+  s.add_development_dependency("rake", "= 0.8.7")
 end

data/spec/configuration_spec.rb

@@ -65,8 +65,19 @@ describe "Using the Configuration Model", :reset_redis => true do
       c = Noah::Configurations.all
       c.class.to_s.should == 'Hash'
       c.size.should == 2
-      c.has_key?(a.name).should == true
-      c.has_key?(b.name).should == true
+      c.has_key?(a.name.to_s).should == true
+      c.has_key?(b.name.to_s).should == true
+    end
+
+    it "return all Configurations in short form" do
+      a = Noah::Configuration.find_or_create(@appconf_string)
+      b = Noah::Configuration.find_or_create(@appconf_json)
+      c = Noah::Configurations.all({},true)
+      c.class.to_s.should == 'Hash'
+      c.size.should == 2
+      c.has_key?(a.name.to_s).should == true
+      c.has_key?(b.name.to_s).should == true
+      c.each {|k,v| v.keys.map {|k| k.to_s}.sort.should == ['created_at','format','updated_at']}
     end
   end
 

data/spec/link_spec.rb

@@ -58,16 +58,16 @@ describe "Using the Link Model", :reset_redis => true do
       h[:name].should == l.name
       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.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.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.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.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.map {|k| k.to_s}.sort.should == [:id, :tags, :path, :data].map {|k| k.to_s}.sort
+      h[:hosts].has_key?(@host.name.to_s).should == true
+      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.to_s).should == true
+      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.to_s).should == true
+      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.to_s).should == true
+      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.to_s).should == true
+      h[:ephemerals]["#{@ephemeral.name}"].keys.map {|k| k.to_s}.sort.should == [:id, :tags, :path, :data].map {|k| k.to_s}.sort
 
     end
   end

data/spec/noahapp_application_spec.rb

@@ -27,7 +27,7 @@ describe "Using the Application API", :reset_redis => false do
         response["name"].should == @a.name
         response.has_key?("configurations").should == true
         c = response["configurations"]
-        c.has_key?(@c.name).should == true
+        c.has_key?(@c.name.to_s).should == true
         c["#{@c.name}"]["format"].should == "#{@c.format}"
         c["#{@c.name}"]["body"].should == "#{@c.body}"
       end

data/spec/noahapp_configuration_spec.rb

@@ -41,6 +41,35 @@ describe "Using the Configuration API", :reset_redis => true, :populate_sample_d
           end
         end
       end
+
+      it "all configurations in short form with no trailing slash" do
+        get '/configurations?short=true'
+        last_response.should be_ok
+        response = last_response.should return_json
+        response.keys.size.should == 3
+        %w[redis_url json_config yaml_config].each do |c|
+          response.keys.member?(c).should == true
+          %w[format location created_at updated_at].each do |ck|
+            response[c].keys.member?(ck).should == true
+          end
+        end
+        response.each {|k,v| v['location'].should =~ /^http:\/\/.*\/configurations\/#{k}/}
+      end
+
+      it "all configurations in short form with trailing slash" do
+        get '/configurations/?short=true'
+        last_response.should be_ok
+        response = last_response.should return_json
+        response.keys.size.should == 3
+        %w[redis_url json_config yaml_config].each do |c|
+          response.keys.member?(c).should == true
+          %w[format location created_at updated_at].each do |ck|
+            response[c].keys.member?(ck).should == true
+          end
+        end
+        response.each {|k,v| v['location'].should =~ /^http:\/\/.*\/configurations\/#{k}/}
+      end
+
       it "named configuration should work as JSON" do
         header "Accept", "application/json"
         get '/configurations/redis_url'

data/spec/noahapp_service_spec.rb

@@ -22,13 +22,13 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
         get "/services/#{@sample_service[:name]}"
         last_response.should be_ok
         response = last_response.should return_json
-        response.is_a?(Hash).should == true
-        response.has_key?(@s.name).should == true
-        response[@s.name].is_a?(Hash).should == true
-        response[@s.name].has_key?(@h.name).should == true
-        response[@s.name][@h.name].is_a?(Hash).should == true
-        response[@s.name][@h.name]["id"].should == @s.id
-        response[@s.name][@h.name]["status"].should == @s.status
+        response.class.to_s.should == "Hash"
+        response.has_key?(@s.name.to_s).should == true
+        response["#{@s.name}"].class.to_s.should == "Hash"
+        response["#{@s.name}"].has_key?(@h.name.to_s).should == true
+        response["#{@s.name}"]["#{@h.name}"].class.to_s.should == "Hash"
+        response["#{@s.name}"]["#{@h.name}"]["id"].should == @s.id
+        response["#{@s.name}"]["#{@h.name}"]["status"].should == @s.status
       end
       it "named service for host should work" do
         get "/services/#{@sample_service[:name]}/#{@sample_host[:name]}"

data/spec/noahapp_spec.rb

@@ -2,16 +2,27 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Noah App Basics", :reset_redis => true do
 
-  it "should show the index page" do
+  it "should show the index page as html" do
+    header "Accept", "text/html"
     get '/'
     last_response.should be_ok
     last_response.body.include?("Noah Start Page").should  == true
   end
 
+  it "should show the index page as json" do
+    header "Accept", "application/json"
+    get '/'
+    last_response.should return_json
+    response = JSON.parse(last_response.body)
+    response.has_key?("redis_version").should == true
+    response.has_key?("noah_version").should == true
+    response.has_key?("resources").should == true
+  end
+
   it "should test the 404 message" do
     get '/foo'
     last_response.status.should == 404
-    last_response.headers["Content-Type"].should == "application/json"
+    last_response.should return_json
     response = JSON.parse(last_response.body)
     response["result"].should == "failure"
     response["error_message"].should == "Resource not found"

data/spec/spec_helper.rb

@@ -72,7 +72,7 @@ end
 
 RSpec::Matchers.define :return_json do
   match do |last_response|
-    last_response.headers["Content-Type"].should == "application/json"
+    last_response.headers["Content-Type"].should =~ /^application\/json;.*/
     response = JSON.parse(last_response.body)
   end
 
@@ -83,7 +83,7 @@ end
 
 RSpec::Matchers.define :be_missing do
   match do |last_response|
-    last_response.headers["Content-Type"].should == "application/json"
+    last_response.headers["Content-Type"].should =~ /^application\/json;.*/
     last_response.status.should == 404
     response = JSON.parse(last_response.body)
     response["result"].should == "failure"
@@ -93,7 +93,7 @@ end
 
 RSpec::Matchers.define :be_invalid do
   match do |last_response|
-    last_response.headers["Content-Type"].should == "application/json"
+    last_response.headers["Content-Type"].should =~ /^application\/json;.*/
     response = JSON.parse(last_response.body)
     response["result"].should == "failure"
     response["error_message"].should == "Missing Parameters"

data/views/index.json.erb

@@ -0,0 +1,10 @@
+{
+  "redis_version":"<%= locals[:redis_version] %>",
+  "noah_version":"<%= locals[:noah_version] %>",
+  "resources":{
+    "hosts":{"link":"<%= request.url %>hosts"},
+    "services":{"link":"<%= request.url %>services"},
+    "applications":{"link":"<%= request.url %>applications"},
+    "configurations":{"link":"<%= request.url %>configurations"}
+  }
+}

metadata

@@ -1,263 +1,304 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: noah
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.8.5
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.8.7
 platform: jruby
-authors: 
+authors:
 - John E. Vincent
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2011-08-05 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &2056 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.4
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0.beta.3
+  requirement: *2056
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: em-http-request
+  version_requirements: &2074 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.4
+    none: false
+  requirement: *2074
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: cookiejar
+  version_requirements: &2090 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0.beta.4
+  requirement: *2090
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: redis
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &2106 !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.2.0
+  requirement: *2106
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: nest
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: &2122 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.1.0
+    none: false
+  requirement: *2122
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &2138 !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.2.2
+  requirement: *2138
+  prerelease: false
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: tilt
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &2154 !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.2.2
+  requirement: *2154
+  prerelease: false
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: sinatra
+  version_requirements: &2170 !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
+  requirement: *2170
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rack-protection
+  version_requirements: &2186 !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.2.3
+  requirement: *2186
+  prerelease: false
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: ohm
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: &2202 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.1.3
+    none: false
+  requirement: *2202
+  prerelease: false
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: ohm-contrib
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: &2218 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.1.1
+    none: false
+  requirement: *2218
+  prerelease: false
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: haml
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: &2234 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 3.0.25
+    none: false
+  requirement: *2234
+  prerelease: false
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: vegas
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: &2250 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.1.8
+    none: false
+  requirement: *2250
+  prerelease: false
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: guid
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: &2266 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.1.1
+    none: false
+  requirement: *2266
+  prerelease: false
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: slop
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: &2282 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.1.0
+    none: false
+  requirement: *2282
+  prerelease: false
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: hiredis
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &2298 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.4.5
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.3.1
-  type: :runtime
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  requirement: *2298
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
   type: :runtime
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: thin
+- !ruby/object:Gem::Dependency
+  name: cs-em-hiredis
+  version_requirements: &2314 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+    none: false
+  requirement: *2314
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jruby-openssl
+  version_requirements: &2330 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: *2330
+  prerelease: false
   type: :runtime
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
+- !ruby/object:Gem::Dependency
+  name: json
+  version_requirements: &2346 !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: *2346
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: warbler
+  version_requirements: &2362 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.2.1
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  requirement: *2362
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  version_requirements: &2380 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.1.2
+    none: false
+  requirement: *2380
+  prerelease: false
   type: :development
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: sinatra-reloader
-  prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: &2396 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.5.0
+    none: false
+  requirement: *2396
+  prerelease: false
   type: :development
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: &2412 !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    none: false
+  requirement: *2412
+  prerelease: false
   type: :development
-  version_requirements: *id019
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rack-test
-  prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  version_requirements: &2428 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.6.1
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.5.7
+  requirement: *2428
+  prerelease: false
   type: :development
-  version_requirements: *id020
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: &2444 !ruby/object:Gem::Requirement
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.8.7
+    none: false
+  requirement: *2444
+  prerelease: false
   type: :development
-  version_requirements: *id021
 description: Application registry inspired by Apache Zookeeper
-email: 
+email:
 - lusis.org+rubygems.org@gmail.com
-executables: 
+executables:
 - noah
-- noah-watcher.rb
+- noah-watcher
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
 - .gemtest
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -265,7 +306,7 @@ files:
 - TODO.md
 - autotest/discover.rb
 - bin/noah
-- bin/noah-watcher.rb
+- bin/noah-watcher
 - config.ru
 - config/warble.rb
 - examples/Kirkfile
@@ -354,33 +395,50 @@ files:
 - views/404.erb
 - views/500.erb
 - views/index.haml
-has_rdoc: true
+- views/index.json.erb
 homepage: https://github.com/lusis/noah
 licenses: []
-
 post_install_message: This release has backwards incompatible changes to the API. Please watch http://goo.gl/jYqp2 for details
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
 requirements: []
-
 rubyforge_project: noah
-rubygems_version: 1.6.2
-signing_key: 
+rubygems_version: 1.8.15
+signing_key:
 specification_version: 3
 summary: Application registry inspired by Apache Zookeeper
-test_files: []
-
+test_files:
+- spec/application_spec.rb
+- spec/configuration_spec.rb
+- spec/ephemeral_spec.rb
+- spec/host_spec.rb
+- spec/link_spec.rb
+- spec/noahapp_application_spec.rb
+- spec/noahapp_configuration_spec.rb
+- spec/noahapp_ephemeral_spec.rb
+- 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
+- spec/support/db/.keep
+- spec/support/sample_data.rb
+- spec/support/test-redis.conf
+- spec/tag_spec.rb
+- spec/watcher_spec.rb
+...