xlogin 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66ed84e83f0210fe7afb90cd49eb82e154c283a4
-  data.tar.gz: 4fe09e46fdfffbae74ea20c06052787422f4255b
+  metadata.gz: 11817df618eb661d0dc3e58f5674467709e0475c
+  data.tar.gz: 9a729fe08da4e9038b1a6ef62c13e176a4bc05dc
 SHA512:
-  metadata.gz: 8f94c7c38965d65bcb02d958d243d50b9dbe9c725b5309e2fe5e7176f2bcca260cb7d349e4f1033bc7b4254453b3c4b2ed60c5b535f8bdab0843d390d1e149f7
-  data.tar.gz: 6b28b13d079ed877dc88d3ff64b63576af85a5d13250a49373adb3f9593a487a22aad7cf5f719d0edf2ff41ff08118812d034db86797880aa45639285b07fac4
+  metadata.gz: 1dbe170e2ea3046890fd5ade698114ba18c6f6a861b67b19a6031ff610971c56e125c6c7ddd9fb4b518e82f3156b3eeff4d661847ba9d9a62849c3ea1020a30d
+  data.tar.gz: abaeeb95993ed797b2e61669d7fd9fb9596dea2de2444eebb8eb3902d9a9d4a3069d7b03cba3d21eb95e145adddc914ff174f9b2e77bad6de4a6494b7dad281b

data/lib/xlogin/firmware_factory.rb

@@ -51,27 +51,30 @@ module Xlogin
     end
 
     def set(type, name, uri, opts = {})
-      @database[name] = { name: name, type: type, uri: uri, opts: opts }
+      @database[name] = opts.merge(uri: uri, type: type, name: name)
     end
 
     def list
-      @database.map { |nodename, args| args.merge(name: nodename) }
+      @database.values
     end
 
-    def build(name, args = {})
-      item     = item.kind_of?(Hash) ? name : @database[name]
-      item_uri = item[:uri] if item
-      firmware = Xlogin::FirmwareFactory[item[:type]] if item
-      raise Xlogin::GeneralError.new("Hostname '#{name}' not found ") unless item && item_uri && firmware
+    def build(args)
+      uri  = args.delete(:uri)
+      type = args.delete(:type)
+      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
 
-      opts = item[:opts] || {}
-      opts = opts.merge(args).reduce({}) { |a, (k, v)| a.merge(k.to_s.downcase.to_sym => v) }
-
-      session = firmware.dup.run(item_uri, opts)
-      session.name = item[:name]
+      firmware = Xlogin::FirmwareFactory[type].dup
+      session  = firmware.run(uri, opts)
+      session.name = name
       session
     end
 
+    def build_from_hostname(hostname, **args)
+      build(get(hostname).merge(args))
+    end
+
     def method_missing(name, *args, &block)
       firmware = Xlogin::FirmwareFactory[name]
       super unless firmware && args.size >= 2

data/lib/xlogin/version.rb

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

data/lib/xlogin.rb

@@ -31,9 +31,9 @@ module Xlogin
       Xlogin::FirmwareFactory.register(new_name, firmware)
     end
 
-    def get(nodename, opts = {})
+    def get(hostname, args = {})
       @factory ||= Xlogin::FirmwareFactory.new
-      session = @factory.build(nodename, opts)
+      session = @factory.build_from_hostname(hostname, args)
 
       if block_given?
         begin yield session ensure session.close end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler