kafo 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d52907dcd0715f3a20a5777a99929543e0a08fd
-  data.tar.gz: ccd312355b0ef53e9d2e4055daacb52500cec7af
+  metadata.gz: ec86e090c75136ef7d6ae7c98ca05f943aded079
+  data.tar.gz: 703958a133df34d7379e855bc0ca69011bf583e4
 SHA512:
-  metadata.gz: f036f88b92b9ab1c7fa226f07f7479c37eab34a177e0a0bcc0084e6322e25d0f1b49791c7df2c6de4312702b272a03a0f53219380650ba0de98640a723904815
-  data.tar.gz: c80fb9f59d9c85b4b3db3a000fb411a874ebf3af28a3dbade0f326cb60ad7b018091fb04a81861dea1928825dd9fffa23a75bc8bff2d9123d2ccb2f9037720d7
+  metadata.gz: 298dcc7dc510ff9acee3356c796cec7283842c724763250a2c780467a3bb8ca83fe078d3225d081b855a5332f7d6a3894bdcd5e97c18401daa2b046035287238
+  data.tar.gz: bd582b45420ad6510449ec11f0a7e9afa6ff8a52b675ee8b0467be47cdfa9cb81908bff3374656789dd4486a4945c2db93c9710b92b730f1af0624857078d58d

data/lib/kafo/data_type.rb

@@ -1,3 +1,5 @@
+require 'strscan'
+
 module Kafo
   class DataType
     def self.new_from_string(str)
@@ -39,16 +41,42 @@ module Kafo
     end
 
     def self.split_arguments(input)
-      input.scan(%r{
-        \s*
-          (?:
-            ["'/](.*?)["'/] # quoted string, or regexp argument
-            |
-            ([\w:]+ (?:\[.+\])?) # bare words, or Type::Name, or Type::Name[args..]
-          )
-        \s*
-        (?:,|$) # match to end of comma-separated arg, or the last arg
-      }mx).flatten.compact
+      scanner = StringScanner.new(input)
+      args = []
+
+      until scanner.eos?
+        scanner.skip(/\s*/)
+
+        if %w(' " /).include?(quote = scanner.peek(1)) # quoted string, or regexp argument
+          scanner.getch  # skip first quote
+          quoted = scanner.scan_until(/(?:^|[^\\])#{quote}/) or raise ConfigurationException, "missing end quote in argument #{args.count + 1} in data type #{input}"
+          args << quoted[0..-2]  # store unquoted value
+
+        else # bare words, or Type::Name, or Type::Name[args..]
+          type = scanner.scan(/[\w:-]+/) or raise ConfigurationException, "missing argument #{args.count + 1} to data type #{input}"#
+
+          # store inner arguments as a continuation of the type string
+          if scanner.peek(1) == '['
+            type << scanner.getch
+            bracket_count = 1
+            until bracket_count.zero?
+              next_bracket = scanner.scan_until(/[\[\]]/) or raise ConfigurationException, "missing close bracket in argument #{args.count + 1} in data type #{input}"
+              case next_bracket[-1..-1]
+              when '['
+                bracket_count += 1
+              when ']'
+                bracket_count -= 1
+              end
+              type << next_bracket
+            end
+          end
+          args << type
+        end
+
+        scanner.skip(/\s*,?/)
+      end
+
+      args
     end
 
     def self.parse_hash(input)

data/lib/kafo/puppet_log_parser.rb

@@ -5,6 +5,7 @@ module Kafo
     end
 
     def parse(line)
+      line = normalize_encoding(line)
       method, message = case
                           when line =~ /^Error:(.*)/i || line =~ /^Err:(.*)/i
                             [:error, $1]
@@ -21,5 +22,15 @@ module Kafo
       @last_level = method
       return [method, message.chomp]
     end
+
+    private
+
+    def normalize_encoding(line)
+      if line.respond_to?(:encode) && line.respond_to?(:valid_encoding?)
+        line.valid_encoding? ? line : line.encode('UTF-16be', :invalid => :replace, :replace => '?').encode('UTF-8')
+      else  # Ruby 1.8.7, doesn't worry about invalid encodings
+        line
+      end
+    end
   end
 end

data/lib/kafo/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 module Kafo
   PARSER_CACHE_VERSION = 1
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler