lib/tailstrom/command/stat.rb in tailstrom-0.0.4 vs lib/tailstrom/command/stat.rb in tailstrom-0.0.5

@@ -3,60 +3,93 @@
 require 'tailstrom/tail_reader'
 
 module Tailstrom
   module Command
     class Stat
-      SCHEMA = [
-        { :name => 'time', :width => 8 },
-        { :name => 'count', :width => 7 },
-        { :name => 'min', :width => 10 },
-        { :name => 'max', :width => 10 },
-        { :name => 'avg', :width => 10 },
-        { :name => 'key', :width => 10, :align => :left }
-      ]
-
       def initialize(options)
-        @infile = $stdin
+        @infile = options[:static_infile] || $stdin
         @counters = CounterCollection.new
-        @table = Table.new SCHEMA
-        @options = options
+        @options = { :async => !options[:static_infile] }.merge options
+        @table = Table.new schema
       end
 
+      def schema
+        [
+          ({ :name => 'time', :width => 8 } if @options[:async]),
+          { :name => 'count', :width => 7 },
+          { :name => 'min', :width => 10 },
+          { :name => 'max', :width => 10 },
+          { :name => 'avg', :width => 10 },
+          { :name => 'key', :width => 10, :align => :left }
+        ].compact
+      end
+
       def run
-        Thread.start do
-          reader = TailReader.new @infile, @options
-          reader.each_line do |line|
-            @counters[line[:key]] << line[:value]
-          end
-          puts 'EOF'
+        reader = TailReader.new @infile, @options
+        reader.each_line do |line|
+          @counters[line[:key]] << line[:value]
         end
 
         height = `put lines`.to_i - 4 rescue 10
-        @i = 0
-        loop do
+        i = 0
+        begin
           sleep @options[:interval]
 
-          if @i % height == 0
+          if i % height == 0
             @table.print_header
           end
 
-          @counters.to_a.sort_by {|key, c|
-            c.sum
-          }.reverse_each do |key, c|
-            key = (key == :nil ? nil : key)
-            time = Time.now.strftime("%H:%M:%S")
-            @table.print_row time, c.count, c.min, c.max, c.avg, key
-          end
+          print_counters
 
           if @counters.size > 1
             @table.puts
           end
 
           @counters.clear
-          @i = @i + 1
-        end
+          i = i + 1
+        end while !reader.eof?
       rescue Interrupt
         exit 0
       end
+
+      private
+        def print_counters
+          sorted_counters.each do |key, c|
+            key = (key == :nil ? nil : key)
+            next unless out_filter(key, c)
+            if @options[:async]
+              time = Time.now.strftime("%H:%M:%S")
+              @table.print_row time, c.count, c.min, c.max, c.avg, key
+            else
+              @table.print_row c.count, c.min, c.max, c.avg, key
+            end
+          end
+        end
+
+        def sorted_counters
+          counters = @counters.to_a
+          if sort = @options[:sort]
+            counters.sort_by! do |key, c|
+              sum, avg, min, max, count =
+                c.sum, c.avg, c.min, c.max, c.count
+              binding.eval sort
+            end
+          else
+            counters.sort_by! do |key, c|
+              c.sum
+            end
+          end
+          @options[:order] == :asc ? counters : counters.reverse
+        end
+
+        def out_filter(key, counter)
+          if filter = @options[:out_filter]
+            sum, avg, min, max, count =
+              counter.sum, counter.avg, counter.min, counter.max, counter.count
+            binding.eval filter
+          else
+            true
+          end
+        end
     end
   end
 end