redis-stat 0.1.2 → 0.1.4

data/README.md

@@ -13,7 +13,7 @@ gem install redis-stat
 ```
 usage: redis-stat [HOST[:PORT]] [INTERVAL [COUNT]]
 
-        --csv=OUTPUT_CSV_FILE_PATH   Saves the result in CSV format
+        --csv=OUTPUT_CSV_FILE_PATH   Save the result in CSV format
     -v, --verbose                    Show more info
         --version                    Show version
         --help                       Show this message

data/lib/redis-stat.rb

@@ -22,18 +22,19 @@ class RedisStat
     @os = output_stream
     trap('INT') { Thread.main.raise Interrupt }
 
-    @csv = File.open(@options[:csv], 'w') if @options[:csv]
+    csv = File.open(@options[:csv], 'w') if @options[:csv]
     update_term_size!
 
+    prev_info = nil
     begin
       @started_at = Time.now
       loop do
-        @info = @redis.info.insensitive
-        @info[:at] = Time.now.to_f
+        info = @redis.info.insensitive
+        info[:at] = Time.now.to_f
 
-        output @info, @prev_info, @csv
+        output info, prev_info, csv
 
-        @prev_info = @info
+        prev_info = info
         @count += 1
         break if @max_count && @count >= @max_count
         sleep @options[:interval]
@@ -46,7 +47,7 @@ class RedisStat
       @os.puts ansi(:red, :bold) { e.to_s }
       exit 1
     ensure
-      @csv.close if @csv
+      csv.close if csv
     end
     @os.puts ansi(:blue, :bold) {
       "Elapsed: #{"%.2f" % (Time.now - @started_at)} sec."
@@ -55,6 +56,18 @@ class RedisStat
 
 private
   def update_term_size!
+    if RUBY_PLATFORM.match(/java/)
+      require 'java'
+      begin
+        @term ||= Java::jline.Terminal.getTerminal
+        @term_width  = (@term.getTerminalWidth rescue DEFAULT_TERM_WIDTH)
+        @term_height = (@term.getTerminalHeight rescue DEFAULT_TERM_HEIGHT) - 4
+        return
+      rescue Exception
+        # Fallback to tput (which yields incorrect values as of now)
+      end
+    end
+
     @term_width  = (`tput cols`  rescue DEFAULT_TERM_WIDTH).to_i
     @term_height = (`tput lines` rescue DEFAULT_TERM_HEIGHT).to_i - 4
   end
@@ -230,19 +243,17 @@ private
     end.to_s
   end
 
-  def humanize_number bytes, k = 1000, suffix = ''
-    return '-' if bytes.nil?
+  def humanize_number num, k = 1000, suffix = ''
+    return '-' if num.nil?
 
-    bytes = bytes.to_f
-    if bytes < k
-      format_number(bytes)
-    elsif bytes < k ** 2
-      format_number(bytes / k) + 'K' + suffix
-    elsif bytes < k ** 3
-      format_number(bytes / k ** 2) + 'M' + suffix
-    else
-      format_number(bytes / k ** 3) + 'G' + suffix
+    sign = num >= 0 ? '' : '-'
+    num  = num.abs
+    mult = k.to_f
+    ['', 'K', 'M', 'G', 'T', 'P', 'E'].each do |mp|
+      return sign + format_number(num * k / mult) + mp + suffix if num < mult || mp == 'E'
+      mult *= k
     end
+    return nil
   end
 
   def ansi *args, &block

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/test/test_redis-stat.rb

@@ -4,6 +4,39 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'redis-stat'
 
 class TestRedisStat < Test::Unit::TestCase
+  def test_humanize_number
+    rs = RedisStat.new
+    assert_equal '0', rs.send(:humanize_number, 0.00)
+    assert_equal '7', rs.send(:humanize_number, 7)
+    assert_equal '0.01', rs.send(:humanize_number, 0.00751)
+    assert_equal '0.08', rs.send(:humanize_number, 0.0751)
+    assert_equal '0.75', rs.send(:humanize_number, 0.751)
+    assert_equal '7.51', rs.send(:humanize_number,  7.51)
+    assert_equal '75.1', rs.send(:humanize_number,  75.1)
+    assert_equal '7.51K', rs.send(:humanize_number, 7510)
+    assert_equal '75.1K', rs.send(:humanize_number, 75100)
+    assert_equal '751K', rs.send(:humanize_number,  751000)
+    assert_equal '7.51M', rs.send(:humanize_number, 7510000)
+    assert_equal '75.1M', rs.send(:humanize_number, 75100000)
+    assert_equal '751M', rs.send(:humanize_number,  751000000)
+    assert_equal '7.51G', rs.send(:humanize_number, 7510000000)
+    assert_equal '75.1G', rs.send(:humanize_number, 75100000000)
+    assert_equal '751G', rs.send(:humanize_number,  751000000000)
+    assert_equal '7.51T', rs.send(:humanize_number, 7510000000000)
+    assert_equal '75.1T', rs.send(:humanize_number, 75100000000000)
+    assert_equal '751T', rs.send(:humanize_number,  751000000000000)
+    assert_equal '7.51P', rs.send(:humanize_number, 7510000000000000)
+    assert_equal '75.1P', rs.send(:humanize_number, 75100000000000000)
+    assert_equal '751P', rs.send(:humanize_number,  751000000000000000)
+    assert_equal '7.51E', rs.send(:humanize_number, 7510000000000000000)
+    assert_equal '75.1E', rs.send(:humanize_number, 75100000000000000000)
+    assert_equal '751E',  rs.send(:humanize_number, 751000000000000000000)
+    assert_equal '7510E', rs.send(:humanize_number, 7510000000000000000000)
+
+    assert_equal '7.51PB', rs.send(:humanize_number, 7.51 * (1024 ** 5), 1024, 'B')
+    assert_equal '-7.51PB', rs.send(:humanize_number, -7.51 * (1024 ** 5), 1024, 'B')
+  end
+
   def test_option_parse
     options = RedisStat::Option.parse([])
     assert_equal RedisStat::Option::DEFAULT.sort, options.sort
@@ -66,8 +99,14 @@ class TestRedisStat < Test::Unit::TestCase
   end
 
   def test_start
-    rs = RedisStat.new :interval => 0.1, :count => 200, :verbose => true, :csv => '/tmp/redis-stat.csv'
+    csv = '/tmp/redis-stat.csv'
+    cnt = 50
+    rs = RedisStat.new :interval => 0.01, :count => cnt, :verbose => true, :csv => csv
     rs.start $stdout
+
+    assert_equal cnt + 1, File.read(csv).lines.to_a.length
+  ensure
+    File.unlink csv
   end
 end
 

metadata

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