tailstrom 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51c1542ccac5cf92967e2b680b6248c3ad8d331c
-  data.tar.gz: 4d5bd73e287be37c0b8ebb7b66bfc6f420671794
+  metadata.gz: d6fec2ff65f0328d66e043a18c115cd3015b9caf
+  data.tar.gz: 647ff07f72e2450bc69405fb2705a3996c040e78
 SHA512:
-  metadata.gz: e33172c883c53c51c92601836402177cbb0bebcecd8c330b0354567f5b5b34bd74e81b810ab142c7fce9e4ba48e45bc84c2539860ff985dd6986a53f48ea6a87
-  data.tar.gz: 653713a2e282bf351260423bcc42cb0f08e590664f76dcab15b99b8b90f858a4664ac763405375658e65a41f0a468f709b8eaf721ee81613ce33c006225881e9
+  metadata.gz: c557df7bb847da8d28c3f0f95193719bd65a0c1222e4f18fc2d0ea724c378ce6b8de4d1ece305ec969090b9cfe8dd704d79466d8e0ccb4b25ad544467a5dd135
+  data.tar.gz: 8f0edf474fee9be1783f114287826bd5ecc6c641825bdc372b9a292c9ce3e68e81f3dfc630e43d397418986b89ef50512f2f47db39df2da2572835afc34c034d

data/bin/tailstrom

@@ -8,10 +8,12 @@ options = {
 }
 OptionParser.new(ARGV) {|opt|
   opt.banner = "tail -f access.log | #{$0} <OPTIONS>"
-  opt.on('-f [field]', Integer, 'value field') {|v| options[:field] = v - 1 }
+  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.on('--stat', 'statistics mode (default)') { options[:mode] = :stat }
   opt.on('--print', 'print line mode') { options[:mode] = :print }
 }.parse!

data/example/map1.rb

@@ -0,0 +1,10 @@
+value = col[2]
+key = case col[3]
+      when %r(^/photos/)
+        'photos'
+      when %r(^/users/)
+        'users'
+      when %r(^/products/)
+        'products'
+      end
+#filter = 'value > 0'

data/lib/tailstrom/command/stat.rb

@@ -1,4 +1,4 @@
-require 'tailstrom/counter'
+require 'tailstrom/counter_collection'
 require 'tailstrom/table'
 require 'tailstrom/tail_reader'
 
@@ -6,15 +6,17 @@ module Tailstrom
   module Command
     class Stat
       SCHEMA = [
+        { :name => 'time', :width => 8 },
         { :name => 'count', :width => 7 },
-        { :name => 'min', :width => 15 },
-        { :name => 'max', :width => 15 },
-        { :name => 'avg', :width => 15 }
+        { :name => 'min', :width => 10 },
+        { :name => 'max', :width => 10 },
+        { :name => 'avg', :width => 10 },
+        { :name => 'key', :width => 10, :align => :left }
       ]
 
       def initialize(options)
         @infile = $stdin
-        @counter = Counter.new
+        @counters = CounterCollection.new
         @table = Table.new SCHEMA
         @options = options
       end
@@ -23,23 +25,34 @@ module Tailstrom
         Thread.start do
           reader = TailReader.new @infile, @options
           reader.each_line do |line|
-            @counter << line[:value]
+            @counters[line[:key]] << line[:value]
           end
+          puts 'EOF'
         end
 
-        @table.print_header
-
+        height = `put lines`.to_i - 4 rescue 10
+        @i = 0
         loop do
-          if @counter
-            @table.print_row(
-              @counter.count,
-              @counter.min,
-              @counter.max,
-              @counter.avg
-            )
-          end
-          @counter.clear
           sleep @options[:interval]
+
+          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
+
+          if @counters.size > 1
+            @table.puts
+          end
+
+          @counters.clear
+          @i = @i + 1
         end
       rescue Interrupt
         exit 0

data/lib/tailstrom/counter_collection.rb

@@ -3,11 +3,11 @@ require 'tailstrom/counter'
 module Tailstrom
   class CounterCollection
     def initialize
-      @counters = Hash.new {|h, k| h[k] = Counter.new }
+      clear
     end
 
     def clear
-      @counters.values.each(&:clear)
+      @counters = Hash.new {|h, k| h[k] = Counter.new }
     end
 
     def [](key)
@@ -17,5 +17,17 @@ module Tailstrom
     def empty?
       @counters.empty?
     end
+
+    def each(&block)
+      @counters.each &block
+    end
+
+    def to_a
+      @counters.to_a
+    end
+
+    def size
+      @counters.size
+    end
   end
 end

data/lib/tailstrom/table.rb

@@ -10,9 +10,10 @@ module Tailstrom
         col_schema = @schema[i]
         num_str = col ? num_with_delim(col) : '-'
         print ' ' if i > 0
-        printf "%#{col_schema[:width]}s", num_str
+        align = col_schema[:align].to_s == 'left' ? '-' : nil
+        printf "%#{align}#{col_schema[:width]}s", num_str
       end
-      @out.puts
+      self.puts
     end
 
     def print_header
@@ -21,13 +22,16 @@ module Tailstrom
         if i > 0
           border += '-'
           head   += ' '
-          #border += '+'
-          #head   += '|'
         end
+        align = col[:align].to_s == 'left' ? '-' : nil
         border += '-' * col[:width]
-        head   += "%#{col[:width]}s" % col[:name]
+        head += "%#{align}#{col[:width]}s" % col[:name]
       end
-      @out.puts border, head, border
+      self.puts border, head, border
+    end
+
+    def puts(*args)
+      @out.puts *args
     end
 
     private

data/lib/tailstrom/tail_reader.rb

@@ -7,22 +7,33 @@ module Tailstrom
 
     def each_line
       @infile.each_line do |line|
+        line.chomp!
         result = parse_line(line)
         yield result if result
       end
     end
 
     def parse_line(line)
-      columns = line.split @options[:delimiter]
-      value = @options[:field] ? columns[@options[:field]] : line
-      value = value =~ /\./ ? value.to_f : value.to_i
+      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]
 
-      if @options[:filter]
-        v, cols = value, columns # shorthands
-        return nil unless binding.eval(@options[:filter])
+      if @options[:map]
+        binding.eval(@options[:map])
+        value = format_value value
       end
 
-      { :line => line, :columns => columns, :value => value }
+      if filter
+        return nil unless binding.eval(filter)
+      end
+
+      { :line => line, :columns => col, :key => key, :value => value }
+    end
+
+    def format_value(value)
+      value =~ /\./ ? value.to_f : value.to_i
     end
   end
 end

data/lib/tailstrom/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailstrom
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Issei Naruta
@@ -14,7 +14,6 @@ description: tailstrom is an utility for "tail -f"
 email:
 - naruta@cookpad.com
 executables:
-- dummylog
 - tailstrom
 extensions: []
 extra_rdoc_files: []
@@ -24,8 +23,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/dummylog
 - bin/tailstrom
+- example/dummylog
+- example/map1.rb
 - lib/tailstrom.rb
 - lib/tailstrom/command/print.rb
 - lib/tailstrom/command/stat.rb