xlogin 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 100ba79a46574b64637b2dff6480b75353acc21d
-  data.tar.gz: a9aa7094fed1a2a3d6b7515e4cfcb5bf94f211fb
+  metadata.gz: 2c07f2ff5ac2cd13434e68ad9c2f70354981a3a1
+  data.tar.gz: af17f5d674b0643f823edfb0e9eff31bc13531b4
 SHA512:
-  metadata.gz: 80ba1c2c142dd80fe5c8291fe95baf927d063ee6089489957b6c57011851074de96f3cac6e5fa1f1bdf1fc3a6d4df958c54c29d345689f6239301542d61498f5
-  data.tar.gz: 6deea9b37a0d41d3c2794be95a93d0b6a484f6495887d86b0b67b85b05dc8dcfc2a98e6109c19d10bcf1845a4cd05945c912c02d3516b19cc967462580143c7d
+  metadata.gz: c971df162507902afa1217092ecc92203960d392156daeafea936c3a0bb2faaf1594dcd67b7237abed1b8847ee74ba5a2b3a7a34e2b24ff7737cf981fad58aec
+  data.tar.gz: 57018f0aa2bcad19a8efb85c6865c128f00709328dcd75f09588302cb0f0b3aa06556c269a9a3df8b04a4070b9996c2e3c6ee4e2d64c2c2d466f99622705de0d

data/lib/xlogin/delegator.rb

@@ -5,11 +5,14 @@ module Xlogin
 
     module FirmwareDelegator
       def run(uri, opts = {})
+        uri = URI(uri.to_s)
+
         if hostname = opts.delete(:delegate)
-          delegatee = FirmwareFactory.new.find(hostname)
-          firmware  = FirmwareFactory[delegatee[:type]]
+          target = FirmwareFactory.new.get(hostname)
+          target_os  = FirmwareFactory[target[:type]]
+          target_uri = URI(target[:uri])
 
-          firmware.on_exec do |args|
+          target_os.on_exec do |args|
             if args['String'].strip =~ /^kill-session(?:\(([\s\w]+)\))?$/
               puts($1.to_s)
               close
@@ -19,12 +22,15 @@ module Xlogin
             end
           end
 
-          login_method = firmware.instance_eval { @methods[:login] }
-          firmware.bind(:login,    &@methods[:login])
-          firmware.bind(:delegate, &@methods[:delegate])
+          login    = @methods[:login]
+          delegate = @methods[:delegate]
+
+          userinfo = uri.userinfo.dup
+          uri.userinfo = ''
 
-          session = firmware.run(uri, opts.merge(delegatee[:opts]))
-          session.delegate(URI(delegatee[:uri]), &login_method)
+          session = target_os.run(uri, opts)
+          session.instance_exec(*userinfo.split(':'), &login)
+          session.instance_exec(target_uri, opts, &delegate)
           session
         else
           session = super(uri, opts)
@@ -34,5 +40,32 @@ module Xlogin
 
     prepend FirmwareDelegator
 
+    ### Usage:
+    ## Write xloginrc file
+    #
+    # vyos       'vyos01',          'telnet://user:pass@host:port'
+    # consolesrv 'vyos01::console', 'telnet://console_user:console_pass@console_host:console_port', delegate: 'vyos01'
+    #
+    ## Write firmware definition
+    #
+    # require 'timeout'
+    # Xlogin.configure :consolesrv do |os|
+    #   os.bind(:login) do |*args|
+    #    username, password = *args
+    #    waitfor(/login:\s*\z/)    && puts(username)
+    #    waitfor(/Password:\s*\z/) && puts(password)
+    #  end
+    #
+    #  os.bind(:delegate) do |uri, opts|
+    #    begin
+    #      waittime = 3
+    #      Timeout.timeout(waittime) do
+    #        login(*uri.userinfo.split(':'), opts)
+    #      end
+    #    rescue Timeout::Error
+    #    end
+    #  end
+    #end
+
   end
 end

data/lib/xlogin/firmware.rb

@@ -58,9 +58,8 @@ module Xlogin
           define_method(open) do |arg = password, &block|
             send("original_#{open}", arg)
             if block
-              resp = block.call
+              block.call
               cmd(close)
-              resp
             end
           end
           alias_method :enable, open
@@ -74,7 +73,6 @@ module Xlogin
           userinfo: uri.userinfo,
           timeout:  @timeout,
           prompts:  @prompts,
-          methods:  @methods,
         }.merge(opts)
       )
     end

data/lib/xlogin/firmware_factory.rb

@@ -47,7 +47,11 @@ module Xlogin
     end
 
     def set(type, name, uri, opts = {})
-      @database[name] = { type: type, uri: uri, opts: opts }
+      @database[name] = { name: name, type: type, uri: uri, opts: opts }
+    end
+
+    def get(name)
+      @database[name]
     end
 
     def list
@@ -62,7 +66,10 @@ module Xlogin
 
       opts = item[:opts] || {}
       opts = opts.merge(args).reduce({}) { |a, (k, v)| a.merge(k.to_s.downcase.to_sym => v) }
-      firmware.run(item_uri, opts)
+
+      session = firmware.run(item_uri, opts)
+      session.name = item[:name]
+      session
     end
 
     def method_missing(name, *args, &block)

data/lib/xlogin/firmwares/vyos.rb

@@ -1,7 +1,8 @@
 Xlogin.configure :vyos do |os|
   os.prompt(/[$#] (?:\e\[K)?\z/n)
 
-  os.bind(:login) do |username, password|
+  os.bind(:login) do |*args|
+    username, password = *args
     waitfor(/login:\s/)    && puts(username)
     waitfor(/Password:\s/) && puts(password)
     waitfor

data/lib/xlogin/gateway.rb

@@ -4,9 +4,9 @@ require 'net/ssh/gateway'
 module Xlogin
   module Session
 
-    alias_method :original_configure, :configure
-    def configure(**opts)
-      original_configure(**opts)
+    alias_method :original_configure_session, :configure_session
+    def configure_session(**opts)
+      original_configure_session(**opts)
 
       if uri = opts[:via]
         gateway = URI(uri)

data/lib/xlogin/rake_task.rb

@@ -59,7 +59,7 @@ module Xlogin
     def initialize(name, *args)
       @name          = name
       @fail_on_error = true
-      @silent        = false
+      @silent        = Rake.application.options.silent
       @lockfile      = nil
       @logfile       = nil
       @timeout       = nil
@@ -76,11 +76,13 @@ module Xlogin
       @taskrunner = block
     end
 
-    def safe_puts(*messages, io: $stdout)
+    def safe_puts(*messages, **opts)
+      opts[:io] ||= $stdout
+      return if @silent && !opts[:force]
       RakeTask.mutex.synchronize do
         messages.flat_map { |message| message.to_s.lines }.each do |line|
           line.gsub!("\r", "")
-          io.puts (Rake.application.options.always_multitask)? "#{name}\t#{line}" : line
+          opts[:io].puts (Rake.application.options.always_multitask)? "#{name}\t#{line}" : line
         end
       end
     end
@@ -120,7 +122,7 @@ module Xlogin
 
     def run_task
       loggers = []
-      loggers << $stdout unless silent || Rake.application.options.silent || Rake.application.options.always_multitask
+      loggers << $stdout unless silent || Rake.application.options.always_multitask
 
       if logfile
         mkdir_p(File.dirname(logfile), verbose: Rake.application.options.trace)
@@ -131,32 +133,31 @@ module Xlogin
       xlogin_opts[:log]     = loggers unless loggers.empty?
       xlogin_opts[:timeout] = timeout if timeout
 
-      @session = Xlogin.get(name, xlogin_opts)
-      @session.extend(SessionExt)
+      begin
+        @session = Xlogin.get(name, xlogin_opts)
+        @session.extend(SessionExt)
 
-      %i( safe_puts fail_on_error ).each do |name|
-        method_proc = method(name)
-        @session.define_singleton_method(name) { |*args| method_proc.call(*args) }
-      end
+        method_proc = method(:safe_puts)
+        @session.define_singleton_method(:safe_puts) { |*args| method_proc.call(*args) }
 
-      @taskrunner.call(@session) if @taskrunner
+        @taskrunner.call(@session) if @taskrunner && @session
+      rescue => e
+        raise e if fail_on_error
+        safe_puts(e, io: $stderr, force: true)
+      end
     end
 
     module SessionExt
       def cmd(*args)
-        super(*args).tap do |message|
-          safe_puts(message, io: $stdout) unless Rake.application.options.silent || !Rake.application.options.always_multitask
-          break yield(message) if block_given?
-        end
-      rescue => e
-        raise e if fail_on_error
-        safe_puts("\n#{e}", io: $stderr)
-        cmd('')
+        message = super(*args)
+        safe_puts(message, io: $stdout) if Rake.application.options.always_multitask
+        message = yield(message) if block_given?
+        message
       end
 
       def readline(command)
         prompt = StringIO.new
-        safe_puts(cmd('').lines.last, io: prompt)
+        safe_puts(cmd('').lines.last, io: prompt, force: true)
 
         my_command = RakeTask.mutex.synchronize do
           Readline.pre_input_hook = lambda do
@@ -178,6 +179,10 @@ module Xlogin
           readline(command)
         end
       end
+
+      def sync(&block)
+        RakeTask.mutex.synchronize(&block) if block
+      end
     end
 
   end

data/lib/xlogin/session.rb

@@ -3,16 +3,15 @@ require 'stringio'
 module Xlogin
   module Session
 
-    attr_reader :name
+    attr_accessor :name
 
-    def configure(**opts)
+    def configure_session(**opts)
       @name     = opts[:node]
       @node     = opts[:node]
       @port     = opts[:port]
-      @userinfo = opts[:userinfo].split(':')
+      @userinfo = opts[:userinfo].to_s.split(':')
       raise Xlogin::GeneralError.new('Argument error.') unless @node && @port
 
-      @methods  = opts[:methods] || {}
       @prompts  = opts[:prompts] || [[/[$%#>] ?\z/n, nil]]
       @timeout  = opts[:timeout] || 60
 

data/lib/xlogin/ssh.rb

@@ -6,7 +6,7 @@ module Xlogin
     include Session
 
     def initialize(**opts)
-      configure(opts.merge(port: opts[:port] || 22))
+      configure_session(opts.merge(port: opts[:port] || 22))
 
       begin
         username, password = *@userinfo

data/lib/xlogin/telnet.rb

@@ -8,7 +8,7 @@ module Xlogin
     include Session
 
     def initialize(**opts)
-      configure(opts.merge(port: opts[:port] || 23))
+      configure_session(opts.merge(port: opts[:port] || 23))
 
       super(
         'Host'    => @node,

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler