redmon 0.0.2 → 0.0.3

data/README.md

@@ -31,8 +31,15 @@ Intuitively introspect registered keys.  ** Coming Soon **
 
 ----
 
+## Installation
+
+Redmon is available as a RubyGem:
+
+```bash
+gem install redmon
+```
+
 ## Usage
-Currently not a registered gem, but soon.  For now clone the repo and start the app as demonstrated below
 
 ```bash
 $ bundle install
@@ -60,6 +67,30 @@ $ ruby load_sim.rb
 
 Open your browser to 0.0.0.0:4567
 
+
+## Using in a Rails application
+
+Add to Gemfile:
+
+    gem 'redmon', require: false
+
+Add to config/routes.rb:
+
+    require 'redmon/app'
+    mount Redmon::App => '/redmon'
+
+You can configure the Redmon using an initializer config/initializers/redmon.rb:
+
+```ruby
+Redmon.configure do |config|
+  config.redis_url = 'redis://127.0.0.1:6379'
+  config.namespace = 'redmon'
+  config.poll_interval = 10
+end
+```
+
+This will mount the Redmon application to the /redmon/ path. The trailing slash is important.
+
 ## License
 
 Copyright (c) 2012 Sean McDaniel
@@ -68,4 +99,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/redmon/app.rb

@@ -1,5 +1,12 @@
+require 'redmon/helpers'
+
 module Redmon
   class App < Sinatra::Base
+    use Rack::Static, {
+      urls: [/\.css$/, /\.js$/],
+      root: "#{root}/public",
+      cache_control: 'public, max-age=3600'
+    }
 
     helpers Redmon::Helpers
 
@@ -36,4 +43,4 @@ module Redmon
     end
 
   end
-end
+end

data/lib/redmon/config.rb

@@ -0,0 +1,26 @@
+module Redmon
+  def self.configure
+    yield config
+  end
+
+  def self.config
+    @config ||= Config.new
+  end
+
+  class Config
+    DEFAULTS = {
+      :web_interface => ['0.0.0.0', 4567],
+      :redis_url     => 'redis://127.0.0.1:6379',
+      :namespace     => 'redmon',
+      :worker        => true,
+      :poll_interval => 10
+    }
+
+    attr_accessor(*DEFAULTS.keys)
+
+    def initialize
+      DEFAULTS.each { |k,v| send("#{k}=", v) }
+    end
+
+  end
+end

data/lib/redmon/helpers.rb

@@ -1,3 +1,5 @@
+require 'redmon/redis'
+
 module Redmon
   module Helpers
     include Redmon::Redis
@@ -7,7 +9,7 @@ module Redmon
     end
 
     def poll_interval
-      Redmon[:poll_interval] * 1000
+      Redmon.config.poll_interval * 1000
     end
 
     def count
@@ -15,4 +17,4 @@ module Redmon
     end
 
   end
-end
+end

data/lib/redmon/redis.rb

@@ -1,3 +1,5 @@
+require 'redmon/config'
+
 module Redmon
   module Redis
     extend self
@@ -13,15 +15,15 @@ module Redmon
     ]
 
     def redis
-      @redis ||= ::Redis.connect(:url => Redmon[:redis_url])
+      @redis ||= ::Redis.connect(:url => Redmon.config.redis_url)
     end
 
     def ns
-      Redmon[:namespace]
+      Redmon.config.namespace
     end
 
     def redis_url
-      @redis_url ||= Redmon[:redis_url].gsub(/\w*:\w*@/, '')
+      @redis_url ||= Redmon.config.redis_url.gsub(/\w*:\w*@/, '')
     end
 
     def redis_host
@@ -60,4 +62,4 @@ module Redmon
       "#{ns}:redis:#{redis_host}:stats"
     end
   end
-end
+end

data/lib/redmon/version.rb

@@ -1,3 +1,3 @@
 module Redmon
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/redmon/worker.rb

@@ -34,8 +34,8 @@ module Redmon
     end
 
     def interval
-      Redmon[:poll_interval]
+      Redmon.config.poll_interval
     end
 
   end
-end
+end

data/lib/redmon.rb

@@ -1,3 +1,4 @@
+require 'redmon/config'
 require 'active_support/core_ext'
 require 'eventmachine'
 require 'haml'
@@ -10,16 +11,8 @@ module Redmon
 
   attr_reader :opts
 
-  @opts = {
-    :web_interface => ['0.0.0.0', 4567],
-    :redis_url     => 'redis://127.0.0.1:6379',
-    :namespace     => 'redmon',
-    :worker        => true,
-    :poll_interval => 10
-  }
-
   def run(opts={})
-    @opts.merge! opts
+    @opts = Redmon::Config::DEFAULTS.merge(opts)
     start_em
   rescue Exception => e
     log "!!! Redmon has shit the bed, restarting... #{e.message}"
@@ -55,6 +48,7 @@ module Redmon
     puts "[#{Time.now.strftime('%y-%m-%d %H:%M:%S')}] #{msg}"
   end
 
+  # @deprecated
   def [](option)
     opts[option]
   end
@@ -64,4 +58,4 @@ end
 require 'redmon/redis'
 require 'redmon/helpers'
 require 'redmon/app'
-require 'redmon/worker'
+require 'redmon/worker'

data/spec/helpers_spec.rb

@@ -4,7 +4,7 @@ describe "Helpers" do
 
   describe "redis" do
     it "should call Redis.connect" do
-      Redis.should_receive(:connect).with({:url => Redmon[:redis_url]})
+      Redis.should_receive(:connect).with({:url => Redmon.config.redis_url})
       Redmon::Redis.redis
     end
   end
@@ -19,19 +19,19 @@ describe "Helpers" do
 
   describe "#ns" do
     it "should return the configured namespace" do
-      Redmon[:namespace].should == Redmon::Redis.ns
+      Redmon.config.namespace.should == Redmon::Redis.ns
     end
   end
 
   describe "#redis_url" do
     it "should return the configured redis url" do
-      Redmon[:redis_url].should == Redmon::Redis.redis_url
+      Redmon.config.redis_url.should == Redmon::Redis.redis_url
     end
   end
 
   describe "#redis_host" do
     it "should return the configured redis host" do
-      Redmon[:redis_url].gsub('redis://', '').should == Redmon::Redis.redis_host
+      Redmon.config.redis_url.gsub('redis://', '').should == Redmon::Redis.redis_host
     end
   end
 
@@ -83,4 +83,4 @@ describe "Helpers" do
     end
   end
 
-end
+end

data/spec/worker_spec.rb

@@ -55,8 +55,8 @@ describe "worker" do
 
   describe "#interval" do
     it "should return the configured poll interval" do
-      @worker.interval.should == Redmon[:poll_interval]
+      @worker.interval.should == Redmon.config.poll_interval
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70250847178440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70250847178440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70250847177320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70250847177320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &70250847176300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70250847176300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70250847175520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70250847175520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70250847174640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250847174640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70250847172620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250847172620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70250847171980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250847171980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70250847202180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250847202180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70250847200940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250847200940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70250847199620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250847199620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70250847197980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250847197980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &70250847197040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +197,15 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70250847197040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70250847196180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250847196180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70250847195320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +229,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250847195320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70250846940040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +245,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70250846940040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70250846939060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +261,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250846939060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Redis Admin interface and monitor.
 email:
 - sean.mcdaniel@me.com
@@ -204,6 +284,7 @@ files:
 - bin/redmon
 - lib/redmon.rb
 - lib/redmon/app.rb
+- lib/redmon/config.rb
 - lib/redmon/helpers.rb
 - lib/redmon/public/redmon.css
 - lib/redmon/public/redmon.js
@@ -239,7 +320,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3944178042738235931
+      hash: -783449072633030627
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,10 +329,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3944178042738235931
+      hash: -783449072633030627
 requirements: []
 rubyforge_project: redmon
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Redis monitor