redis-stat 0.2.0 → 0.2.1

data/README.md

@@ -13,6 +13,7 @@ gem install redis-stat
 ```
 usage: redis-stat [HOST[:PORT] ...] [INTERVAL [COUNT]]
 
+        --auth=PASSWORD              Password
         --csv=OUTPUT_CSV_FILE_PATH   Save the result in CSV format
     -v, --verbose                    Show more info
         --version                    Show version

data/lib/redis-stat.rb

@@ -12,28 +12,37 @@ class RedisStat
   DEFAULT_TERM_HEIGHT = 25
 
   def initialize options = {}
-    @options   = RedisStat::Option::DEFAULT.merge options
-    @hosts     = @options[:hosts]
+    options    = RedisStat::Option::DEFAULT.merge options
+    @hosts     = options[:hosts]
     @redises   = @hosts.map { |e| 
       host, port = e.split(':')
       Redis.new(Hash[ {:host => host, :port => port}.select { |k, v| v } ])
     }
-    @max_count = @options[:count]
+    @interval  = options[:interval]
+    @max_count = options[:count]
+    @colors    = options[:colors] || COLORS
+    @csv       = options[:csv]
+    @auth      = options[:auth]
+    @measures  = MEASURES[ options[:verbose] ? :verbose : :default ]
     @count     = 0
-    @colors    = @options[:colors] || COLORS
   end
 
   def start output_stream
     @os = output_stream
     trap('INT') { Thread.main.raise Interrupt }
 
-    csv = File.open(@options[:csv], 'w') if @options[:csv]
-    update_term_size!
-
-
     begin
-      # Warm-up
-      @redises.each { |r| r.info }
+      csv = File.open(@csv, 'w') if @csv
+      update_term_size!
+
+      # Warm-up / authenticate only when needed
+      @redises.each do |r|
+        begin
+          r.info
+        rescue Redis::CommandError
+          r.auth @auth if @auth
+        end
+      end
 
       @started_at = Time.now
       prev_info = nil
@@ -60,7 +69,7 @@ class RedisStat
         prev_info = info
         @count += 1
         break if @max_count && @count >= @max_count
-        sleep @options[:interval]
+        sleep @interval
       end
       @os.puts
     rescue Interrupt
@@ -213,7 +222,7 @@ private
   end
 
   def process info, prev_info
-    MEASURES[@options[:verbose] ? :verbose : :default].map { |key|
+    @measures.map { |key|
       [ key, process_how(info, prev_info, key) ]
     }.select { |pair| pair.last }
   end

data/lib/redis-stat/option.rb

@@ -17,6 +17,10 @@ module Option
       opts.banner = "usage: redis-stat [HOST[:PORT] ...] [INTERVAL [COUNT]]"
       opts.separator ''
 
+      opts.on('--auth=PASSWORD', 'Password') do |v|
+        options[:auth] = v
+      end
+
       opts.on('--csv=OUTPUT_CSV_FILE_PATH', 'Save the result in CSV format') do |v|
         options[:csv] = v
       end

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/test_redis-stat.rb

@@ -96,7 +96,8 @@ class TestRedisStat < Test::Unit::TestCase
   def test_start
     csv = '/tmp/redis-stat.csv'
     cnt = 50
-    rs = RedisStat.new :hosts => %w[localhost] * 5, :interval => 0.1, :count => cnt, :verbose => true, :csv => csv
+    rs = RedisStat.new :hosts => %w[localhost] * 5, :interval => 0.1, :count => cnt,
+            :verbose => true, :csv => csv, :auth => 'pw'
     rs.start $stdout
 
     assert_equal cnt + 1, File.read(csv).lines.to_a.length

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi