tailstrom 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6fec2ff65f0328d66e043a18c115cd3015b9caf
-  data.tar.gz: 647ff07f72e2450bc69405fb2705a3996c040e78
+  metadata.gz: e2084969ae138b43205364ee1c78bbe4af7e3288
+  data.tar.gz: b9bf1f575d1c915c2ae185d38d40acabb27341d6
 SHA512:
-  metadata.gz: c557df7bb847da8d28c3f0f95193719bd65a0c1222e4f18fc2d0ea724c378ce6b8de4d1ece305ec969090b9cfe8dd704d79466d8e0ccb4b25ad544467a5dd135
-  data.tar.gz: 8f0edf474fee9be1783f114287826bd5ecc6c641825bdc372b9a292c9ce3e68e81f3dfc630e43d397418986b89ef50512f2f47db39df2da2572835afc34c034d
+  metadata.gz: 3b960f9634555b00cedf6cb08d2e4449b1f13dc5e40b956b2734bd59547d0207c427e63111ee47ef7b90d239c252703e789748e699f6b93e363431dd1939096b
+  data.tar.gz: bc421512afa39984806754b237e6096df8fb7c4ae31a6f78504ef3f82a055b2bceb055956d5af312fbbd23ca7afa503323fd0e2c907705f5327bcd3ac2b55a01

data/bin/tailstrom

@@ -1,24 +1,53 @@
 #!/usr/bin/env ruby
+$: << File.expand_path('../../lib', __FILE__)
 require 'optparse'
 
+def file_or_string(value)
+  File.exist?(value) ? File.read(value) : value
+end
+
 options = {
   :delimiter => "\t",
   :interval => 1,
-  :mode => :stat
+  :mode => :stat,
+  :order => :desc
 }
 OptionParser.new(ARGV) {|opt|
-  opt.banner = "tail -f access.log | #{$0} <OPTIONS>"
-  opt.on('-f [num]', Integer, 'value field') {|v| options[:field] = v }
-  opt.on('-k [num]', Integer, 'key field') {|v| options[:key] = v }
-  opt.on('-d [delimiter]', String) {|v| options[:delimiter] = v }
-  opt.on('-i [interval]', Integer, 'interval for stat mode') {|v| options[:interval] = v }
-  opt.on('-e [filter]', String) {|v| options[:filter] = v }
-  opt.on('--map [file]', String, 'mapping file') {|v| options[:map] = File.read(v) }
+  opt.banner = <<-END
+tail -f access.log | #{$0} [OPTIONS]
+#{$0} [OPTIONS] [file]
+  END
+  opt.on('-f num', Integer, 'value field') {|v| options[:field] = v }
+  opt.on('-k num', Integer, 'key field') {|v| options[:key] = v }
+  opt.on('-d delimiter', String, 'delimiter') {|v| options[:delimiter] = v }
+  opt.on('-i interval', Integer, 'interval for stat mode') {|v| options[:interval] = v }
+  opt.on('-e file_or_string', '--in-filter file_or_string', String, 'input filtering') do |v|
+    options[:in_filter] = file_or_string v
+  end
+  opt.on('--map file_or_string', String, 'input mapping') do |v|
+    options[:map] = file_or_string v
+  end
+  opt.on('--out-filter file_or_string', String, 'output filtering') do |v|
+    options[:out_filter] = file_or_string v
+  end
+  opt.on('--sort file_or_string', String, 'output sorting') do |v|
+    options[:sort] = file_or_string v
+  end
+  opt.on('--order desc|asc', String, 'sorting order (default=desc)') do |v|
+    options[:order] = v.to_s.downcase == 'asc' ? :asc : :desc
+  end
   opt.on('--stat', 'statistics mode (default)') { options[:mode] = :stat }
   opt.on('--print', 'print line mode') { options[:mode] = :print }
-}.parse!
+  opt.on('--version', 'show version') do
+    require 'tailstrom/version'
+    puts Tailstrom::VERSION
+    exit 0
+  end
+}.order!
+if infile = ARGV.shift
+  options[:static_infile] = open(infile, 'r')
+end
 
-$: << File.expand_path('../../lib', __FILE__)
 require "tailstrom/command/#{options[:mode]}"
 cls = Module.const_get "Tailstrom::Command::#{options[:mode].capitalize}"
 cmd = cls.new options

data/example/map1.rb

@@ -7,4 +7,4 @@ key = case col[3]
       when %r(^/products/)
         'products'
       end
-#filter = 'value > 0'
+#in_filter = 'value > 0'

data/lib/tailstrom/command/stat.rb

@@ -5,58 +5,91 @@ 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

data/lib/tailstrom/counter.rb

@@ -5,11 +5,17 @@ module Tailstrom
     end
 
     def <<(value)
+      purge_cache
       @values << value
     end
 
     def clear
       @values = []
+      purge_cache
+    end
+
+    def purge_cache
+      @cache = {}
     end
 
     def avg
@@ -18,15 +24,15 @@ module Tailstrom
     end
 
     def sum
-      @values.inject(0, :+)
+      @cache[:sum] ||= @values.inject(0, :+)
     end
 
     def min
-      @values.min
+      @cache[:min] ||= @values.min
     end
 
     def max
-      @values.max
+      @cache[:max] ||= @values.max
     end
 
     def med
@@ -34,7 +40,7 @@ module Tailstrom
     end
 
     def count
-      @values.count
+      @cache[:count] ||= @values.count
     end
   end
 end

data/lib/tailstrom/table.rb

@@ -8,10 +8,10 @@ module Tailstrom
     def print_row(*cols)
       cols.each_with_index do |col, i|
         col_schema = @schema[i]
-        num_str = col ? num_with_delim(col) : '-'
+        str = format_string col
         print ' ' if i > 0
         align = col_schema[:align].to_s == 'left' ? '-' : nil
-        printf "%#{align}#{col_schema[:width]}s", num_str
+        printf "%#{align}#{col_schema[:width]}s", str
       end
       self.puts
     end
@@ -35,6 +35,17 @@ module Tailstrom
     end
 
     private
+      def format_string(value)
+        case value
+        when Numeric
+          num_with_delim value
+        when nil
+          '-'
+        else
+          value
+        end
+      end
+
       def num_with_delim(num)
         head, tail = num.to_s.split('.')
         head.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")

data/lib/tailstrom/tail_reader.rb

@@ -5,28 +5,41 @@ module Tailstrom
       @options = options
     end
 
-    def each_line
+    def each_line(&block)
+      if @options[:async]
+        Thread.new { _each_line &block }
+      else
+        _each_line &block
+      end
+    end
+
+    def _each_line
       @infile.each_line do |line|
         line.chomp!
         result = parse_line(line)
         yield result if result
       end
     end
+    private :_each_line
+
+    def eof?
+      @infile.eof?
+    end
 
     def parse_line(line)
       col = line.split @options[:delimiter]
       value = @options[:field] ? col[@options[:field]] : line
       value = format_value value
       key = @options[:key] ? col[@options[:key]] : :nil
-      filter = @options[:filter]
+      in_filter = @options[:in_filter]
 
       if @options[:map]
         binding.eval(@options[:map])
         value = format_value value
       end
 
-      if filter
-        return nil unless binding.eval(filter)
+      if in_filter
+        return nil unless binding.eval(in_filter)
       end
 
       { :line => line, :columns => col, :key => key, :value => value }

data/lib/tailstrom/version.rb

@@ -1,3 +1,3 @@
 module Tailstrom
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/tailstrom.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Tailstrom::VERSION
   spec.authors       = ["Issei Naruta"]
   spec.email         = ["naruta@cookpad.com"]
-  spec.description   = %q{tailstrom is an utility for "tail -f"} 
+  spec.description   = %q{tailstrom is an utility for "tail -f"}
   spec.summary       = %q{A utility for "tail -f"}
   spec.homepage      = ""
   spec.license       = "MIT"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailstrom
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Issei Naruta