xlogin 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d1d3a6d542d119f68907e730830c7a96c3cfe000651344aa55f8eecbfd9641e
-  data.tar.gz: aeebf45583736b0c2d8754f1b3440b5970074e631dcb38493c0c3c213fdb39f6
+  metadata.gz: d7c0c48f0e43214927dbdba1f0033e6e06e563ffd4a781b391b072557ff26ade
+  data.tar.gz: c2a3b20ceef5323db59f71d0d4da2969c7de2ab7416c25df60243364ca2b2540
 SHA512:
-  metadata.gz: af2864edb358c631ebf2dc1113d2168d024fbd2005549f6fcf415ff4898e2fe3708537a19d6ad085ff296a29b9007261cdf90a1ef0abdd038d65fe2f510afaf7
-  data.tar.gz: 569159401aab9730cebd526136b7524b7cbb449c0d31bfd580d59b4eac03aabb1932d5ea71bfa51d5064edc10f4f529c5a206b949ecced0af5227bd5d080d350
+  metadata.gz: c9dad66a4dc1de1ccd2a60218b0ea0b35d0ebeb983d9ba3b3610e3c998823ed40d5902da5e7764aa3eb425ab8e0cb8a33892b698b513bd06f11747ce026e9e01
+  data.tar.gz: 5080938c72495cf7c87ca3e92ea2a7628ff0a67dd170fcfa3b44fcc7102b9cbefafc79a6578e308d0bccd1e7dafbee475255a177390ec6488cf112da38dcd73c

data/lib/xlogin/rake_task.rb

@@ -1,3 +1,4 @@
+require 'time'
 require 'rake'
 require 'rake/tasklib'
 require 'ostruct'
@@ -92,7 +93,7 @@ module Xlogin
         @runner.call(session)
         session.close if session
 
-        output($stdout, buffer.string) if !silent && Rake.application.options.always_multitask
+        printf($stdout, buffer.string) if !silent && Rake.application.options.always_multitask
       rescue => e
         output($stderr, buffer.string) if !silent && Rake.application.options.always_multitask
         output($stderr, "[ERROR] Xlogin - #{e}\n")
@@ -101,10 +102,13 @@ module Xlogin
       end
     end
 
-    def output(fp, text)
-      prefix = (Rake.application.options.always_multitask)? "#{name}\t|" : ""
-      lines  = text.lines.map { |line| "#{prefix}#{line.strip}\n" }
-      lines.each { |line| $stdout.print line }
+    def printf(fp, text)
+      time = Time.now.iso8061
+      text.each_line do |line|
+        fp.print "#{time} "
+        fp.print "#{name}\t" if Rake.application.options.always_multitask
+        fp.print "|#{line.chomp.gsub(/^\s*\r/, '')}\n"
+      end
     end
 
   end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.10.4"
+  VERSION = "0.10.5"
 end

data/lib/xlogin.rb

@@ -60,7 +60,12 @@ module Xlogin
       factory.set_inventory(**args)
     end
 
-    def source(*source_files)
+    def source(*source_files, &block)
+      return source_file(*source_files) unless block
+      instance_eval(&block) unless source_files.empty?
+    end
+
+    def source_file(*source_files)
       source_files.compact.each do |file|
         raise SessionError.new("Inventory file not found: #{file}") unless File.exist?(file)
         instance_eval(IO.read(file), file) if File.exist?(file)
@@ -68,17 +73,12 @@ module Xlogin
     end
 
     def template(name, *args, &block)
-      return template_dir(name, *args) unless block # for backward compatibility
+      return template_dir(name, *args) unless block
 
       raise ArgumentError.new('missing template name') unless name
       factory.set_template(name, &block)
     end
 
-    def template_dir(*template_dirs)
-      files = template_dirs.flat_map { |dir| Dir.glob(File.join(dir, '*.rb')) }
-      template_file(*files)
-    end
-
     def template_file(*template_files)
       template_files.compact.each do |file|
         raise TemplateError.new("Template file not found: #{file}") unless File.exist?(file)
@@ -87,6 +87,11 @@ module Xlogin
       end
     end
 
+    def template_dir(*template_dirs)
+      files = template_dirs.flat_map { |dir| Dir.glob(File.join(dir, '*.rb')) }
+      template_file(*files)
+    end
+
     def method_missing(method_name, *args, &block)
       type = method_name.to_s.downcase
       name = args[0]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet