redmon 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWM1NzliMjNjZWZjYjZiZTdhMWFhYWY4NTg5NWE2NTQ4MjBlNzBjYQ==
-  data.tar.gz: !binary |-
-    NmM3YjNjM2E4YWM5MTFlMDdjODhiY2QwM2ViNzA1M2YzNWZiYzM3Yw==
+SHA1:
+  metadata.gz: 28f5cedae9d53022bfb9236bf61e049dc108ecf3
+  data.tar.gz: 842200093bf6b2068af54456d25dcc83bae309d9
 SHA512:
-  metadata.gz: !binary |-
-    OGI0NDdlZjk1NmM0NDMzZWMyZDNjOWVkM2VmNThjN2M0MWVmYTJiNWZiMTRi
-    NGQxNmUwMTdiMmZkMmUzMmM4MjZkMDJhY2IxMTdkYzk2ODJmOGViNDNjYmM0
-    ZGEyYWYwZjMxZWVmNWE5ZjMxYTdkY2JmMWYyMTExZWYxMWM1OTQ=
-  data.tar.gz: !binary |-
-    NTY0MWM5OWEwNmU4NjEwYzkzNDg1N2MxMjg4OTAyZTNkNjM3MmY0MDY3OTVh
-    NmNlNDc0MzAyZjVmZWIxMWJmOTJlY2U1Nzk2NTg4N2RlNmE5MGFjM2U5NjQz
-    NzBiYjZhNjA3OTVlOGI2NDBjOGE2MGM1NzY5OTJiZTQ0MGMxYWQ=
+  metadata.gz: 305e647bbfacd7e4875adaf05adb9ad12487c84a19d13ac0f1fa5d850b0364d861c025e732983dd1d4668179df5f2962a58b5d61973cecc64119b5190d784e76
+  data.tar.gz: a7688038c9defc9941720e11d91feb737fb2eda69530bd61605430a2c77aa06f00bf73c898176bb34b59f7bc534e6cb1c550b3611e29d086a13c4eda8a153ecf

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 rvm:
-  - ree-1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.2
   - ruby-head
   - rbx
 

data/Gemfile

@@ -2,8 +2,28 @@ source "http://rubygems.org"
 
 gemspec
 
+gem "rake"
+
+gem "sinatra", ">= 1.2.6"
+gem "hiredis", "~> 0.4.0"
+gem "redis", ">= 2.2.2"
+gem "eventmachine"
+gem "i18n"
+gem "haml"
+gem "rack"
+gem "thin"
+gem "activesupport", "~> 3.2.0"
+# gem "json", "~> 1.7.7"
+gem "mixlib-cli"
+
+group :development do
+  gem "sinatra-contrib", "~> 1.3.1"
+  gem "rack-test"
+end
+
 group :test do
   gem "coveralls", :require => false
+  gem "rspec", "~> 2.8.0"
 end
 
 platforms :ruby_18 do

data/README.md

@@ -40,22 +40,23 @@ gem install redmon
 
 ```bash
 $ redmon -h
-Usage: /Users/sean/codez/steelThread/redmon/vendor/ruby/1.9.1/bin/redmon (options)
+Usage: bin/redmon (options)
     -a, --address ADDRESS            The thin bind address for the app (default: 0.0.0.0)
-    -n, --namespace NAMESPACE        The root Redis namespace (default: redmon)
+    -b, --base-path BASE_PATH        The base path to expose the service at (default: /)
     -l, --lifespan MINUTES           Lifespan(in minutes) for polled data (default: 30)
+    -n, --namespace NAMESPACE        The root Redis namespace (default: redmon)
     -i, --interval SECS              Poll interval in secs for the worker (default: 10)
     -p, --port PORT                  The thin bind port for the app (default: 4567)
-    -r, --redis URL                  The Redis url for monitor (default: redis://127.0.0.1:6379)
+    -r, --redis URL                  The Redis url for monitor (default: redis://127.0.0.1:6379, note: password is support, ie redis://:password@127.0.0.1:6379)
     -s, --secure CREDENTIALS         Use basic auth. Colon separated credentials, eg admin:admin.
-        --no-app                     Do not run the web app to present stats
-        --no-worker                  Do not run a worker to collect the stats
+        --no-app                     Do not run the web app to present stats (default: true)
+        --no-worker                  Do not run a worker to collect the stats (default: true)
 
 $ redmon
->> Thin web server (v1.3.1 codename Triple Espresso)
->> Maximum connections set to 1024
->> Listening on 0.0.0.0:4567, CTRL+C to stop
-[12-03-10 15:49:40] listening on http#0.0.0.0:4567
+Thin web server (v1.7.0 codename Dunder Mifflin)
+Maximum connections set to 1024
+Listening on 0.0.0.0:4567, CTRL+C to stop
+[16-08-22 19:36:53] listening on http://0.0.0.0:4567
 ```
 
 If you want to simulate a weak load on redis
@@ -109,7 +110,9 @@ class RedmonWorker
   include Sidekiq::Worker
 
   def perform
-    Redmon::Worker.new.record_stats
+    worker = Redmon::Worker.new
+    worker.record_stats
+    worker.cleanup_old_stats
   ensure
     self.class.perform_in Redmon.config.poll_interval.seconds
   end

data/bin/redmon

@@ -22,6 +22,12 @@ class RedmonCLI
     :description => "The thin bind port for the app (default: 4567)",
     :proc        => to_i
 
+  option :base_path,
+    :short       => '-b BASE_PATH',
+    :long        => '--base-path BASE_PATH',
+    :default     => '/',
+    :description => "The base path to expose the service at (default: /)"
+
   option :redis_url,
     :short       => '-r URL',
     :long        => '--redis URL',

data/lib/redmon.rb

@@ -27,10 +27,14 @@ module Redmon
 
   def start_app
     require 'thin'
+    base_path = config.base_path
     Thin::Server.start(*config.web_interface) do
-      run Redmon::App.new
+      app = Redmon::App.new
+      map base_path do
+        run app
+      end
     end
-    log "listening on http##{config.web_interface.join(':')}"
+    log "listening on http://#{config.web_interface.join(':')}#{base_path}"
   rescue Exception => e
     log "Can't start Redmon::App. port in use? Error: #{e}"
   end

data/lib/redmon/config.rb

@@ -11,6 +11,7 @@ module Redmon
     DEFAULTS = {
       :namespace     => 'redmon',
       :redis_url     => 'redis://127.0.0.1:6379',
+      :base_path     => '',
       :app           => true,
       :worker        => true,
       :web_interface => ['0.0.0.0', 4567],

data/lib/redmon/version.rb

@@ -1,3 +1,3 @@
 module Redmon
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/redmon/views/app.haml

@@ -31,7 +31,7 @@
           .pull-right
             %a.brand #{redis_url}
             .btns
-              %button#flush-btn.btn.primary Flush DB
+              %button#flush-btn.btn.danger Flush DB
               %button#reset-btn.btn.primary Reset Statistics
 
     .container.viewport

data/redmon.gemspec

@@ -18,18 +18,5 @@ Gem::Specification.new do |s|
   s.executables   = ["redmon"]
   s.require_paths = ["lib"]
 
-  s.add_dependency "sinatra", ">= 1.2.6"
-  s.add_dependency "hiredis", "~> 0.4.0"
-  s.add_dependency "redis", ">= 2.2.2"
-  s.add_dependency "eventmachine"
-  s.add_dependency "i18n"
-  s.add_dependency "haml"
-  s.add_dependency "rack"
-  s.add_dependency "thin", "~> 1.5.1"
-  s.add_dependency "mixlib-cli"
-
-  s.add_development_dependency "sinatra-contrib", "~> 1.3.1"
-  s.add_development_dependency "rack-test"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 2.8.0"
-end
+  s.add_development_dependency 'bundler', '~> 1.3'
+end

metadata

@@ -1,197 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: redmon
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Sean McDaniel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.6
-- !ruby/object:Gem::Dependency
-  name: hiredis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: mixlib-cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra-contrib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '1.3'
 description: Redis Admin interface and monitor.
 email:
 - sean.mcdaniel@me.com
@@ -200,9 +32,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -243,17 +75,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: redmon
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Redis monitor