xlogin 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 220f187297c3702d3cac89b41988734724bd3ecf
-  data.tar.gz: 69c3556b40c2e4955500c3a9e45964ab7630304a
+  metadata.gz: 66ed84e83f0210fe7afb90cd49eb82e154c283a4
+  data.tar.gz: 4fe09e46fdfffbae74ea20c06052787422f4255b
 SHA512:
-  metadata.gz: 5fcffdf0cb88156bc6ec2d4650d8916e73702a4ec50a3059204ea533a555bcd83c186d8050250fada1cf3539cac614bdb46ebe4b2e1e01826044424784ef3e5a
-  data.tar.gz: 380fd408f3d51148e3fa455b4d4078d8a92c4df6b7143991a4fe21a0a9b38be9f4ba90b56cac7f4deb156e10ad0c1ac1f15d8ff67ccb0fe858491085cc2249ca
+  metadata.gz: 8f94c7c38965d65bcb02d958d243d50b9dbe9c725b5309e2fe5e7176f2bcca260cb7d349e4f1033bc7b4254453b3c4b2ed60c5b535f8bdab0843d390d1e149f7
+  data.tar.gz: 6b28b13d079ed877dc88d3ff64b63576af85a5d13250a49373adb3f9593a487a22aad7cf5f719d0edf2ff41ff08118812d034db86797880aa45639285b07fac4

data/bin/cmd_exec

@@ -40,18 +40,19 @@ module Xlogin
       options = Hash.new
 
       opt = OptionParser.new
-      opt.on('-e', '--enable', 'Try to gain enable priviledge.') { |v| options[:e] = v }
-      opt.on('-l', '--log',    'Enable logging.')                { |v| options[:l] = v }
-      opt.on('-H', 'Display hostnames for each response.')       { |v| options[:H] = v }
+      opt.on('-F', '--force',  'Automatically reply "yes" if confirmed.') { |v| options[:F] = v }
+      opt.on('-e', '--enable', 'Try to gain enable priviledge.')          { |v| options[:e] = v }
+      opt.on('-l', '--log',    'Enable logging.')                         { |v| options[:l] = v }
+      opt.on('-H', 'Display hostnames for each response.')   { |v| options[:H] = v }
 
-      opt.on('-f FILE',  'Read target hostnames from FILE.')     { |v| options[:f] = v }
-      opt.on('-r FILE',  'Load extention library.')              { |v| options[:r] = v }
+      opt.on('-f FILE',  'Read target hostnames from FILE.') { |v| options[:f] = v }
+      opt.on('-r FILE',  'Load extention library.')          { |v| options[:r] = v }
 
-      opt.on('-x VALUE', 'Read commands from VALUE.')            { |v| options[:x] = v }
-      opt.on('-c VALUE')                                         { |v| options[:c] = v }
+      opt.on('-x VALUE', 'Read commands from VALUE.')        { |v| options[:x] = v }
+      opt.on('-c VALUE')                                     { |v| options[:c] = v }
 
-      opt.on('-p VALUE', 'Specify concurrency pool size.')       { |v| options[:p] = v }
-      opt.on('-i VALUE', 'Specify interval time [sec].')         { |v| options[:i] = v }
+      opt.on('-p VALUE', 'Specify concurrency pool size.')   { |v| options[:p] = v }
+      opt.on('-i VALUE', 'Specify interval time [sec].')     { |v| options[:i] = v }
 
       opt.banner += ' HOST...'
       opt.summary_width = 16
@@ -91,12 +92,13 @@ module Xlogin
           pool.run do
             begin
               resp    = StringIO.new
-
+              force   = options[:F] || false
               loggers = []
               loggers << $stdout unless size > 1
               loggers << (URI.regexp =~ node ? URI(node).host : node) + ".log" if options[:l]
 
-              session = Xlogin.get(node, log: loggers)
+
+              session = Xlogin.get(node, force: force, log: loggers)
               session.enable if options[:e] && session.respond_to?(:enable)
 
               if options[:x]

data/lib/xlogin/firmware.rb

@@ -6,7 +6,7 @@ module Xlogin
 
     def initialize
       @timeout = 5
-      @on_exec  = nil
+      @on_exec = nil
       @prompts = Array.new
       @methods = Hash.new
     end
@@ -68,7 +68,7 @@ module Xlogin
 
       klass.new(
         {
-          node:     uri.host,
+          host:     uri.host,
           port:     uri.port,
           userinfo: uri.userinfo,
           timeout:  @timeout,

data/lib/xlogin/firmware_factory.rb

@@ -46,28 +46,28 @@ module Xlogin
       instance_eval(content)
     end
 
-    def set(type, name, uri, opts = {})
-      @database[name] = { name: name, type: type, uri: uri, opts: opts }
-    end
-
     def get(name)
       @database[name]
     end
 
+    def set(type, name, uri, opts = {})
+      @database[name] = { name: name, type: type, uri: uri, opts: opts }
+    end
+
     def list
       @database.map { |nodename, args| args.merge(name: nodename) }
     end
 
-    def build(item, args = {})
-      item     = item.kind_of?(Hash) ? item : @database[item]
-      item_uri = item[:uri]
-      firmware = Xlogin::FirmwareFactory[item[:type]]
-      raise Xlogin::GeneralError.new("Invalid target - #{nodename}") unless item && item_uri && firmware
+    def build(name, args = {})
+      item     = item.kind_of?(Hash) ? name : @database[name]
+      item_uri = item[:uri] if item
+      firmware = Xlogin::FirmwareFactory[item[:type]] if item
+      raise Xlogin::GeneralError.new("Hostname '#{name}' not found ") unless item && item_uri && firmware
 
       opts = item[:opts] || {}
       opts = opts.merge(args).reduce({}) { |a, (k, v)| a.merge(k.to_s.downcase.to_sym => v) }
 
-      session = firmware.run(item_uri, opts)
+      session = firmware.dup.run(item_uri, opts)
       session.name = item[:name]
       session
     end

data/lib/xlogin/gateway.rb

@@ -21,8 +21,8 @@ module Xlogin
             port: gateway.port || 22
           )
 
-          @port = @gateway.open(@node, @port)
-          @node = '127.0.0.1'
+          @port = @gateway.open(@host, @port)
+          @host = '127.0.0.1'
         end
       end
     end

data/lib/xlogin/rake_task.rb

@@ -19,9 +19,6 @@ module Xlogin
         current_namespace do
           description = Rake.application.last_description || "Run '#{RakeTask.current_namespace}'"
 
-          desc description
-          task all: names
-
           names.each do |name|
             desc "#{description} (#{name})"
             RakeTask.new(name, &block)
@@ -108,15 +105,6 @@ module Xlogin
             run_task
           end
         end
-
-        [logfile, lockfile].each do |file|
-          next unless file
-
-          desc 'Remove any temporary products'
-          task 'clean' do
-            rm(file, verbose: true) if File.exist?(file)
-          end
-        end
       end
     end
 

data/lib/xlogin/session.rb

@@ -3,19 +3,20 @@ require 'stringio'
 module Xlogin
   module Session
 
+    attr_reader   :opts
     attr_accessor :name
 
     def configure_session(**opts)
-      @name     = opts[:node]
-      @node     = opts[:node]
-      @port     = opts[:port]
-      @userinfo = opts[:userinfo].to_s.split(':')
-      raise Xlogin::GeneralError.new('Argument error.') unless @node && @port
+      @opts     = opts.dup
+      @host     = @name = @opts.delete(:host)
+      @port     = @opts.delete(:port)
+      @userinfo = @opts.delete(:userinfo).to_s.split(':')
+      raise Xlogin::GeneralError.new('Argument error.') unless @host && @port
 
-      @prompts  = opts[:prompts] || [[/[$%#>] ?\z/n, nil]]
-      @timeout  = opts[:timeout] || 60
+      @prompts  = @opts.delete(:prompts) || [[/[$%#>] ?\z/n, nil]]
+      @timeout  = @opts.delete(:timeout) || 60
 
-      @loglist  = [opts[:log]].flatten.compact
+      @loglist  = [@opts.delete(:log)].flatten.compact
       @logger   = update_logger
     end
 

data/lib/xlogin/ssh.rb

@@ -12,7 +12,7 @@ module Xlogin
         username, password = *@userinfo
 
         @ssh = Net::SSH.start(
-          @node,
+          @host,
           username,
           :port =>     @port,
           :timeout =>  @timeout,

data/lib/xlogin/telnet.rb

@@ -11,7 +11,7 @@ module Xlogin
       configure_session(opts.merge(port: opts[:port] || 23))
 
       super(
-        'Host'    => @node,
+        'Host'    => @host,
         'Port'    => @port,
         'Timeout' => @timeout,
         'Prompt'  => Regexp.union(*@prompts.map(&:first))

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler