kafo 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec86e090c75136ef7d6ae7c98ca05f943aded079
-  data.tar.gz: 703958a133df34d7379e855bc0ca69011bf583e4
+  metadata.gz: 442ba70002fba70bca91ba81955e85c7a6205c50
+  data.tar.gz: 35cb1e2184a1381bbea5af20a12186df94c86c4e
 SHA512:
-  metadata.gz: 298dcc7dc510ff9acee3356c796cec7283842c724763250a2c780467a3bb8ca83fe078d3225d081b855a5332f7d6a3894bdcd5e97c18401daa2b046035287238
-  data.tar.gz: bd582b45420ad6510449ec11f0a7e9afa6ff8a52b675ee8b0467be47cdfa9cb81908bff3374656789dd4486a4945c2db93c9710b92b730f1af0624857078d58d
+  metadata.gz: dd7e866ea43f64da01f75085328350f011ee88c3062626a0b0116007c439c43c7e151203aa967752278491b90df95f533db4172d06147db5af82baa879abb8d2
+  data.tar.gz: e6f21ddca839a279544d842cf6beb6bde61de0b3584c41ba2ec24c127b2c780b0d55ad567ab0b944367e63de0b29e6858ae65f51f422e1ab968b1697160e9f23

data/lib/kafo/configuration.rb

@@ -111,7 +111,7 @@ module Kafo
     end
 
     def module_dirs
-      [app[:module_dirs] || (app[:installer_dir] + '/modules')].flatten.map { |dir| File.expand_path(dir) }
+      [app[:module_dirs] || (app[:installer_dir] + '/modules')].flatten.map { |dir| File.expand_path(dir) }.uniq
     end
 
     def gem_root

data/lib/kafo/kafo_configure.rb

@@ -451,6 +451,7 @@ module Kafo
         PTY.spawn(command) do |stdin, stdout, pid|
           begin
             stdin.each do |line|
+              line = normalize_encoding(line)
               progress_log(*log_parser.parse(line))
               @progress_bar.update(line) if @progress_bar
             end
@@ -513,5 +514,15 @@ module Kafo
         :background => config.app[:color_of_background],
         :colors => use_colors?).setup
     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/puppet_log_parser.rb

@@ -5,7 +5,6 @@ module Kafo
     end
 
     def parse(line)
-      line = normalize_encoding(line)
       method, message = case
                           when line =~ /^Error:(.*)/i || line =~ /^Err:(.*)/i
                             [:error, $1]
@@ -22,15 +21,5 @@ 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.1"
+  VERSION = "2.0.2"
 end

metadata

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