xlogin 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2be188c26cbf628e71b5eaf1cb10f7ddc3ffc334
-  data.tar.gz: fe373f5b3d3f7cc1693cb0ebd3bfe982987e9a67
+  metadata.gz: 9ac09545140fdb579f104d9d89a9680d36b50522
+  data.tar.gz: e27770786a5251da7e202f0112732c9ffa104db9
 SHA512:
-  metadata.gz: afe158fb986690afa66c0aecb5854f95049ad26b1d080b24b56343bb925844a83900cb47a30b65dac90eabacadc87bd66884bded360f8dbc87f33657ed09c978
-  data.tar.gz: 0c30870ce6e156a5bc7ab030945d3b62cee1acdd2d5a00bfedaf02cb4a6b8732b705f6b3a703a909b50f0cdc99a886a5b7156fdf4a581a1cc6e1d57ada1fc63a
+  metadata.gz: 0ab2b2221629cb99df6de1aa45d78758e18b5bce185de383c4a32ccdc67d9b0cab0d8927fc92c8cd4ffdd74c0fc0a7667ed2f3f1aab396b59c3edc81dd4f64e6
+  data.tar.gz: 909d257d6fde36ff54c28823e10ce6606386164c5284d362a6e2b899af3408093f756b12300b792f36a58cf1eccc131c2697c4ebf86f734f15ccbfad529109db

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xlogin (0.5.6)
+    xlogin (0.5.7)
       net-ssh
       net-ssh-gateway
       net-ssh-telnet

data/lib/xlogin/cli.rb

@@ -35,9 +35,9 @@ module Xlogin
       parser.on('-T DIRECTORY', '--template-dir', String, 'The DIRECTORY to the template files.') { |v| config.templates += Dir.glob(File.join(v, '*.rb')) }
       parser.on('-l [DIRECTORY]', '--log',        String, 'The DIRECTORY to the output log file (default: $PWD/log).') { |v| config.logdir = v || Dir.pwd }
 
-      parser.on('-p NUM', '--parallels', Integer,   'The NUM of the threads. (default: 5).') { |v| config.parallels = v }
-      parser.on('-e',     '--enable',    TrueClass, 'Try to gain enable priviledge.')        { |v| config.enable    = v }
-      parser.on('-y',     '--assumeyes', TrueClass, 'Always answer "yes" if confirmed.')     { |v| config.assumeyes = v }
+      parser.on('-p NUM', '--parallels',  Integer,   'The NUM of the threads. (default: 5).') { |v| config.parallels  = v }
+      parser.on('-e',     '--enable',     TrueClass, 'Try to gain enable priviledge.')        { |v| config.enable     = v }
+      parser.on('-y',     '--assume-yes', TrueClass, 'Always answer "yes" if confirmed.')     { |v| config.assume_yes = v }
       parser.on('-h',     '--help', 'Show this message.') { Xlogin::CLI.usage }
 
       self.class.module_eval do
@@ -54,6 +54,7 @@ module Xlogin
       Xlogin.init do
         source(config.inventory)
         template(*config.templates)
+        authorize(config.assume_yes)
       end
 
       factory = Xlogin::FirmwareFactory.instance
@@ -112,12 +113,12 @@ module Xlogin
     end
 
     private
-    def login(config)
-      display = Mutex.new
-      config.parallels = [config.parallels, config.hostlist.size].min
+    def login(config, &block)
       FileUtils.mkdir_p(config.logdir) if config.logdir
+      config.parallels = [config.parallels, config.hostlist.size].min
 
-      Parallel.each(config.hostlist, in_thread: config.parallels) do |host|
+      display  = Mutex.new
+      Parallel.map(config.hostlist, in_thread: config.parallels) do |host|
         begin
           hostname = host[:name]
           buffer   = StringIO.new
@@ -127,8 +128,8 @@ module Xlogin
           loggers << $stdout if config.parallels == 1
           loggers << File.join(config.logdir, "#{hostname}.log") if config.logdir
 
-          session = Xlogin.get(hostname, assumeyes: config.assumeyes, enable: config.enable, log: loggers)
-          yield session
+          session = Xlogin.get(hostname, enable: config.enable, log: loggers)
+          block.call(session)
 
           if config.parallels > 1
             output = buffer.string.lines.map { |line| "#{hostname}: #{line}" }.join

data/lib/xlogin/firmware.rb

@@ -7,7 +7,7 @@ module Xlogin
 
     def initialize
       @timeout = 5
-      @on_exec = nil
+      @cmdhook = nil
       @prompts = Array.new
       @methods = Hash.new
     end
@@ -16,8 +16,8 @@ module Xlogin
       @timeout = val.to_i
     end
 
-    def on_exec(&block)
-      @on_exec = block
+    def hook(&block)
+      @cmdhook = block
     end
 
     def prompt(expect, &block)
@@ -42,20 +42,23 @@ module Xlogin
         end
       end
 
-      if @on_exec
-        klass.class_exec(@on_exec) do |on_exec|
-          alias_method :do_cmd, :cmd
-          define_method(:cmd) do |args|
-            args = {'String' => args.to_s} unless args.kind_of?(Hash)
-            instance_exec(args, &on_exec)
+      if @cmdhook
+        klass.class_exec(@cmdhook) do |cmdhook|
+          alias_method :pass, :puts
+          define_method(:puts) do |command|
+            instance_exec(command, &cmdhook)
           end
         end
       end
 
       if grant = opts.delete(:grant)
         mod_open, password, mod_close= grant.split(':')
-        klass.class_exec(mod_open, password, mod_close) do |mod_open, password, mod_close|
-          alias_method "__#{mod_open}".to_sym, mod_open.to_sym
+        klass.class_exec(mod_open.to_sym, password, mod_close) do |mod_open, password, mod_close|
+          if method_defined?(mod_open)
+            alias_method "__#{mod_open}".to_sym, mod_open
+            alias_method :enable, mod_open unless mod_open == :enable
+          end
+
           define_method(mod_open) do |*args, &block|
             args = [*args, password] unless password.empty?
             send("__#{mod_open}", *args)
@@ -64,7 +67,6 @@ module Xlogin
               cmd(mod_close)
             end
           end
-          alias_method :enable, mod_open unless mod_open.to_sym == :enable
         end
       end
 

data/lib/xlogin/firmware_factory.rb

@@ -71,18 +71,18 @@ module Xlogin
     def build(args)
       type = args.delete(:type)
       template = get_template(type)
-      raise Xlogin::GeneralError.new("Template not defined: #{type}") unless template
+      raise Xlogin::TemplateNotFound.new("template not found: '#{type}'") unless template
 
       uri  = args.delete(:uri)
       opts = args.reduce({}) { |a, (k, v)| a.merge(k.to_s.downcase.to_sym => v) }
-      raise Xlogin::GeneralError.new("Host not found: #{args}") unless uri
+      raise Xlogin::HostNotFound.new("connection not defined: '#{arg}'") unless uri
 
       template.dup.run(uri, opts)
     end
 
     def build_from_hostname(hostname, **args)
       hostinfo = get(hostname)
-      raise Xlogin::GeneralError.new("Host not found: #{hostname}") unless hostinfo
+      raise Xlogin::HostNotFound.new("host not found: '#{hostname}'") unless hostinfo
 
       build(hostinfo.merge(args))
     end

data/lib/xlogin/rake_task.rb

@@ -23,7 +23,7 @@ module Xlogin
         names = names.map(&:strip).grep(/^\s*[^#]/)
         namecount = names.uniq.inject({}) { |a, e| a.merge(e => names.count(e)) }
         duplicate = namecount.keys.select { |name| namecount[name] > 1 }
-        raise Xlogin::GeneralError.new("Duplicate hosts found - #{duplicate.join(', ')}") unless duplicate.empty?
+        raise ArgumentError.new("Duplicate hosts found - #{duplicate.join(', ')}") unless duplicate.empty?
 
         current_namespace do
           description = Rake.application.last_description || "Run '#{RakeTask.current_namespace}'"
@@ -56,7 +56,6 @@ module Xlogin
     attr_accessor :silent
     attr_accessor :lockfile
     attr_accessor :logfile
-    attr_accessor :assumeyes
     attr_accessor :uncomment
 
     def initialize(name)
@@ -69,7 +68,6 @@ module Xlogin
       @silent        = Rake.application.options.silent
       @lockfile      = nil
       @logfile       = nil
-      @assumeyes     = false
       @uncomment     = false
 
       yield(self) if block_given?
@@ -114,7 +112,7 @@ module Xlogin
     end
 
     def run_task
-      raise Xlogin::GeneralError.new("missing xlogin_opts to connect to #{name}") unless @xlogin_opts[:type] && @xlogin_opts[:uri]
+      raise ArgumentError.new("missing xlogin_opts to connect to #{name}") unless @xlogin_opts[:type] && @xlogin_opts[:uri]
 
       loggers = [@xlogin_opts[:log]].flatten.compact
       loggers << $stdout unless silent || Rake.application.options.always_multitask
@@ -125,7 +123,6 @@ module Xlogin
       end
 
       @xlogin_opts[:log] = loggers unless loggers.empty?
-      @xlogin_opts[:assumeyes] ||= assumeyes
 
       begin
         @session = Xlogin.factory.build(@xlogin_opts)

data/lib/xlogin/session.rb

@@ -14,7 +14,7 @@ module Xlogin
       @name     = @opts[:name] || @host
       @port     = @opts[:port]
       @userinfo = @opts[:userinfo].to_s
-      raise Xlogin::GeneralError.new('Argument error.') unless @host && @port
+      raise ArgumentError.new('device hostname or port not specified.') unless @host && @port
 
       @prompts  = @opts[:prompts] || [[/[$%#>] ?\z/n, nil]]
       @timeout  = @opts[:timeout] || 60

data/lib/xlogin/telnet.rb

@@ -53,7 +53,7 @@ module Xlogin
         end
       end
     rescue EOFError, Errno::ECONNRESET
-      $stdout.puts "\r\n", "Conneciton closed."
+      $stdout.puts "\r\n", "Conneciton closed.", "\r\n"
       self.close
     ensure
       $stdin.cooked!

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/lib/xlogin.rb

@@ -10,10 +10,20 @@ module Xlogin
   DEFAULT_TEMPLATE_DIR   = File.join(ENV['HOME'], '.xlogin.d')
   BUILTIN_TEMPLATE_FILES = Dir.glob(File.join(File.dirname(__FILE__), 'xlogin', 'templates', '*.rb'))
 
-  class GeneralError < StandardError; end
+  class HostNotFound       < StandardError; end
+  class TemplateNotFound   < StandardError; end
+  class AuthorizationError < StandardError; end
 
   class << self
 
+    def authorize(boolean = false, &block)
+      @authorized = (boolean == true || block.call == true)
+    end
+
+    def authorized?
+      @authorized == true
+    end
+
     def factory
       @factory ||= Xlogin::FirmwareFactory.instance
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet