xlogin 0.8.13 → 0.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e251188ed2cd4bf54eb0ce913589b90616028c
-  data.tar.gz: e97da63feb0cfb0c021d5a9a65429ec6ff10175c
+  metadata.gz: 8f0d2cc4b93c270d5703ca6327e6df0cfe6b5637
+  data.tar.gz: 4acb729d66575f83c0cd581b48aeb4c3043b5f9f
 SHA512:
-  metadata.gz: ebb68fec6f598de8e5464acf4d7939d309ba302f125fc3f809c8ffb2669acdb596907563bce762fdfdd44aa90f47cbdd7aa64ebb15dbcc7095da7a0cccf4dcdf
-  data.tar.gz: dc8d06e60ba16f5c488f8e70abc6ea49b65b31258213ca2c317d4daed4f7942f73bdc8ecee06436aae6ab9b329821d0959db58f3e62c8dafc7cd07018d87db40
+  metadata.gz: 20d3cfbb957515b28d2e7c25d3a46948077acaac0e0946eab1b06f846e37ed330d38c46b0cfb714166aaadad6ad0a66e58e41c392635ea915aeabe37c883d282
+  data.tar.gz: 129b8413b891cbca0f15e18b2f86a296964b80a68c0a6049c6c7cbb890582093e7440546221a4e0102fef153a86357a92a7239f90c438b9f18d759a3449dc2c8

data/lib/xlogin/cli.rb

@@ -75,9 +75,7 @@ module Xlogin
     end
 
     def list(config)
-      wid1 = config.hostlist.map { |e| e[:type].length }.max
-      wid2 = config.hostlist.map { |e| e[:name].length }.max
-      list = config.hostlist.map { |e| "#{e[:type].to_s.ljust(wid1)} #{e[:name].to_s.ljust(wid2)} #{e[:uri]}" }.sort
+      list = config.hostlist.map { |e| e[:name] }.uniq.sort
       $stdout.puts list
     end
 

data/lib/xlogin/factory.rb

@@ -14,7 +14,7 @@ module Xlogin
     def source(*files)
       files.compact.each do |file|
         raise SessionError.new("Inventory file not found: #{file}") unless File.exist?(file)
-        instance_eval(IO.read(file)) if File.exist?(file)
+        instance_eval(IO.read(file), file) if File.exist?(file)
       end
     end
 

data/lib/xlogin/template.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require 'addressable/uri'
 require 'xlogin/ssh'
 require 'xlogin/telnet'
 
@@ -41,7 +41,7 @@ module Xlogin
     end
 
     def build(uri, **opts)
-      uri   = URI(uri.to_s)
+      uri   = Addressable::URI.parse(uri.to_s)
       klass = Class.new(Xlogin.const_get(uri.scheme.capitalize))
       klass.class_exec(@methods) do |methods|
         methods.each do |name, block|

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.8.13"
+  VERSION = "0.8.14"
 end

data/xlogin.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "net-ssh-telnet"
   spec.add_dependency "net-ssh-gateway"
   spec.add_dependency "parallel"
+  spec.add_dependency "addressable"
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.8.14
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  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: bundler
   requirement: !ruby/object:Gem::Requirement