tailstrom 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fc9291b2a7850cedd5567f7c78a94073695a49b
-  data.tar.gz: ceb209f84de1c9c1104e0e5df763812eed71b894
+  metadata.gz: 6f926cdcaa4991ec047200693a400944e4923e26
+  data.tar.gz: 1739fde8a212c22dee1a2c2fb11c5dbbe4d5a67f
 SHA512:
-  metadata.gz: e0a0ce1ff435b17b851d51516a0bf0137ed2d866618e855d9a3d35b7f45843ea664d10d123e310ff2a09254175160771244530f6495b4f76c4ee8cb83759f367
-  data.tar.gz: fda93ef992bebf83c9c2828e4e09e91de049f07549de250b99c8836340a1166eb1978474d72b2d2c6b6b19c266b4aa08aeb2241c7442622a41f2c77d82554402
+  metadata.gz: 30e6c199b116df31de4235e51b689879e00ec01f3951eb754589250c534c4034a75ea14250eefda4bd4c790f9e4fef6508144db45c31e29a7e5c6cd716c2f43a
+  data.tar.gz: ecbe7d88dede8e5cfd9f217883da8125c0ed796c2f0cad64949b62d9d75ec06896a6f9ed3deb8ad1cb0f5976f6faf05ea865cd8d234d268f3a31f8b2db450afe

data/bin/tailstrom

@@ -1,52 +1,8 @@
 #!/usr/bin/env ruby
 $: << File.expand_path('../../lib', __FILE__)
-require 'optparse'
+require 'tailstrom/option_parser'
 
-def file_or_string(value)
-  File.exist?(value) ? File.read(value) : value
-end
-
-options = {
-  :delimiter => "\t",
-  :interval => 1,
-  :mode => :stat,
-  :order => :desc
-}
-OptionParser.new(ARGV) {|opt|
-  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 }
-  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
+options = Tailstrom::OptionParser.new.parse ARGV
 
 require "tailstrom/command/#{options[:mode]}"
 cls = Tailstrom::Command.const_get options[:mode].to_s.capitalize

data/lib/tailstrom/command/stat.rb

@@ -40,10 +40,6 @@ module Tailstrom
 
           print_counters
 
-          if @counters.size > 1
-            @table.puts
-          end
-
           @counters.clear
           i = i + 1
         end while !reader.eof?
@@ -62,6 +58,7 @@ module Tailstrom
         end
 
         def print_counters
+          printed_lines = 0
           sorted_counters.each do |key, c|
             key = (key == :nil ? nil : key)
             next unless out_filter(key, c)
@@ -71,7 +68,9 @@ module Tailstrom
             else
               @table.print_row c.count, c.min, c.max, c.avg, key
             end
+            printed_lines += 1
           end
+          @table.puts if printed_lines > 1
         end
 
         def sorted_counters

data/lib/tailstrom/option_parser.rb

@@ -0,0 +1,93 @@
+require 'optparse'
+
+module Tailstrom
+  class OptionParser
+    DEFAULTS = {
+      :delimiter => "\t",
+      :interval => 1,
+      :mode => :stat,
+      :order => :desc
+    }.freeze
+
+    def initialize
+      @options = {}
+      @options_from_file = {}
+    end
+
+    def parse(argv)
+      parser.order! argv
+      if infile = argv.shift
+        @options[:static_infile] = open(infile, 'r')
+      end
+      @options = @options_from_file.merge @options
+      DEFAULTS.merge @options
+    end
+
+    def parser
+      ::OptionParser.new do |opt|
+        opt.banner = <<-END
+tail -f access.log | #{$0} [OPTIONS]
+#{$0} [OPTIONS] [file]
+        END
+        opt.on('-c file', '--config file', String, 'config file') do |v|
+          require 'tailstrom/config_loader'
+          @options_from_file = load_config v
+        end
+        opt.on('-f num', Integer, 'value field') do |v|
+          @options[:field] = v
+        end
+        opt.on('-k num', Integer, 'key field') do |v|
+          @options[:key] = v
+        end
+        opt.on('-d delimiter', String, 'delimiter') do |v|
+          @options[:delimiter] = v
+        end
+        opt.on('-i interval', Integer, 'interval for stat mode') do |v|
+          @options[:interval] = v
+        end
+        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)') do
+          @options[:mode] = :stat
+        end
+        opt.on('--print', 'print line mode') do
+          @options[:mode] = :print
+        end
+        opt.on('--version', 'show version') do
+          require 'tailstrom/version'
+          puts Tailstrom::VERSION
+          exit 0
+        end
+      end
+    end
+
+    private
+      def file_or_string(value)
+        File.exist?(value) ? File.read(value) : value
+      end
+
+      def load_config(file)
+        argv = []
+        hash = YAML.load File.read(file)
+        hash.each do |k, v|
+          argv << (k.length > 1 ? "--#{k}" : "-#{k}")
+          argv << (v unless v.is_a? TrueClass)
+        end
+        parser = Tailstrom::OptionParser.new
+        parser.parse argv
+      end
+  end
+end

data/lib/tailstrom/version.rb

@@ -1,3 +1,3 @@
 module Tailstrom
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailstrom
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Issei Naruta
@@ -31,6 +31,7 @@ files:
 - lib/tailstrom/command/stat.rb
 - lib/tailstrom/counter.rb
 - lib/tailstrom/counter_collection.rb
+- lib/tailstrom/option_parser.rb
 - lib/tailstrom/table.rb
 - lib/tailstrom/tail_reader.rb
 - lib/tailstrom/version.rb