xlogin 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5cae10e317124a423c1aa86ebb0461645ecd54f
-  data.tar.gz: 9d69438c6cefdb260c2503abb4575d6afc057d17
+  metadata.gz: c814eeefd4b51ff2814b8884832929111d7ab66e
+  data.tar.gz: 0b426a3286f44ceeae1c4daa2d95d9a33e9091c4
 SHA512:
-  metadata.gz: d5686ebbb6036c35d71a7a10bedd63f3be198bc4bcfe2fa53e2c9680811f388cf1debcf04b68c15447dda45821b16c035b357310d221f90df850dfe131fe263c
-  data.tar.gz: 44abe1bda6ea08bba42613fd9f6fc7b016aff20d3b107c9e40db591b4e553184f2db71f9611aff79efe5c0b9faed0ad4b7486f3929f2a3cd7c87e6934761ac22
+  metadata.gz: 9f7960c129ab9e558cb5587dc102c599dc3d6f94f9c2c6a9ce307e57cc96ac76d217061f7618dfa3b85b8307452927f269b518d7a14f8866864c8dfeb5df5fe8
+  data.tar.gz: 52c75c2f293eef34aea1a0be6c3109cb0cb2bb3e075411eeb29130b00e53b0ef864f85847261a84620d8bf6d9faf8e8ded436550f29932e23fce70a70c911f3c

data/lib/xlogin.rb

@@ -8,25 +8,20 @@ module Xlogin
 
   class GeneralError < StandardError; end
 
-  # default template directory
-  TEMPLATE_DIR = File.join(File.dirname(__FILE__), 'xlogin', 'templates')
+  BUILDIN_TEMPLATES = Dir.glob(File.join(File.dirname(__FILE__), 'xlogin', 'templates', '*.rb'))
 
   class << self
     def factory
-      @factory ||= configure_factory
+      @factory ||= load_templates(*BUILDIN_TEMPLATES)
     end
 
-    def configure_factory(*template_dirs)
-      unless @factory
-        @factory = Xlogin::FirmwareFactory.instance
-
-        template_dirs = [TEMPLATE_DIR, File.join(Dir.pwd, 'templates'), *template_dirs]
-        template_dirs.compact.uniq.each do |dir|
-          next unless FileTest.directory?(dir)
-          @factory.load_template_file(*Dir.glob(File.join(dir, '*.rb')))
-        end
+    def load_templates(*template_files)
+      @loaded_template_files ||= []
+      Xlogin::FirmwareFactory.instance.tap do |factory|
+        files = template_files - @loaded_template_files
+        factory.load_template_file(*files)
+        @loaded_template_files += files
       end
-      @factory
     end
 
     def configure(name)

data/lib/xlogin/firmware_factory.rb

@@ -63,25 +63,23 @@ module Xlogin
     end
 
     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
-
+      type     = args.delete(:type)
       template = get_template(type)
       raise Xlogin::GeneralError.new("Template not defined: #{type}") unless template
 
+      uri  = args.delete(:uri)
+      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
+
       session = template.dup.run(uri, opts)
-      session.name = name if name
       session
     end
 
     def build_from_hostname(hostname, **args)
-      host = get(hostname)
-      raise Xlogin::GeneralError.new("Host not found: #{hostname}") unless host
+      hostinfo = get(hostname)
+      raise Xlogin::GeneralError.new("Host not found: #{hostname}") unless hostinfo
 
-      build(get(hostname).merge(args))
+      build(hostinfo.merge(args))
     end
 
     def method_missing(name, *args, &block)

data/lib/xlogin/session.rb

@@ -10,7 +10,8 @@ module Xlogin
 
     def configure_session(**opts)
       @opts     = opts.dup
-      @host     = @name = @opts[:host]
+      @host     = @opts[:host]
+      @name     = @opts[:name] || @host
       @port     = @opts[:port]
       @userinfo = @opts[:userinfo].to_s.split(':')
       raise Xlogin::GeneralError.new('Argument error.') unless @host && @port

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

metadata

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