tailstrom 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b35a6296aafaca9109eb5fa60b6adaa0e2d98a2f
-  data.tar.gz: c4e00a60b880f28e030c88421e45795953beabb1
+  metadata.gz: 30ba940607a94b7a30111d0a1d5cfc64d4ffbe92
+  data.tar.gz: 55a929d508f09b314fd783a4ba3843b89b3c9c0e
 SHA512:
-  metadata.gz: 9de2b148f1eb4fa79783a3a3028c4c3e6f948166eb07f6fae1bdc0eae3e5f57ff978bc2e6803c85afc91a49a424852798e9db4c29f1af026d66a266fbddedf08
-  data.tar.gz: 6bcbfb29db916fbce4671daf296377a57fdf945f3b1e016c8afe3fba6c2f0740e44d5c4a3066b31cdaf7a89a748fd529bbc366b350968d9ec3503eeb16c58f2a
+  metadata.gz: 046e9476d9ed1d61b3ac8127fced3cfcd571de4b30d900aab9474da256fae61043a3a014ffb6fe0b40f96800280a6c92414293229cb01894e338dd5f92c453f0
+  data.tar.gz: 3da54d4b6b9c5d9270b6d65ee810536d7d1e65264e3c6dd54f83e37cfe52eac258443f4dafdd52e41272ea7103a20c1a18fe2aae3a341a66b044a6f4293cd01e

data/bin/tailstrom

@@ -1,6 +1,23 @@
 #!/usr/bin/env ruby
-$: << File.expand_path('../../lib', __FILE__)
+require 'optparse'
+
+options = {
+  :delimiter => "\t",
+  :interval => 1,
+  :mode => :stat
+}
+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('-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('--stat', 'statistics mode (default)') { options[:mode] = :stat }
+  opt.on('--print', 'print line mode') { options[:mode] = :print }
+}.parse!
 
-require 'tailstrom/command/stat'
-cmd = Tailstrom::Command::Stat.new(ARGV)
+$: << File.expand_path('../../lib', __FILE__)
+require "tailstrom/command/#{options[:mode]}"
+cls = Module.const_get "Tailstrom::Command::#{options[:mode].capitalize}"
+cmd = cls.new options
 cmd.run

data/lib/tailstrom/command/print.rb

@@ -0,0 +1,19 @@
+require 'tailstrom/tail_reader'
+
+module Tailstrom
+  module Command
+    class Print
+      def initialize(options)
+        @infile = $stdin
+        @options = options
+      end
+
+      def run
+        reader = TailReader.new @infile, @options
+        reader.each_line do |line|
+          puts line[:line]
+        end
+      end
+    end
+  end
+end

data/lib/tailstrom/command/stat.rb

@@ -1,7 +1,6 @@
-require 'optparse'
-require 'tailstrom/counter_collection'
+require 'tailstrom/counter'
 require 'tailstrom/table'
-require 'thread'
+require 'tailstrom/tail_reader'
 
 module Tailstrom
   module Command
@@ -13,56 +12,38 @@ module Tailstrom
         { :name => 'avg', :width => 15 }
       ]
 
-      def initialize(argv)
+      def initialize(options)
         @infile = $stdin
-        @counters = CounterCollection.new
+        @counter = Counter.new
         @table = Table.new SCHEMA
-        parse_option argv
+        @options = options
       end
 
       def run
-        Thread.start {
-          loop do
-            while line = @infile.gets
-              line = line.chomp
-              parse_line line
-            end
-            sleep 0.1
+        Thread.start do
+          reader = TailReader.new @infile, @options
+          reader.each_line do |line|
+            @counter << line[:value]
           end
-        }
+        end
 
         @table.print_header
 
         loop do
-          unless @counters.empty?
-            c = @counters[:all]
-            @table.print_row c.count, c.min, c.max, c.avg
+          if @counter
+            @table.print_row(
+              @counter.count,
+              @counter.min,
+              @counter.max,
+              @counter.avg
+            )
           end
-          @counters.clear
+          @counter.clear
           sleep @options[:interval]
         end
       rescue Interrupt
         exit 0
       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
-        @counters[:all] << value
-      end
-
-      def parse_option(argv)
-        @options = {
-          :delimiter => "\t",
-          :interval => 1
-        }
-        opt = OptionParser.new(argv)
-        opt.on('-f [field]', Integer) {|v| @options[:field] = v - 1 }
-        opt.on('-d [delimiter]', String) {|v| @options[:delimiter] = v }
-        opt.on('-i [interval]', Integer) {|v| @options[:interval] = v }
-        opt.parse!
-      end
     end
   end
 end

data/lib/tailstrom/tail_reader.rb

@@ -1,10 +1,28 @@
 module Tailstrom
   class TailReader
-    def initialize(infile)
-      @inflie = infile
+    def initialize(infile, options={})
+      @infile = infile
+      @options = options
     end
 
-    def run
+    def each_line
+      @infile.each_line do |line|
+        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
+
+      if @options[:filter]
+        v, cols = value, columns # shorthands
+        return nil unless binding.eval(@options[:filter])
+      end
+
+      { :line => line, :columns => columns, :value => value }
     end
   end
 end

data/lib/tailstrom/version.rb

@@ -1,3 +1,3 @@
 module Tailstrom
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tailstrom
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Issei Naruta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies: []
 description: tailstrom is a utility for "tail -f"
 email:
@@ -27,6 +27,7 @@ files:
 - bin/dummylog
 - bin/tailstrom
 - lib/tailstrom.rb
+- lib/tailstrom/command/print.rb
 - lib/tailstrom/command/stat.rb
 - lib/tailstrom/counter.rb
 - lib/tailstrom/counter_collection.rb