redmon 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmZjOTRiZTdlM2U1YjBhMjcxZTlkYmE1MDNjZjE3ZTlkMzlkODk2NQ==
+  data.tar.gz: !binary |-
+    MGEwNzdiMDVlNDFkNDMxMjY4MzAyMDkwZmU1N2FhM2Y2M2E4NjM4MQ==
+SHA512:
+  metadata.gz: !binary |-
+    Y2U5NDkxYzhmYTI3N2JlY2VkMjFmNDc4NmUxZDg3MWIzMWRlMjc2NWMzNzM0
+    ZTU3MmQwMzZiMmYxMDQzNGMyNWZiZjlkZjdlMDMxZTMwZTNiMGU3NDk0MjAx
+    YTFiOWQxNDMxZDIzMzYzODZiZGMzZjgxNjk0NTFhZGFmNWZmM2M=
+  data.tar.gz: !binary |-
+    ZDFlYzU2YTk5MjEzYjJmYWVmYjhhZmU5NWFmNzZhYzdkMDNiMzNhMGNhMTdl
+    NTRkN2ZmYmQ5YzRhMWU4NmJhNTFmMzQ0YmVmZDJkY2JlYzM1NjE3OWE5YTQ0
+    Y2Q3Y2Q2OWZmODgyODNhYjcyODdiZTdmMDY0MjNkM2NlYzVhOTk=

data/.gitignore

@@ -5,5 +5,7 @@
 dump.rdb
 pkg
 vendor
+coverage
 !/lib/redmon/public/vendor
-Gemfile.lock
+Gemfile.lock
+.coveralls.yml

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format <%= true ? 'documentation' : 'progress' %>
+--format documentation

data/.travis.yml

@@ -3,7 +3,16 @@ rvm:
   - ree-1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - ruby-head
+  - rbx
+
 branches:
   only:
     - master
-    - ruby-1.8
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  fast_finish: true

data/Gemfile

@@ -1,3 +1,19 @@
 source "http://rubygems.org"
 
-gemspec
+gemspec
+
+group :test do
+  gem "coveralls", :require => false
+end
+
+platforms :ruby_18 do
+  gem "mime-types", "~> 1.25"
+end
+
+platforms :rbx do
+  gem "json"
+  gem "racc"
+  gem "rubinius-coverage", "~> 2.0"
+  gem "rubysl", "~> 2.0"
+  gem "psych"
+end

data/README.md

@@ -1,11 +1,12 @@
+[![Build status - Travis-ci](https://secure.travis-ci.org/steelThread/redmon.png) ](http://travis-ci.org/steelThread/redmon)
+[![Code Climate](https://codeclimate.com/github/steelThread/redmon.png)](https://codeclimate.com/github/steelThread/redmon)
+[![Gem Version](https://badge.fury.io/rb/redmon.png)](http://badge.fury.io/rb/redmon)
+[![Coverage Status](https://coveralls.io/repos/steelThread/redmon/badge.png?branch=master)](https://coveralls.io/r/steelThread/redmon?branch=master)
 # Redmon
 
-Simple sinatra based dashbord for redis.  After seeing the [fnordmetric](https://github.com/paulasmuth/fnordmetric)
+Simple sinatra based dashboard for redis.  After seeing the [fnordmetric](https://github.com/paulasmuth/fnordmetric)
 project I was inspired to write this.  Some of the ideas there have be carried over here.
 
-[ ![Build status - Travis-ci](https://secure.travis-ci.org/steelThread/redmon.png) ](http://travis-ci.org/steelThread/redmon)
-
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/steelThread/redmon)
 
 ----
 
@@ -73,16 +74,22 @@ Add to Gemfile:
 gem 'redmon', require: false
 ```
 
-Add to config/routes.rb:
+Mount redmon in config/routes.rb:
 
 ```ruby
-require 'redmon/app'
 mount Redmon::App => '/redmon'
 ```
 
-You can configure the Redmon using an initializer config/initializers/redmon.rb:
+Create a config/initializers/redmon.rb file:
 
 ```ruby
+require 'redmon/config'
+require 'redmon/redis'
+require 'redmon/app'
+
+#
+# Optional config overrides
+#
 Redmon.configure do |config|
   config.redis_url = 'redis://127.0.0.1:6379'
   config.namespace = 'redmon'

data/bin/redmon

@@ -26,7 +26,7 @@ class RedmonCLI
     :short       => '-r URL',
     :long        => '--redis URL',
     :default     => 'redis://127.0.0.1:6379',
-    :description => "The Redis url for monitor (default: redis://127.0.0.1:6379)"
+    :description => "The Redis url for monitor (default: redis://127.0.0.1:6379, note: password is support, ie redis://:password@127.0.0.1:6379)"
 
   option :namespace,
     :short       => '-n NAMESPACE',
@@ -58,14 +58,14 @@ class RedmonCLI
     :long        => '--no-app',
     :boolean     => true,
     :default     => true,
-    :description => 'Do not run the web app to present stats'
+    :description => 'Do not run the web app to present stats (default: true)'
 
   option :worker,
     :on          => :tail,
     :long        => '--no-worker',
     :boolean     => true,
     :default     => true,
-    :description => 'Do not run a worker to collect the stats'
+    :description => 'Do not run a worker to collect the stats (default: true)'
 
   def run
     parse_options

data/lib/redmon.rb

@@ -1,4 +1,6 @@
 require 'eventmachine'
+require 'active_support'
+require 'active_support/deprecation'
 require 'active_support/core_ext'
 
 module Redmon
@@ -32,7 +34,7 @@ module Redmon
     end
     log "listening on http##{config.web_interface.join(':')}"
   rescue Exception => e
-    log "Can't start Redmon::App. port in use?  Error #{e}"
+    log "Can't start Redmon::App. port in use? Error: #{e}"
   end
 
   def start_worker

data/lib/redmon/version.rb

@@ -1,3 +1,3 @@
 module Redmon
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/load_sim.rb

@@ -1,20 +1,39 @@
 $: << ::File.expand_path("../lib/", __FILE__)
 require "rubygems"
 require "bundler/setup"
+require 'mixlib/cli'
 require 'redmon'
 require 'redis'
 
-redis = Redis.connect
+class RedmonLoadSimCLI
+	include Mixlib::CLI
 
-loop do
-  start = rand(100000)
-  multi = rand(5)
-  start.upto(multi * start) do |i|
-    redis.set("key-#{i}", "abcdedghijklmnopqrstuvwxyz")
-  end
+	option :redis_url,
+		:short       => '-r URL',
+		:long        => '--redis URL',
+		:default     => 'redis://127.0.0.1:6379',
+		:description => "The Redis url to load simulated traffic against (default: redis://127.0.0.1:6379, note: password is supported, ie redis://:password@127.0.0.1:6379)"
 
-  start.upto(multi * start) do |i|
-    redis.get("key-#{i}")
-    redis.del("key-#{i}")
-  end
-end
+	def run
+		parse_options
+		
+		redis_options = Redis::Client::DEFAULTS || {}
+		redis_options[:url] = config[:redis_url] if config[:redis_url]
+		redis = Redis.new(redis_options)
+
+		loop do
+			start = rand(100000)
+			multi = rand(5)
+			start.upto(multi * start) do |i|
+				redis.set("key-#{i}", "abcdedghijklmnopqrstuvwxyz")
+			end
+
+			start.upto(multi * start) do |i|
+				redis.get("key-#{i}")
+				redis.del("key-#{i}")
+			end
+		end
+	end
+end
+
+RedmonLoadSimCLI.new.run

data/redmon.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Redmon::VERSION
   s.authors     = ["Sean McDaniel"]
   s.email       = ["sean.mcdaniel@me.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/steelThread/redmon"
   s.summary     = %q{Redis monitor}
   s.description = %q{Redis Admin interface and monitor.}
 
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = ["redmon"]
   s.require_paths = ["lib"]
 
-  s.add_dependency "bson_ext", ">= 1.4.0"
   s.add_dependency "sinatra", ">= 1.2.6"
   s.add_dependency "hiredis", "~> 0.4.0"
   s.add_dependency "redis", ">= 2.2.2"
@@ -26,8 +25,8 @@ Gem::Specification.new do |s|
   s.add_dependency "i18n"
   s.add_dependency "haml"
   s.add_dependency "rack"
-  s.add_dependency "thin"
-  s.add_dependency "activesupport"
+  s.add_dependency "thin", "~> 1.5.1"
+  s.add_dependency "activesupport", "~> 3.2.0"
   s.add_dependency "mixlib-cli"
 
   s.add_development_dependency "sinatra-contrib", "~> 1.3.1"

data/spec/helpers_spec.rb

@@ -22,25 +22,26 @@ describe "Helpers" do
 
   describe "#ns" do
     it "should return the configured namespace" do
-      Redmon.config.namespace.should == Redmon::Redis.ns
+      Redmon::Redis.ns.should == Redmon.config.namespace
     end
   end
 
   describe "#redis_url" do
     it "should return the configured redis url" do
-      Redmon.config.redis_url.should == Redmon::Redis.redis_url
+      Redmon::Redis.redis_url.should == Redmon.config.redis_url
     end
   end
 
   describe "#redis_host" do
     it "should return the configured redis host" do
-      Redmon.config.redis_url.gsub('redis://', '').should == Redmon::Redis.redis_host
+      config_uri = URI.parse(Redmon.config.redis_url)
+      Redmon::Redis.redis_host.should == "#{config_uri.host}:#{config_uri.port}"
     end
   end
 
   describe "#unquoted" do
     it "should return the configured redis host" do
-      (%w{string OK} << '(empty list or set)').should == Redmon::Redis.unquoted
+      Redmon::Redis.unquoted.should == (%w{string OK} << '(empty list or set)')
     end
   end
 
@@ -56,33 +57,32 @@ describe "Helpers" do
 
   describe "#empty_result" do
     it "should return the empty list message" do
-      '(empty list or set)'.should == Redmon::Redis.empty_result
+      Redmon::Redis.empty_result.should == '(empty list or set)'
     end
   end
 
   describe "#unknown" do
     it "should return the unknown command message" do
-      "(error) ERR unknown command 'unknown'".should == Redmon::Redis.unknown('unknown')
+      Redmon::Redis.unknown("unknown").should == "(error) ERR unknown command 'unknown'"
     end
   end
 
   describe "#wrong_number_of_arguments_for" do
     it "" do
-      "(error) ERR wrong number of arguments for 'unknown' command".should ==
-        Redmon::Redis.wrong_number_of_arguments_for('unknown')
+      Redmon::Redis.wrong_number_of_arguments_for("unknown").should ==
+        "(error) ERR wrong number of arguments for 'unknown' command"
     end
   end
 
   describe "#connection_refused" do
     it "should return the connection refused message" do
-      "Could not connect to Redis at 127.0.0.1:6379: Connection refused".should ==
-        Redmon::Redis.connection_refused
+      Redmon::Redis.connection_refused.should == "Could not connect to Redis at 127.0.0.1:6379: Connection refused"
     end
   end
 
   describe "#stats_key" do
     it "should return the namespaced scoped stats key" do
-      "redmon:redis:127.0.0.1:6379:stats".should == Redmon::Redis.stats_key
+      Redmon::Redis.stats_key.should == "redmon:redis:127.0.0.1:6379:stats"
     end
   end
 

data/spec/spec_helper.rb

@@ -1,3 +1,14 @@
+require 'simplecov'
+require 'coveralls'
+
+if ENV["TRAVIS"]
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+end
+
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
 require 'redmon'
 require 'rack/test'
 

data/spec/worker_spec.rb

@@ -11,7 +11,26 @@ describe "worker" do
   end
 
   describe "#run!" do
-    it "should poll and record stats"
+    it "should poll and record stats" do
+      Redmon.config.poll_interval = 1 #reduce the interval to a second for testing
+      redis = mock_redis
+      redis.should_receive(:zadd).at_least(:twice)
+      redis.should_receive(:zremrangebyscore).at_least(:twice)
+      
+      @worker.stub(:stats).and_return(['ts', 'stats'])
+
+      emThread = Thread.new do
+        EM.run do
+          @timer = @worker.run! 
+        end
+      end
+
+      puts "sleeping for 3 cycles of Redmon.config.poll_interval: #{Redmon.config.poll_interval} seconds to ensure polling occurred"
+      sleep 3 * Redmon.config.poll_interval.seconds
+      @timer.cancel
+      emThread.kill
+      @worker.cleanup_old_stats
+    end
   end
 
   describe "#record_stats" do
@@ -34,13 +53,12 @@ describe "worker" do
 
   describe "#stats" do
     it "should fetch info, dbsize and slowlog from redis" do
-      pending
       redis = mock_redis
       redis.should_receive(:info).with(no_args()).and_return({})
       redis.should_receive(:dbsize).with(no_args()).and_return(0)
       redis.should_receive(:slowlog).with(:get).and_return({})
 
-      @worker.stub(:entires).and_return([{}])
+      @worker.stub(:entries).and_return([{}])
       @worker.stats
     end
   end

metadata

@@ -1,36 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: redmon
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Sean McDaniel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,39 +111,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -198,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -206,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -222,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -230,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -238,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -246,7 +202,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -293,29 +248,28 @@ files:
 - spec/helpers_spec.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb
-homepage: ''
+homepage: https://github.com/steelThread/redmon
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: redmon
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Redis monitor
 test_files:
 - spec/app_spec.rb