xlogin 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcf7616b6aca051514dc83fd78d0404230a50ed9
-  data.tar.gz: 631a3d7ea97cc422a0c91ff6a257a8f384688370
+  metadata.gz: 95893b3808428acd30e3bc7f48ea6d4b38771c97
+  data.tar.gz: 257cdc2bfb9c90785fe629586c4d1eaccb18f285
 SHA512:
-  metadata.gz: a220037b93c800ac4bbe120bb3e6ef4d69ce34bd188d6b64e9d022869700ef2a1ccb9acea10504e008a2a746654af2e032706d136abc95aba6baf5d4a170676e
-  data.tar.gz: c755f66e92023dc47f0c4b876e306a165007bbed2acde20fd5f55bf1276f3524c30a99909d78faec292e2d8c34cf662a89d51e1c0ef2b264705e15beed14ce9a
+  metadata.gz: c73ab2e886935518c13cb8be9aa085854745ecdc61c5eaa171fc4400a43ae68f9e230d8feb3f753da4ad1b1f221b11830492d2cc9b42d668c7f11f1f2eeb1afb
+  data.tar.gz: 7603d4a210ff9b6f549833a9271d320c2cb5b6dbd19308727eafa2b5411e58a400de8cc4a37fd2cb4f2ce111fce7e6a775ffa256ba91d6ceb2e9a926efb1da06

data/lib/xlogin/cli.rb

@@ -56,7 +56,8 @@ module Xlogin
         authorize(config.assume_yes)
       end
 
-      config.hostlist += parser.parse(args).flat_map do |target|
+      args = parser.parse(args)
+      config.hostlist += args.flat_map do |target|
         hostlist = Xlogin.factory.list(target)
         hostlist.tap { |e| raise "Invalid inventory - #{target}" if e.empty? }
       end
@@ -103,7 +104,6 @@ module Xlogin
 
     private
     def login(config, &block)
-      display = Mutex.new
       buffer  = StringIO.new
 
       Parallel.map(config.hostlist, in_thread: config.parallels) do |hostinfo|
@@ -120,13 +120,13 @@ module Xlogin
 
           block.call(session)
         rescue => e
-          lines = (config.parallels > 1)? "\n#{hostname}\t[Error] #{e}" : "\n[Error] #{e}"
-          display.synchronize { $stderr.puts lines }
+          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", '') }
-          display.synchronize { $stdout.puts lines }
+          lines = buffer.string.lines.map { |line| "#{hostname}\t| " + line.gsub("\r", '') }
+          lines.each { |line| $stderr.print "#{line.chomp}\n" }
         end
       end
     end

data/lib/xlogin/rake_task.rb

@@ -1,6 +1,5 @@
 require 'rake'
 require 'rake/tasklib'
-require 'thread'
 require 'stringio'
 
 module Xlogin
@@ -31,10 +30,6 @@ module Xlogin
           end
         end
       end
-
-      def mutex
-        @mutex ||= Mutex.new
-      end
     end
 
 
@@ -89,14 +84,12 @@ module Xlogin
         begin
           session = Xlogin.factory.build_from_hostname(name, log: loggers)
           @runner.call(session)
-          RakeTask.mutex.synchronize do
-            $stdout.puts buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
-          end
+          lines = buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
+          lines.each { |line| $stdout.print line.chomp + "\n" }
         rescue => e
-          RakeTask.mutex.synchronize do
-            $stdout.puts buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
-            $stderr.puts "#{name}\t#{e}"
-          end
+          lines = buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
+          lines.each { |line| $stdout.print line.chomp + "\n" }
+          $stderr.puts "#{name}\t#{e}"
         end
       else
         loggers << $stdout unless silent

data/lib/xlogin/session.rb

@@ -83,7 +83,7 @@ module Xlogin
     end
 
     def close
-      @gateway.close(@port) if @gateway
+      @gateway.shutdown! if @gateway
       super
     end
 

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.6.6"
+  VERSION = "0.6.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet