xlogin 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36970bb1e8aa8b5964f5f6816def6f9c7f022e29
-  data.tar.gz: 43247a1af547984234d5a27e3cd5376545a6b609
+  metadata.gz: e7279f5af85472ff7036bae0371989769c7b59af
+  data.tar.gz: 7a462b1f5df61cb32dec19548cdc0cf205a183d3
 SHA512:
-  metadata.gz: 93a538d2bb67c8602e042580f41c3593c3f2cd81b2b1ee57e94d4fbfb0a51326e5e25e5efb202eed8e9c593eb794081ebccc80a08098f05f28bfc4bf24ab18c8
-  data.tar.gz: fd43f1cc39141d0707c056ed6f9d3e1d47d3bac58e7330114f5d3188201b0fbdd9853403101dee4b82f1c53bdb98b26448e55850da10687b5fa5dd3e4f8ea93c
+  metadata.gz: b3880819e38e42ff5213d36b020f86f84e991bc027bef87ae89d98c279101fba03a3586ba6de923b488c6cb243909f6ed6b9e528474a026a941a553fb0cd1c89
+  data.tar.gz: bb354168a5ba42ded1ba9ae6dffedf4fbf2f48df67e1def6dfae35d9b29111985faf65eaedab8e9e95b8357d3bcdd61765e80d320bc9bcd6d56912b2adcd036b

data/.gitignore

@@ -56,5 +56,5 @@ build-iPhoneSimulator/
 # End of https://www.gitignore.io/api/ruby
 /lib/xlogin/.xloginrc
 /lib/xlogin/_xloginrc
-/lib/xlogin/firmwares/*
-!/lib/xlogin/firmwares/vyos.rb
+/lib/xlogin/firmware_templates/*
+!/lib/xlogin/firmware_templates/vyos.rb

data/lib/xlogin/delegator.rb

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

data/lib/xlogin/firmware_factory.rb

@@ -13,16 +13,20 @@ module Xlogin
       @templates = Hash.new
     end
 
-    def register_template_file(file)
+    def load_template_file(file)
       require file if file =~ /.rb$/
     end
 
-    def register_template(name, template)
+    def get_template(name)
+      @templates[name.to_s.downcase]
+    end
+
+    def set_template(name, template)
       @templates[name.to_s.downcase] = template
     end
 
-    def template_for(name)
-      @templates[name.to_s.downcase]
+    def list_templates
+      @templates.keys
     end
 
     def source(db_file)
@@ -51,7 +55,7 @@ module Xlogin
       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
 
-      session = template_for(type).dup.run(uri, opts)
+      session = get_template(type).dup.run(uri, opts)
       session.name = name if name
       session
     end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/xlogin.rb

@@ -7,12 +7,12 @@ require 'xlogin/version'
 module Xlogin
 
   ## where firmware templates locate.
-  TemplateDir = File.join(File.dirname(__FILE__), 'xlogin', 'firmwares')
+  template_dir = File.join(File.dirname(__FILE__), 'xlogin', 'firmware_templates')
 
   ## where instance parameter definitions locate.
-  SourceDirs  = [
-    File.join(File.dirname(__FILE__), 'xlogin'),
-    ENV['HOME'], ENV['XLOGIN_HOME'],
+  source_dirs  = [
+    ENV['HOME'],
+    ENV['XLOGIN_HOME'],
     Dir.pwd
   ]
 
@@ -23,11 +23,11 @@ module Xlogin
       unless @factory
         @factory = Xlogin::FirmwareFactory.instance
 
-        Dir.entries(TemplateDir).each do |file|
-          @factory.register_template_file(File.join(TemplateDir, file))
+        Dir.entries(template_dir).each do |file|
+          @factory.load_template_file(File.join(TemplateDir, file))
         end
 
-        SourceDirs.compact.uniq.each do |dir|
+        source_dirs.compact.uniq.each do |dir|
           @factory.source(File.join(dir, '.xloginrc'))
           @factory.source(File.join(dir, '_xloginrc'))
         end
@@ -37,17 +37,17 @@ module Xlogin
     end
 
     def configure(name)
-      template = factory.template_for(name) || Xlogin::Firmware.new
+      template = factory.get_template(name) || Xlogin::Firmware.new
       yield template if block_given?
 
-      factory.register_template(name, template)
+      factory.set_template(name, template)
     end
 
     def alias(new_name, original_name)
-      template = factory.template_for(original_name)
+      template = factory.get_template(original_name)
       raise Xlogin::GeneralError.new("'#{original_name}' not found") unless template
 
-      factory.register_template(new_name, template)
+      factory.set_template(new_name, template)
     end
 
     def get(hostname, args = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,7 @@ files:
 - lib/xlogin/delegator.rb
 - lib/xlogin/firmware.rb
 - lib/xlogin/firmware_factory.rb
-- lib/xlogin/firmwares/vyos.rb
+- lib/xlogin/firmware_templates/vyos.rb
 - lib/xlogin/gateway.rb
 - lib/xlogin/rake_task.rb
 - lib/xlogin/rspec.rb