redis_scanner 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4d4379646a6674439ca7ad275828c5881c97901
-  data.tar.gz: 36e42b13cab65c468e71dded6a2edfafeaba3671
+  metadata.gz: 1f3caec0caf363f654534e72a721a6aa800db43e
+  data.tar.gz: fddaf355144726462164b00552c20be7fd4a5b79
 SHA512:
-  metadata.gz: 1d4180f672190a047a5a39269b1d726ad8b26c3dfe9d640d8839006c0be2050d96a185bbbaf16c883f62cc05afa6387f00ba62de2c8c325aab542431c8cbc21e
-  data.tar.gz: 83599028ff33ec24a5f573a5332aedb1db25a03c9a7e3daebd364210cffc34e52e6d39af65052a7ef0aaecbc5cf90ff0df278b8d5ad27b1acc5d5fb4a0193fd6
+  metadata.gz: c996fbbec218b7c45d69f838da6750f46c96c750419ee1a8b64d474b10a94709b246b9c179b49acbfc6164bd991d7cbc737bf75252f94b30534b6cf75be541ab
+  data.tar.gz: be62722d95943fbdd710ba533a3f9d940df39b3260b0b48591f30da7dc0fd6189ef8fccf4646e615997980efed397e760720a14e49748b0e65bb0b5bdf876c55

data/README.md

@@ -46,26 +46,26 @@ The Output is like this:
 ```
 
 ```shell
-redis_scanner -d
+redis_scanner -d -l 10
 ```
 
 The Output is like this:
 
 ```shell
-+------------------------------------+-------+--------+---------+
-| Key                                | Count | Size   | AvgSize |
-+------------------------------------+-------+--------+---------+
-| demo:user:<id>:counter             | 10000 |        |         |
-|  > string                          | 10000 | 927510 |   92.75 |
-| u:<uuid>:pf                        |    52 |        |         |
-|  > hash                            |    52 |    108 |    2.08 |
-| sidekiq_demo:stat:failed:<date>    |     4 |        |         |
-|  > string                          |     4 |      5 |    1.25 |
-| sidekiq_demo:stat:processed:<date> |     4 |        |         |
-|  > string                          |     4 |      6 |     1.5 |
-| _sp_one:queue:default              |     1 |        |         |
-|  > list                            |     1 |      1 |     1.0 |
-+------------------------------------+-------+--------+---------+
++------------------------------------+--------+-------+--------+---------+
+| Key                                | Type   | Count | Size   | AvgSize |
++------------------------------------+--------+-------+--------+---------+
+| demo:user:<id>:counter             | string | 10000 | 927510 |   92.75 |
+| u:<uuid>:pf                        | hash   |    52 |    108 |    2.08 |
+| sidekiq_demo:stat:failed:<date>    | string |     4 |      5 |    1.25 |
+| sidekiq_demo:stat:processed:<date> | string |     4 |      6 |     1.5 |
+| _sp_one:queue:default              | list   |     1 |      1 |     1.0 |
+| bh:queues                          | set    |     1 |      1 |     1.0 |
+| bh:retry                           | zset   |     1 |      1 |     1.0 |
+| bh:stat:failed                     | string |     1 |      1 |     1.0 |
+| bh:stat:processed                  | string |     1 |      1 |     1.0 |
+| bus_app:app_two                    | hash   |     1 |      1 |     1.0 |
++------------------------------------+--------+-------+--------+---------+
 ```
 
 * Scan keys with some pattern

data/bin/redis_scanner

@@ -27,7 +27,7 @@ OptionParser.new do |opts|
   end
 
   options[:format] = 'table'
-  opts.on("-t FORMAT", "--format FORMAT", "Formt(simple or talbe. default is table)") do |v|
+  opts.on("-t FORMAT", "--format FORMAT", "Format(simple or talbe. default is table)") do |v|
     options[:format] = v
   end
 

data/lib/redis_scanner/engine.rb

@@ -46,12 +46,12 @@ module RedisScanner
           else
             stat[pattern].increment
           end
-          bar.increment
+          bar.increment unless bar.finished?
         end
         cursor = cursor.to_i
         break if cursor == 0
       end
-      bar.finish
+      bar.finish unless bar.finished?
 
       stat
     end

data/lib/redis_scanner/formatter.rb

@@ -41,9 +41,8 @@ module RedisScanner
 
       patterns.each do |pattern|
         if with_detail
-          rows << [pattern.name, pattern.total, "", ""]
           pattern.sorted_items.each do |item|
-            rows << [" > #{item.type}", item.count, item.size, item.avg_size]
+            rows << [pattern.name, item.type, item.count, item.size, item.avg_size]
           end
         else
           rows << [pattern.name, pattern.total]
@@ -52,17 +51,19 @@ module RedisScanner
         break if touch_limit?(count)
       end
 
-      headings = ['Key', 'Count']
+
       if with_detail
-        headings << "Size"
-        headings << "AvgSize"
+        headings = %w(Key Type Count Size AvgSize)
+      else
+        headings = %w(Key Count)
       end
 
       table = Terminal::Table.new headings: headings, rows: rows
-      table.align_column(1, :right)
+
       if with_detail
-        table.align_column(2, :right)
-        table.align_column(3, :right)
+        4.times {|i| table.align_column(i+2, :right) }
+      else
+        table.align_column(1, :right)
       end
 
       table.to_s

data/lib/redis_scanner/pattern.rb

@@ -60,11 +60,12 @@ module RedisScanner
     end
 
     def to_s
-      ret = "#{name} #{total}"
       if @items.size > 0
-        sorted_items.each do |item|
-          ret << "\n  #{item}"
-        end
+        ret = sorted_items.map do |item|
+          "#{@name} #{item}"
+        end.join("\n")
+      else
+        ret = "#{@name} #{@total}"
       end
       ret
     end

data/lib/redis_scanner/version.rb

@@ -1,3 +1,3 @@
 module RedisScanner
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_scanner
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Vincent Xie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis