xlogin 0.11.4 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee087d494b733693bedb67a2c81daa6e0f25dd95557712898efd03bc5486dfd
-  data.tar.gz: 7efa71f1ef4e3a09964b986b77c334e44664586df26cf29f561a665340dbf9d1
+  metadata.gz: 65379601a175fd8c600a374e312c4a03bb5ffeba056bab55f4b68414319c3507
+  data.tar.gz: 70ee6c3eabc2bd6d982d0e583b3402156dad0651ae8c4932c7608b9b93af188f
 SHA512:
-  metadata.gz: 21443be5b7f07179fd92565c4d4092137dc4b7a650fac098f9077a3644ef2d5876362f7b7325564899b8f74acbf13d5b387ac8197dc553380949b3708dd2ccf4
-  data.tar.gz: 6dfce221c5e716d33b1c9b3fec9a9b1443b0d2e06f5e1b5dc71f64dadd373c6c2e32281d96bdca2ccee051e95bd8aa700d2daf695e0e4507b1120097885fbe3b
+  metadata.gz: 40e15b65f6890bd6721260fafaacc0194b7f737c5a0377ad7d08a59fcb068be90896db242d333f67eea9cb05d7f1e1319a741ee9f6243ac351b221b1123c6c3e
+  data.tar.gz: a3ada3ee5ff44393fec79e87da1746d09b608ac6428700a6bf4530f27e76107cc612e098a7b8c890c648e64a42b4f7445ca334acf907937fd1de4ef3a0955ae3

data/lib/xlogin.rb

@@ -58,13 +58,13 @@ module Xlogin
 
     def source(*source_files, &block)
       return source_file(*source_files) unless block
-      instance_eval(&block) unless source_files.empty?
+      factory.instance_eval(&block) unless 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)
-        instance_eval(IO.read(file), file) if File.exist?(file)
+        factory.instance_eval(IO.read(file), file) if File.exist?(file)
       end
     end
 
@@ -88,16 +88,6 @@ module Xlogin
       template_file(*files)
     end
 
-    def method_missing(method_name, *args, &block)
-      type = method_name.to_s.downcase
-      name = args[0]
-      uri  = args[1]
-      opts = args[2] || {}
-
-      super unless args.size == 2 || args.size == 3
-      factory.set_inventory(name, type: type, uri: uri, **opts)
-    end
-
   end
 
 end

data/lib/xlogin/factory.rb

@@ -76,6 +76,17 @@ module Xlogin
       build(hostinfo.merge(name: args, **opts))
     end
 
+    def method_missing(method_name, *args, &block)
+      super unless args.size == 2 || args.size == 3 && URI.regexp =~ args[1]
+
+      type = method_name.to_s.downcase
+      name = args[0]
+      uri  = args[1]
+      opts = args[2] || {}
+
+      set_inventory(name, type: type, uri: uri, **opts)
+    end
+
     private
     def uri(**opts)
       return Addressable::URI.parse(opts[:uri].strip) if opts.key?(:uri)

data/lib/xlogin/rake_task.rb

@@ -58,14 +58,12 @@ module Xlogin
       if lock
         task(name => lock)
         file(lock) do
-          next if @@graceful_shutdown
-          run_task
-          touch(lock, verbose: Rake.application.options.trace)
+          run_task unless @@graceful_shutdown
+          touch(lock, verbose: Rake.application.options.trace) unless @@graceful_shutdown
         end
       else
         task(name) do
-          next if @@graceful_shutdown
-          run_task
+          run_task unless @@graceful_shutdown
         end
       end
     end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.11.4"
+	VERSION = "0.11.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.6
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet