ddtop 0.0.2 → 0.0.3

data/README.md

@@ -38,6 +38,16 @@ Swap:        0k total,        0k used,        0k free,  1124444k cached
 
 ![datadog-metrics.png](https://bitbucket.org/winebarrel/ddtop/downloads/datadog-metrics.png)
 
+### `--emits` option
+
+Sending all processes data to Datadog is too heavy.
+
+You can specify the process of sending in `--emits` option.
+
+```sh
+ddtop --emits httpd.worker,awk,ruby
+```
+
 ## Contributing
 
 1. Fork it ( http://github.com/<my-github-username>/ddtop/fork )

data/bin/ddtop

@@ -5,9 +5,12 @@ require 'ddtop'
 civis = system('tput civis')
 
 trap(:INT) do
+  exit
+end
+
+at_exit do
   puts "\e[0m"
   system('tput cnorm') if civis
-  exit
 end
 
 Ddtop.run

data/lib/ddtop/ddtop.rb

@@ -12,12 +12,14 @@ class Ddtop::Ddtop
   def run
     clear_screen
 
+    emits = get_emits(ARGV)
+
     summary, fields = nil
     values = []
 
     head_hook = proc do
       if summary and not values.empty?
-        emit_points(summary, fields, values)
+        emit_points(summary, fields, values, emits)
         values.clear
       end
     end
@@ -33,6 +35,19 @@ class Ddtop::Ddtop
 
   private
 
+  def get_emits(args)
+    i = args.index('--emits')
+    emits = []
+
+    if i and args[i + 1] and args[i + 1] !~ /\A-/
+      emits = args[i + 1].split(/,/).map {|i| i.strip }.select {|i| not i.empty? }
+      args.delete_at(i + 1)
+      args.delete_at(i)
+    end
+
+    return emits
+  end
+
   def top_each_lien(head_hook)
     cmd = [TOP_CMD, ARGV].flatten.join(' ')
 
@@ -47,7 +62,7 @@ class Ddtop::Ddtop
     line = top.gets
 
     if head?(line)
-      @win_rows = win_rows
+      @win_rows, @win_cols = get_winsize
       @curr_row = 0
       yield if block_given?
       reset_cursor
@@ -55,10 +70,16 @@ class Ddtop::Ddtop
 
     @curr_row += 1
 
+    if @curr_row <= @win_rows
+      line.chomp!
+      delta = @win_cols - line.length
+      line += ' ' * (@win_cols - line.length) if delta > 0
+    end
+
     if @curr_row < @win_rows
-      print line.sub(/\s+\Z/, "\n")
+      puts line[0, @win_cols]
     elsif @curr_row == @win_rows
-      print line.sub(/\s+\Z/, '')
+      print line[0, @win_cols]
     end
 
     return line.strip
@@ -102,9 +123,9 @@ class Ddtop::Ddtop
     Hash[*items.flatten]
   end
 
-  def emit_points(summary, names, values)
+  def emit_points(summary, names, values, emits)
     time = summary.delete(:time)
-    fields = aggregate_fields(names, values)
+    fields = aggregate_fields(names, values, emits)
     emit_points0(time, summary)
     emit_points0(time, fields)
   end
@@ -123,7 +144,7 @@ class Ddtop::Ddtop
     # nothing to do
   end
 
-  def aggregate_fields(names, values)
+  def aggregate_fields(names, values, emits)
     aggregated = {}
 
     values.map {|v|
@@ -131,6 +152,8 @@ class Ddtop::Ddtop
       %w(PID USER PR NI S).each {|k| h.delete(k) }
       h['TIME+'] = parse_time_plus(h['TIME+'])
       h
+    }.select {|h|
+      emits.empty? || emits.include?(h['COMMAND'])
     }.sort_by {|h|
       h['COMMAND']
     }.chunk {|h|
@@ -158,8 +181,10 @@ class Ddtop::Ddtop
     t[0] * 60 + t[1] + t[2] / 100
   end
 
-  def win_rows
-    `stty -a`.split("\n").first.split(';')[1].strip.split(/\s+/, 2)[1].to_i
+  def get_winsize
+    `stty -a`.split("\n").first.split(';').values_at(1, 2).map do |nv|
+      nv.strip.split(/\s+/, 2)[1].to_i
+    end
   end
 
   def clear_screen

data/lib/ddtop/version.rb

@@ -1,3 +1,3 @@
 module Ddtop
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddtop
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: