xlogin 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3f7355fe67c656f25da151d83442fbe6cdc9c2ae442e10550191230653991da
-  data.tar.gz: b46b07acfdaea0ccbc0bff01dd27518ab4fdd1cd227a8654eb5be878b79ffe9f
+  metadata.gz: f7bce41012494be0a8efad4624674f5677a0830b7d3ebff88df664a2cbe5131e
+  data.tar.gz: 4f08a126e596f227ae6ff97361995ef48e3a588f2cf13746979cddf379851f32
 SHA512:
-  metadata.gz: 6bfa4af5ffa2bdd7a56e751b0add6be766f481840b17a91779b7ade1b546745a1c46492c73ca63a5f3a83ef2a3a859aff4963480b0a2cdcf162ca1172211bcf4
-  data.tar.gz: 3ce180fa56f5599937b52176366cac3a449c1d2a6cbc078861b3f7a8e8a3c1cc2f79738bd8d3a5a141121af707691127360b6efe3fb86ea3523d895a94be60fd
+  metadata.gz: 848c4161be59adabd9931374d26deec1e67efa9a0be44c50f58237c96c7c84857987213ea5c34ded3ca683e971dbdfa3e2bb68dd83e243286aac612c15833068
+  data.tar.gz: ab6627e2a78435ee709d19e8cb230ac9b3645da9fe991cbc879667e62355985efdbaf63a544afa9318ce12733b11c9ac5b58a372a113c1888386c0e9ddbb9ffa

data/lib/xlogin.rb

@@ -20,6 +20,10 @@ module Xlogin
       factory.list_inventory(*patterns)
     end
 
+    def find(*patterns)
+      list(*patterns).first
+    end
+
     def get(args, **opts, &block)
       session = case args
                 when Hash   then factory.build(**args.merge(**opts))
@@ -57,32 +61,41 @@ module Xlogin
       @authorized = boolean == true || (block && block.call == true)
     end
 
-    def source(*source_files, &block)
-      return source_file(*source_files) unless block
-      factory.instance_eval(&block) if source_files.empty?
-    end
-
-    def source_file(*source_files)
-      source_files.compact.each do |file|
-        raise SessionError.new("Inventory file not found: #{file}") unless File.exist?(file)
-        factory.instance_eval(IO.read(file), file) if File.exist?(file)
+    def source(*sources, &block)
+      unless block
+        return sources.each do |path|
+          raise SessionError.new("Inventory file not found: #{path}") unless File.exist?(path)
+          factory.instance_eval(IO.read(path), path)
+        end
       end
+
+      factory.instance_eval(&block)
     end
 
-    def template(name, *args, &block)
+    def template(*templates, **opts, &block)
       unless block
-        return template_url(name, *args) if name =~ URI.regexp(['http', 'https'])
-        return template_dir(name, *args)
+        templates.each do |template|
+          return template_url(template, **opts) if template =~ URI.regexp(['http', 'https'])
+          raise TemplateError.new("Template file or directory not found: #{template}") unless File.exist?(template)
+
+          files = [template] if File.file?(template)
+          files = Dir.glob(File.join(template, '*.rb')) if File.directory?(template)
+          files.each do |file|
+            name = opts[:type] || File.basename(file, '.rb').scan(/\w+/).join('_')
+            factory.set_template(name, IO.read(file))
+          end
+        end
       end
 
-      raise ArgumentError.new('missing template name') unless name
+      name = opts[:type] || templates.first
+      raise ArgumentError.new('Missing template name') unless name
       factory.set_template(name, &block)
     end
 
-    def template_url(*template_urls)
+    def template_url(*template_urls, **opts)
       template_urls.compact.each do |url|
         uri = URI(url.to_s)
-        name = File.basename(uri.path, '.rb').scan(/\w+/).join('_')
+        name = opts[:type] || File.basename(uri.path, '.rb').scan(/\w+/).join('_')
         text = Net::HTTP.get(uri)
         if text =~ /\w+.rb$/
           uri.path = File.join(File.dirname(uri.path), text.lines.first.chomp)
@@ -92,19 +105,6 @@ module Xlogin
       end
     end
 
-    def template_file(*template_files)
-      template_files.compact.each do |file|
-        raise TemplateError.new("Template file not found: #{file}") unless File.exist?(file)
-        name = File.basename(file, '.rb').scan(/\w+/).join('_')
-        factory.set_template(name, IO.read(file))
-      end
-    end
-
-    def template_dir(*template_dirs)
-      files = template_dirs.flat_map { |dir| Dir.glob(File.join(dir, '*.rb')) }
-      template_file(*files)
-    end
-
   end
 
 end

data/lib/xlogin/cli.rb

@@ -47,7 +47,7 @@ module Xlogin
       Xlogin.configure do
         authorize(config.auth)
         source(File.expand_path(config.inventory, ENV['PWD']))
-        template_dir(File.expand_path(config.template_dir, ENV['PWD']))
+        template(File.expand_path(config.template_dir, ENV['PWD']))
       end
 
       config.hosts = Xlogin.list(*args)

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.12.2"
+	VERSION = "0.12.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet