xlogin 0.12.11 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 072e11f01422b9a33d8d41fbd1af71fe322783ef00b920d22cdb5b13b048d610
-  data.tar.gz: da9263bd37c56de30b903e83ceee3ca95c0105c5467e376d055114d25eb70c5e
+  metadata.gz: f6a3054375bed554e54f7d09096df9a5d0bf6e1e614db1b90ddec6c6091ee184
+  data.tar.gz: d5a2f79a8c1a2e233c267af0ba7c2b469125f88a3e011467251c8198d8990310
 SHA512:
-  metadata.gz: 01ce8239c84dddbc92f722c7b12bbd1a9bf412467bf7b9e93a6fcf15cd8df2814ea778a3a51e1dcee3f83d1bc51524e81a13308a49a90b65ce3a8b91587122c6
-  data.tar.gz: 0f40a544dcc8194abbd7896d7b5c39319907b65c501d9f3addf44d2486770c1fce4e93e642074799bade06d7e92943e9c65040933fc69bebbb064e4d4719e554
+  metadata.gz: '04915fd0733db1d164a83fab63745aef560c75a3d1d5739765f2933af75a3f3cd336e35e99ad589a51a9f5bc15d738e651878c36737e3598f40150db6caefef3'
+  data.tar.gz: 2739edd7f265bd8fc12a50ca04fca9bcd80788a75ba54484907c887e1c2b60e068b9b9f2e44f2b31f54566398ba3274b107781b888db90748752b29e2e3ee0e3

data/lib/xlogin.rb

@@ -1,20 +1,21 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'net/http'
+require 'ostruct'
 require 'xlogin/factory'
 require 'xlogin/version'
 
 module Xlogin
 
-  class SessionError       < StandardError; end
-  class TemplateError      < StandardError; end
-
-  class << self
-
-    def factory
-      @factory ||= Xlogin::Factory.instance
+  class Error < StandardError; end
+  class Settings < OpenStruct
+    def initialize(*args, &block)
+      super(*args, &block)
+      freeze
     end
+  end
 
+  class << self
     def list(*patterns)
       factory.list_inventory(*patterns)
     end
@@ -27,12 +28,14 @@ module Xlogin
       session = case args
                 when Hash   then factory.build(**args.merge(**opts))
                 when String then factory.build_from_hostname(args, **opts)
-                else return
+                else
+                  raise SessionError.new("Invalid argument: '#{args}'")
                 end
 
       return session unless block
       begin block.call(session) ensure session.close end
     end
+    alias_method :create, :get
 
     def get_pool(args, **opts, &block)
       pool = factory.build_pool(args, **opts)
@@ -40,13 +43,15 @@ module Xlogin
       return pool unless block
       block.call(pool)
     end
+    alias_method :create_pool, :get_pool
 
     def configure(&block)
       instance_eval(&block)
     end
 
-    def assume_yes?
-      @assume_yes == true
+    def settings
+      @settings ||= {}
+      Settings.new(@settings)
     end
 
     def generate_templates(dir)
@@ -56,54 +61,50 @@ module Xlogin
     end
 
     private
-    def assume_yes(boolean = true, &block)
-      @assume_yes = boolean == true || (block && block.call == true)
+    def factory
+      @factory ||= Xlogin::Factory.instance
     end
 
-    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
+    def set(**opts)
+      @settings ||= {}
+      opts.each do |key, val|
+        val = val.call if val.kind_of?(Proc)
+        @settings.update(key.to_sym => val)
       end
+    end
 
-      factory.instance_eval(&block)
+    def source(*sources, &block)
+      return factory.instance_eval(&block) if block
+
+      sources.each do |path|
+        raise Xlogin::Error.new("Inventory file not found: #{path}") unless File.exist?(path)
+        factory.instance_eval(IO.read(path), path)
+      end
     end
 
     def template(*templates, **opts, &block)
-      unless block
-        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
+      return factory.set_template(templates.shift, &block) if block && templates.size == 1
+
+      templates.each do |template|
+        return template_url(template, **opts) if template =~ URI.regexp(['http', 'https'])
+        raise Xlogin::Error.new("Template file or directory not found: #{template}") unless File.exist?(template)
+
+        paths = [template] if File.file?(template)
+        paths = Dir.glob(File.join(template, '*.rb')) if File.directory?(template)
+        paths.each do |path|
+          name = opts[:type] || File.basename(path, '.rb').scan(/\w+/).join('_')
+          factory.set_template(name, IO.read(path))
         end
       end
-
-      name = opts[:type] || templates.first
-      raise ArgumentError.new('Missing template name') unless name
-      factory.set_template(name, &block)
     end
 
     def template_url(*template_urls, **opts)
-      template_urls.compact.each do |url|
-        uri = URI(url.to_s)
+      template_urls.each do |url|
+        uri  = URI(url.to_s)
         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)
-          text = Net::HTTP.get(uri)
-        end
-        factory.set_template(name, text)
+        factory.set_template(name, Net::HTTP.get(uri))
       end
     end
-
   end
 
 end

data/lib/xlogin/cli.rb

@@ -1,9 +1,7 @@
 #! /usr/bin/env ruby
 
 require 'optparse'
-require 'ostruct'
 require 'parallel'
-require 'readline'
 require 'stringio'
 
 module Xlogin
@@ -13,112 +11,91 @@ module Xlogin
     DEFAULT_TEMPLATE_DIR   = File.join(ENV['HOME'], '.xlogin.d')
 
     def self.run(args = ARGV)
-      config = getopts(args)
-      client = Xlogin::CLI.new
-      client.method(config.task.first).call(config)
-    end
-
-    def self.getopts(args)
-      config = OpenStruct.new(
-        jobs: 1,
-        task: [:tty, nil],
-        assume_yes:   false,
-        inventory:    DEFAULT_INVENTORY_FILE,
-        template_dir: DEFAULT_TEMPLATE_DIR,
-      )
-
-      parser = OptionParser.new
-      parser.banner  = "#{File.basename($0)} HOST_PATTERN [Options]"
-      parser.version = Xlogin::VERSION
-
-      parser.on('-i PATH',        '--inventory',    String, 'The PATH to the inventory file (default: $HOME/.xloginrc).') { |v| config.inventory    = v }
-      parser.on('-T PATH',        '--template',     String, 'The PATH to the template dir (default: $HOME/.xlogin.d).')   { |v| config.template_dir = v }
-      parser.on('-L [DIRECTORY]', '--log-dir',      String, 'The PATH to the log dir (default: $PWD).')                   { |v| config.logdir = v || '.' }
-
-      parser.on('-l', '--list', TrueClass, 'List the inventory.')     { |v| config.task = [:list, nil] }
-      parser.on('-t', '--tty',  TrueClass, 'Allocate a pseudo-tty.')  { |v| config.task = [:tty,  nil] }
-      parser.on('-e COMMAND', '--exec', 'Execute commands and quit.') { |v| config.task = [:exec, v] }
-
-      parser.on('-j NUM', '--jobs', Integer, 'The NUM of jobs to execute in parallel(default: 1).') { |v| config.jobs = v }
-      parser.on('-E',     '--enable',     TrueClass, 'Try to gain enable priviledge.')              { |v| config.enable = v }
-      parser.on('-y',     '--assume-yes', TrueClass, 'Automatically answer yes to prompts.')        { |v| config.assume_yes = v }
-
-      parser.parse!(args)
-      Xlogin.configure do
-        assume_yes(true)
-        source(File.expand_path(config.inventory, ENV['PWD']))
-        template(File.expand_path(config.template_dir, ENV['PWD']))
-      end
-
-      config.hosts = Xlogin.list(*args)
-      raise "No host found: `#{args.join(', ')}`" if config.hosts.empty?
-
-      return config
-    rescue => e
-      $stderr.puts e, '', parser
-      exit 1
+      Xlogin::CLI.new.run(args)
     end
 
     def list(config)
-      $stdout.puts config.hosts.map { |e| e[:name] }.sort.uniq
+      $stdout.puts Xlogin.list(*config[:pattern]).map { |e| e[:name] }.sort.uniq
     end
 
     def tty(config)
-      Signal.trap(:INT) { exit 0 }
-
-      config.hosts.each do |hostinfo|
-        unless config.hosts.size == 1
-          case resp = Readline.readline(">> #{hostinfo[:name]}(Y/n)? ", false).strip
-          when /^y(es)?$/i, ''
-          when /^n(o)?$/i then next
-          else redo
-          end
-        end
-
-        $stdout.puts "Trying #{hostinfo[:name]}...", "Escape character is '^]'."
-        tty_config = OpenStruct.new(config.to_h.merge(jobs: 1, hosts: [hostinfo]))
+      info = Xlogin.list(*config[:pattern]).first
+      $stdout.puts "Trying #{info[:name]}...", "Escape character is '^]'."
 
-        session, _ = exec(tty_config)
-        session.interact!
-      end
+      session, _ = exec(config.merge(jobs: 1))
+      session.interact!
     end
 
     def exec(config)
       Signal.trap(:INT) { exit 0 }
 
-      max_width = config.hosts.map { |e| e[:name].length }.max
-      Parallel.map(config.hosts, in_threads: config.jobs) do |hostinfo|
+      jobs  = config[:jobs] || 1
+      hosts = Xlogin.list(*config[:pattern])
+      width = hosts.map { |e| e[:name].length }.max
+
+      Parallel.map(hosts, in_threads: jobs) do |info|
+        buffer  = StringIO.new
+        prefix  = "#{info[:name].to_s.ljust(width)} |"
         session = nil
-        error   = nil
 
         begin
-          buffer   = StringIO.new
-
           loggers  = []
-          loggers << ((config.jobs > 1)? buffer : $stdout)
-          loggers << File.expand_path(File.join(config.logdir, "#{hostinfo[:name]}.log"), ENV['PWD']) if config.logdir
+          loggers << ((jobs > 1)? buffer : $stdout)
+          loggers << File.expand_path(File.join(config[:log_dir], "#{info[:name]}.log"), ENV['PWD']) if config[:log_dir]
 
-          session = Xlogin.get(hostinfo.merge(log: loggers))
-          session.enable(hostinfo[:enable]) if config.enable && hostinfo[:enable]
+          session = Xlogin.get(info.merge(log: loggers))
+          session.enable(info[:enable]) if config[:enable] && info[:enable]
 
-          command_lines = ['', *config.task.last.to_s.split(';').map(&:strip)]
+          command_lines = ['', *config[:exec].to_s.split(';').map(&:strip)]
           command_lines.each { |line| session.cmd(line) }
-        rescue => err
-          error = err
-        end
 
-        if config.jobs > 1
-          prefix = "#{hostinfo[:name].to_s.ljust(max_width)} |"
-          output = buffer.string.lines.map { |line| prefix + line.chomp.gsub("\r", '') + "\n" }.join
-          $stdout.print output
-          $stderr.print prefix + "[Error] #{error}\n" if error
-        else
-          $stderr.print "[Error] #{error}\n" if error
+          buffer.string.lines.each { |line| $stdout.print prefix + line.gsub("\r", '') } if jobs > 1
+        rescue => e
+          buffer.string.lines.each { |line| $stdout.print prefix + line.gsub("\r", '') } if jobs > 1
+          raise e
         end
 
         session
       end
     end
 
+    def run(args)
+      config = Hash.new
+      config[:runner]    = self.method(:tty)
+      config[:inventory] = DEFAULT_INVENTORY_FILE
+      config[:templates] = DEFAULT_TEMPLATE_DIR
+
+      parser = OptionParser.new
+      parser.banner  = "#{File.basename($0)} HOST_PATTERN [Options]"
+      parser.version = Xlogin::VERSION
+
+      parser.on('-i PATH',        '--inventory',    String, 'The PATH to the inventory file (default: $HOME/.xloginrc).')
+      parser.on('-T PATH',        '--template',     String, 'The PATH to the template dir (default: $HOME/.xlogin.d).')
+      parser.on('-L [DIRECTORY]', '--log-dir',      String, 'The PATH to the log dir (default: $PWD).') { |v| v || '.' }
+
+      parser.on('-t', '--tty',  TrueClass, 'Allocate a pseudo-tty.')  { |v| config[:runner] = self.method(:tty) }
+      parser.on('-l', '--list', TrueClass, 'List the inventory.')     { |v| config[:runner] = self.method(:list) }
+      parser.on('-e COMMAND', '--exec', 'Execute commands and quit.') { |v| config[:runner] = self.method(:exec); v }
+
+      parser.on('-j NUM', '--jobs', Integer, 'The NUM of jobs to execute in parallel(default: 1).')
+      parser.on('-E',     '--enable',     TrueClass, 'Try to gain enable priviledge.')
+      parser.on('-y',     '--assume-yes', TrueClass, 'Automatically answer yes to prompts.')
+
+      parser.parse!(args, into: config)
+      config[:pattern] = args
+
+      Xlogin.configure do
+        set      assume_yes: true if config[:assume_yes]
+        source   File.expand_path(config[:inventory], ENV['PWD'])
+        template File.expand_path(config[:templates], ENV['PWD'])
+      end
+      raise "No host found: `#{args.join(', ')}`" if Xlogin.list(*config[:pattern]).empty?
+
+      config[:runner].call(config)
+    rescue => e
+      $stderr.puts e, '', parser
+      exit 1
+    end
+
   end
 end

data/lib/xlogin/delegator.rb

@@ -15,7 +15,7 @@ module Xlogin
 
         login    = @methods.fetch(:login)
         delegate = @methods.fetch(:delegate)
-        raise TemplateError.new("'login' and 'delegate' methods must be defined in the #{target_info[:type]} template.") unless login && delegate
+        raise Xlogin::Error.new("'login' and 'delegate' methods must be defined in the #{target_info[:type]} template.") unless login && delegate
 
         relay_uri = Addressable::URI.parse(uri.to_s)
         userinfo_cache = relay_uri.userinfo.dup

data/lib/xlogin/factory.rb

@@ -52,7 +52,7 @@ module Xlogin
 
     def build(type:, **opts)
       template = get_template(type)
-      raise TemplateError.new("Template not found: '#{type}'") unless template
+      raise Xlogin::Error.new("Template not found: '#{type}'") unless template
 
       template.build(uri(opts), **opts)
     end
@@ -63,19 +63,17 @@ module Xlogin
 
     def build_from_hostname(args, **opts)
       hostinfo = get_inventory(args)
-      raise SessionError.new("Host not found: '#{args}'") unless hostinfo
+      raise Xlogin::Error.new("Host not found: '#{args}'") unless hostinfo
 
       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]
+    def method_missing(method_name, *args, **opts, &block)
+      super unless args.size == 2 && 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
 
@@ -90,7 +88,7 @@ module Xlogin
 
       Addressable::URI.parse("#{scheme}://" + [userinfo, address].compact.join('@'))
     rescue
-      raise SessionError.new("Invalid target - '#{opts}'")
+      raise Xlogin::Error.new("Invalid target - '#{opts}'")
     end
 
   end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.12.11"
+	VERSION = "0.13.1"
 end

data/xlogin.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.4.1"
 
   spec.add_dependency "net-telnet"
   spec.add_dependency "net-ssh"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.12.11
+  version: 0.13.1
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="