xlogin 0.14.2 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 547e74e0f0fa2ffc7c30a9d809e7459eea4776c7a902e7f30f1c2e109e7b9a6a
-  data.tar.gz: e810cb9efb8098ce1acd8063f7de24f63876676b03819a06a329a04e010c588c
+  metadata.gz: 2b7da6393c7979c4716280dc7b867aa091ea500b1c94594451681f654429c41d
+  data.tar.gz: b726972429831ac6169691c974f7bffcf74ff1526d2aa7402537bcfbe423b385
 SHA512:
-  metadata.gz: 17373511e6a0f038ca63e6c7721d45eb3e1f8ef2c8a0f02ae287a0eeb0af51bc59f302ae7aaf27ae2b0d8f6c99673426744c33a1cb052d13d3d6b63a81a130cf
-  data.tar.gz: f0258f43d91d1043c5cf55ead1e71aba4e25df7cee36c2f6f3e34b528f66c62702280bfa5802840ab985e3a03988b1f0c89da69cd50a09d27d02c2842a7eae68
+  metadata.gz: a65049cdb3360bcb51eceb7c3275ee3db21da38c455bf95fc7d0e20e505efd3b95edac6f5a35fb245b5493df78b736a9c6bc81e5fddfb88a4fc5d349bf496e08
+  data.tar.gz: d5b37ee384e0c2feb4b330dee8c4ce1e65f1d6b9138a6ecbec7ac5541d225a8d6fc0aa4dd5cd82010b4686dd99398e33aba8e9a16c6673d2cb887740d861f091

data/lib/xlogin.rb

@@ -59,7 +59,7 @@ module Xlogin
     end
 
     def generate_templates(dir)
-      FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+      FileUtils.mkdir_p(dir)
       builtin_templates = Dir.glob(File.join(File.dirname(__FILE__), 'xlogin', 'templates', '*.rb'))
       builtin_templates.each{ |file| FileUtils.cp(file, DEFAULT_TEMPLATE_DIR) }
     end

data/lib/xlogin/cli.rb

@@ -25,7 +25,7 @@ module Xlogin
     end
 
     def exec(config)
-      Signal.trap(:INT){ exit 0 }
+      Signal.trap(:INT){ exit 1 }
 
       jobs  = config[:jobs] || 1
       hosts = Xlogin.list(*config[:patterns])
@@ -48,9 +48,9 @@ module Xlogin
           command_lines = config[:command].flat_map { |e| e.to_s.split(';').map(&:strip) }
           command_lines.each{ |line| session.cmd(line) }
 
-          buffer.string.lines.each{ |line| print prefix + line.gsub("\r", '') } if jobs > 1
+          buffer.string.lines.each{ |line| print prefix + line.gsub(/^.*\r/, '') } if jobs > 1
         rescue => e
-          buffer.string.lines.each{ |line| print prefix + line.gsub("\r", '') } if jobs > 1
+          buffer.string.lines.each{ |line| print prefix + line.gsub(/^.*\r/, '') } if jobs > 1
           raise e
         end
 

data/lib/xlogin/factory.rb

@@ -26,10 +26,9 @@ module Xlogin
     end
 
     def list_hostinfo(*patterns)
-      return [] if patterns == [nil]
       return @inventory.values if patterns.empty?
 
-      values1 = patterns.map do |pattern|
+      values1 = patterns.compact.map do |pattern|
         values2 = pattern.split(',').map do |entry|
           key, val = entry.to_s.split(':')
           key, val = 'name', key if val.nil?

data/lib/xlogin/rake_task.rb

@@ -101,7 +101,7 @@ module Xlogin
     end
 
     def log_text(text)
-      text.lines.map{ |line| "#{Time.now.iso8601} - #{name}\t|#{line.gsub(/^\s*[\r]+/, '')}" }.join
+      text.lines.map{ |line| "#{Time.now.iso8601} - #{name}\t|#{line.gsub(/^.*\r/, '')}" }.join
     end
 
   end
@@ -109,7 +109,7 @@ module Xlogin
   module SessionModule
 
     def comment(line, prefix: "[INFO]", chomp: false, **color)
-      write_log("#{prefix} #{line}".colorize(**color))
+      write_log("#{prefix} #{line}".colorize({color: :light_white}.merge(**color)))
       cmd('') unless chomp
     end
 

data/lib/xlogin/telnet.rb

@@ -38,7 +38,7 @@ module Xlogin
             @sock.syswrite(bs)
           when @sock
             begin
-              log(fh.readpartial(1024))
+              write_log(fh.readpartial(1024))
             rescue Errno::EAGAIN
               retry
             end
@@ -47,7 +47,7 @@ module Xlogin
       end
     rescue EOFError, Errno::ECONNRESET
       $stdout.puts "\r\n", "Conneciton closed.", "\r\n"
-      self.close
+      close
     ensure
       $stdin.cooked!
     end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.14.2"
+	VERSION = "0.14.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.3
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-03 00:00:00.000000000 Z
+date: 2020-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet