xlogin 0.6.21 → 0.6.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f3058dd9339c091bdfff25b681721bc12a3164
-  data.tar.gz: 170601572b1f0fabc104e9d3dc847b72735d520c
+  metadata.gz: d528317f3613b805a7a2fda9e0050f3cc1742509
+  data.tar.gz: c494dd3ce0a54764c8b705df31b46627a3b2bc35
 SHA512:
-  metadata.gz: a580d56638b1efafa8aadd7341f1ea45a959043b9eae32de525ab773f9d5d6e9da7b627206282a350600709591e4c4b9ac485fe1d627e259d5f33dc0d0e96ded
-  data.tar.gz: a4c26e95726386820c49f42429555bfaef6546ffe2f596257a114b04597dbb32b61865289cd60b8f1d3bdeecbbf6a31f628386bf614e5bed8d37e82a2764f3b0
+  metadata.gz: caefd1b0d95cffc7e937ac6b1038a3973f8f1e332d3685090aa427c8f2fac584c07b9a1e8226fd45ce00343e3957d56d8b4f0b534b93bdafdd5c7edc0c34f73d
+  data.tar.gz: 2bfcf0d7db14de250343f23b7862eb7f13ec1b0cf89629d5fabbbece99b8c68d998364e04eff3ab17f0c3f35b3cdde0c46df701988cc35696af837f31b7d4c64

data/lib/xlogin/rake_task.rb

@@ -56,38 +56,27 @@ module Xlogin
     end
 
     def invoke
+      buffer  = StringIO.new
       loggers = []
+      loggers << buffer  if Rake.application.options.always_multitask
+      loggers << $stdout unless Rake.application.options.always_multitask || silent
 
       if log
         mkdir_p(File.dirname(log), verbose: Rake.application.options.trace)
         loggers << log
       end
 
-      if Rake.application.options.always_multitask
-        buffer = StringIO.new
-        loggers << buffer  unless silent
-
-        begin
-          session = Xlogin.factory.build_from_hostname(name, log: loggers)
-          @runner.call(session)
-          session.close if session
-          lines = buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
-          lines.each { |line| $stdout.print line.chomp + "\n" }
-        rescue => e
-          lines = buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
-          lines.each { |line| $stdout.print line.chomp + "\n" }
-          $stderr.print "#{name}\t#{e}\n"
-        end
-      else
-        loggers << $stdout unless silent
+      begin
+        session = Xlogin.factory.build_from_hostname(name, log: loggers)
+        @runner.call(session)
+        session.close if session
+      rescue => e
+        $stderr.print "#{name}\t#{e}\n"
+      end
 
-        begin
-          session = Xlogin.factory.build_from_hostname(name, log: loggers)
-          @runner.call(session)
-          session.close if session
-        rescue => e
-          $stderr.print "#{e}\n"
-        end
+      if Rake.application.options.always_multitask && not silent
+        lines = buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
+        lines.each { |line| $stdout.print "#{line.chomp}\n" }
       end
     end
 

data/lib/xlogin/session.rb

@@ -55,8 +55,7 @@ module Xlogin
     end
 
     def exec(*args)
-      resp = cmd(*args)
-      yield resp if block_given?
+      cmd(*args).tap { |resp| yield resp if block_given? }
     end
 
     def puts(line, &block)

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.6.21"
+  VERSION = "0.6.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.6.21
+  version: 0.6.22
 platform: ruby
 authors:
 - haccht