redis-stat 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 620b88df3da7dcfd956b3145547b9fc45dd71063
-  data.tar.gz: e63968613471cd7cbeb6bead4fc394393f625a26
+  metadata.gz: c56ec96d61c7fa7063f01dc425bcfbb297ede709
+  data.tar.gz: 60461ebf410c62beb58dde1c35fd83799561b6cd
 SHA512:
-  metadata.gz: 16693f8340f90aff4f055be91472e54dd430db0e180106f24a46526e1a58ac73c66e4c7a8b8fdc17427138135147ee8bb8689e50e3c06805db89feb762759bed
-  data.tar.gz: eb7769fd2ab7768ecd54ddab4c6242c51ed0a7ea9ff004e95c8de1e42566bf362a6fceae62f639bc99e2da40579fb75cb88fb51b1c9d64628f602684085746e5
+  metadata.gz: 2f939a8ab819e4ff7fc1bf8f60f0b253692fe15ba9e63b5c623da35a2e6648f6a20e75559893f7095d89351f09f694fdcb8a596df6cbf92224f42d1681d28b17
+  data.tar.gz: 1778b1b9693d3bbbe48b2c0964b84bb5e4c311adbee7e45470cd5acca1b541cb5fb6ef47204f691c5f2bcd198b0b99761c0e503b5ba3697203f0a5ffca3f5305

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,15 @@ 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/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = '0.4.12'
+  VERSION = '0.4.13'
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors:
 - Junegunn Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi256
@@ -150,6 +150,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: thin
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A real-time Redis monitoring tool written in Ruby