xlogin 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11817df618eb661d0dc3e58f5674467709e0475c
-  data.tar.gz: 9a729fe08da4e9038b1a6ef62c13e176a4bc05dc
+  metadata.gz: ac8f3ae4ad7a17da2c37a40f5c6e0a32545501be
+  data.tar.gz: 88dc898abf314811283b50ee0d6b8d62dc31c641
 SHA512:
-  metadata.gz: 1dbe170e2ea3046890fd5ade698114ba18c6f6a861b67b19a6031ff610971c56e125c6c7ddd9fb4b518e82f3156b3eeff4d661847ba9d9a62849c3ea1020a30d
-  data.tar.gz: abaeeb95993ed797b2e61669d7fd9fb9596dea2de2444eebb8eb3902d9a9d4a3069d7b03cba3d21eb95e145adddc914ff174f9b2e77bad6de4a6494b7dad281b
+  metadata.gz: 7813c69c44723ef01af12d89f8b2970aca9a4215676fd30adcb7bd304d5e13a7c175c714e821e08d51d7fb88b487a5ffcf95095c94507b0f2360a0a6d56ff671
+  data.tar.gz: 00fa87b310643a1de8986586bc5889ad75caeaf8065d226996a41721a58ef81953a2310c7bae37bf3c765ce2a5b8331ed194a453958d8402dc2ce8fbf326b735

data/.gitignore

@@ -54,5 +54,7 @@ build-iPhoneSimulator/
 .rvmrc
 
 # End of https://www.gitignore.io/api/ruby
+/lib/xlogin/.xloginrc
+/lib/xlogin/_xloginrc
 /lib/xlogin/firmwares/*
 !/lib/xlogin/firmwares/vyos.rb

data/lib/xlogin.rb

@@ -2,6 +2,7 @@ $:.unshift File.dirname(__FILE__)
 
 require 'xlogin/firmware'
 require 'xlogin/firmware_factory'
+require 'xlogin/queue'
 require 'xlogin/version'
 
 module Xlogin
@@ -18,6 +19,7 @@ module Xlogin
 
   class << self
     def configure(name)
+      name = name.to_s
       firmware = Xlogin::FirmwareFactory[name] || Xlogin::Firmware.new
       yield firmware if block_given?
 

data/lib/xlogin/delegator.rb

@@ -12,8 +12,8 @@ module Xlogin
           target_os  = FirmwareFactory[target[:type]]
           target_uri = URI(target[:uri])
 
-          login    = @methods[:login]
-          delegate = @methods[:delegate]
+          login    = @methods.delete(:login)
+          delegate = @methods.delete(:delegate)
 
           userinfo = uri.userinfo.dup
           uri.userinfo = ''
@@ -50,7 +50,7 @@ module Xlogin
     #    begin
     #      waittime = 3
     #      Timeout.timeout(waittime) do
-    #        login(*uri.userinfo.split(':'), opts)
+    #        login(*uri.userinfo.split(':'))
     #      end
     #    rescue Timeout::Error
     #    end

data/lib/xlogin/firmware_factory.rb

@@ -50,8 +50,9 @@ module Xlogin
       @database[name]
     end
 
-    def set(type, name, uri, opts = {})
-      @database[name] = opts.merge(uri: uri, type: type, name: name)
+    def set(**opts)
+      opts[:type] = opts[:type].to_s
+      @database[opts[:name]] = opts
     end
 
     def list
@@ -60,7 +61,7 @@ module Xlogin
 
     def build(args)
       uri  = args.delete(:uri)
-      type = args.delete(:type)
+      type = args.delete(:type).to_s
       name = args.delete(:name)
       opts = args.reduce({}) { |a, (k, v)| a.merge(k.to_s.downcase.to_sym => v) }
       raise Xlogin::GeneralError.new("Host not found: #{args}") unless uri && type
@@ -72,6 +73,9 @@ module Xlogin
     end
 
     def build_from_hostname(hostname, **args)
+      host = get(hostname)
+      raise Xlogin::GeneralError.new("Host not found: #{hostname}") unless host
+
       build(get(hostname).merge(args))
     end
 
@@ -79,7 +83,11 @@ module Xlogin
       firmware = Xlogin::FirmwareFactory[name]
       super unless firmware && args.size >= 2
 
-      set(name, *args)
+      type = name
+      name = args.shift
+      uri  = args.shift
+      opts = args.shift || {}
+      set(type: type, name: name, uri: uri, **opts)
     end
 
   end

data/lib/xlogin/gateway.rb

@@ -1,31 +1,35 @@
-require 'uri'
-require 'net/ssh/gateway'
+begin
+  require 'uri'
+  require 'net/ssh/gateway'
 
-module Xlogin
-  module Session
+  module Xlogin
+    module Session
 
-    alias_method :original_configure_session, :configure_session
-    def configure_session(**opts)
-      original_configure_session(**opts)
+      alias_method :original_configure_session, :configure_session
+      def configure_session(**opts)
+        original_configure_session(**opts)
 
-      if uri = opts[:via]
-        gateway = URI(uri)
-        username, password = *gateway.userinfo.split(':')
+        if uri = opts[:via]
+          gateway = URI(uri)
+          username, password = *gateway.userinfo.split(':')
 
-        case gateway.scheme
-        when 'ssh'
-          @gateway = Net::SSH::Gateway.new(
-            gateway.host,
-            username,
-            password: password,
-            port: gateway.port || 22
-          )
+          case gateway.scheme
+          when 'ssh'
+            @gateway = Net::SSH::Gateway.new(
+              gateway.host,
+              username,
+              password: password,
+              port: gateway.port || 22
+            )
 
-          @port = @gateway.open(@host, @port)
-          @host = '127.0.0.1'
+            @port = @gateway.open(@host, @port)
+            @host = '127.0.0.1'
+          end
         end
       end
     end
-  end
 
+  end
+rescue LoadError
+  $stderr.puts "Option 'gateway' is not supported in your environment."
 end

data/lib/xlogin/queue.rb

@@ -0,0 +1,56 @@
+require 'timeout'
+require 'thread'
+
+module Xlogin
+  class Queue
+
+    class << self
+      def get(hostname, **args)
+        @queues ||= {}
+        @queues[hostname] ||= Xlogin::Queue.new(hostname, **args)
+      end
+    end
+
+    def initialize(hostname, **args)
+      @name  = hostname
+      @args  = args
+      @mutex = Mutex.new
+
+      hostinfo = Xlogin::FirmwareFactory.new.get(hostname)
+      if hostinfo
+        firmware = Xlogin::FirmwareFactory[hostinfo[:type]]
+        @timeout = firmware.timeout
+      end
+
+      @timeout = @args['Timeout'] || @args['timeout' || @args[:timeout]] || @timeout || 10
+    end
+
+    def with(timeout: @timeout, limit: 1)
+      Timeout.timeout(timeout) do
+        @mutex.synchronize do
+          retry_count = 0
+
+          begin
+            @session ||= Xlogin.get(@name, **@args)
+            @session.cmd('')
+          rescue Errno::ECONNRESET => e
+            raise e unless (retry_count += 1) < limit
+            @session = nil
+            retry
+          end
+
+          yield @session
+        end
+      end
+    end
+
+    def shutdown(**args)
+      with(args) do |s|
+        begin
+          yield s ensure s.close if s
+        end
+      end
+    end
+
+  end
+end

data/lib/xlogin/rake_task.rb

@@ -9,7 +9,7 @@ module Xlogin
     class << self
       include Rake::DSL
 
-      def bulk(names, &block)
+      def bulk(names, **xlogin_opts, &block)
         names = names.map(&:strip).grep(/^\s*[^#]/)
 
         namecount = names.uniq.inject({}) { |a, e| a.merge(e => names.count(e)) }
@@ -21,7 +21,7 @@ module Xlogin
 
           names.each do |name|
             desc "#{description} (#{name})"
-            RakeTask.new(name, &block)
+            RakeTask.new(name, **xlogin_opts, &block)
           end
         end
       end
@@ -50,17 +50,16 @@ module Xlogin
     attr_accessor :silent
     attr_accessor :lockfile
     attr_accessor :logfile
-    attr_accessor :timeout
     attr_accessor :uncomment
 
-    def initialize(name, *args)
+    def initialize(name, **xlogin_opts)
       @name          = name
       @fail_on_error = true
       @silent        = Rake.application.options.silent
       @lockfile      = nil
       @logfile       = nil
-      @timeout       = nil
       @uncomment     = false
+      @xlogin_opts   = xlogin_opts
 
       @session       = nil
       @taskrunner    = nil
@@ -117,12 +116,10 @@ module Xlogin
         loggers << logfile if logfile
       end
 
-      xlogin_opts = Hash.new
-      xlogin_opts[:log]     = loggers unless loggers.empty?
-      xlogin_opts[:timeout] = timeout if timeout
+      @xlogin_opts[:log] = loggers unless loggers.empty?
 
       begin
-        @session = Xlogin.get(name, xlogin_opts)
+        @session = Xlogin.get(name, @xlogin_opts.dup)
         @session.extend(SessionExt)
 
         method_proc = method(:safe_puts)

data/lib/xlogin/telnet.rb

@@ -66,7 +66,7 @@ module Xlogin
           end
         end
       end
-    rescue EOFError
+    rescue EOFError, Errno::ECONNRESET
       $stdout.puts "\r\n", "Conneciton closed."
       self.close
     ensure

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ files:
 - lib/xlogin/firmware_factory.rb
 - lib/xlogin/firmwares/vyos.rb
 - lib/xlogin/gateway.rb
+- lib/xlogin/queue.rb
 - lib/xlogin/rake_task.rb
 - lib/xlogin/rspec.rb
 - lib/xlogin/rspec/context.rb