xlogin 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d9a1b26c54a0a1729282e93dca1abcc8dfc1336
-  data.tar.gz: 41c331ddf6bf109f0ef85b79d79f0f841dbb787c
+  metadata.gz: a71e3f5d31063e0a93efe56206322d5deb3f029a
+  data.tar.gz: 15efe2eeb297593352b1f9697a88f6a608210598
 SHA512:
-  metadata.gz: 5c472d2e2fbe03a9b2bcfc088fe3a5143ac0fa20253c53c07dc84604ebd4fdbab787343bbd8e06e1f5eea259d1ff8894055e6a7f3dc0e7ecc855d472584c660c
-  data.tar.gz: b46d85dca28cf7643e2c85fb517bf4c86a5a58418b76f88b3011436e2b4bdb04f1a2b1221c55a83923b3a33dcedfcbde2bd5de3f4591725e66a8725dae803636
+  metadata.gz: 6c3c536bce5218ddcae4701f31891c0db6bab5a6d59f40172bcb4ab07baab060a734576cb0e0c16435022c64adc479d2491c3b6a52172f509ce32319b2009b56
+  data.tar.gz: 556d8f2a5394d29fbd05d60826ab2096cb2db8475d13a5652ccdfa7c0804b51841bf789a8a8665920715944881a4b9bdd0f3d6e231b27d606e9f558cec268ee9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xlogin (0.8.0)
+    xlogin (0.8.1)
       net-ssh
       net-ssh-gateway
       net-ssh-telnet

data/lib/xlogin/cli.rb

@@ -3,6 +3,7 @@
 require 'optparse'
 require 'ostruct'
 require 'parallel'
+require 'readline'
 require 'stringio'
 
 module Xlogin
@@ -75,10 +76,14 @@ module Xlogin
     end
 
     def tty(config)
-      target = config.hostlist.sort_by { |e| e[:name] }.first
-      $stdout.puts "Trying #{target[:name]}...", "Escape character is '^]'."
-      config.hostlist = [target]
-      login(config) { |session| session.interact! }
+      Signal.trap(:INT) { exit 0 }
+      list = config.hostlist.sort_by { |e| e[:name] }
+      list.each do |target|
+        Readline.readline(">> #{target[:name]} ", false) unless list.size == 1
+        $stdout.puts "Trying #{target[:name]}...", "Escape character is '^]'."
+        config.hostlist = [target]
+        login(config) { |session| session.interact! }
+      end
     end
 
     def exec(config)

data/lib/xlogin/rake_task.rb

@@ -1,5 +1,6 @@
 require 'rake'
 require 'rake/tasklib'
+require 'ostruct'
 require 'stringio'
 
 module Xlogin
@@ -9,14 +10,18 @@ module Xlogin
     class << self
       include Rake::DSL
 
-      def bulk(names, &block)
-        names = names.map(&:strip).grep(/^\s*[^#]/).uniq
+      def generate(*target, **opts, &block)
+        hostnames = target.flat_map { |e| Xlogin.factory.list(e) }.map { |e| e[:name] }
+
         description = Rake.application.last_description
+        task 'all' => hostnames unless opts[:bundle] == false
 
-        names.each do |name|
+        description = opts[:desc] if opts.key?(:desc)
+        hostnames.each do |hostname|
           desc description
-          RakeTask.new(name, &block)
+          RakeTask.new(hostname, &block)
         end
+
       end
     end
 
@@ -24,66 +29,75 @@ module Xlogin
     attr_accessor :lock
     attr_accessor :log
     attr_accessor :silent
-    attr_accessor :timeout
     attr_accessor :fail_on_error
 
     def initialize(name)
       @name   = name
       @runner = nil
+      @config = OpenStruct.new
       @silent ||= Rake.application.options.silent
       @fail_on_error = true
 
-      yield(self) if block_given?
-      define_task
+      yield self if block_given?
+      define
     end
 
-    def start(&block)
+    def run(&block)
       @runner = block
     end
 
+    def method_missing(name, *args, &block)
+      super(name, *args, &block) unless name.to_s =~ /^\w+=$/
+      @config.send(name, *args)
+    end
+
     private
-    def define_task
+    def define
       description = Rake.application.last_description
       description = "#{description} - #{name}" if description
       desc description
 
+      mkdir_p(File.dirname(log),  verbose: Rake.application.options.trace) if log
+      mkdir_p(File.dirname(lock), verbose: Rake.application.options.trace) if lock
+
       if lock
         task(name => lock)
         file(lock) do
-          invoke
-          mkdir_p(File.dirname(lock), verbose: Rake.application.options.trace)
-          touch(lock, verbose: Rake.application.options.trace)
+          File.open(lock, 'w') do |fd|
+            run_task if fd.flock(File::LOCK_EX|File::LOCK_NB)
+          end
         end
       else
-        task(name) { invoke }
+        task(name) do
+          run_task
+        end
       end
     end
 
-    def invoke
+    def run_task
       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
+      loggers << log     if log
+      loggers << buffer  if !silent &&  Rake.application.options.always_multitask
+      loggers << $stdout if !silent && !Rake.application.options.always_multitask
 
       begin
-        session = Xlogin.get(name, log: loggers, timeout: timeout)
-
-        @runner.call(session)
+        session = Xlogin.get(name, log: loggers, **@config.to_h)
+        session.instance_eval(&@runner)
         session.close if session
+
+        output($stdout, buffer.string) if !silent && Rake.application.options.always_multitask
       rescue => e
-        $stderr.print "[ERROR] #{name} - #{e}\n"
+        output($stderr, buffer.string) if !silent && Rake.application.options.always_multitask
+        output($stderr, "[ERROR] Xlogin - #{e}\n")
         raise e if fail_on_error
       end
+    end
 
-      if Rake.application.options.always_multitask && !silent
-        lines = buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
-        lines.each { |line| $stdout.print "#{line.chomp}\n" }
-      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 }
     end
 
   end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.8.0"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet