xlogin 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac8f3ae4ad7a17da2c37a40f5c6e0a32545501be
-  data.tar.gz: 88dc898abf314811283b50ee0d6b8d62dc31c641
+  metadata.gz: 236da0f51f5506ec90714afb37232998575b0fe0
+  data.tar.gz: 3907742fb721d176716f845f1575f09edae86f73
 SHA512:
-  metadata.gz: 7813c69c44723ef01af12d89f8b2970aca9a4215676fd30adcb7bd304d5e13a7c175c714e821e08d51d7fb88b487a5ffcf95095c94507b0f2360a0a6d56ff671
-  data.tar.gz: 00fa87b310643a1de8986586bc5889ad75caeaf8065d226996a41721a58ef81953a2310c7bae37bf3c765ce2a5b8331ed194a453958d8402dc2ce8fbf326b735
+  metadata.gz: 143ba3dd1a9f1f9a8dc2d9a8d9fe5121a1d8421d22117b56c6e3a83ed283aa55e80cf91a3f2c02785e8b1ca281bf183e2627a90b4d5ea99f7466ff278b14aa5b
+  data.tar.gz: 1193fa2db3d0876788e33856d59b4f74cba71400de2d5f479a476ce6453e5226081158a53204f5ff5d4888dcef2ff67113f28c747e63d0f67097263ff1799f20

data/bin/xlogin

@@ -39,8 +39,7 @@ module Xlogin
       end
 
       if options[:list]
-        factory = FirmwareFactory.new
-        puts factory.list.map { |e| "#{e[:name]}\t#{e[:type]}" }
+        puts Xlogin.factory.list.map { |e| "#{e[:name]}\t#{e[:type]}" }
         exit 0
       end
 

data/lib/xlogin/delegator.rb

@@ -8,8 +8,8 @@ module Xlogin
         uri = URI(uri.to_s)
 
         if hostname = opts.delete(:delegate)
-          target = FirmwareFactory.new.get(hostname)
-          target_os  = FirmwareFactory[target[:type]]
+          target = Xlogin.factory.get(hostname)
+          target_os  = Xlogin.factory.template_for(target[:type])
           target_uri = URI(target[:uri])
 
           login    = @methods.delete(:login)

data/lib/xlogin/firmware_factory.rb

@@ -1,42 +1,28 @@
 require 'uri'
+require 'singleton'
 require 'stringio'
 require 'xlogin/firmware'
 
 module Xlogin
   class FirmwareFactory
 
-    class << self
-      def [](name)
-        firmwares[name.to_s.downcase]
-      end
-
-      def register(name, firmware)
-        firmwares[name.to_s.downcase] = firmware
-      end
-
-      def register_file(file)
-        require file if file =~ /.rb$/
-      end
-
-      def register_dir(dir)
-        Dir.entries(dir).each do |file|
-          register_file(File.join(dir, file))
-        end
-      end
-
-      private
-      def firmwares
-        @firmwares ||= Hash.new
-      end
-    end
+    include Singleton
 
     def initialize
-      @database = Hash.new
+      @database  = Hash.new
+      @templates = Hash.new
+    end
+
+    def register_template_file(file)
+      require file if file =~ /.rb$/
+    end
+
+    def register_template(name, template)
+      @templates[name.to_s.downcase] = template
+    end
 
-      SourceDir.compact.each do |dir|
-        source(File.join(dir, '.xloginrc'))
-        source(File.join(dir, '_xloginrc'))
-      end
+    def template_for(name)
+      @templates[name.to_s.downcase]
     end
 
     def source(db_file)
@@ -51,7 +37,6 @@ module Xlogin
     end
 
     def set(**opts)
-      opts[:type] = opts[:type].to_s
       @database[opts[:name]] = opts
     end
 
@@ -61,14 +46,13 @@ module Xlogin
 
     def build(args)
       uri  = args.delete(:uri)
-      type = args.delete(:type).to_s
+      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
 
-      firmware = Xlogin::FirmwareFactory[type].dup
-      session  = firmware.run(uri, opts)
-      session.name = name
+      session = template_for(type).dup.run(uri, opts)
+      session.name = name if name
       session
     end
 
@@ -80,10 +64,9 @@ module Xlogin
     end
 
     def method_missing(name, *args, &block)
-      firmware = Xlogin::FirmwareFactory[name]
-      super unless firmware && args.size >= 2
+      super unless template_for(name) && args.size >= 2
 
-      type = name
+      type = name.to_s.downcase
       name = args.shift
       uri  = args.shift
       opts = args.shift || {}

data/lib/xlogin/queue.rb

@@ -16,9 +16,8 @@ module Xlogin
       @args  = args
       @mutex = Mutex.new
 
-      hostinfo = Xlogin::FirmwareFactory.new.get(hostname)
-      if hostinfo
-        firmware = Xlogin::FirmwareFactory[hostinfo[:type]]
+      if hostinfo = Xlogin.factory.get(hostname)
+        firmware = Xlogin.factory.template_for(hostinfo[:type])
         @timeout = firmware.timeout
       end
 

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/lib/xlogin.rb

@@ -7,35 +7,52 @@ require 'xlogin/version'
 
 module Xlogin
 
+  ## where firmware templates locate.
+  TemplateDir = File.join(File.dirname(__FILE__), 'xlogin', 'firmwares')
 
-  SourceDir = [
+  ## where instance parameter definitions locate.
+  SourceDirs  = [
     File.join(File.dirname(__FILE__), 'xlogin'),
-    ENV['HOME'],
-    ENV['XLOGIN_HOME'],
+    ENV['HOME'], ENV['XLOGIN_HOME'],
     Dir.pwd
   ]
 
   class GeneralError < StandardError; end
 
   class << self
+    def factory
+      unless @factory
+        @factory = Xlogin::FirmwareFactory.instance
+
+        Dir.entries(TemplateDir).each do |file|
+          @factory.register_template_file(File.join(TemplateDir, file))
+        end
+
+        SourceDirs.compact.uniq.each do |dir|
+          @factory.source(File.join(dir, '.xloginrc'))
+          @factory.source(File.join(dir, '_xloginrc'))
+        end
+      end
+
+      @factory
+    end
+
     def configure(name)
-      name = name.to_s
-      firmware = Xlogin::FirmwareFactory[name] || Xlogin::Firmware.new
-      yield firmware if block_given?
+      template = factory.template_for(name) || Xlogin::Firmware.new
+      yield template if block_given?
 
-      Xlogin::FirmwareFactory.register(name, firmware)
+      factory.register_template(name, template)
     end
 
     def alias(new_name, original_name)
-      firmware = Xlogin::FirmwareFactory[original_name]
-      raise Xlogin::GeneralError.new("'#{original_name}' not found") unless firmware
+      template = factory.template_for(original_name)
+      raise Xlogin::GeneralError.new("'#{original_name}' not found") unless template
 
-      Xlogin::FirmwareFactory.register(new_name, firmware)
+      factory.register_template(new_name, template)
     end
 
     def get(hostname, args = {})
-      @factory ||= Xlogin::FirmwareFactory.new
-      session = @factory.build_from_hostname(hostname, args)
+      session = factory.build_from_hostname(hostname, args)
 
       if block_given?
         begin yield session ensure session.close end
@@ -43,10 +60,6 @@ module Xlogin
         session
       end
     end
-
   end
 
-  Directory = File.join(File.dirname(__FILE__), 'xlogin', 'firmwares')
-  Xlogin::FirmwareFactory.register_dir(Directory)
-
 end

metadata

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