xlogin 0.6.29 → 0.6.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cf6cc5d3360756020f661eca6254eb65bec6ec3
-  data.tar.gz: 474a9b59b05719522535610e30b59f9a51f58f2a
+  metadata.gz: d6cecc1941f217b65d75839af8ec66dbd3c6fa53
+  data.tar.gz: f45469b1160d246c5f065671e65e6f9945c642d5
 SHA512:
-  metadata.gz: 5d26cb132c50e42067461ca310026d5f99f8262146dc71e473d69f8b9a99e1f81b48df7151951891f764b3c5b24ca79b0cf79333ed3d54d1c023fbfa6db41f62
-  data.tar.gz: faff67cfcd7d6ed68f5d48db3c0783b665ddc3fb0e2cb6d52d221cda2bf1a2fc63d2e924625910313162e36003110c717eea263c7ff0153ebfac12d76bd48c8e
+  metadata.gz: b6c5e727b05904282986743645fe5bd2a0fcfa44a2e61365266b668ebde2655e07e0d359cf7064bea351a557a2b32a33d1668bb4f7e116ddff760f335de5104c
+  data.tar.gz: 7975f93f7df0c6900cc36839b3b61b186a600fb8233b7133e5cd14e7a586390063997ec229d64f3f34b98f9534a5df53a5ddf4957a0761f48f1f9af3bd4d075c

data/lib/xlogin/cli.rb

@@ -21,7 +21,7 @@ module Xlogin
       config = OpenStruct.new(
         task: 'tty',
         hostlist:  [],
-        parallels: 5,
+        parallels: 1,
         inventory: nil,
         templates: [],
       )
@@ -117,16 +117,17 @@ module Xlogin
 
           session = Xlogin.factory.build(hostinfo.merge(log: loggers))
           session.enable(session.opts.enable) if config.enable && session.respond_to?(:enable)
+          session.cmd('')
 
           block.call(session)
         rescue => e
-          lines = (config.parallels > 1)? "\n#{hostname}\t| [Error] #{e}" : "\n[Error] #{e}"
-          lines.each_line { |line| $stderr.print "#{line.chomp}\n" }
+          lines = (config.parallels > 1)? ["\n#{hostname}\t| [Error] #{e}"] : ["\n[Error] #{e}"]
+          lines.each { |line| $stderr.print "#{line.chomp}\n" }
         end
 
         if config.parallels > 1
           lines = buffer.string.lines.map { |line| "#{hostname}\t| " + line.gsub("\r", '') }
-          lines.each_line { |line| $stderr.print "#{line.chomp}\n" }
+          lines.each { |line| $stdout.print "#{line.chomp}\n" }
         end
       end
     end

data/lib/xlogin/delegator.rb

@@ -14,7 +14,7 @@ module Xlogin
 
         login    = @methods.fetch(:login)
         delegate = @methods.fetch(:delegate)
-        raise TemplateError.new("'login' and 'delegate' methods are necessary in the #{target_info[:type]} template.") unless login && delegate
+        raise TemplateError.new("'login' and 'delegate' must be defined in the #{target_info[:type]} template.") unless login && delegate
 
         relay_uri = URI(uri.to_s)
         userinfo_cache = relay_uri.userinfo.dup
@@ -44,7 +44,7 @@ module Xlogin
     # end
     #
     # delegate do |uri, **opts|
-    #   cmd("telnet #{uri.host}")
+    #   puts("telnet #{uri.host}")
     #   login(*uri.userinfo.split(':'))
     # end
 

data/lib/xlogin/factory.rb

@@ -76,7 +76,7 @@ module Xlogin
       hostinfo = get(hostname)
       raise Xlogin::SessionError.new("Host not found: '#{hostname}'") unless hostinfo
 
-      build(hostinfo.merge(**params))
+      build(hostinfo.merge(**params)).tap { |s| s.name = hostname }
     end
 
     def method_missing(method_name, *args, &block)

data/lib/xlogin/rake_task.rb

@@ -87,11 +87,4 @@ module Xlogin
 
   end
 
-  # monkey patch to SessionModule#cmd method
-  module SessionModule
-    def cmd(*args)
-      super(*args) { |resp| yield resp if block_given? }
-    end
-  end
-
 end

data/lib/xlogin/session.rb

@@ -81,12 +81,14 @@ module Xlogin
     end
 
     def close(*args)
+      logout(*args) if respond_to?(:logout)
       @gateway.shutdown! if @gateway
       @output_loggers.each do |output_log, logger|
         next unless logger
         logger.close if output_log.kind_of?(String)
       end
-      logout(*args) if respond_to?(:logout)
+    rescue
+    ensure
       super
     end
 

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.6.29"
+  VERSION = "0.6.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.6.29
+  version: 0.6.31
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet