xlogin 0.13.9 → 0.13.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb72f536e716a97150265056b54238052e4d551684da2ce925d67239df1a808c
-  data.tar.gz: 5770c7d59f27dc65c5f5493a91efc5b8a3a83ca299611612f58e1ec745d45204
+  metadata.gz: 719819143a56b26ad14b31cbe6e61ed9d4df208c36dc9c060709bce170974d43
+  data.tar.gz: e0d20e9e5cd5967cacb28a8d92bd0f342bd5ecf47e591e9b7b3fb6257e6d5690
 SHA512:
-  metadata.gz: acbebe02ea2a5f1bb5e4b8d11c5bb847c6a38160f2017a1a078d5e2c19f70cc4f77cbd08370206d208bdbb2f26824fb82e0b1e47450c3b83dce5972fc7d7f815
-  data.tar.gz: 83a151cae2fe52456b783401f27c1e15e2a97022475d2fe48ba0831ff54b9e95d73241a6a1d4792c4733bb986280adec694710b517536b746e7ca6ba5be3ff4c
+  metadata.gz: ce9b1a9bd127b38edd212875887773264019eb25a137eb4f84793b284671915246b2055d5e36c85a0d65d9350910262e642940f5f71d78400e6dffa8addaf4a8
+  data.tar.gz: d57ea13b2a0fd0aee2e332cf941e4cf596253297695932944dda3a310932e50be72a9fd0ea099adce2c9784ac55da91c92c781d5b74d3238f418334796eb23f4

data/README.md

@@ -62,16 +62,13 @@ Some other commandline options are:
 ~~~sh
 $ xlogin -h
 xlogin HOST_PATTERN [Options]
-    -i, --inventory PATH             The PATH to the inventory file(default: $HOME/.xloginrc).
-        --template PATH              The PATH to the template file.
-    -T, --template-dir DIRECTORY     The DIRECTORY of the template files.
-    -L, --log-dir [DIRECTORY]        The DIRECTORY of the log files(default: $PWD).
-    -l, --list                       List all available devices.
-    -e, --exec                       Execute commands and quit.
-    -t, --tty                        Allocate a pseudo-tty.
-    -j, --jobs NUM                   The NUM of jobs to execute in parallel(default: 1).
-    -E, --enable                     Try to gain enable priviledge.
-    -y, --assume-yes                 Automatically answer yes to any confirmation prompts.
+    -i, --inventory PATH             The PATH to the inventory file.
+    -t, --template PATH              The PATH to the template file or directory.
+    -L, --log-dir PATH               The PATH to the log directory.
+    -l, --list                       List the inventory.
+    -e, --exec COMMAND               Execute commands and quit.
+    -E, --env KEY=VAL                Environment variables.
+    -j, --jobs NUM                   The NUM of jobs to execute in parallel.
 ~~~
 
 ## Development

data/lib/xlogin.rb

@@ -46,7 +46,7 @@ module Xlogin
       pool = factory.build_pool(args, **opts)
 
       return pool unless block
-      block.call(pool)
+      begin block.call(pool) ensure pool.close end
     end
     alias_method :create_pool, :get_pool
 
@@ -55,8 +55,7 @@ module Xlogin
     end
 
     def settings
-      @settings ||= {}
-      @rosettings ||= ReadOnlyStruct.new(@settings)
+      ReadOnlyStruct.new(@settings || {})
     end
 
     def generate_templates(dir)
@@ -70,7 +69,7 @@ module Xlogin
       @factory ||= Xlogin::Factory.instance
     end
 
-    def set(**opts)
+    def set(opts = {})
       @settings ||= {}
       opts.each do |key, val|
         val = val.call if val.kind_of?(Proc)
@@ -79,7 +78,7 @@ module Xlogin
     end
 
     def source(*sources, &block)
-      return factory.instance_eval(&block) if block
+      return factory.instance_eval(&block) if block && sources.size == 0
 
       sources.each do |path|
         raise Xlogin::Error.new("Inventory file not found: #{path}") unless File.exist?(path)

data/lib/xlogin/cli.rb

@@ -15,13 +15,12 @@ module Xlogin
     end
 
     def list(config)
-      $stdout.puts Xlogin.list(*config[:pattern]).map { |e| e[:name] }.sort.uniq
+      puts Xlogin.list(*config[:pattern]).map { |e| e[:name] }.sort.uniq
     end
 
     def tty(config)
-      info = Xlogin.list(*config[:pattern]).first
-      $stdout.puts "Trying #{info[:name]}...", "Escape character is '^]'."
-
+      info = Xlogin.list(*config[:pattern]).shift
+      puts "Trying #{info[:name]}...", "Escape character is '^]'."
       session, _ = exec(config.merge(pattern: info[:name], jobs: 1))
       session.interact!
     end
@@ -44,14 +43,14 @@ module Xlogin
           loggers << File.expand_path(File.join(config[:"log-dir"], "#{info[:name]}.log"), ENV['PWD']) if config[:"log-dir"]
 
           session = Xlogin.get(info.merge(log: loggers))
-          session.enable(info[:enable]) if config[:enable] && info[:enable]
+          session.enable(info[:enable]) if info[:enable] && Xlogin.settings.enable?
 
           command_lines = ['', *config[:exec].to_s.split(';').map(&:strip)]
           command_lines.each { |line| session.cmd(line) }
 
-          buffer.string.lines.each { |line| $stdout.print prefix + line.gsub("\r", '') } if jobs > 1
+          buffer.string.lines.each { |line| print prefix + line.gsub("\r", '') } if jobs > 1
         rescue => e
-          buffer.string.lines.each { |line| $stdout.print prefix + line.gsub("\r", '') } if jobs > 1
+          buffer.string.lines.each { |line| print prefix + line.gsub("\r", '') } if jobs > 1
           raise e
         end
 
@@ -61,6 +60,7 @@ module Xlogin
 
     def run(args)
       config = Hash.new
+      config[:env]       = {}
       config[:runner]    = self.method(:tty)
       config[:inventory] = DEFAULT_INVENTORY_FILE
       config[:template]  = DEFAULT_TEMPLATE_DIR
@@ -69,23 +69,20 @@ module Xlogin
       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('-i PATH', '--inventory', String, 'The PATH to the inventory file.')
+      parser.on('-t PATH', '--template',  String, 'The PATH to the template file or directory.')
+      parser.on('-L PATH', '--log-dir',   String, 'The PATH to the log directory.') { |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('-l',         '--list',   TrueClass, 'List the inventory.')        { |v| config[:runner] = self.method(:list) }
+      parser.on('-e COMMAND', '--exec',   String,    '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.on('-E KEY=VAL', '--env',    /(\w+=\w+)+/, 'Environment variables.')
+      parser.on('-j NUM',     '--jobs',   Integer,      'The NUM of jobs to execute in parallel.')
 
-      parser.parse!(args, into: config)
-      config[:pattern] = args
+      config[:pattern] = parser.parse!(args, into: config)
 
       Xlogin.configure do
-        set      assume_yes: true if config[:assume_yes]
+        set      Hash[config[:env].map{ |v| v.split('=') }]
         source   File.expand_path(config[:inventory], ENV['PWD'])
         template File.expand_path(config[:template],  ENV['PWD'])
       end

data/lib/xlogin/template.rb

@@ -6,7 +6,7 @@ module Xlogin
 
     DEFAULT_TIMEOUT  = 10
     DEFAULT_PROMPT   = /[$%#>] ?\z/n
-    RESERVED_METHODS = %i( login logout enable disable delegate )
+    RESERVED_METHODS = %i( login logout enable disable )
 
     attr_reader :name, :scopes, :methods
 

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-	VERSION = "0.13.9"
+	VERSION = "0.13.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.13.9
+  version: 0.13.10
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2020-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: rancid clogin alternative