fixx 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2411d8f5f90daac163d97769cf5cecc240cef14d
-  data.tar.gz: cfe54f11d4668039494e6d3f21e85d13103deb50
+  metadata.gz: d8e0899db70b41f4b44b2d69686364bd5f468e82
+  data.tar.gz: 8589abda9b4dc53b9cacabe6070ea7e94a71fa38
 SHA512:
-  metadata.gz: 1026f26650913c2e5416d9d9dc827005e9e3190a1d84931847ba0c023289b2d35accab8621eaa318d419d9ab163c64161a123f34495fa5419a4e5bad034c1f22
-  data.tar.gz: 2c4d01a96a193ac0d37287e4ecc9c5027c105752ad957ff2a4c249672d032d5cdb650b3414e2233072d6d894ba91b6bfb64cf8424e88e4bff1a0a40d8a4c0b54
+  metadata.gz: b38567d5c80eae6270a11ab652694827e9cb8cce0aeda4f62658cd00e05c40fe0fbe408215072d3714bd0b1e8909a6a8696203b99ba161a2e2546685e1cdc8d4
+  data.tar.gz: 34dfa3a1b9334b8242ab509c1051d31d8090873072e3022d297727164c322d66d39845ccec20c7c4f4957a4ebd9056a7467d3d2c45f634ce40c2600e082d9e07

data/bin/fixx

@@ -4,9 +4,9 @@ require 'optparse'
 
 fix_delim = "^A"
 human_delim = " : "
-extract_field = -1
+extract_fields = "all"
 heartbeats = false
-message_type = "all"
+message_types = "all"
 contains_field = "all"
 output_raw = false
 
@@ -27,16 +27,16 @@ OptionParser.new do |options|
     output_raw = flag
   end
 
-  options.on("-m", "--message-type TYPE", String, "Filter for a specific message type.") do |value|
-    message_type = value
+  options.on("-m", "--message-types t1,t2,t3", String, "Filter for specific message types (comma delimited list).") do |value|
+    message_types = value.split(",").map(&:strip)
   end
 
   options.on("-c", "--contains-field NUM", Integer, "Filter for messages that contain a particular field.") do |value|
     contains_field = value
   end
 
-  options.on("-e", "--extract-field NUM", Integer, "Extract a particular field.") do |value|
-    extract_field = value.to_i
+  options.on("-e", "--extract-fields f1,f2,f3", String, "Extract specific fields (comma delimited list).") do |value|
+    extract_fields = value.split(",").map{|x| x.strip.to_i}
   end
 
   options.on_tail("-h", "--help", "You're looking at it!") do
@@ -53,16 +53,16 @@ while input = ARGF.gets
 
     skip = false
     skip = true if !heartbeats && printable.include?(" 35=0 ")
-    skip = true if message_type != "all" && !printable.include?(" 35=#{message_type} ")
+    skip = true unless message_types == "all" || message_types.any?{|mt| printable.include?(" 35=#{mt} ")}
     skip = true if contains_field != "all" && !printable.include?(" #{contains_field}=")
 
     unless skip
-      if extract_field > 0
-        match = printable.match(/#{extract_field.to_s}=[^ ]*/)
-        if match.nil?
+      if extract_fields != "all"
+        matches = extract_fields.collect{|ef| printable.match(/#{ef.to_s}=[^ ]*/)}.select{|m| !m.nil?}
+        if matches.empty?
           skip = true
         else
-          output_line = match[0]
+          output_line = matches.collect{|m| m[0]}.join(human_delim)
         end
       else
         output_line = printable

data/lib/fixx/version.rb

@@ -1,3 +1,3 @@
 module Fixx
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixx
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Corbin Fox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler