redis-stat 0.4.12-java → 0.4.14-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc7545407011634c90945f45fd977c572710bdfe
-  data.tar.gz: 9e534a8f2c7edc984f0bd0b17bbf007965cba047
+  metadata.gz: 70ab12c910bd8d18bd0931f8acd3b2e416cea7b7
+  data.tar.gz: cd3c67146c92f87b122306153ad054bcca011bcb
 SHA512:
-  metadata.gz: 3f6e0c566495cbb70e1cbadef94f2d1f3c0da68ea134df3c7f13c395c4b9f64a4c666f8c90bd9309cade19163178c10f9cb394643c39d519a6988c4718af2772
-  data.tar.gz: b1b0a9a5ce59caf9b62c0feccff1bdec560cecf4e171b0b16aa24ec446351e433646dd6e4482997ca38918a76af16550b5432ab426b791ed630f0b7a59c920a8
+  metadata.gz: a92ab3c0317070213b1dce3e3d1f43cef642613bbb9cfe4d260e65e6801b8c59f712732d70df8e71866a80b96fc541843ab75d7e70953e1dad71b168eca0d956
+  data.tar.gz: b76c3a854ad8adc6f290b754489409495063b924db9f2c848b57ccb2cf742447664731411eb6d5535deacf22921ea84182e419113a0264eb9c3c8cbfef744aca

data/README.md

@@ -23,7 +23,7 @@ it instead.
 ## Usage
 
 ```
-usage: redis-stat [HOST[:PORT] ...] [INTERVAL [COUNT]]
+usage: redis-stat [HOST[:PORT][/PASS] ...] [INTERVAL [COUNT]]
 
     -a, --auth=PASSWORD              Password
     -v, --verbose                    Show more info
@@ -84,14 +84,6 @@ If you're running Windows, you can only install redis-stat on
 [JRuby](http://jruby.org/). Notice that fancy terminal colors will not be
 printed as they are not supported in the default Windows command prompt.
 
-## Author
-- [Junegunn Choi](https://github.com/junegunn)
-
-## Contributors
-- [Chris Meisl](https://github.com/cmeisl)
-- [Hyunseok Hwang](https://github.com/frhwang)
-- [Sent Hil](https://github.com/sent-hil)
-
 ## Contributing
 
 1. Fork it
@@ -100,6 +92,16 @@ printed as they are not supported in the default Windows command prompt.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+### Test
+
+You need two Redis servers running on localhost with port 6379 and 6380 with
+no password.
+
+```sh
+bundle install
+bundle exec rake test
+```
+
 ## About the name _redis-stat_
 
 Since this project was supposed to be a vmstat-like monitoring script for Redis,

data/lib/redis-stat.rb

@@ -28,10 +28,13 @@ class RedisStat
 
     @hosts         = options[:hosts]
     @interval      = options[:interval]
+    @auth          = options[:auth]
     @redises       = @hosts.inject({}) { |hash, e|
-      host, port   = e.split(':')
+      hostport, password = e.split('/')
+      host, port = hostport.split(':')
       hash[e] = Redis.new(Hash[ {:host => host,
                                  :port => port,
+                                 :password => password || @auth,
                                  :timeout => @interval}.select { |k, v| v } ])
       hash
     }
@@ -39,7 +42,6 @@ class RedisStat
     @colors        = options[:colors] || COLORS
     @csv_file      = options[:csv_file]
     @csv_output    = options[:csv_output]
-    @auth          = options[:auth]
     @verbose       = options[:verbose]
     @measures      = MEASURES[ @verbose ? :verbose : :default ].map { |m| [*m].first }
     @tab_measures  = MEASURES[:static].map { |m| [*m].first }
@@ -82,7 +84,6 @@ class RedisStat
               $stdout
             end
       update_term_size!
-      authenticate!
 
       # Initial info collection
       info, x = collect
@@ -114,11 +115,6 @@ class RedisStat
             raise
           end
 
-        if exceptions.any? { |k, v| need_auth? v }
-          authenticate!
-          next
-        end
-
         info_output_all = process info, prev_info
         begin
           output_es Hash[info_output_all] if @elasticsearch && @count > 0
@@ -459,7 +455,7 @@ private
       })
       [humanize_number(val), val]
     when :evicted_keys_per_second, :expired_keys_per_second, :keyspace_hits_per_second,
-         :keyspace_misses_per_second, :total_commands_processed_per_second
+         :keyspace_misses_per_second, :total_commands_processed_per_second, :rejected_connections_per_second
       val = get_diff.call(key.to_s.gsub(/_per_second$/, '').to_sym)
       [humanize_number(val), val]
     when :used_memory, :used_memory_rss, :aof_current_size, :aof_base_size
@@ -508,15 +504,4 @@ private
     end
     str
   end
-
-  def need_auth? e
-    @auth && e.is_a?(Redis::CommandError) &&
-      e.to_s =~ /NOAUTH|operation not permitted/
-  end
-
-  def authenticate!
-    @redises.values.each do |r|
-      r.ping rescue (r.auth @auth)
-    end if @auth
-  end
 end

data/lib/redis-stat/constants.rb

@@ -39,6 +39,7 @@ class RedisStat
       :used_cpu_sys,
       :connected_clients,
       :blocked_clients,
+      :rejected_connections_per_second,
       :used_memory,
       :used_memory_rss,
       :mem_fragmentation_ratio,
@@ -69,6 +70,7 @@ class RedisStat
     :used_cpu_sys                        => [:yellow],
     :connected_clients                   => [:cyan, :bold],
     :blocked_clients                     => [:cyan, :bold],
+    :rejected_connections_per_second     => [:cyan],
     :used_memory                         => [:green],
     :used_memory_rss                     => [:green],
     :mem_fragmentation_ratio             => [:green],
@@ -98,6 +100,7 @@ class RedisStat
     :used_cpu_sys                        => 'sy',
     :connected_clients                   => 'cl',
     :blocked_clients                     => 'bcl',
+    :rejected_connections_per_second     => 'rej/s',
     :used_memory                         => 'mem',
     :used_memory_rss                     => 'rss',
     :mem_fragmentation_ratio             => 'frag',
@@ -127,6 +130,8 @@ class RedisStat
     :used_cpu_sys                        => :f,
     :connected_clients                   => :i,
     :blocked_clients                     => :i,
+    :rejected_connections                => :i,
+    :rejected_connections_per_second     => :f,
     :used_memory                         => :i,
     :used_memory_rss                     => :i,
     :mem_fragmentation_ratio             => :f,

data/lib/redis-stat/server/views/index.erb

@@ -2,32 +2,32 @@
 <html>
   <head>
     <title>redis-stat</title>
-    <link href="/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
-    <link href="/jqplot/jquery.jqplot.min.css" rel="stylesheet"/>
-    <link href="/select2/select2.css" rel="stylesheet"/>
-    <link href="/select2/select2-bootstrap.css" rel="stylesheet"/>
-    <link href="/css/site.css" rel="stylesheet"/>
-    <script type="text/javascript" src="/jquery-1.8.2.min.js"></script>
-    <script type="text/javascript" src="/jqplot/jquery.jqplot.min.js"></script>
-    <script type="text/javascript" src="/jqplot/jqplot.canvasTextRenderer.min.js"></script>
-    <script type="text/javascript" src="/jqplot/jqplot.canvasAxisLabelRenderer.min.js"></script>
-    <script type="text/javascript" src="/jqplot/jqplot.canvasAxisTickRenderer.min.js"></script>
-    <script type="text/javascript" src="/select2/select2.min.js"></script>
-    <script type="text/javascript" src="/bootstrap/js/bootstrap.min.js"></script>
-    <script type="text/javascript" src="/js/site.js"></script>
+    <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="jqplot/jquery.jqplot.min.css" rel="stylesheet"/>
+    <link href="select2/select2.css" rel="stylesheet"/>
+    <link href="select2/select2-bootstrap.css" rel="stylesheet"/>
+    <link href="css/site.css" rel="stylesheet"/>
+    <script type="text/javascript" src="jquery-1.8.2.min.js"></script>
+    <script type="text/javascript" src="jqplot/jquery.jqplot.min.js"></script>
+    <script type="text/javascript" src="jqplot/jqplot.canvasTextRenderer.min.js"></script>
+    <script type="text/javascript" src="jqplot/jqplot.canvasAxisLabelRenderer.min.js"></script>
+    <script type="text/javascript" src="jqplot/jqplot.canvasAxisTickRenderer.min.js"></script>
+    <script type="text/javascript" src="select2/select2.min.js"></script>
+    <script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="js/site.js"></script>
   </head>
   <body>
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="brand" href="/">redis-stat</a>
+          <a class="brand" href="./">redis-stat</a>
           <% if @hosts.length > 1 %>
             <ul class="nav">
               <li>
                 <select id="hostlist" class="select2 input-default">
-                  <option value="/"<%= ' selected' unless @selected %>>All instances</option>
+                  <option value="./"<%= ' selected' unless @selected %>>All instances</option>
                   <% @hosts.each do |host| %>
-                  <option value="/?host=<%= URI.escape host %>"<%= ' selected' if @selected == host %>><%= host %></option>
+                  <option value="./?host=<%= URI.escape host %>"<%= ' selected' if @selected == host %>><%= host %></option>
                   <% end %>
                 </select>
               </li>
@@ -157,7 +157,7 @@
 
         // TODO Check (typeof(EventSource) !== "undefined")
 
-        var source = new EventSource("/pull")
+        var source = new EventSource("./pull")
         source.onmessage = function(e) {
           var alert = $(".alert");
           var json = JSON.parse(e.data);

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = '0.4.12'
+  VERSION = '0.4.14'
 end

data/redis-stat.gemspec

@@ -27,9 +27,13 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "json", '~> 1.8.2'
   gem.add_runtime_dependency "lps", '~> 0.2.0'
   gem.add_runtime_dependency "elasticsearch", '~> 1.0.0'
+  gem.add_development_dependency "minitest"
+  gem.add_development_dependency "rake"
 
   if RUBY_PLATFORM == 'java'
-    gem.add_runtime_dependency "puma", '~> 2.3.2'
+    gem.add_runtime_dependency "puma", "~> 2.3.2"
+    gem.add_development_dependency "jruby-jars", "1.7.19"
+    gem.add_development_dependency "warbler", "1.4.9"
   else
     gem.add_runtime_dependency "thin", '~> 1.5.0'
     gem.add_runtime_dependency "daemons", '~> 1.1.9'

data/test/test_redis-stat.rb

@@ -2,14 +2,15 @@
 # encoding: utf-8
 
 $VERBOSE = true
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
 require 'rubygems'
+require 'bundler/setup'
 require 'redis-stat'
 require 'redis'
 require 'stringio'
 require 'minitest/autorun'
 
-class TestRedisStat < MiniTest::Unit::TestCase
+class TestRedisStat < MiniTest::Test
   def test_humanize_number
     rs = RedisStat.new
     assert_equal '0', rs.send(:humanize_number, 0.00)
@@ -180,7 +181,7 @@ class TestRedisStat < MiniTest::Unit::TestCase
     csv = '/tmp/redis-stat.csv'
     cnt = 100
     rs = RedisStat.new :hosts => %w[localhost] * 5, :interval => 0.01, :count => cnt,
-            :verbose => true, :csv_file => csv, :auth => 'pw'
+            :verbose => true, :csv_file => csv
     rs.start $stdout
 
     assert_equal cnt + 1, File.read(csv).lines.to_a.length
@@ -191,7 +192,7 @@ class TestRedisStat < MiniTest::Unit::TestCase
   def test_mono
     [true, false].each do |mono|
       rs = RedisStat.new :hosts => %w[localhost] * 5, :interval => 0.02, :count => 20,
-                         :verbose => true, :auth => 'pw', :mono => mono
+                         :verbose => true, :mono => mono
       output = StringIO.new
       rs.start output
       puts output.string
@@ -205,8 +206,7 @@ class TestRedisStat < MiniTest::Unit::TestCase
     r2 = Redis.new(:host => 'localhost', :port => 6380)
 
     if r1.info['redis_version'] =~ /^2\.4/ && r2.info['redis_version'] =~ /^2\.2/
-      rs = RedisStat.new :hosts => %w[localhost:6380 localhost], :interval => 1, :count => 1,
-            :auth => 'pw', :style => :ascii
+      rs = RedisStat.new :hosts => %w[localhost:6380 localhost], :interval => 1, :count => 1, :style => :ascii
       output = StringIO.new
       rs.start output
       vline = output.string.lines.select { |line| line =~ /gcc_version/ }.first

metadata

@@ -1,169 +1,225 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.14
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.5
   name: ansi256
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.5
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 3.0.2
+  name: redis
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: redis
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 0.2.9
+  name: tabularize
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: tabularize
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.9
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.3.0
+  name: insensitive_hash
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: insensitive_hash
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
+  name: parallelize
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: parallelize
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.1.4
+  name: si
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: si
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 1.3.3
+  name: sinatra
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.8.2
+  name: json
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 0.2.0
+  name: lps
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: lps
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
+  name: elasticsearch
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: elasticsearch
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
+  name: minitest
   prerelease: false
-  type: :runtime
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rake
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.2
+  name: puma
   prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.19
+  name: jruby-jars
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.19
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.9
+  name: warbler
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.9
 description: A real-time Redis monitoring tool written in Ruby
 email:
 - junegunn.c@gmail.com
@@ -172,7 +228,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -216,17 +272,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:
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key:
 specification_version: 4
 summary: A real-time Redis monitoring tool written in Ruby