redis-stat 0.2.5 → 0.2.6

data/README.md

@@ -17,6 +17,7 @@ usage: redis-stat [HOST[:PORT] ...] [INTERVAL [COUNT]]
         --csv=OUTPUT_CSV_FILE_PATH   Save the result in CSV format
     -v, --verbose                    Show more info
         --style=STYLE                Output style: unicode|ascii
+        --no-color                   Suppress ANSI color codes
         --version                    Show version
         --help                       Show this message
 ```

data/lib/redis-stat.rb

@@ -22,6 +22,7 @@ class RedisStat
     }
     @interval    = options[:interval]
     @max_count   = options[:count]
+    @mono        = options[:mono]
     @colors      = options[:colors] || COLORS
     @csv         = options[:csv]
     @auth        = options[:auth]
@@ -49,6 +50,7 @@ class RedisStat
       end
 
       @started_at = Time.now
+      all_measures = MEASURES.values.inject(:+).uniq - [:at]
       prev_info = nil
       loop do
         info = {}.insensitive
@@ -62,9 +64,9 @@ class RedisStat
         @redises.pmap(@redises.length) { |redis|
           redis.info.insensitive
         }.each do |rinfo|
-          rinfo.each do |k, v|
+          all_measures.each do |k|
             info[k] ||= []
-            info[k] << v
+            info[k] << rinfo[k]
           end
         end
 
@@ -191,18 +193,8 @@ private
     )
     tab << [nil] + @hosts.map { |h| ansi(:bold, :green) { h } }
     tab.separator!
-    [
-      :redis_version,
-      :process_id,
-      :uptime_in_seconds,
-      :uptime_in_days,
-      :gcc_version,
-      :role,
-      :connected_slaves,
-      :aof_enabled,
-      :vm_enabled
-    ].each do |key|
-      tab << [ansi(:bold) { key }] + info[key] if info[key]
+    MEASURES[:static].each do |key|
+      tab << [ansi(:bold) { key }] + info[key] unless info[key].compact.empty?
     end
     @os.puts tab
   end
@@ -211,7 +203,7 @@ private
     table = Tabularize.new :unicode => false,
                        :align        => :right,
                        :border_style => @style,
-                       :border_color => ANSI::Code.red,
+                       :border_color => @mono ? nil : ANSI::Code.red,
                        :vborder      => ' ',
                        :pad_left     => 0,
                        :pad_right    => 0,
@@ -295,7 +287,7 @@ private
   end
 
   def ansi *args, &block
-    if args.empty?
+    if @mono || args.empty?
       block.call
     else
       ANSI::Code.ansi *args, &block
@@ -303,6 +295,17 @@ private
   end
 
   MEASURES = {
+    :static => [
+      :redis_version,
+      :process_id,
+      :uptime_in_seconds,
+      :uptime_in_days,
+      :gcc_version,
+      :role,
+      :connected_slaves,
+      :aof_enabled,
+      :vm_enabled
+    ],
     :default => [
       :at,
       :used_cpu_user,

data/lib/redis-stat/option.rb

@@ -34,6 +34,10 @@ module Option
         options[:style] = v.downcase.to_sym
       end
 
+      opts.on('--no-color', 'Suppress ANSI color codes') do |v|
+        options[:mono] = true
+      end
+
       opts.on('--version', 'Show version') do
         puts RedisStat::VERSION
         exit 0

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/test/test_redis-stat.rb

@@ -1,9 +1,12 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
 require 'rubygems'
-require 'test/unit'
+require 'test-unit'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'redis-stat'
+require 'redis'
+require 'stringio'
 
 class TestRedisStat < Test::Unit::TestCase
   def test_humanize_number
@@ -87,6 +90,9 @@ class TestRedisStat < Test::Unit::TestCase
       :csv => '/tmp/a.csv',
       :style => :ascii
     }.sort, options.sort)
+
+    options = RedisStat::Option.parse(%w[--no-color])
+    assert_equal true, options[:mono]
   end
 
   def test_option_parse_invalid
@@ -107,7 +113,7 @@ class TestRedisStat < Test::Unit::TestCase
   def test_start
     csv = '/tmp/redis-stat.csv'
     cnt = 100
-    rs = RedisStat.new :hosts => %w[localhost] * 5, :interval => 0.02, :count => cnt,
+    rs = RedisStat.new :hosts => %w[localhost] * 5, :interval => 0.01, :count => cnt,
             :verbose => true, :csv => csv, :auth => 'pw'
     rs.start $stdout
 
@@ -115,6 +121,36 @@ class TestRedisStat < Test::Unit::TestCase
   ensure
     File.unlink csv
   end
-end
 
+  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
+      output = StringIO.new
+      rs.start output
+      puts output.string
+      assert_equal mono, output.string !~ /\e\[\d*(;\d+)*m/
+    end
+  end
+
+  def test_static_info_of_mixed_versions
+    # prerequisite
+    r1 = Redis.new(:host => 'localhost')
+    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
+      output = StringIO.new
+      rs.start output
+      vline = output.string.lines.select { |line| line =~ /gcc_version/ }.first
+      puts vline.gsub(/ +/, ' ')
+      assert vline.gsub(/ +/, ' ').include?('| | 4.2.1 |')
+    else
+      raise NotImplementedError.new # FIXME
+    end
+  rescue Redis::CannotConnectError, NotImplementedError 
+    pend "redises not ready"
+  end
+end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi