redis-stat 0.3.7 → 0.3.8

data/README.md

@@ -73,6 +73,12 @@ killall -9 redis-stat-daemon
 
 ![Dashboard](https://github.com/junegunn/redis-stat/raw/master/screenshots/redis-stat-web.png)
 
+## Windows support
+
+If you're running Windows, you can only install redis-stat on
+[JRuby](http://jruby.org/). Notice that fancy terminal colors will not be
+printed as they are not supported in the default Windows command prompt.
+
 ## Author
 - [Junegunn Choi](https://github.com/junegunn)
 

data/lib/redis-stat.rb

@@ -7,16 +7,23 @@ require 'redis-stat/server'
 require 'insensitive_hash'
 require 'redis'
 require 'tabularize'
-require 'ansi'
+require 'ansi256'
 require 'csv'
 require 'parallelize'
 require 'si'
+require 'rbconfig'
+require 'lps'
 
 class RedisStat
   attr_reader :hosts, :measures, :tab_measures, :verbose, :interval
 
   def initialize options = {}
-    options      = RedisStat::Option::DEFAULT.merge options
+    options = RedisStat::Option::DEFAULT.merge options
+    windows = RbConfig::CONFIG['target_os'] =~ /mswin|mingw/
+
+    Ansi256.enabled = STDOUT.tty? && !(windows || options[:mono])
+    options[:style] = :ascii if windows
+
     @hosts       = options[:hosts]
     @redises     = @hosts.map { |e|
       host, port = e.split(':')
@@ -24,7 +31,6 @@ class RedisStat
     }
     @interval    = options[:interval]
     @max_count   = options[:count]
-    @mono        = options[:mono]
     @colors      = options[:colors] || COLORS
     @csv         = options[:csv]
     @auth        = options[:auth]
@@ -34,6 +40,7 @@ class RedisStat
     @all_measures= MEASURES.values.inject(:+).uniq - [:at]
     @count       = 0
     @style       = options[:style]
+    @varwidth    = STDOUT.tty? && !windows
     @first_batch = true
     @server_port = options[:server_port]
     @server_thr  = nil
@@ -49,24 +56,15 @@ class RedisStat
     trap('INT') { Thread.main.raise Interrupt }
 
     begin
-      csv = File.open(@csv, 'w') if @csv
+      csv = File.open(File.expand_path(@csv), 'w') if @csv
       update_term_size!
-
-      # Warm-up / authenticate only when needed
-      @redises.each do |r|
-        begin
-          r.info
-        rescue Redis::CommandError
-          r.auth @auth if @auth
-        end
-      end
-
+      authenticate!
 
       @started_at = Time.now
       prev_info   = nil
       server      = start_server if @server_port
 
-      loop do
+      LPS.interval(@interval).loop do
         errs = 0
         info =
           begin
@@ -74,12 +72,15 @@ class RedisStat
           rescue Interrupt
             raise
           rescue Exception => e
+            if need_auth?(e)
+              authenticate!
+              retry
+            end
+
             errs += 1
             if server || errs < NUM_RETRIES
               @os.puts if errs == 1
-              @os.puts ansi(:red, :bold) {
-                "#{e} (#{ server ? "#{errs}" : [errs, NUM_RETRIES].join('/') })"
-              }
+              @os.puts "#{e} (#{ server ? "#{errs}" : [errs, NUM_RETRIES].join('/') })".red.bold
               sleep @interval
               retry
             else
@@ -93,25 +94,22 @@ class RedisStat
 
         @count += 1
         break if @max_count && @count >= @max_count
-        sleep @interval
       end
       @os.puts
     rescue Interrupt
       @os.puts
-      @os.puts ansi(:yellow, :bold) { "Interrupted." }
+      @os.puts "Interrupted.".yellow.bold
       if @server_thr
         @server_thr.raise Interrupt
         @server_thr.join
       end
     rescue Exception => e
-      @os.puts ansi(:red, :bold) { e.to_s }
+      @os.puts e.to_s.red.bold
       raise
     ensure
       csv.close if csv
     end
-    @os.puts ansi(:blue, :bold) {
-      "Elapsed: #{"%.2f" % (Time.now - @started_at)} sec."
-    }
+    @os.puts "Elapsed: #{"%.2f" % (Time.now - @started_at)} sec.".blue.bold
   end
 
 private
@@ -153,6 +151,7 @@ private
       begin
         case JRUBY_VERSION
         when /^1\.7/
+          # TODO Currently Windows terminal is not supported: always returns 80x24
           @term ||= Java::jline.console.ConsoleReader.new.getTerminal
           @term_width  = (@term.width rescue DEFAULT_TERM_WIDTH)
           @term_height = (@term.height rescue DEFAULT_TERM_HEIGHT) - 4
@@ -173,25 +172,29 @@ private
   end
 
   def move! lines
-    return if lines == 0
+    return if lines == 0 || !@varwidth
 
     @os.print(
-      if defined?(Win32::Console)
-        if lines < 0
-          "\e[#{- lines}F"
-        else
-          "\e[#{lines}E"
-        end
+      if lines < 0
+        "\e[#{- lines}A\e[0G"
       else
-        if lines < 0
-          "\e[#{- lines}A\e[0G"
-        else
-          "\e[#{lines}B\e[0G"
-        end
-      end)
+        "\e[#{lines}B\e[0G"
+      end
+    )
   end
 
-  def output info, info_output, file
+  def output_file info_output, file
+    file.puts CSV.generate_line(info_output.map { |pair|
+      LABELS[pair.first] || pair.first
+    }) if @count == 0
+
+    file.puts CSV.generate_line(info_output.map { |pair|
+      [*pair.last].last
+    })
+    file.flush
+  end
+
+  def output_term info_output
     @table ||= init_table info_output
 
     movement = nil
@@ -199,11 +202,6 @@ private
       output_static_info info
 
       movement = 0
-      if file
-        file.puts CSV.generate_line(info_output.map { |pair|
-          LABELS[pair.first] || pair.first
-        })
-      end
     elsif @count % @term_height == 0
       @first_batch = false
       movement = -1
@@ -213,33 +211,34 @@ private
 
     # Build output table
     @table << info_output.map { |pair|
-      ansi(*@colors[pair.first]) { [*pair.last].first }
+      # [ key, [ humanized, raw ] ]
+      msg = [*pair.last].first
+      colorize msg, *@colors[pair.first]
     }
-    lines  = @table.to_s.lines.map(&:chomp)
+    lines = @table.to_s.lines.map(&:chomp)
     lines.delete_at @first_batch ? 1 : 0
     width  = lines.first.length
     height = lines.length
 
-    # Calculate the number of lines to go upward
-    if movement.nil?
-      if @prev_width && @prev_width == width
-        lines = lines[-2..-1]
-        movement = -1
-      else
-        movement = -(height - 1)
+    if @varwidth
+      # Calculate the number of lines to go upward
+      if movement.nil?
+        if @prev_width && @prev_width == width
+          lines = lines[-2..-1]
+          movement = -1
+        else
+          movement = -(height - 1)
+        end
       end
+    else
+      lines = movement ? lines[0..-2] : lines[-2..-2]
     end
     @prev_width = width
 
     move! movement
     begin
       @os.print $/ + lines.join($/)
-
-      if file
-        file.puts CSV.generate_line(info_output.map { |pair|
-          [*pair.last].last
-        })
-      end
+      @os.flush
     rescue Interrupt
       move! -movement
       raise
@@ -252,28 +251,33 @@ private
       :border_style => @style,
       :screen_width => @term_width
     )
-    tab << [nil] + @hosts.map { |h| ansi(:bold, :green) { h } }
+    tab << [nil] + @hosts.map { |h| h.bold.green }
     tab.separator!
     @tab_measures.each do |key|
-      tab << [ansi(:bold) { key }] + info[key] unless info[key].compact.empty?
+      tab << [key.to_s.bold] + info[key] unless info[key].compact.empty?
     end
     @os.puts tab
   end
 
+  def output info, info_output, file
+    output_term info_output
+    output_file info_output, file if file
+  end
+
   def init_table info_output
-    table = Tabularize.new :unicode => false,
-                       :align        => :right,
-                       :border_style => @style,
-                       :border_color => @mono ? nil : ANSI::Code.red,
-                       :vborder      => ' ',
-                       :pad_left     => 0,
-                       :pad_right    => 0,
-                       :screen_width => @term_width
+    table = Tabularize.new(
+      :unicode      => false,
+      :align        => :right,
+      :border_style => @style,
+      :border_color => (Ansi256.enabled? ? Ansi256.red : nil),
+      :vborder      => ' ',
+      :pad_left     => 0,
+      :pad_right    => 0,
+      :screen_width => @term_width)
     table.separator!
     table << info_output.map { |pair|
-      ansi(*((@colors[pair.first] || []) + [:underline])) {
-        LABELS[pair.first] || pair.first
-      }
+      key = pair.first
+      colorize LABELS.fetch(key, key), :underline, *@colors[key]
     }
     table.separator!
     table
@@ -281,6 +285,7 @@ private
 
   def process info, prev_info
     @measures.map { |key|
+      # [ key, [humanized, raw] ]
       [ key, process_how(info, prev_info, key) ]
     }.select { |pair| pair.last }
   end
@@ -296,14 +301,6 @@ private
       end
     end
 
-    get_ratio = lambda do |x, y|
-      if x > 0 || y > 0
-        x / (x + y) * 100
-      else
-        nil
-      end
-    end
-
     case key
     when :at
       val = Time.now.strftime('%H:%M:%S')
@@ -327,12 +324,12 @@ private
     when :keyspace_hit_ratio
       hits = info.sumf(:keyspace_hits)
       misses = info.sumf(:keyspace_misses)
-      val = get_ratio.call(hits, misses)
+      val = ratio(hits, misses)
       [humanize_number(val), val]
     when :keyspace_hit_ratio_per_second
       hits = get_diff.call(:keyspace_hits) || 0
       misses = get_diff.call(:keyspace_misses) || 0
-      val = get_ratio.call(hits, misses)
+      val = ratio(hits, misses)
       [humanize_number(val), val]
     else
       val = info.sumf(key)
@@ -340,6 +337,14 @@ private
     end
   end
 
+  def ratio x, y
+    if x > 0 || y > 0
+      x / (x + y) * 100
+    else
+      nil
+    end
+  end
+
   def humanize_number num, byte = false
     return '-' if num.nil?
 
@@ -351,11 +356,20 @@ private
     end
   end
 
-  def ansi *args, &block
-    if @mono || args.empty?
-      block.call
-    else
-      ANSI::Code.ansi *args, &block
+  def colorize str, *colors
+    colors.each do |color|
+      str = str.send color
     end
+    str
+  end
+
+  def need_auth? e
+    @auth && e.is_a?(Redis::CommandError) && e.to_s =~ /operation not permitted/
+  end
+
+  def authenticate!
+    @redises.each do |r|
+      r.ping rescue (r.auth @auth)
+    end if @auth
   end
 end

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/redis-stat.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = RedisStat::VERSION
 
-  gem.add_runtime_dependency "ansi", '~> 1.4.3'
+  gem.add_runtime_dependency "ansi256", '~> 0.2.5'
   gem.add_runtime_dependency "redis", '~> 3.0.2'
   gem.add_runtime_dependency "tabularize", '~> 0.2.9'
   gem.add_runtime_dependency "insensitive_hash", '~> 0.3.0'
@@ -25,6 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "si", '~> 0.1.4'
   gem.add_runtime_dependency "sinatra", '~> 1.3.3'
   gem.add_runtime_dependency "json", '~> 1.7.5'
+  gem.add_runtime_dependency "lps", '~> 0.2.0'
 
   if RUBY_PLATFORM == 'java'
     gem.add_runtime_dependency "puma", '~> 2.3.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ansi
+  name: ansi256
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.5
+- !ruby/object:Gem::Dependency
+  name: lps
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement