redmon 0.0.3 → 0.0.4

data/README.md

@@ -27,10 +27,6 @@ Dynamically update your server configuration.
 
 ----
 
-Intuitively introspect registered keys.  ** Coming Soon **
-
-----
-
 ## Installation
 
 Redmon is available as a RubyGem:
@@ -72,12 +68,16 @@ Open your browser to 0.0.0.0:4567
 
 Add to Gemfile:
 
-    gem 'redmon', require: false
+```ruby
+gem 'redmon', require: false
+```
 
 Add to config/routes.rb:
 
-    require 'redmon/app'
-    mount Redmon::App => '/redmon'
+```ruby
+require 'redmon/app'
+mount Redmon::App => '/redmon'
+```
 
 You can configure the Redmon using an initializer config/initializers/redmon.rb:
 
@@ -89,7 +89,8 @@ Redmon.configure do |config|
 end
 ```
 
-This will mount the Redmon application to the /redmon/ path. The trailing slash is important.
+This will mount the Redmon application to the /redmon/ path. The trailing slash
+is important.
 
 ## License
 
@@ -99,4 +100,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/bin/redmon

@@ -54,18 +54,12 @@ class RedmonCLI
     :default     => true,
     :description => 'Do not run a worker to collect the stats'
 
-  def parse
+  def run
     parse_options
-    config[:web_interface] = web_interface
+    config[:web_interface] = [config[:address], config[:port]]
     config
   end
 
-  def web_interface
-    if config[:app]
-      config[:web_interface] = [config[:address], config[:port]]
-    end
-  end
-
 end
 
-Redmon.run RedmonCLI.new.parse
+Redmon.run RedmonCLI.new.run

data/lib/redmon.rb

@@ -9,10 +9,8 @@ require 'thin'
 module Redmon
   extend self
 
-  attr_reader :opts
-
   def run(opts={})
-    @opts = Redmon::Config::DEFAULTS.merge(opts)
+    config.apply opts
     start_em
   rescue Exception => e
     log "!!! Redmon has shit the bed, restarting... #{e.message}"
@@ -23,15 +21,15 @@ module Redmon
     EM.run do
       trap 'TERM', &method(:shutdown)
       trap 'INT',  &method(:shutdown)
-      start_app    if opts[:web_interface]
-      start_worker if opts[:worker]
+      start_app    if config.app
+      start_worker if config.worker
     end
   end
 
   def start_app
     app = Redmon::App.new
-    Thin::Server.start(*opts[:web_interface], app)
-    log "listening on http##{opts[:web_interface].join(':')}"
+    Thin::Server.start(*config.web_interface, app)
+    log "listening on http##{config.web_interface.join(':')}"
   rescue Exception => e
     log "Can't start Redmon::App. port in use?  Error #{e}"
   end
@@ -40,7 +38,7 @@ module Redmon
     Worker.new.run!
   end
 
-  def shutdown
+  def shutdown(code)
     EM.stop
   end
 
@@ -50,7 +48,7 @@ module Redmon
 
   # @deprecated
   def [](option)
-    opts[option]
+    config.send :option
   end
 
 end
@@ -58,4 +56,4 @@ end
 require 'redmon/redis'
 require 'redmon/helpers'
 require 'redmon/app'
-require 'redmon/worker'
+require 'redmon/worker'

data/lib/redmon/app.rb

@@ -2,14 +2,15 @@ require 'redmon/helpers'
 
 module Redmon
   class App < Sinatra::Base
+
+    helpers Redmon::Helpers
+
     use Rack::Static, {
       urls: [/\.css$/, /\.js$/],
       root: "#{root}/public",
       cache_control: 'public, max-age=3600'
     }
 
-    helpers Redmon::Helpers
-
     get '/' do
       haml :app
     end
@@ -43,4 +44,4 @@ module Redmon
     end
 
   end
-end
+end

data/lib/redmon/config.rb

@@ -9,18 +9,23 @@ module Redmon
 
   class Config
     DEFAULTS = {
-      :web_interface => ['0.0.0.0', 4567],
-      :redis_url     => 'redis://127.0.0.1:6379',
       :namespace     => 'redmon',
+      :redis_url     => 'redis://127.0.0.1:6379',
+      :app           => true,
       :worker        => true,
+      :web_interface => ['0.0.0.0', 4567],
       :poll_interval => 10
     }
 
     attr_accessor(*DEFAULTS.keys)
 
     def initialize
-      DEFAULTS.each { |k,v| send("#{k}=", v) }
+      apply DEFAULTS
+    end
+
+    def apply(opts)
+      opts.each {|k,v| send("#{k}=", v) if respond_to? k}
     end
 
   end
-end
+end

data/lib/redmon/redis.rb

@@ -62,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.3"
+  VERSION = "0.0.4"
 end

data/lib/redmon/views/app.haml

@@ -22,8 +22,6 @@
           %ul.nav
             %li.active{:id => 'dashboard'}
               %a Dashboard
-            %li{:id => 'keys'}
-              %a Keys
             %li{:id => 'cli'}
               %a CLI
             %li{:id => 'config'}
@@ -125,16 +123,6 @@
                     %tr
                       %td VM Enabled
                       %td{:id => "vm_enabled"}
-      .keys.hidden
-        .content
-          .page-header
-            %h1 Keys - Coming soon!
-          .row
-            .span6
-              .input-prepend
-                %span.add-on pattern
-                %input.span5
-            .span15
 
       .cli.hidden
         .content

data/spec/config_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "Redmon" do
+  describe "#configure" do
+    it "should allow block style config" do
+      Redmon.configure do |config|
+        config.app = false
+      end
+      Redmon.config.app.should be_false
+    end
+  end
+end
+
+describe "Config" do
+  subject {Redmon::Config.new}
+  describe "#initialize" do
+    it "should apply the defaults" do
+      Redmon::Config::DEFAULTS.each do |k,v|
+        subject.send(k).should === v
+      end
+    end
+  end
+
+  describe "#apply" do
+    it "should apply the passed options hash" do
+      subject.app.should be_true
+      subject.worker.should be_true
+
+      subject.apply app: false, worker: false
+      subject.app.should be_false
+      subject.worker.should be_false
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmon
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -303,6 +303,7 @@ files:
 - load_sim.rb
 - redmon.gemspec
 - spec/app_spec.rb
+- spec/config_spec.rb
 - spec/helpers_spec.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb
@@ -320,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -783449072633030627
+      hash: 2796523061834501590
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -329,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -783449072633030627
+      hash: 2796523061834501590
 requirements: []
 rubyforge_project: redmon
 rubygems_version: 1.8.24
@@ -338,6 +339,7 @@ specification_version: 3
 summary: Redis monitor
 test_files:
 - spec/app_spec.rb
+- spec/config_spec.rb
 - spec/helpers_spec.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb