tailstrom 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6720202d46441e9ffd7ae73a403b26e14b2bb5e
-  data.tar.gz: 1e4fb279861cb744697f16b8e912a013ffd58ad8
+  metadata.gz: 248be97938bac3cb884cbdb068a7faca0916061f
+  data.tar.gz: ac7e4f1466fcfd541ea9f4282161c335e7b96afb
 SHA512:
-  metadata.gz: f630928244c74256aa1c488b4d005dd53af9d10a24b92d2d9001cb0cd86110d667b25618855ad8121d24d3309a4b79bc4ec3004d524a3734ae442282fff3ed3d
-  data.tar.gz: 6bdcbcb947d610518768e24d00f945ec9d35466c5364ab4438f1485ac806f31b057187920b354530bcd2c141fe6f8ef318da67314b6c1d9aabb687fd432f7548
+  metadata.gz: 68cd4c9e158940659a5869aa63eb72d9577cc95869dddfe4da682b6dcd3acbe5a6c106a1f91211604c79e678cd97c4634f971a5d6480a6aad29a67aa1db4345f
+  data.tar.gz: 656e5d97c582ef745811da3331626da29d44816586a87646104300d8c0f575bdf5018ca8342973c54337156089cf9fc4e2c0f2ba0504704545179d2ea4c6e19a

data/lib/tailstrom/command/stat.rb

@@ -34,8 +34,7 @@ module Tailstrom
         begin
           sleep @options[:interval]
 
-          # TODO refactoring
-          if printed_lines > 0 && (@counters.size > 1 || @counters.keys != [:nil] && !@counters.empty?)
+          if printed_lines > 0 && (@multiline ||= @counters.size > 1)
             @table.puts
             printed_lines += 1
           end

data/lib/tailstrom/option_parser.rb

@@ -33,11 +33,11 @@ tail -f access.log | #{$0} [OPTIONS]
         opt.on('-c file', '--config file', String, 'config file') do |v|
           @options_from_file = load_config v
         end
-        opt.on('-f num', Integer, 'value field') do |v|
-          @options[:field] = v
+        opt.on('-f num_or_string', '--value num_or_string', String, 'value field') do |v|
+          @options[:value] = num_or_string v
         end
-        opt.on('-k num', Integer, 'key field') do |v|
-          @options[:key] = v
+        opt.on('-k num_or_string', '--key num_or_string', String, 'key field') do |v|
+          @options[:key] = num_or_string v
         end
         opt.on('-d delimiter', String, 'delimiter') do |v|
           @options[:delimiter] = v
@@ -79,6 +79,10 @@ tail -f access.log | #{$0} [OPTIONS]
         File.exist?(value) ? File.read(value) : value
       end
 
+      def num_or_string(value)
+        value =~ /^\d+$/ ? value.to_i : file_or_string(value)
+      end
+
       def load_config(file)
         require 'yaml'
         argv = []

data/lib/tailstrom/tail_reader.rb

@@ -30,29 +30,46 @@ module Tailstrom
 
     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
+      key = value = nil
       in_filter = @options[:in_filter]
 
-      scripts = []
+      _scripts = []
 
       if @options[:map]
-        scripts << @options[:map]
-        scripts << 'value=format_value(value)'
+        _scripts << @options[:map]
+        _scripts << 'value=format_value(value)'
+      end
+
+      if @options[:key]
+        _scripts << index_or_eval('key', 'col', @options[:key])
+      end
+
+      if @options[:value]
+        _scripts << index_or_eval('value', 'col', @options[:value])
+        _scripts << 'value=format_value(value)'
       end
 
       if in_filter
-        scripts << in_filter
-        return nil unless eval scripts.join(';')
+        _scripts << in_filter
+        return nil unless eval _scripts.join(';')
       end
 
-      eval scripts.join(';')
+      eval _scripts.join(';')
       { :line => line, :columns => col, :key => key, :value => value }
     end
 
     def format_value(value)
       value =~ /\./ ? value.to_f : value.to_i
     end
+
+    def index_or_eval(var, col, idx)
+      case idx
+      when Integer
+        "#{var}=col[#{idx}]"
+      when String
+        "#{var}=#{idx}"
+      end
+    end
+    private :index_or_eval
   end
 end

data/lib/tailstrom/version.rb

@@ -1,3 +1,3 @@
 module Tailstrom
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/stat_command_spec.rb

@@ -20,7 +20,7 @@ END
     139      1,521    958,131    476,502 200       
 END
 
-  it { expect(run '-f2 -k3 --map key=key[/[a-z]+/]').to eq <<-END }
+  it { expect(run '-f2 --map key=col[3][/[a-z]+/]').to eq <<-END }
 ---------------------------------------------------
   count        min        max        avg key       
 ---------------------------------------------------
@@ -29,14 +29,21 @@ END
     103      1,521    989,278    414,438 photos    
 END
 
-  it { expect(run '-f2 -k3 --map key=key[/[a-z]+/] --in-filter key=~/products/').to eq <<-END }
+  it { expect(run %!-f2 --key col[3][/[a-z]+/] -e 'key=="products"'!).to eq <<-END }
 ---------------------------------------------------
   count        min        max        avg key       
 ---------------------------------------------------
     104      2,524    995,595    505,832 products  
 END
 
-  it { expect(run '-f2 -k3 --map key=key[/[a-z]+/] --sort count').to eq <<-END }
+  it { expect(run '-f2 --map key=col[3][/[a-z]+/] --in-filter key=~/products/').to eq <<-END }
+---------------------------------------------------
+  count        min        max        avg key       
+---------------------------------------------------
+    104      2,524    995,595    505,832 products  
+END
+
+  it { expect(run '-f2 --map key=col[3][/[a-z]+/] --sort count').to eq <<-END }
 ---------------------------------------------------
   count        min        max        avg key       
 ---------------------------------------------------
@@ -45,7 +52,7 @@ END
      93      5,584    971,226    485,544 users     
 END
 
-  it { expect(run '-f2 -k3 --map key=key[/[a-z]+/] --sort count --order asc').to eq <<-END }
+  it { expect(run '-f2 --map key=col[3][/[a-z]+/] --sort count --order asc').to eq <<-END }
 ---------------------------------------------------
   count        min        max        avg key       
 ---------------------------------------------------
@@ -54,12 +61,21 @@ END
     104      2,524    995,595    505,832 products  
 END
 
-  it { expect(run '-f2 -k3 --map key=key[/[a-z]+/] --out-filter "min>2000"').to eq <<-END }
+  it { expect(run '-f2 --map key=col[3][/[a-z]+/] --out-filter "min>2000"').to eq <<-END }
+---------------------------------------------------
+  count        min        max        avg key       
+---------------------------------------------------
+    104      2,524    995,595    505,832 products  
+     93      5,584    971,226    485,544 users     
+END
+
+  it { expect(run '-f2 --map key1=col[3][/[a-z]+/] --key key1').to eq <<-END }
 ---------------------------------------------------
   count        min        max        avg key       
 ---------------------------------------------------
     104      2,524    995,595    505,832 products  
      93      5,584    971,226    485,544 users     
+    103      1,521    989,278    414,438 photos    
 END
 
 end

metadata

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