xlogin 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bdf011d17fbb9f332a09e59355fd1c4397799cc
-  data.tar.gz: f2f1cb422bfed21add6fa1ff6760fe741322fb17
+  metadata.gz: 3fe50364e64650b54e9d1a7eda4fa625370a1439
+  data.tar.gz: 099fcd36ef9083f54d55e5a972878251f79da858
 SHA512:
-  metadata.gz: c8a83cb62990a031a9db36e68701373fae43cffa3eee30c79d99743a6eae17f8b92f0da8554bd8f4885e3c8bf6fe155f97c7c00fd85534d09850b9ea3fa8f16a
-  data.tar.gz: 3c763adb40a901f7277fcd494ecab91386a7618e8680aa8047f107cd8e5881a95dcb9b336856df784d12781a7993579924a2c89aac59123498b1e5d4eb5c37eb
+  metadata.gz: 185a11590ff1f0559991a405574e5a2b3ef9d18f5a4940a833baa2c6460515cafaf2a2be08d683fbc4ae411b6bb1d81d206b836bf487732357a37445b91b18cf
+  data.tar.gz: fa4164c955bd8246ccf0a8db70e8e224bc2e9cf29b4cf1afd8dbadbf6913e07289b5492b74f305b85a3a0b7b8e62d99a16596f3e8d52ad26cfbed7fd1550fb6f

data/lib/xlogin.rb

@@ -30,16 +30,7 @@ module Xlogin
     end
 
     def configure(&block)
-      instance_eval(&block) if block
-
-      source(DEFAULT_INVENTORY_FILE) if factory.list.empty?
-      if factory.list_templates.empty?
-        unless Dir.exist?(DEFAULT_TEMPLATE_DIR)
-          FileUtils.mkdir_p(DEFAULT_TEMPLATE_DIR)
-          Xlogin::BUILTIN_TEMPLATE_FILES.each { |file| FileUtils.cp(file, DEFAULT_TEMPLATE_DIR) }
-        end
-        template_dir(DEFAULT_TEMPLATE_DIR)
-      end
+      instance_eval(&block)
     end
 
     def authorized?
@@ -51,18 +42,23 @@ module Xlogin
       @authorized = boolean == true || (block && block.call == true)
     end
 
-    def source(source_file)
+    def source(source_file = DEFAULT_INVENTORY_FILE)
       factory.source(source_file)
     end
 
     def template(*template_files)
-      factory.source_template(*template_files)
+      return factory.source_template(*template_files) unless template_files.empty?
+
+      unless Dir.exist?(DEFAULT_TEMPLATE_DIR)
+        FileUtils.mkdir_p(DEFAULT_TEMPLATE_DIR)
+        BUILTIN_TEMPLATE_FILES.each { |file| FileUtils.cp(file, DEFAULT_TEMPLATE_DIR) }
+      end
+      template_dir(DEFAULT_TEMPLATE_DIR)
     end
 
     def template_dir(*template_dirs)
-      template_dirs.each do |template_dir|
-        template(*Dir.glob(File.join(template_dir, '*.rb')))
-      end
+      files = template_dirs.flat_map { |dir| Dir.glob(File.join(dir, '*.rb')) }
+      template(*files)
     end
 
   end

data/lib/xlogin/cli.rb

@@ -8,9 +8,6 @@ require 'stringio'
 module Xlogin
   class CLI
 
-    DEFAULT_INVENTORY_PATH = File.join(ENV['HOME'], '.xloginrc')
-    DEFAULT_TEMPLATE_DIR   = File.join(ENV['HOME'], '.xlogin.d')
-
     def self.run(args = ARGV)
       config = getopts(args)
       client = Xlogin::CLI.new
@@ -23,10 +20,10 @@ module Xlogin
     def self.getopts(args)
       config = OpenStruct.new(
         task: 'tty',
-        inventory: DEFAULT_INVENTORY_PATH,
+        hostlist:  [],
         parallels: 5,
+        inventory: nil,
         templates: [],
-        hostlist:  [],
       )
 
       parser = OptionParser.new
@@ -53,7 +50,6 @@ module Xlogin
         end
       end
 
-      config.templates += Dir.glob(File.join(DEFAULT_TEMPLATE_DIR, '*.rb')) if config.templates.empty?
       Xlogin.configure do
         source(config.inventory)
         template(*config.templates)

data/lib/xlogin/delegator.rb

@@ -4,7 +4,7 @@ module Xlogin
   class Template
 
     module RelayTemplate
-      def build(uri, **params) 
+      def build(uri, **params)
         login_host = params.delete(:relay)
         return super(uri, **params) unless login_host
 
@@ -37,14 +37,12 @@ module Xlogin
     #
     ## Write firmware definition
     #
-    # require 'timeout'
-    # login do |*args|
-    #   username, password = *args
+    # login do |username, password|
     #   waitfor(/login:\s*\z/)    && puts(username)
     #   waitfor(/Password:\s*\z/) && puts(password)
     # end
     #
-    # delegate do |uri, opts|
+    # delegate do |uri, **opts|
     #   cmd("telnet #{uri.host}")
     #   login(*uri.userinfo.split(':'))
     # end

data/lib/xlogin/factory.rb

@@ -67,7 +67,6 @@ module Xlogin
 
     def build(type:, uri:, **params)
       template = get_template(type)
-      raise Xlogin::SessionNotFound.new("Target not defined") unless uri
       raise Xlogin::TemplateNotFound.new("Template not found: '#{type}'") unless template
 
       template.build(uri, **params)

data/lib/xlogin/rake_task.rb

@@ -1,6 +1,5 @@
 require 'rake'
 require 'rake/tasklib'
-require 'readline'
 require 'thread'
 require 'stringio'
 
@@ -32,6 +31,10 @@ module Xlogin
           end
         end
       end
+
+      def mutex
+        @mutex ||= Mutex.new
+      end
     end
 
 
@@ -86,10 +89,14 @@ module Xlogin
         begin
           session = Xlogin.factory.build_from_hostname(name, log: loggers)
           @runner.call(session)
-          $stdout.puts buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
+          RakeTask.mutex.synchronize do
+            $stdout.puts buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
+          end
         rescue => e
-          $stdout.puts buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
-          $stderr.puts "#{name}\t#{e}"
+          RakeTask.mutex.synchronize do
+            $stdout.puts buffer.string.lines.map { |line| "#{name}\t" + line.gsub("\r", '') }
+            $stderr.puts "#{name}\t#{e}"
+          end
         end
       else
         loggers << $stdout unless silent

data/lib/xlogin/session.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'net/ssh/gateway'
 require 'ostruct'
-require 'readline'
 require 'stringio'
 
 module Xlogin
@@ -42,7 +41,6 @@ module Xlogin
           'Prompt'   => Regexp.union(*@template.prompt.map(&:first)),
         )
       rescue => e
-        $stdout.puts e
         retry if (max_retry -= 1) > 0
         raise e
       end
@@ -108,10 +106,9 @@ module Xlogin
     private
     def ssh_tunnel(gateway)
       gateway_uri = URI(gateway)
-      username, password = *gateway_uri.userinfo.split(':')
-
       case gateway_uri.scheme
       when 'ssh'
+        username, password = *gateway_uri.userinfo.split(':')
         gateway = Net::SSH::Gateway.new(
           gateway_uri.host,
           username,
@@ -140,6 +137,7 @@ module Xlogin
                  when IO, StringIO
                    output_log
                  end
+
         lambda { |c| logger.syswrite c if logger }
       end
     end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet