xlogin 0.15.1 → 0.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c42dda50faff8d019ae126b4283df85aeca1007e119fe486882b06092090168
-  data.tar.gz: 5d15694b3a53acdecca601e99039e9121b83d111e5e5070eaaa7fa353936d57a
+  metadata.gz: 6f25c0609f9ca195248b0e83a5d0386d894f35f9bc668154abbc2c938b8d2c19
+  data.tar.gz: e5f0a51725eb34c702c3b7f413664dc15a4dbc8966ab9a72ea5ac58dded6bca1
 SHA512:
-  metadata.gz: 9ce8c023c0be12b67a33be6ca9fa84eabdc78aa1832d9311b0dd9a55cc82627260effeecdb6395c397fa74f1799b6d3b8382a95e35eeb83099bbca7be903f0c1
-  data.tar.gz: ff604b3256270f0b81ddcf455a6f62b77fdc44d5d6f136de86225ecc4fae452d2dee55001c3eee94817d01bdfbfb87f7ee256fa66106b29d5ecd3c4c10a79ea6
+  metadata.gz: 958b61738c7920b6fc9378a64bc5ea377f29296dcc5f76a2a36ad8abf91afd142795d5b6157483ee51fa665e3a7cf7925d0d016d4172b36de039d9db3a2e2149
+  data.tar.gz: ae99528b807c97339f6ed052d0ca7d2c80c1079acb62c102564d81c4b175cab46cd9d43b1cd4389f3b4228c61e758de4696ec4d8433672b980d4abcdadd42e8d

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?
@@ -56,7 +57,8 @@ module Xlogin
 
     def open_tunnel(name, host, port)
       @mutex.synchronize do
-        unless @tunnels[name]
+        tunnel = @tunnels[name]
+        unless tunnel && tunnel.gateway.active?
           uri = Addressable::URI.parse(name)
           case uri.scheme
           when 'ssh'

data/lib/xlogin/rake_task.rb

@@ -92,8 +92,10 @@ module Xlogin
     rescue => e
       RakeTask.shutdown! if fail_on_error
 
-      session.comment(e.to_s, prefix: "[ERROR]", chomp: true, color: :white, background: :red) if session
-      $stderr.print log_text(buffer.string + "\n").colorize(color: :light_red) if Rake.application.options.always_multitask
+      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
     ensure
@@ -101,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

@@ -43,9 +43,9 @@ module Xlogin
         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 +62,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.1"
+	VERSION = "0.15.6"
 end

metadata

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