xlogin 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 760aaee769ea50c9c07ceb41c3f02c85de66386b
-  data.tar.gz: e4a2fd9aeb0980061e60f59b10781af25ac646de
+  metadata.gz: dcf7616b6aca051514dc83fd78d0404230a50ed9
+  data.tar.gz: 631a3d7ea97cc422a0c91ff6a257a8f384688370
 SHA512:
-  metadata.gz: 2ba76caf35e5a154f6de4d36a04f2f85c1bf9b718f3d89b2c261c15f3d67997e497ba6ebecf90e6642f817882b6f003ef95e555d468abf3cb636b5e823290ff1
-  data.tar.gz: 49272ff63021e177f333f11c75e05e34861473f31e7919cdb3da2f7158a456f2b762afe1ce008c459000e15c538dfe5072d622deac06f95677b1f90ef23347be
+  metadata.gz: a220037b93c800ac4bbe120bb3e6ef4d69ce34bd188d6b64e9d022869700ef2a1ccb9acea10504e008a2a746654af2e032706d136abc95aba6baf5d4a170676e
+  data.tar.gz: c755f66e92023dc47f0c4b876e306a165007bbed2acde20fd5f55bf1276f3524c30a99909d78faec292e2d8c34cf662a89d51e1c0ef2b264705e15beed14ce9a

data/lib/xlogin/delegator.rb

@@ -5,23 +5,24 @@ module Xlogin
 
     module RelayTemplate
       def build(uri, **params)
-        login_host = params.delete(:relay)
-        return super(uri, **params) unless login_host
+        target_host = params.delete(:relay)
+        return super(uri, **params) unless target_host
 
-        login_info = Xlogin.factory.get(login_host)
-        login_os   = Xlogin.factory.get_template(login_info[:type])
-        login_uri  = URI(login_info[:uri])
+        target_info = Xlogin.factory.get(target_host)
+        target_temp = Xlogin.factory.get_template(target_info[:type])
+        target_uri  = URI(target_info[:uri])
 
         login    = @methods.fetch(:login)
         delegate = @methods.fetch(:delegate)
+        raise TemplateError.new("'login' and 'delegate' methods are necessary in the #{target_info[:type]} template.") unless login && delegate
 
         relay_uri = URI(uri.to_s)
         userinfo_cache = relay_uri.userinfo.dup
         relay_uri.userinfo = ''
 
-        session = login_os.build(relay_uri, **params)
+        session = target_temp.build(relay_uri, **params)
         session.instance_exec(*userinfo_cache.split(':'), &login)
-        session.instance_exec(login_uri, **params, &delegate)
+        session.instance_exec(target_uri, **params, &delegate)
         session
       end
     end

data/lib/xlogin/factory.rb

@@ -67,14 +67,14 @@ module Xlogin
 
     def build(type:, uri:, **params)
       template = get_template(type)
-      raise Xlogin::TemplateNotFound.new("Template not found: '#{type}'") unless template
+      raise Xlogin::TemplateError.new("Template not found: '#{type}'") unless template
 
       template.build(uri, **params)
     end
 
     def build_from_hostname(hostname, **params)
       hostinfo = get(hostname)
-      raise Xlogin::SessionNotFound.new("Host not found: '#{hostname}'") unless hostinfo
+      raise Xlogin::SessionError.new("Host not found: '#{hostname}'") unless hostinfo
 
       build(hostinfo.merge(**params))
     end

data/lib/xlogin/session.rb

@@ -82,6 +82,11 @@ module Xlogin
       line
     end
 
+    def close
+      @gateway.close(@port) if @gateway
+      super
+    end
+
     def dup
       uri = URI::Generic.build(@scheme, [@username, @password].compact.join(':'), @host, @port)
       self.class.new(@template, uri, **opts.to_h)
@@ -109,14 +114,14 @@ module Xlogin
       case gateway_uri.scheme
       when 'ssh'
         username, password = *gateway_uri.userinfo.split(':')
-        gateway = Net::SSH::Gateway.new(
+        @gateway = Net::SSH::Gateway.new(
           gateway_uri.host,
           username,
           password: password,
           port: gateway_uri.port || 22
         )
 
-        @port = gateway.open(@host, @port)
+        @port = @gateway.open(@host, @port)
         @host = '127.0.0.1'
       end
     end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/lib/xlogin.rb

@@ -9,8 +9,8 @@ module Xlogin
   DEFAULT_TEMPLATE_DIR   = File.join(ENV['HOME'], '.xlogin.d')
   BUILTIN_TEMPLATE_FILES = Dir.glob(File.join(File.dirname(__FILE__), 'xlogin', 'templates', '*.rb'))
 
-  class SessionNotFound    < StandardError; end
-  class TemplateNotFound   < StandardError; end
+  class SessionError       < StandardError; end
+  class TemplateError      < StandardError; end
   class AuthorizationError < StandardError; end
 
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: rancid clogin alternative