xlogin 0.8.15 → 0.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf4e6280392c93a8aa86966e02e3a70f24f105a0
-  data.tar.gz: dbf16754da5837d19e13e0932cf0bc5c1d66c6df
+  metadata.gz: ada4bef520cb3929924a9de570480b28af0c5ec0
+  data.tar.gz: fc80ebec45b43cf0a752376b5981fed03b5f7eff
 SHA512:
-  metadata.gz: 0fffcf6ac36faddd71dee62e42a01e5a8db39f4562764b37b1abf44207fa0066f0a926c495ecd683d783852fe3266646a5c6f70a529ef9206b59ebb5466f2917
-  data.tar.gz: 1913cac1400e7945aaf941ad8060eb60961e1d1030f1d6bbafef3845ed421307e4fdbc04df4bdae6d56e68c32e0520b19988835726409be95b464739290e7004
+  metadata.gz: f61d0bfb77b7bd07943ca1eae1356a66d924ffadd35b85314eaec46f6e0708656220925c9f7553eab1fd3ce0024838fba36a30385663a27ea31ae1bf36dba2c5
+  data.tar.gz: a8d19a98a7329aee5f8fb2704059e46b773fd456ef15bfd529b8695a6e2e5f65cb8b49abc0c057f54680a2f7d3209abfb2073a207db677a565200918ee62a146

data/lib/xlogin.rb

@@ -56,18 +56,45 @@ module Xlogin
       @authorized = boolean == true || (block && block.call == true)
     end
 
+    def register(**args)
+      factory.set_info(**args)
+    end
+
     def source(*source_files)
-      factory.source(*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)
+      end
+    end
+
+    def template(name, *args, &block)
+      return template_dir(name, *args) unless block # for backward compatibility
+
+      raise ArgumentError.new('missing template name') unless name
+      factory.set_template(name, &block)
     end
 
-    def template(*template_dirs)
+    def template_dir(*template_dirs)
       files = template_dirs.flat_map { |dir| Dir.glob(File.join(dir, '*.rb')) }
-      load_templates(*files)
+      template_file(*files)
+    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)) if File.exist?(file)
+      end
     end
-    alias_method :template_dir, :template
 
-    def load_templates(*template_files)
-      factory.source_template(*template_files)
+    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
+      register(type: type, name: name, uri: uri, **opts)
     end
 
   end

data/lib/xlogin/cli.rb

@@ -61,14 +61,14 @@ module Xlogin
 
           authorize(config.authorize)
           source(File.expand_path(config.inventory, ENV['PWD']))
-          load_templates(*config.templates.map { |file| File.expand_path(file, ENV['PWD']) })
+          template_file(*config.templates.map { |file| File.expand_path(file, ENV['PWD']) })
         end
 
         config.hostlist  = Xlogin.list(*host.to_s.split(/\s+/))
         raise "No host found: `#{host}`" if config.hostlist.empty?
-      rescue => e
-        $stderr.puts e, '', parser
-        exit 1
+      #rescue => e
+      # $stderr.puts e, '', parser
+      # exit 1
       end
 
       config

data/lib/xlogin/factory.rb

@@ -11,13 +11,6 @@ module Xlogin
       @templates = Hash.new
     end
 
-    def source(*files)
-      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)
-      end
-    end
-
     def set_info(**opts)
       name = opts[:name]
       return unless name
@@ -39,17 +32,10 @@ module Xlogin
       values.reduce(&:&).uniq
     end
 
-    def source_template(*files)
-      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('_')
-        set_template(name, IO.read(file)) if File.exist?(file)
-      end
-    end
-
-    def set_template(name, text)
+    def set_template(name, text = nil, &block)
       template = get_template(name)
-      template.instance_eval(text)
+      template.instance_eval(text)   if text
+      template.instance_eval(&block) if block
       @templates[name.to_s.downcase] = template
     end
 
@@ -68,22 +54,10 @@ module Xlogin
 
     def build_from_hostname(hostname, **opts)
       hostinfo = get_info(hostname)
-      raise Xlogin::SessionError.new("Host not found: '#{hostname}'") unless hostinfo
+      raise SessionError.new("Host not found: '#{hostname}'") unless hostinfo
 
       build(hostinfo.merge(name: hostname, **opts))
     end
 
-    def method_missing(method_name, *args, &block)
-      super unless caller_locations.first.label == 'block in source' and args.size >= 2
-
-      type = method_name.to_s.downcase
-      name = args.shift
-      uri  = args.shift
-      opts = args.shift || {}
-
-      super if [type, name, uri].any? { |e| e.nil? }
-      set_info(type: type, name: name, uri: uri, **opts)
-    end
-
   end
 end

data/lib/xlogin/rake_task.rb

@@ -16,7 +16,7 @@ module Xlogin
         description = Rake.application.last_description
         task 'all' => hostnames unless opts[:bundle] == false
 
-        description = opts[:desc] if opts.key?(:desc)
+        description = opts[:desc]
         hostnames.each do |hostname|
           desc description
           RakeTask.new(hostname, &block)
@@ -32,6 +32,8 @@ module Xlogin
     attr_accessor :silent
     attr_accessor :fail_on_error
 
+    @@graceful_shutdown = false
+
     def initialize(name)
       @name     = name
       @taskname = [*Rake.application.current_scope.to_a.reverse, name].join(':')
@@ -65,12 +67,14 @@ module Xlogin
       if lock
         task(name => lock)
         file(lock) do
+          next if @@graceful_shutdown
           run_task
           mkdir_p(File.dirname(lock), verbose: Rake.application.options.trace)
           touch(lock, verbose: Rake.application.options.trace)
         end
       else
         task(name) do
+          next if @@graceful_shutdown
           run_task
         end
       end
@@ -92,7 +96,8 @@ module Xlogin
       rescue => e
         output($stderr, buffer.string) if !silent && Rake.application.options.always_multitask
         output($stderr, "[ERROR] Xlogin - #{e}\n")
-        raise e if fail_on_error
+
+        @@graceful_shutdown = true if fail_on_error
       end
     end
 

data/lib/xlogin/spec.rb

@@ -0,0 +1,52 @@
+module Xlogin
+
+  class ExpectationError < StandardError
+
+    def initialize(expect, actual)
+      super("Expected to match #{expect}")
+      @actual = actual
+    end
+
+    def full_message
+      "#{message},\nbut actually was:\n#{@actual}"
+    end
+
+  end
+
+  class Expectation
+
+    def initialize(session, *args)
+      @session = session
+      @args = args
+    end
+
+    def to_match(regexp)
+      return if match(regexp)
+      raise ExpectationError.new(@expect, @actual)
+    end
+
+    def not_to_match(regexp)
+      return unless match(regexp)
+      raise ExpectationError.new(@expect, @actual)
+    end
+
+    private
+    def match(regexp)
+      regexp  = Regexp.new(regexp.to_s) unless regexp.kind_of?(Regexp)
+      @expect = regexp.inspect
+
+      @actual || = @session.cmd(*@args)
+      @actual =~ regexp
+    end
+
+  end
+
+  module SessionModule
+
+    def expect(*args)
+      Expectation.new(self, *args)
+    end
+
+  end
+
+end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.8.15"
+  VERSION = "0.8.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.8.15
+  version: 0.8.18
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -148,6 +148,7 @@ files:
 - lib/xlogin/rake_task.rb
 - lib/xlogin/session.rb
 - lib/xlogin/session_pool.rb
+- lib/xlogin/spec.rb
 - lib/xlogin/ssh.rb
 - lib/xlogin/telnet.rb
 - lib/xlogin/template.rb