net-ssh-xlogin 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1a3c3f9e810eb5b7ecf8f42207dacdb92fdc8d46d71868133ee97520a2c9228
-  data.tar.gz: 5d6e14f9b766979a55d2e378acbf3019337e6ac9b2d6de4a0af2be16bbeac87d
+  metadata.gz: 15d61a3ec730381d2aadb63e7e851f0a7283e77d1c1f85090da0df6326afa08f
+  data.tar.gz: 853834013e2eb4ad2e9dc044154909b1eadf623a26819f34cda372bba8eb331b
 SHA512:
-  metadata.gz: 2d49ba142f0db57a7c0cb49f4b76b2a14100f230b9c0ea652093c01323abd2f43ffa1f97675217bc17d09d6d72cfe7f58f8f46ac79cd65f4410c85ae09f9544a
-  data.tar.gz: d6a547f74528675199e50e49e5297bc5a32f18d016d9df1d9656db9901c6376de20047c457be0aeac0e8b5d11e310f1f0e3de86d50e0b95bc5db490229dc5400
+  metadata.gz: a9cabc5560fe8d30df14e3c6874ea6b8c9f0af7729eecae49c2c9d82b3469251bcc9b2e0ab9cffb04dff3a2b91507e2eb9607148d0ae2be8d789f0a2d4d9ace9
+  data.tar.gz: 2a52e09b5ccf156b0f95e7c1e8895a666bfb1169c4d06eab3fa7c4efc4b33a41e03b77e0549f29ba9ec5982da6433ce940632ac85fdf2ba3544892052ee51cc6

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    net-ssh-xlogin (0.2.1)
+    net-ssh-xlogin (0.2.6)
       bcrypt_pbkdf
       ed25519
       net-ssh
+      net-ssh-gateway
       net-ssh-telnet
 
 GEM
@@ -13,6 +14,8 @@ GEM
     bcrypt_pbkdf (1.0.1)
     ed25519 (1.2.4)
     net-ssh (5.2.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
     net-ssh-telnet (0.2.1)
       net-ssh (>= 2.0.1)
     rake (10.5.0)

data/lib/net/ssh/xlogin.rb

@@ -7,11 +7,24 @@ require 'net/ssh/xlogin/template'
 module Net::SSH::Xlogin
   class Error < StandardError; end
   class << self
-    def get(name, **opts)
-      opts  = factory.inventory[name].merge(opts)
-      type  = opts[:type]
-      klass = factory.templates[type]
-      klass.build(name, **opts)
+    def get(name, **opts, &block)
+      begin
+        opts     = factory.inventory[name].merge(opts)
+        type     = opts[:type]
+        template = factory.templates[type]
+        session  = template.build(name, **opts)
+
+        return session unless block
+        yield  session
+      rescue => err
+        raise Error.new(err)
+      ensure
+        session.close rescue nil
+      end
+    end
+
+    def list(**query)
+      factory.query(query)
     end
 
     def configure(&block)

data/lib/net/ssh/xlogin/connection.rb

@@ -1,5 +1,6 @@
 require 'net/ssh'
 require 'net/ssh/telnet'
+require 'net/ssh/gateway'
 require 'net/ssh/xlogin/factory'
 
 module Net::SSH::Xlogin
@@ -28,6 +29,12 @@ module Net::SSH::Xlogin
         args["Binmode"]     = @options[:binmode]    || false
         args["PTYOptions"]  = @options[:ptyoptions] || {}
 
+        if @options[:relay]
+          relay             = @options[:relay]
+          info              = Factory.instance.inventory[relay]
+          @options[:port]   = Net::SSH::Gateway.new(relay, nil , info)
+        end
+
         if @options[:proxy]
           args["Host"]      = @options[:host_name]
           args["Port"]      = @options[:port]

data/lib/net/ssh/xlogin/factory.rb

@@ -20,13 +20,30 @@ module Net::SSH::Xlogin
       @templates[name] = klass
     end
 
+    def query(q)
+      list = inventory.map{|k, v| v}
+      return list if q.empty?
+
+      list.select do |h|
+        q.any? do |k,v|
+          case v
+          when Regexp
+            h[k] =~ v
+          else
+            h[k] == v
+          end
+        end
+      end
+    end
+
     def yaml(file)
       raise Error, 'not cofnig file' unless File.exist?(file)
       srcs = YAML.load_file(file)
       srcs.each do |src|
-        src  = src.inject({}){|h, (k,v)| h = h.merge(k.sym => v) }
-        name = src.delete(:host)
-        factory.source_set(name, **src)
+        src        = src.inject({}){|h, (k,v)| h = h.merge(k.to_sym => v) }
+        name       = src.delete(:host)
+        src[:name] = name
+        set_source(name, **src)
       end
     end
 
@@ -42,6 +59,7 @@ module Net::SSH::Xlogin
 
       options[:type]       = method
       options[:uri]        = uri
+      options[:name]       = name
       options[:host_name]  = uri.host
       options[:user]       = uri.user
       options[:password]   = uri.password

data/lib/net/ssh/xlogin/version.rb

@@ -1,7 +1,7 @@
 module Net
   module SSH
     module Xlogin
-      VERSION = '0.2.1'
+      VERSION = '0.2.6'
     end
   end
 end

data/net-ssh-xlogin.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency     "net-ssh"
   spec.add_runtime_dependency     "net-ssh-telnet"
+  spec.add_runtime_dependency     "net-ssh-gateway"
   spec.add_runtime_dependency     "ed25519"
   spec.add_runtime_dependency     "bcrypt_pbkdf"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh-xlogin
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - ito.toshifumi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh-gateway
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ed25519
   requirement: !ruby/object:Gem::Requirement