xlogin 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 236da0f51f5506ec90714afb37232998575b0fe0
-  data.tar.gz: 3907742fb721d176716f845f1575f09edae86f73
+  metadata.gz: 2adfeee117c2c81c467f4e38db77d70af3f80df7
+  data.tar.gz: 006e04c87d2f37ae00341934fe6979d1a75de08c
 SHA512:
-  metadata.gz: 143ba3dd1a9f1f9a8dc2d9a8d9fe5121a1d8421d22117b56c6e3a83ed283aa55e80cf91a3f2c02785e8b1ca281bf183e2627a90b4d5ea99f7466ff278b14aa5b
-  data.tar.gz: 1193fa2db3d0876788e33856d59b4f74cba71400de2d5f479a476ce6453e5226081158a53204f5ff5d4888dcef2ff67113f28c747e63d0f67097263ff1799f20
+  metadata.gz: c8ce6423265a437e802910751df6e5c5c26087537ba29dfad5f9601d0ca2dd3b9f2af62ad88e03850e04ed7c8c5c2e19283f952dc2c69dce64ab075025da2e83
+  data.tar.gz: bb2ae2504a79215f90c766dbf16349f7141a5fd0b05e7627b25ff594beb58a3a1170022b731c968bbf2207bae847ca54ff800de4cd4e020fee8c9af3a8a9a9a4

data/lib/xlogin/gateway.rb

@@ -31,5 +31,5 @@ begin
 
   end
 rescue LoadError
-  $stderr.puts "Option 'gateway' is not supported in your environment."
+  $stderr.puts "WARN: 'gateway' option is not supported in your environment."
 end

data/lib/xlogin/scanner.rb

@@ -0,0 +1,88 @@
+require 'xlogin'
+require 'xlogin/thread_safe'
+
+module Xlogin
+
+  class Scanner
+    class << self
+      def login_opts(**opts)
+        @login_opts = opts unless opts.empty?
+        @login_opts || {}
+      end
+    end
+
+    def initialize
+      @sessions = Hash.new
+      @scan_db  = Hash.new
+      @queries  = Array.new
+    end
+
+    def ids
+      @scan_db.keys
+    end
+
+    def sessions(&block)
+      hostnames = @queries.map { |_, hostname, _| hostname }.uniq
+      sessions  = hostnames.map { |hostname| session(hostname) }
+      sessions.each { |s| block.call(s) } if block
+      sessions
+    end
+
+    def define(id, &block)
+      type = ScanType.new
+      type.instance_eval(&block)
+
+      @scan_db[id] = type
+    end
+
+    def add(id, hostname, *args)
+      @queries << [id, hostname, *args]
+    end
+
+    def scan
+      data  = Hash.new
+      cache = Hash.new
+
+      threads = @queries.map do |req_key|
+        Thread.new do
+          id, hostname, *args = *req_key
+          type = @scan_db[id]
+
+          command = type.command.call(*args)
+          content = session(hostname).thread_safe { |s| s.cmd(command) }
+          matched = type.scanner.call(content)
+
+          cache[[hostname, command]] ||= content
+          data[req_key] = matched
+
+          yield(req_key, matched) if block_given?
+        end
+      end
+      threads.each { |th| th.join }
+
+      data
+    end
+
+    def close
+      sessions { |s| s.close }
+    end
+
+    private
+    def session(hostname)
+      @sessions[hostname] ||= Xlogin.get(hostname, **Xlogin::Scanner.login_opts)
+    end
+  end
+
+  class ScanType
+    def command(val = nil, &block)
+      return @command unless val || block
+      @command = (val) ? lambda { val } : block
+    end
+
+    def scanner(&block)
+      return @scanner unless block
+      @scanner = block
+    end
+  end
+
+end

data/lib/xlogin/session.rb

@@ -8,15 +8,15 @@ module Xlogin
 
     def configure_session(**opts)
       @opts     = opts.dup
-      @host     = @name = @opts.delete(:host)
-      @port     = @opts.delete(:port)
-      @userinfo = @opts.delete(:userinfo).to_s.split(':')
+      @host     = @name = @opts[:host]
+      @port     = @opts[:port]
+      @userinfo = @opts[:userinfo].to_s.split(':')
       raise Xlogin::GeneralError.new('Argument error.') unless @host && @port
 
-      @prompts  = @opts.delete(:prompts) || [[/[$%#>] ?\z/n, nil]]
-      @timeout  = @opts.delete(:timeout) || 60
+      @prompts  = @opts[:prompts] || [[/[$%#>] ?\z/n, nil]]
+      @timeout  = @opts[:timeout] || 60
 
-      @loglist  = [@opts.delete(:log)].flatten.compact
+      @loglist  = [@opts[:log]].flatten.compact
       @logger   = update_logger
     end
 

data/lib/xlogin/thread_safe.rb

@@ -0,0 +1,25 @@
+require 'thread'
+require 'timeout'
+
+module Xlogin
+  module Session
+    def thread_safe(timeout: @timeout, maximum_retry: 1)
+      @safe_session = self
+      @safe_session_mutex ||= Mutex.new
+
+      Timeout.timeout(timeout) do
+        @safe_session_mutex.synchronize do
+          retry_count = 0
+          begin
+            @safe_session ||= Xlogin.get(@host, @opts)
+            yield @safe_session
+          rescue Errno::ECONNRESET => e
+            raise e unless (retry_count += 1) < maximum_retry
+            @safe_session = nil
+            retry
+          end
+        end
+      end
+    end
+  end
+end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.3.0"
+  VERSION = "0.3.3"
 end

data/lib/xlogin.rb

@@ -2,7 +2,6 @@ $:.unshift File.dirname(__FILE__)
 
 require 'xlogin/firmware'
 require 'xlogin/firmware_factory'
-require 'xlogin/queue'
 require 'xlogin/version'
 
 module Xlogin
@@ -62,4 +61,8 @@ module Xlogin
     end
   end
 
+  # do not remove this line!
+  # initialize Xlogin systems and load related modules beforehand.
+  Xlogin.factory
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,14 +75,15 @@ 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
 - lib/xlogin/rspec/resource.rb
+- lib/xlogin/scanner.rb
 - lib/xlogin/session.rb
 - lib/xlogin/ssh.rb
 - lib/xlogin/telnet.rb
+- lib/xlogin/thread_safe.rb
 - lib/xlogin/version.rb
 - xlogin.gemspec
 homepage: https://github.com/haccht/xlogin

data/lib/xlogin/queue.rb

@@ -1,55 +0,0 @@
-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
-
-      if hostinfo = Xlogin.factory.get(hostname)
-        firmware = Xlogin.factory.template_for(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