xlogin 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07769f0169bc78d592d032d9e1fead22b33f486a
-  data.tar.gz: 701a5526bd5592fc5018970a4854c75e9f100333
+  metadata.gz: 0a2e4e26466fe9c3ce6fca2152b24a356e1d0e86
+  data.tar.gz: a0586274542123fc2ec8b432fd4a71b9db291cae
 SHA512:
-  metadata.gz: 867923f469e68e5ddaf5dd7b657f0331094cedccbc1040d452d83ea96da7aef1b643916d543f1ae68a71e825ad390e1d27d559b281be1d1579f23d94dd418516
-  data.tar.gz: ff5c63bca0182e256274611bcb62d026c9a41b997d4157ad98bbe0eba75a24857b621dc749aac9bb4b6c75797e95fa8eb5ed644640c1bb074587a0ab807ea577
+  metadata.gz: cc78f90a059c0b534b7b6421eb7962dc432bcef3e41fd1a56eb0df1eda82d14536e835302725665fa53ecd9e887e1edb8cc7f5a3ef3f4f67bbaa9dfae28b46d8
+  data.tar.gz: 67340955759b4992f15b9b37c91359f517f0963423abb64855062faec59fbae0329745e6acc31302ebae3c93558f6a4f6c112696e81413a90d0aa926c44dbded

data/lib/xlogin/factory.rb

@@ -12,13 +12,11 @@ module Xlogin
       @group     = nil
     end
 
-    def source(file)
-      file = File.expand_path(file)
-      instance_eval(IO.read(file)) if File.exist?(file)
-    end
-
-    def get(name)
-      @database[name]
+    def source(*files)
+      files.each do |file|
+        file = File.expand_path(file)
+        instance_eval(IO.read(file)) if File.exist?(file)
+      end
     end
 
     def set(**params)
@@ -26,28 +24,36 @@ module Xlogin
       @database[name] = params if name
     end
 
+    def get(name)
+      @database[name]
+    end
+
     def list(name = nil)
       keys = @database.keys
       keys = keys.select { |key| key =~ /^#{name}(:|$)/ } unless name.nil? || name.to_s == 'all'
       @database.values_at(*keys)
     end
 
-    def get_template(name)
-      @templates[name.to_s.downcase] ||= Xlogin::Template.new
-    end
-
-    def set_template(*files)
+    def source_template(*files)
       files.each do |file|
         file = File.expand_path(file)
-        next unless File.exist?(file) && file =~ /.rb$/
-
         name = File.basename(file, '.rb').scan(/\w+/).join('_')
-        template = get_template(name)
-        template.instance_eval(IO.read(file))
-        @templates[name.to_s.downcase] = template
+        next unless File.exist?(file)
+
+        set_template(name, IO.read(file))
       end
     end
 
+    def set_template(name, text)
+      template = get_template(name)
+      template.instance_eval(text)
+      @templates[name.to_s.downcase] = template
+    end
+
+    def get_template(name)
+      @templates[name.to_s.downcase] ||= Xlogin::Template.new
+    end
+
     def list_templates
       @templates.keys
     end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/xlogin.rb

@@ -56,7 +56,7 @@ module Xlogin
     end
 
     def template(*template_files)
-      factory.set_template(*template_files)
+      factory.source_template(*template_files)
     end
 
     def template_dir(*template_dirs)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - haccht