redis-stat 0.4.9-java → 0.4.10-java

data/lib/redis-stat/server/public/js/site.js

@@ -32,7 +32,7 @@ var initialize = function(params) {
         xaxis: {
           pad: 1,
           min: - max,
-          tickOptions: { show: true }
+          tickOptions: { show: false }
         },
         yaxis: {
           label:'Commands/sec',
@@ -41,10 +41,10 @@ var initialize = function(params) {
         }
       },
       grid: {
-        borderWidth: 0.0,
+        borderWidth: 1.0,
         borderColor: '#ddd',
         background: '#ffffff',
-        shadowAlpha: 0.03
+        shadow: false
       }
     },
     chart2: {
@@ -67,7 +67,7 @@ var initialize = function(params) {
         xaxis: {
           pad: 1,
           min: - max,
-          tickOptions: { show: true }
+          tickOptions: { show: false }
         },
         yaxis: {
           label:'CPU usage',
@@ -80,10 +80,10 @@ var initialize = function(params) {
         location: 'se'
       },
       grid: {
-        borderWidth: 0.0,
+        borderWidth: 1.0,
         borderColor: '#ddd',
         background: '#ffffff',
-        shadowAlpha: 0.03
+        shadow: false
       }
     },
     chart3: {
@@ -104,7 +104,7 @@ var initialize = function(params) {
         xaxis: {
           pad: 1,
           min: - max,
-          tickOptions: { show: true }
+          tickOptions: { show: false }
         },
         yaxis: {
           label:'Memory usage',
@@ -120,10 +120,10 @@ var initialize = function(params) {
         location: 'se'
       },
       grid: {
-        borderWidth: 0.0,
+        borderWidth: 1.0,
         borderColor: '#ddd',
         background: '#ffffff',
-        shadowAlpha: 0.03
+        shadow: false
       }
     },
   } // chart_options

data/lib/redis-stat/server/views/index.erb

@@ -132,10 +132,6 @@
 
     </div>
 
-    <a href="https://github.com/junegunn/redis-stat">
-      <img style="position: fixed; top: 0; right: 0; border: 0; z-index: 10000" src="/forkme.png" alt="Fork me on GitHub">
-    </a>
-
     <footer class="footer">
       <div class="container">
         <p>Powered by <a href="http://twitter.github.com/bootstrap/">Bootstrap</a>, <a href="http://jquery.com/">jQuery</a> and <a href="http://www.jqplot.com/">jqPlot</a>.</p>

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = '0.4.9'
+  VERSION = '0.4.10'
 end

data/lib/redis-stat.rb

@@ -37,7 +37,8 @@ class RedisStat
     }
     @max_count     = options[:count]
     @colors        = options[:colors] || COLORS
-    @csv           = options[:csv]
+    @csv_file      = options[:csv_file]
+    @csv_output    = options[:csv_output]
     @auth          = options[:auth]
     @verbose       = options[:verbose]
     @measures      = MEASURES[ @verbose ? :verbose : :default ].map { |m| [*m].first }
@@ -53,13 +54,33 @@ class RedisStat
     @elasticsearch = options[:es] && ElasticsearchSink.new(@hosts, options[:es])
   end
 
-  def start output_stream
+  def output_stream! stream
+    if @csv_output
+      class << $stderr
+        alias puts! puts
+        def puts(*args); end
+        def print(*args); end
+      end
+      $stderr
+    else
+      class << stream
+        alias puts! puts
+      end
+      stream
+    end
+  end
+
+  def start stream
     @started_at = Time.now
-    @os = output_stream
+    @os = output_stream!(stream)
     trap('INT') { Thread.main.raise Interrupt }
 
     begin
-      csv = File.open(File.expand_path(@csv), 'w') if @csv
+      csv = if @csv_file
+              File.open(File.expand_path(@csv_file), 'w')
+            elsif @csv_output
+              $stdout
+            end
       update_term_size!
       authenticate!
 
@@ -108,7 +129,7 @@ class RedisStat
         end
         error_messages = format_exceptions(exceptions)
         info_output = @measures.map { |key| [key, info_output_all[key][:sum]] }
-        unless @daemonized
+        if !@daemonized && !@csv_output
           output_static_info info if @count == 0
           output_term info_output, error_messages
         end
@@ -123,7 +144,7 @@ class RedisStat
       @os.puts
     rescue Interrupt
       @os.puts
-      @os.puts "Interrupted.".yellow.bold
+      @os.puts! "Interrupted.".yellow.bold
       if @server_thr
         @server_thr.raise Interrupt
         @server_thr.join
@@ -131,12 +152,12 @@ class RedisStat
     rescue SystemExit
       raise
     rescue Exception => e
-      @os.puts e.to_s.red.bold
+      @os.puts! e.to_s.red.bold
       raise
     ensure
       csv.close if csv
     end
-    @os.puts "Elapsed: #{"%.2f" % (Time.now - @started_at)} sec.".blue.bold
+    @os.puts! "Elapsed: #{"%.2f" % (Time.now - @started_at)} sec.".blue.bold
   end
 
 private
@@ -289,7 +310,7 @@ private
   end
 
   def output_term_errors! error_messages
-    @os.puts error_messages.join($/).red.bold
+    @os.puts! error_messages.join($/).red.bold
   end
 
   def output_term info_output, error_messages

data/test/test_redis-stat.rb

@@ -52,7 +52,8 @@ class TestRedisStat < MiniTest::Unit::TestCase
       :hosts => ['localhost:1000'],
       :interval => 20,
       :count => nil,
-      :csv => nil,
+      :csv_file => nil,
+      :csv_output => false,
       :style => :unicode
     }.sort, options.sort)
 
@@ -61,7 +62,8 @@ class TestRedisStat < MiniTest::Unit::TestCase
       :hosts => ['localhost:1000'],
       :interval => 20,
       :count => 30,
-      :csv => nil,
+      :csv_file => nil,
+      :csv_output => false,
       :style => :unicode
     }.sort, options.sort)
 
@@ -70,7 +72,8 @@ class TestRedisStat < MiniTest::Unit::TestCase
       :hosts => ['127.0.0.1:6379'],
       :interval => 20,
       :count => nil,
-      :csv => nil,
+      :csv_file => nil,
+      :csv_output => false,
       :style => :unicode
     }.sort, options.sort)
 
@@ -79,7 +82,8 @@ class TestRedisStat < MiniTest::Unit::TestCase
       :hosts => ['127.0.0.1:6379'],
       :interval => 20,
       :count => 30,
-      :csv => nil,
+      :csv_file => nil,
+      :csv_output => false,
       :style => :unicode
     }.sort, options.sort)
 
@@ -89,7 +93,8 @@ class TestRedisStat < MiniTest::Unit::TestCase
       :hosts => ['localhost:8888'],
       :interval => 10,
       :count => nil,
-      :csv => '/tmp/a.csv',
+      :csv_file => '/tmp/a.csv',
+      :csv_output => false,
       :style => :ascii
     }.sort, options.sort)
 
@@ -99,7 +104,8 @@ class TestRedisStat < MiniTest::Unit::TestCase
       :hosts => ['localhost:8888'],
       :interval => 10,
       :count => nil,
-      :csv => '/tmp/a.csv',
+      :csv_file => '/tmp/a.csv',
+      :csv_output => false,
       :style => :ascii
     }.sort, options.sort)
 
@@ -109,7 +115,20 @@ class TestRedisStat < MiniTest::Unit::TestCase
       :hosts => ['localhost:8888'],
       :interval => 10,
       :count => nil,
-      :csv => '/tmp/a.csv',
+      :csv_file => '/tmp/a.csv',
+      :csv_output => false,
+      :style => :ascii,
+      :es => %w[http://localhost index]
+    }.sort, options.sort)
+
+    options = RedisStat::Option.parse(%w[-h localhost:8888 10 -a password --csv --style=ascii --es=localhost/index])
+    assert_equal({
+      :auth => 'password',
+      :hosts => ['localhost:8888'],
+      :interval => 10,
+      :count => nil,
+      :csv_file => nil,
+      :csv_output => true,
       :style => :ascii,
       :es => %w[http://localhost index]
     }.sort, options.sort)
@@ -126,7 +145,8 @@ class TestRedisStat < MiniTest::Unit::TestCase
         :hosts => ['localhost:8888'],
         :interval => 10,
         :count => nil,
-        :csv => '/tmp/a.csv',
+        :csv_file => '/tmp/a.csv',
+        :csv_output => false,
         :server_port => "5555",
         :style => :ascii,
         :daemon => true
@@ -160,7 +180,7 @@ class TestRedisStat < MiniTest::Unit::TestCase
     csv = '/tmp/redis-stat.csv'
     cnt = 100
     rs = RedisStat.new :hosts => %w[localhost] * 5, :interval => 0.01, :count => cnt,
-            :verbose => true, :csv => csv, :auth => 'pw'
+            :verbose => true, :csv_file => csv, :auth => 'pw'
     rs.start $stdout
 
     assert_equal cnt + 1, File.read(csv).lines.to_a.length

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi256
@@ -191,7 +191,6 @@ files:
 - lib/redis-stat/server/public/css/site.css
 - lib/redis-stat/server/public/favicon.ico
 - lib/redis-stat/server/public/favicon.png
-- lib/redis-stat/server/public/forkme.png
 - lib/redis-stat/server/public/jqplot/jqplot.canvasAxisLabelRenderer.min.js
 - lib/redis-stat/server/public/jqplot/jqplot.canvasAxisTickRenderer.min.js
 - lib/redis-stat/server/public/jqplot/jqplot.canvasTextRenderer.min.js