xlogin 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c449db3a3cf0359fc79c858d307ebfb6625fc35f6005fa4e4578463363fe786
-  data.tar.gz: 5514370c6d66e44e1066e0fa4e80108954750a6c7cc19062bef8eb9a462f049f
+  metadata.gz: a3f7355fe67c656f25da151d83442fbe6cdc9c2ae442e10550191230653991da
+  data.tar.gz: b46b07acfdaea0ccbc0bff01dd27518ab4fdd1cd227a8654eb5be878b79ffe9f
 SHA512:
-  metadata.gz: '08a519dde6a07cdc637a4044bd52ec46b91289fe10c2e89ba5992a405c4e99f70ee57e206cda3020583f2f9a7a7f13ca7ab6602d37b709a5a2dae99795381e7a'
-  data.tar.gz: 41b9b7e3827256fc796b57dbc67c2b78d8d1c63af6982297cb75542c661d1d9786170280dc4c9dc3998490bd3ff7f882ea0004b4105045f1857d3fdad0e8432f
+  metadata.gz: 6bfa4af5ffa2bdd7a56e751b0add6be766f481840b17a91779b7ade1b546745a1c46492c73ca63a5f3a83ef2a3a859aff4963480b0a2cdcf162ca1172211bcf4
+  data.tar.gz: 3ce180fa56f5599937b52176366cac3a449c1d2a6cbc078861b3f7a8e8a3c1cc2f79738bd8d3a5a141121af707691127360b6efe3fb86ea3523d895a94be60fd

data/lib/xlogin/rake_task.rb

@@ -20,7 +20,14 @@ module Xlogin
           desc "#{description} - #{hostname}" if opts[:desc] == true
           RakeTask.new(hostname, &block)
         end
+      end
+
+      def shutdown!
+        @stop = true
+      end
 
+      def stop?
+        !!@stop
       end
     end
 
@@ -31,8 +38,6 @@ module Xlogin
     attr_accessor :silent
     attr_accessor :fail_on_error
 
-    @@stopped = false
-
     def initialize(name)
       @name     = name
       @runner   = nil
@@ -61,12 +66,13 @@ module Xlogin
       if lock
         task(name => lock)
         file(lock) do
-          run_task unless @@stopped
-          touch(lock, verbose: Rake.application.options.trace) unless @@stopped
+          next if RakeTask.stop?
+          run_task && touch(lock, verbose: Rake.application.options.trace)
         end
       else
         task(name) do
-          run_task unless @@stopped
+          next if RakeTask.stop?
+          run_task
         end
       end
     end
@@ -79,22 +85,27 @@ module Xlogin
       logger.push buffer  if !silent &&  Rake.application.options.always_multitask
 
       session = Xlogin.get(name, log: logger, timeout: timeout)
-      def session.comment(text, prefix: "[INFO]", **color)
-        color = {color: :green}.merge(**color)
+      def session.msg(text, prefix: "[INFO]", chomp: false, **color)
+        default_color = { color: :green }
 
         log("\n")
         log(Time.now.iso8601.colorize(**color) + ' ') if !Rake.application.options.always_multitask
-        log("#{prefix} #{text}".colorize(**color))
-        cmd('')
+        log("#{prefix} #{text}".colorize(**default_color.merge(color)))
+        cmd('') unless chomp
       end
 
       @runner.call(session)
       $stdout.print format_log(buffer.string)
+
+      return true
     rescue => e
-      session.comment("#{e}", prefix: "[ERROR]", color: :red)
-      $stderr.print format_log(buffer.string)
+      RakeTask.shutdown! if fail_on_error
+
+      session.msg("#{e}", prefix: "[ERROR]", chomp: true, color: :white, background: :red)
+      $stderr.print format_log(buffer.string.colorize(color: :light_red))
+      $stderr.print "\n"
 
-      @@stopped = true if fail_on_error
+      return false
     ensure
       session.close rescue nil
     end

data/lib/xlogin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet