xlogin 0.11.11 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6dae2d182fa540c1ede9d1bb18eef34307a333b5f9981de501491824e576c62
-  data.tar.gz: 5a35f8146697e899a1b406083b99b35e4ff2e5e217e8d3ec8116d230b0e80aed
+  metadata.gz: 6c449db3a3cf0359fc79c858d307ebfb6625fc35f6005fa4e4578463363fe786
+  data.tar.gz: 5514370c6d66e44e1066e0fa4e80108954750a6c7cc19062bef8eb9a462f049f
 SHA512:
-  metadata.gz: bfba33b9fd36cb0725c4adc94ba2b300085aa115eff051694969ca3e46943fe4c8b2f2d6d653bfeb9cbd72e9c7fc8f423b23310cdfa9729c3d4c7a9dc110f0b6
-  data.tar.gz: b1b6ef3733cd9dd2cbb8396bfd71e43b7063fdd59c605672f1b92295d43a9a0137a1eb457b9401c2599c90a695678e184a445cc10d4686eec4ebcc6bcbb462f7
+  metadata.gz: '08a519dde6a07cdc637a4044bd52ec46b91289fe10c2e89ba5992a405c4e99f70ee57e206cda3020583f2f9a7a7f13ca7ab6602d37b709a5a2dae99795381e7a'
+  data.tar.gz: 41b9b7e3827256fc796b57dbc67c2b78d8d1c63af6982297cb75542c661d1d9786170280dc4c9dc3998490bd3ff7f882ea0004b4105045f1857d3fdad0e8432f

data/lib/xlogin/rake_task.rb

@@ -3,6 +3,7 @@ require 'rake'
 require 'rake/tasklib'
 require 'ostruct'
 require 'stringio'
+require 'colorize'
 
 module Xlogin
   class RakeTask < Rake::TaskLib
@@ -21,21 +22,6 @@ module Xlogin
         end
 
       end
-
-      def printf(fp, text)
-        time  = Time.now.iso8601
-        lines = text.lines
-        lines.pop if lines[-1] == "\n"
-
-        lines = lines.map do |line|
-          str = time
-          str << " #{name}" if Rake.application.options.always_multitask
-          str << " |#{line.gsub(/^\s*[\r\n]+/, '')}"
-        end
-
-        fp.print "\n"
-        fp.print lines.join("\n")
-      end
     end
 
     attr_reader   :name
@@ -45,7 +31,7 @@ module Xlogin
     attr_accessor :silent
     attr_accessor :fail_on_error
 
-    @@graceful_shutdown = false
+    @@stopped = false
 
     def initialize(name)
       @name     = name
@@ -75,12 +61,12 @@ module Xlogin
       if lock
         task(name => lock)
         file(lock) do
-          run_task unless @@graceful_shutdown
-          touch(lock, verbose: Rake.application.options.trace) unless @@graceful_shutdown
+          run_task unless @@stopped
+          touch(lock, verbose: Rake.application.options.trace) unless @@stopped
         end
       else
         task(name) do
-          run_task unless @@graceful_shutdown
+          run_task unless @@stopped
         end
       end
     end
@@ -88,23 +74,35 @@ module Xlogin
     def run_task
       buffer = StringIO.new
 
-      args = Hash.new
-      args[:log] = []
-      args[:log] << log     if log
-      args[:log] << buffer  if !silent &&  Rake.application.options.always_multitask
-      args[:log] << $stdout if !silent && !Rake.application.options.always_multitask
-      args[:timeout] = timeout if timeout
+      logger = log ? [log] : []
+      logger.push $stdout if !silent && !Rake.application.options.always_multitask
+      logger.push buffer  if !silent &&  Rake.application.options.always_multitask
 
-      session = Xlogin.get(name, **args)
-      @runner.call(session)
-      session.close rescue nil
+      session = Xlogin.get(name, log: logger, timeout: timeout)
+      def session.comment(text, prefix: "[INFO]", **color)
+        color = {color: :green}.merge(**color)
 
-      RakeTask.printf($stdout, buffer.string) if !silent && Rake.application.options.always_multitask
+        log("\n")
+        log(Time.now.iso8601.colorize(**color) + ' ') if !Rake.application.options.always_multitask
+        log("#{prefix} #{text}".colorize(**color))
+        cmd('')
+      end
+
+      @runner.call(session)
+      $stdout.print format_log(buffer.string)
     rescue => e
-      RakeTask.printf($stderr, buffer.string) if !silent && Rake.application.options.always_multitask
-      RakeTask.printf($stderr, "ERROR - #{e}\n")
+      session.comment("#{e}", prefix: "[ERROR]", color: :red)
+      $stderr.print format_log(buffer.string)
+
+      @@stopped = true if fail_on_error
+    ensure
+      session.close rescue nil
+    end
 
-      @@graceful_shutdown = true if fail_on_error
+    def format_log(text)
+      text.lines.map do |line|
+        "#{Time.now.iso8601} - #{name}\t|#{line.gsub(/^\s*[\r]+/, '')}"
+      end.join
     end
 
   end

data/lib/xlogin/session.rb

@@ -86,6 +86,10 @@ module Xlogin
       end
     end
 
+    def log(text)
+      @loggers.each { |_, logger| logger.syswrite(text) if logger }
+    end
+
     def enable_log(log = $stdout)
       @loggers.update(log => build_logger(log))
       if block_given?
@@ -106,7 +110,7 @@ module Xlogin
     def _waitfor(*args, &block)
       __waitfor = method(:waitfor).super_method
       line = __waitfor.call(*args) do |recv|
-        output_log(recv)
+        log(recv)
         block.call(recv) if block
       end
 
@@ -119,10 +123,6 @@ module Xlogin
       return line
     end
 
-    def output_log(text)
-      @loggers.each { |_, logger| logger.syswrite(text) if logger }
-    end
-
     def ssh_tunnel(gateway)
       gateway_uri = Addressable::URI.parse(gateway)
       case gateway_uri.scheme

data/lib/xlogin/telnet.rb

@@ -38,8 +38,7 @@ module Xlogin
             @sock.syswrite(bs)
           when @sock
             begin
-              bs = fh.readpartial(1024)
-              output_log(bs)
+              log(fh.readpartial(1024))
             rescue Errno::EAGAIN
               retry
             end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.11.11"
+	VERSION = "0.12.1"
 end

data/xlogin.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "net-ssh-gateway"
   spec.add_dependency "parallel"
   spec.add_dependency "addressable"
+  spec.add_dependency "colorize"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.11.11
+  version: 0.12.1
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2019-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement