redis-stat 0.2.1 → 0.2.4

data/README.md

@@ -16,6 +16,7 @@ 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
+        --style=STYLE                Output style: unicode|ascii
         --version                    Show version
         --help                       Show this message
 ```
@@ -38,7 +39,7 @@ redis-stat localhost localhost:6380 1 10 --csv=/tmp/output.csv --verbose
 
 ## Screenshot
 
-![](https://github.com/junegunn/redis-stat/raw/master/screenshots/redis-stat-0.1.0.png)
+![](https://github.com/junegunn/redis-stat/raw/master/screenshots/redis-stat-0.2.4.png)
 
 
 ## Contributing

data/lib/redis-stat.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "redis-stat/version"
 require "redis-stat/option"
 require 'insensitive_hash'
@@ -12,19 +14,21 @@ class RedisStat
   DEFAULT_TERM_HEIGHT = 25
 
   def initialize options = {}
-    options    = RedisStat::Option::DEFAULT.merge options
-    @hosts     = options[:hosts]
-    @redises   = @hosts.map { |e| 
+    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 } ])
     }
-    @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
+    @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
+    @style       = options[:style]
+    @first_batch = true
   end
 
   def start output_stream
@@ -126,7 +130,7 @@ private
   def output info, prev_info, file
     info_output = process info, prev_info
 
-    init_table info_output unless @table
+    @table ||= init_table info_output
 
     movement = nil
     if @count == 0
@@ -139,9 +143,10 @@ private
         })
       end
     elsif @count % @term_height == 0
+      @first_batch = false
       movement = -1
       update_term_size!
-      init_table info_output
+      @table = init_table info_output
     end
 
     # Build output table
@@ -149,6 +154,7 @@ private
       ansi(*@colors[pair.first]) { [*pair.last].first }
     }
     lines  = @table.to_s.lines.map(&:chomp)
+    lines.delete_at @first_batch ? 1 : 0
     width  = lines.first.length
     height = lines.length
 
@@ -181,9 +187,7 @@ private
   def output_static_info info
     tab = Tabularize.new(
       :unicode => false, :align => :right,
-      :hborder => ansi(:black, :bold) { '-' },
-      :vborder => ansi(:black, :bold) { '|' },
-      :iborder => ansi(:black, :bold) { '+' }
+      :border_style => @style
     )
     tab << [nil] + @hosts.map { |h| ansi(:bold, :green) { h } }
     tab.separator!
@@ -204,21 +208,22 @@ private
   end
 
   def init_table info_output
-    @table = Tabularize.new :unicode => false,
-                       :align => :right,
-                       :hborder => ansi(:black, :bold) { '-' },
-                       :iborder => ansi(:black, :bold) { '+' },
-                       :vborder => ' ',
-                       :ellipsis => ansi(:bold) { '>' },
-                       :pad_left => 0,
-                       :pad_right => 0,
+    table = Tabularize.new :unicode => false,
+                       :align        => :right,
+                       :border_style => @style,
+                       :border_color => ANSI::Code.red,
+                       :vborder      => ' ',
+                       :pad_left     => 0,
+                       :pad_right    => 0,
                        :screen_width => @term_width
-    @table << info_output.map { |pair|
+    table.separator!
+    table << info_output.map { |pair|
       ansi(*((@colors[pair.first] || []) + [:underline])) {
         LABELS[pair.first] || pair.first
       } 
     }
-    @table.separator!
+    table.separator!
+    table
   end
 
   def process info, prev_info

data/lib/redis-stat/option.rb

@@ -6,7 +6,8 @@ module Option
     :hosts    => ['127.0.0.1:6379'],
     :interval => 2,
     :count    => nil,
-    :csv      => nil
+    :csv      => nil,
+    :style    => :unicode
   }
 
   def self.parse argv
@@ -29,6 +30,10 @@ module Option
         options[:verbose] = v
       end
 
+      opts.on('--style=STYLE', 'Output style: unicode|ascii') do |v|
+        options[:style] = v.downcase.to_sym
+      end
+
       opts.on('--version', 'Show version') do
         puts RedisStat::VERSION
         exit 0
@@ -65,30 +70,40 @@ module Option
   end
 
   def self.validate options
-    interval = options[:interval]
-    unless interval.is_a?(Numeric) && interval > 0
-      raise ArgumentError.new("Invalid interval: #{interval}")
+    options[:interval].tap do |interval|
+      unless interval.is_a?(Numeric) && interval > 0
+        raise ArgumentError.new("Invalid interval: #{interval}")
+      end
     end
 
-    count = options[:count]
-    unless count.nil? || (count.is_a?(Numeric) && count > 0)
-      raise ArgumentError.new("Invalid count: #{count}")
+    options[:count].tap do |count|
+      unless count.nil? || (count.is_a?(Numeric) && count > 0)
+        raise ArgumentError.new("Invalid count: #{count}")
+      end
     end
 
-    hosts = options[:hosts]
-    if hosts.empty?
-      raise ArgumentError.new("Redis host not given")
-    end
+    options[:hosts].tap do |hosts|
+      if hosts.empty?
+        raise ArgumentError.new("Redis host not given")
+      end
 
-    hosts.each do |host|
-      host, port = host.split(':')
-      if port
-        port = port.to_i
-        unless port > 0 && port < 65536
-          raise ArgumentError.new("Invalid port: #{port}")
+      hosts.each do |host|
+        host, port = host.split(':')
+        if port
+          port = port.to_i
+          unless port > 0 && port < 65536
+            raise ArgumentError.new("Invalid port: #{port}")
+          end
         end
       end
     end
+
+    options[:style].tap do |style|
+      unless [:unicode, :ascii].include?(style)
+        raise ArgumentError.new("Invalid style")
+      end
+    end
+
   end
 end
 end

data/lib/redis-stat/version.rb

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

data/redis-stat.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "ansi", '~> 1.4.3'
   gem.add_runtime_dependency "redis", '~> 3.0.1'
-  gem.add_runtime_dependency "tabularize", '~> 0.2.4'
-  gem.add_runtime_dependency "insensitive_hash", '~> 0.2.4'
+  gem.add_runtime_dependency "tabularize", '~> 0.2.8'
+  gem.add_runtime_dependency "insensitive_hash", '~> 0.3.0'
   gem.add_runtime_dependency "parallelize", '~> 0.4.0'
 
   gem.add_development_dependency 'test-unit'

data/test/test_redis-stat.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require 'rubygems'
 require 'test/unit'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -46,7 +48,8 @@ class TestRedisStat < Test::Unit::TestCase
       :hosts => ['localhost:1000'],
       :interval => 20,
       :count => nil,
-      :csv => nil
+      :csv => nil,
+      :style => :unicode
     }.sort, options.sort)
 
     options = RedisStat::Option.parse(%w[localhost:1000 20 30])
@@ -54,7 +57,8 @@ class TestRedisStat < Test::Unit::TestCase
       :hosts => ['localhost:1000'],
       :interval => 20,
       :count => 30,
-      :csv => nil
+      :csv => nil,
+      :style => :unicode
     }.sort, options.sort)
 
     options = RedisStat::Option.parse(%w[20])
@@ -62,7 +66,8 @@ class TestRedisStat < Test::Unit::TestCase
       :hosts => ['127.0.0.1:6379'],
       :interval => 20,
       :count => nil,
-      :csv => nil
+      :csv => nil,
+      :style => :unicode
     }.sort, options.sort)
 
     options = RedisStat::Option.parse(%w[20 30])
@@ -70,15 +75,17 @@ class TestRedisStat < Test::Unit::TestCase
       :hosts => ['127.0.0.1:6379'],
       :interval => 20,
       :count => 30,
-      :csv => nil
+      :csv => nil,
+      :style => :unicode
     }.sort, options.sort)
 
-    options = RedisStat::Option.parse(%w[localhost:8888 10 --csv=/tmp/a.csv])
+    options = RedisStat::Option.parse(%w[localhost:8888 10 --csv=/tmp/a.csv --style=ascii])
     assert_equal({
       :hosts => ['localhost:8888'],
       :interval => 10,
       :count => nil,
       :csv => '/tmp/a.csv',
+      :style => :ascii
     }.sort, options.sort)
   end
 
@@ -91,12 +98,16 @@ class TestRedisStat < Test::Unit::TestCase
         options = RedisStat::Option.parse(argv)
       }
     end
+
+    assert_raise(SystemExit) {
+      RedisStat::Option.parse(%w[--style=html])
+    }
   end
 
   def test_start
     csv = '/tmp/redis-stat.csv'
-    cnt = 50
-    rs = RedisStat.new :hosts => %w[localhost] * 5, :interval => 0.1, :count => cnt,
+    cnt = 100
+    rs = RedisStat.new :hosts => %w[localhost] * 5, :interval => 0.02, :count => cnt,
             :verbose => true, :csv => csv, :auth => 'pw'
     rs.start $stdout
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: insensitive_hash
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: parallelize
   requirement: !ruby/object:Gem::Requirement