xlogin 0.15.2 → 0.15.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 902803f4f718b2af77d3d89721eb0d2f140735b173b1174b58cdfec530502750
-  data.tar.gz: 57a6a00bb8912363f8479ce7f2de1a3b86fff6180d242409431320af3021e11f
+  metadata.gz: c7b8fd89987339e341998c05917253187ab98bf73001b307eefcd4fa6f5db15c
+  data.tar.gz: adc3c1a866e2cc9437ad90d7938ed9076b2eb21f1d9a37c81b62d58ea1e85bad
 SHA512:
-  metadata.gz: b2bb034bb516dfe3994dd246d1effdcf6d68dd8cdd5fe49539941b34447b4f8b8eafb69b3467aa92b6fc3e43898355f55a620652855d24fc37ee3b5f754a534e
-  data.tar.gz: e1ac9a80f9e8e2473e9def3f6cca08dbe1cbb6daedd664ad63fee765dcd4cb45ab0e5d0c1f82e7e4d5f146928123d9c6a4359331105990c6bafc09f26a7b2c2d
+  metadata.gz: b0c4de1d7d7d30d47edf174c393968b218a9937f1bb535a2b3f888428f52b13535b15787d0464c2489a0005ccb2f36d41648b5e8cb668f489ee9bfa88154fbf9
+  data.tar.gz: 10971772a9085d3afdab205e73b6a1f85273256d43e4ee099348fab381a157cae7a7f0fcfbe73811ab0692856bb7e4374c0bf4ef179da0372210295aa50e9e2b

data/lib/xlogin/factory.rb

@@ -26,9 +26,10 @@ module Xlogin
     end
 
     def list_hostinfo(*patterns)
+      patterns = patterns.flat_map{ |e| e.split(/\s+/) }.compact
       return @inventory.values if patterns.empty?
 
-      values1 = patterns.compact.map do |pattern|
+      values1 = patterns.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

@@ -92,10 +92,9 @@ module Xlogin
     rescue => e
       RakeTask.shutdown! if fail_on_error
 
-      session.comment(e.to_s, prefix: "[ERROR]", chomp: true, color: :red) if session
-      if Rake.application.options.always_multitasK
-        $stderr.print log_text(buffer.string + "\n").colorize(color: :red) unless buffer.string.empty?
-        $stderr.print log_text(e.to_s + "\n").colorize(color: :red)
+      session.comment(e.to_s, lf: false, color: :red) if session
+      if Rake.application.options.always_multitask && !buffer.string.empty?
+        $stderr.print log_text(buffer.string + "\n").colorize(color: :red)
       end
 
       return false
@@ -104,16 +103,16 @@ module Xlogin
     end
 
     def log_text(text)
-      text.lines.map{ |line| "#{Time.now.iso8601} - #{name}\t|#{line.gsub(/^.*\r/, '')}" }.join
+      text.lines.map{ |line| "#{Time.now.iso8601} #{name}\t|#{line.gsub(/^.*\r/, '')}" }.join
     end
 
   end
 
   module SessionModule
 
-    def comment(line, prefix: "[INFO]", chomp: false, **color)
-      write_log("#{prefix} #{line}".colorize({color: :light_white}.merge(**color)))
-      cmd('') unless chomp
+    def comment(line, lf: true, **color)
+      write_log(line.chomp.colorize({color: :light_white}.merge(**color)))
+      cmd('') if lf
     end
 
   end

data/lib/xlogin/session.rb

@@ -24,7 +24,7 @@ module Xlogin
       @loggers  = [@config.log].flatten.uniq.reduce({}){ |a, e| a.merge(e => build_log(e)) }
       @host, @port = Xlogin.factory.open_tunnel(@tunnel, @host, @port) if @tunnel
 
-      max_retry = @config.retry || 1
+      num_try = 0
       username, password = uri.userinfo.to_s.split(':')
 
       begin
@@ -43,7 +43,10 @@ module Xlogin
 
         super(args)
       rescue => e
-        retry if (max_retry -= 1) > 0
+        unless (num_try += 1) > (@config.retry || 0)
+          sleep 1.0
+          retry 
+        end
         raise e
       end
     end

data/lib/xlogin/session_pool.rb

@@ -25,7 +25,7 @@ module Xlogin
       session = deq
       Thread.handle_interrupt(Exception => :immediate){ yield session }
     ensure
-      enq session
+      enq session if session
     end
 
     def close
@@ -38,14 +38,15 @@ module Xlogin
     def deq
       @mutex.synchronize do
         if @queue.empty? && @count < @size
+          session = Xlogin.get(@args, **@opts)
           @count += 1
-          return Xlogin.get(@args, **@opts)
+          return session
         end
       end
 
-      session, last_used, watch_dog = @queue.deq
+      session, last_used, watchdog = @queue.deq
 
-      watch_dog.kill
+      watchdog.kill
       if Time.now - last_used > @idle
         destroy(session)
         return deq
@@ -62,8 +63,8 @@ module Xlogin
 
     def enq(session)
       last_used = Time.now
-      watch_dog = Thread.new(session){ |s| sleep(@idle * 1.5) && s.close rescue nil }
-      @queue.enq [session, last_used, watch_dog]
+      watchdog = Thread.new(session){ |s| sleep(@idle * 1.5) && s.close rescue nil }
+      @queue.enq [session, last_used, watchdog]
     end
 
     private

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.15.2"
+	VERSION = "0.15.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.7
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet