redis-stat 0.2.6 → 0.2.7

data/lib/redis-stat.rb

@@ -8,6 +8,7 @@ require 'tabularize'
 require 'ansi'
 require 'csv'
 require 'parallelize'
+require 'si'
 
 class RedisStat
   DEFAULT_TERM_WIDTH  = 180
@@ -64,7 +65,7 @@ class RedisStat
         @redises.pmap(@redises.length) { |redis|
           redis.info.insensitive
         }.each do |rinfo|
-          all_measures.each do |k|
+          (all_measures + rinfo.keys.select { |k| k =~ /^db[0-9]+$/ }).each do |k|
             info[k] ||= []
             info[k] << rinfo[k]
           end
@@ -255,35 +256,21 @@ private
       [humanize_number(val.to_i), val]
     when :used_memory, :used_memory_rss, :aof_current_size, :aof_base_size
       val = info.sumf(key)
-      [humanize_number(val.to_i, 1024, 'B'), val]
+      [humanize_number(val.to_i, true), val]
     else
-      format_number info.sumf(key)
+      humanize_number info.sumf(key)
     end
   end
 
-  def format_number num
-    if num.to_i == num
-      num.to_i
-    elsif num < 10
-      "%.2f" % num
-    elsif num < 100
-      "%.1f" % num
-    else
-      num.to_i
-    end.to_s
-  end
-
-  def humanize_number num, k = 1000, suffix = ''
+  def humanize_number num, byte = false
     return '-' if num.nil?
 
-    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
+    num = num.to_i if num == num.to_i
+    if byte
+      num.si_byte
+    else
+      num.si(:min_exp => 0)
     end
-    return nil
   end
 
   def ansi *args, &block

data/lib/redis-stat/version.rb

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

data/redis-stat.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   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_runtime_dependency "si", '~> 0.1.3'
 
   gem.add_development_dependency 'test-unit'
 end

data/test/test_redis-stat.rb

@@ -18,9 +18,9 @@ class TestRedisStat < Test::Unit::TestCase
     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.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)
@@ -36,10 +36,10 @@ class TestRedisStat < Test::Unit::TestCase
     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.51Z', 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')
+    assert_equal '7.51PB', rs.send(:humanize_number, 7.51 * (1024 ** 5), true)
+    assert_equal '-7.51PB', rs.send(:humanize_number, -7.51 * (1024 ** 5), true)
   end
 
   def test_option_parse

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: si
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement