fix_protocol_tools 1.1.2 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTE3YTM3NjAzM2FmYWJhNDU4ZDY0ZWQ4N2QzMThlMTM2NDg5MWMzYg==
+    MDg5Y2MxMzczNWRjMWRlNzhjOWNkMTYxZDE5NDUxNTNjYjJmYjBhZA==
   data.tar.gz: !binary |-
-    ZTZjNGQzN2EwOTgyNmU3NTMxN2MwOWQzMGE5NzQyNDQwZTlmN2U3YQ==
+    M2I4NjdjYzY0YjY1MTFmOTQ3MzRmNDNhZGMzMjI5OTQ5NGY1MTJiOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWU4OTUyOThiYTNlZGYwNzZjNGI2NjYwMDYwNWY3ZDJjNjdiODVhODM3OGQx
-    ZjlhMzZmMDgzNjNmZmEwMjgwNmQ4MjQ5M2U0ZjdkOTQwMDNhMjYyZmUyNmUw
-    YzhmMzRjM2EzMjhmODQxYjYwZTVjMDBlZmU5MDRmZDJkM2ZlNjQ=
+    ZWRmZGFlMWI3Mjg2OTIyOGFjNzk4ZmFiZjIzMmZlZGVjOGVhYzliMjlkNWIz
+    YjRkYWE0NDllN2VkYjQ4Mzc3M2YxN2Q3YWM5ZjM0ZmVkNTg4OTJjYWRmZDRi
+    ZWJlZTc4YzY5MDEyZjczZTYxZTc1ZTZhZmY4NmJmNWVlNGFlZjQ=
   data.tar.gz: !binary |-
-    OTYzZThkNjE0ODIzNWEzZmZiNjljZWU3ZjI5NjNjZDMzYzRhYjgzMTIyOTk5
-    NDIyZjZkOGJiNTEyNmE5NTU3YzYxYTU5MGZjZTY0ZTc1ZjU3YjVmNWY2NDIz
-    NzBmNTY1ODk0YjY2N2YwYzMzNjgxODdhMjY2MzM0MDU0MjNhYmM=
+    OWEwNjI1ZTRlYzVhYjUyNDNiNWVjMzg2MjQ2ZjMyNWU1NjJiN2U0NWY4YTZk
+    MDcyNzRhYWUyYmRiM2FiMzdiMzNiZjQzYjU5NDJmYWU5OTE0MTAxZjAxZWE3
+    Yjk4Y2E4ZGZkNzA5ZDlhOWY0OWY4NWRiYTc3MzMxYmRlZWU3YjY=

data/bin/{fixgrep → fixlogviewer}

@@ -6,4 +6,4 @@ $LOAD_PATH.unshift(path) unless $LOAD_PATH.include? path
 require 'optparse'
 require 'fix_protocol_tools'
 
-FixProtocolTools::Runner.new.grep!
+FixProtocolTools::Runner.new.run!

data/lib/fix_protocol_tools/messages_processor.rb

@@ -10,8 +10,10 @@ module FixProtocolTools
     def initialize(options)
       @spec = nil
       @is_even_line = true
-      @output = init_output_chanel options
+      @output = STDOUT
       @grep = options[:grep]
+      @highlights = options[:highlights] || []
+      @heartbeats = options[:heartbeats]
 
       if options[:dictionary]
         @spec = Specification::Dictionary.new(Specification::Reader.read_file(options[:dictionary]))
@@ -39,8 +41,6 @@ module FixProtocolTools
       end
 
       process_line(buffer) if buffer
-
-      @output.close
     end
 
     private
@@ -56,7 +56,7 @@ module FixProtocolTools
 
       @spec ||= resolve_specification(fields)
       rows = []
-      is_found = @grep.nil?
+      show_message = @grep.nil?
       message_name = 'Undefined'
       sender = 'Undefined'
       target = 'Undefined'
@@ -74,13 +74,15 @@ module FixProtocolTools
 
         if @grep && (value_name.include?(@grep) || value_id.include?(@grep))
           value_name = red(value_name)
-          is_found = true
+          show_message = true
         end
 
+        show_message = false if !@heartbeats && @spec.heartbeat?(field_id, value_id)
+
         rows << formatted_row(field_id, value_id, field_name, value_name, field_name_padding)
       end
 
-      if is_found
+      if show_message
         @is_even_line = false
         @output.puts ''
         @output.puts("[#{red(message_name + " #{sender} >>> #{target}")}]" +
@@ -90,9 +92,15 @@ module FixProtocolTools
     end
 
     def formatted_row(field_id, value_id, field_name, value_name, field_name_padding)
-      field_name + '  =  '.rjust(field_name_padding) + value_name +
+      row = field_name + '  =  '.rjust(field_name_padding) + value_name +
           '  '.rjust(35 - value_name.length) +
           field_id + '=' + value_id
+
+      if @highlights and @highlights.include?(field_name)
+        yellow(row)
+      else
+        row
+      end
     end
 
     def resolve_specification(fields)
@@ -112,16 +120,6 @@ module FixProtocolTools
         nil
       end
     end
-
-    def init_output_chanel(options)
-      if options[:less]
-        cmd = 'less'
-        cmd += ' -r' if options[:color]
-        IO.popen(cmd, 'w')
-      else
-        STDOUT
-      end
-    end
   end
 end
 

data/lib/fix_protocol_tools/runner.rb

@@ -6,69 +6,61 @@ module FixProtocolTools
   class Runner
     DEFAULTS = {
         :color => Term::ANSIColor::coloring = STDOUT.isatty,
-        :dictionary => ENV['FPT_DICT']
+        :dictionary => ENV['FPT_DICT'],
+        :highlights => ENV['FPT_HIGHLIGHTS'],
+        :heartbeats => false
     }
 
     def initialize
-       @options = DEFAULTS
+      @options = DEFAULTS
     end
 
-    def less!
-      @options.merge!(:less => false)
+    def run!
       opt_parse = OptionParser.new do |opts|
-        opts.banner = "Usage: fixless [options] [fixlogfile]"
+        opts.banner = "Usage: #{File.basename($0)} [options] [file]"
 
-        opts.on('-l', '--[no-]less', 'Use less command for output') do |color|
-          @options[:less] = color
+        opts.on('--dictionary PATH_TO_DICTIONARY', 'You can set up FPT_DICT env variable instead') do |dictionary|
+          @options[:dictionary] = dictionary
         end
 
-        dictionary(opts)
-        color(opts)
-        help(opts)
-      end
+        opts.on('--highlight field1,field2', Array, 'Highlight number of fields, you can set FPT_HIGHLIGHTS env variable instead') do |highlights|
+          @options[:highlights] = highlights
+        end
 
-      opt_parse.parse!
+        opts.on('-c', '--[no-]color', 'Generate color output') do |color|
+          Term::ANSIColor::coloring = color
+          @options[:color] = color
+        end
 
-      MessagesProcessor.new(@options).process
-    end
+        opts.on('--grep', 'Grep by field id or name') do |pattern|
+          @options[:grep] = pattern
+        end
 
-    def grep!
-      opt_parse = OptionParser.new do |opts|
-        opts.banner = "Usage: fixgrep -v value [options] [fixlogfile]"
+        opts.on('--[no-]heartbeats', 'Show full report on heartbeat messages') do |heartbeats|
+          @options[:heartbeats] = heartbeats
+        end
 
-        opts.on('-v', '--v value') do |pattern|
-          @options[:grep] = pattern
+        opts.on_tail('-h', '--help', 'Display help message') do
+          puts opts
+          exit
         end
 
-        dictionary(opts)
-        color(opts)
-        help(opts)
+        opts.on_tail('-v', '--version', 'Display version message') do
+          puts FixProtocolTools::VERSION
+          exit
+        end
       end
 
       opt_parse.parse!
-      MessagesProcessor.new(@options).process
-    end
 
-    private
-
-    def help(opts)
-      opts.on('--help', '-h', 'Display help message') do
-        puts opts
-        exit
-      end
-    end
-
-    def color(opts)
-      opts.on('-c', '--[no-]color', 'Generate color output') do |color|
-        Term::ANSIColor::coloring = color
-        @options[:color] = color
+      ARGV.each do |f|
+        unless File.exists?(f)
+          puts "File #{f} does not exists"
+          exit false
+        end
       end
-    end
 
-    def dictionary(opts)
-      opts.on('-d', '--dictionary PATH_TO_DICTIONARY', 'You can set up FPT_DICT env variable instead') do |dictionary|
-        @options[:dictionary] = dictionary
-      end
+      MessagesProcessor.new(@options).process
     end
   end
 end

data/lib/fix_protocol_tools/specification/dictionary.rb

@@ -31,6 +31,10 @@ module FixProtocolTools::Specification
       tag == '56'
     end
 
+    def heartbeat?(tag, value)
+      message_type?(tag) && value == '0'
+    end
+
     def enum_value(field, enum_id)
       enum = @enums[field]
 

data/lib/fix_protocol_tools/version.rb

@@ -1,3 +1,3 @@
 module FixProtocolTools
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fix_protocol_tools
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Luxor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -56,13 +56,11 @@ description: log viewer for fix protocol logs
 email:
 - atuzov@gmail.com
 executables:
-- fixgrep
-- fixless
+- fixlogviewer
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/fixgrep
-- bin/fixless
+- bin/fixlogviewer
 - lib/fix_protocol_tools.rb
 - lib/fix_protocol_tools/messages_processor.rb
 - lib/fix_protocol_tools/runner.rb

data/bin/fixless

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-path = File.expand_path(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift(path) unless $LOAD_PATH.include? path
-
-require 'optparse'
-require 'fix_protocol_tools'
-
-FixProtocolTools::Runner.new.less!