amnesia 1.0.0 → 1.0.1

data/README.markdown

@@ -8,7 +8,7 @@ Hopefully with Amnesia you'll know exactly whats happening with memory when it c
 
 ## Why?
 
-Its always nice to have some statistics to see how everything is performing within your stack. Memcached seems to be a  mystery box that people don't really pay alot of attention to.
+Its always nice to have some statistics to see how everything is performing within your stack. Memcached seems to be a  mystery box that people don't really pay a lot of attention to.
 
 Amnesia tells you how your application is performing, when it misses, when it is running sweet, when you're about to run out of memcached and (perhaps) fall down in a screaming heap.
 
@@ -16,7 +16,7 @@ Amnesia tells you how your application is performing, when it misses, when it is
 
 All stats are since each memcached instance was restarted
 
-Available as a cumluative result of all your memcached instances, or single instances alone:
+Available as a cumulative result of all your memcached instances, or single instances alone:
 
 * Cache hits and misses
 * Reads and writes
@@ -40,11 +40,39 @@ Available for single instances only:
 "config.ru":
   
     require 'amnesia'
-    use Amnesia::Application, :hosts => ["localhost:11211"]
+    use Amnesia::Application
     run Sinatra::Application
 
 ### Then, cruise on over to `your-host.tld/amnesia`
 
+
+## Configuration options
+
+### Hosts
+Amnesia will work automagically if you drop it on a Heroku powered app, likewise—for a "standard" memcache host (running on localhost:11211, the default.).
+
+When you need to specify where your memcache hosts can be found, you can either set an environment variable: 
+
+    ENV["MEMCACHE_SERVERS"] = ['localhost:11211']
+
+or alternately, you can set it within your `config.ru`:
+
+    use Amnesia::Application, :hosts => ["mc1.yourapp.com:11211", "mc2.yourapp.com:11211"]
+
+### Authentication
+
+When you want to keep your Amnesia data private, you can set an environment variable that will enable http basic authentication: 
+
+    ENV["AMNESIA_CREDS"] = ben:schwarz
+    
+in your shell, you might do it like this: 
+
+    export AMNESIA_CREDS=ben:schwarz
+    
+on heroku, like this:
+
+    heroku config:add AMNESIA_CREDS=ben:schwarz
+
 ## Potential issues
 
 * Hosts are listed as "Inactive" or "Not Responding"

data/lib/amnesia.rb

@@ -1,5 +1,5 @@
 require 'sinatra'
-require 'memcache'
+require 'memcached'
 require 'gchart'
 require 'haml'
 
@@ -19,6 +19,10 @@ module Amnesia
 
     def initialize(app, configuration = {})
       Amnesia.config = configuration
+      # Heroku
+      Amnesia.config[:hosts] ||= [nil] if ENV['MEMCACHE_SERVERS']
+      # Default if nothing set
+      Amnesia.config[:hosts] ||= ['127.0.0.1:11211']
       super(app)
     end
     
@@ -40,16 +44,35 @@ module Amnesia
        rescue
          nil
        end
+
+      def protected!
+        unless authorized?
+          response['WWW-Authenticate'] = %(Basic realm="Amnesia")
+          throw(:halt, [401, "Not authorized\n"])
+        end
+      end
+
+      def authorized?
+        if ENV['AMNESIA_CREDS']
+          @auth ||=  Rack::Auth::Basic::Request.new(request.env)
+          @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == ENV['AMNESIA_CREDS'].split(':')
+        else
+          # No auth needed.
+          true
+        end
+      end
     end
     
     get '/amnesia' do
-      @hosts = Amnesia.config[:hosts].map{|host| Host.new(host)}
+      protected!
+      @hosts = Amnesia.config[:hosts].map{|host| Amnesia::Host.new(host)}
       haml :index
     end
 
     get '/amnesia/:host' do
-      @host = Host.new(params[:host])
+      protected!
+      @host = Amnesia::Host.new(params[:host])
       haml :host
     end
   end
-end
+end

data/lib/amnesia/host.rb

@@ -1,29 +1,34 @@
-class Host
-  attr_reader :address
+module Amnesia
+  class Host
+    def initialize(address)
+      @address = address
+    end
   
-  def initialize(address)
-    @address = address
-  end
+    def alive? 
+      return true if connection.stats
+    rescue Memcached::Error
+      return false
+    end
   
-  def alive? 
-    return true if connection.stats
-  rescue MemCache::MemCacheError
-    return false
-  end
+    def method_missing(method, *args)
+      stats[method.to_s.to_sym].sum if stats.has_key? method.to_s.to_sym
+    end
   
-  def method_missing(method, *args)
-    return stats[method.to_s] if stats.has_key? method.to_s
-  end
-  
-  def stats
-    connection.stats[connection.stats.keys.first]
-  rescue MemCache::MemCacheError
-    return {}
-  end
+    def stats
+      connection.stats[connection.stats.keys.first]
+      connection.stats
+    rescue Memcached::Error
+      return {}
+    end
+
+    def address
+      @address || @connection.servers.join(', ')
+    end
   
-  private
+    private
   
-  def connection
-    @connection ||= MemCache.new(@address)
+    def connection
+      @connection ||= @address ? Memcached.new(@address) : Memcached.new
+    end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: amnesia
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 +10:00
+date: 2010-10-02 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -34,19 +32,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: memcache-client
+  name: memcached-northscale
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
-        - 1
-        - 5
         - 0
-        version: 1.5.0
+        - 19
+        - 5
+        - 4
+        version: 0.19.5.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,7 +55,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -73,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -114,7 +110,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -123,7 +118,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"