xlogin 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e9ecc897b867c8eb0b0ebfe2c8041eb38f660426
-  data.tar.gz: efc23e0139e2b9ffb7fa8b60211e11d71cee76b8
+SHA256:
+  metadata.gz: 58dec6deed809f45a8ec2f9b5afc73eff63dfddd89344eef9826e8199ac2424f
+  data.tar.gz: 660d5943f6847e6770768c6a15a3322a49b7fc7e49bdda426f2eaa229a7ec3f7
 SHA512:
-  metadata.gz: e433036245ec229557d7c4cec84c6226b9b331acf8fe696679a1b33d2c5307b622388cd923ebaff35fb76a2d8cdcb3d873113931a516d4fd0082b5e2efb96834
-  data.tar.gz: 46d2f4b2bfad95cab1e04445bcc9c430f95b9a273629650330fa004aa10cf07ece3aae09f8b5867a7bd69d05e30c9ce8858c894802392d0a05741e171d7f4bb1
+  metadata.gz: a623e0f7e82dc95b079f0be68d69983152df553f5a9468193e7557f8f67ea2b6f032c7f9ae143cbc75f9a3dd8620d42ca9bac5a28c4050847d4c9eeb8a4a531b
+  data.tar.gz: '0854bb0ff3e7e25abd35edadfd9ffc9236b25ba5ff08c55f81514e6d3a27b406569d7fbc0cb2d1091357689c61f80cae8531c6a74f16a100f54cf709f4cebb02'

data/README.md

@@ -28,6 +28,24 @@ xlogin vyos01
 xlogin 'vyos*' -e 'show configuration command | no-more; exit' -j 2
 ~~~
 
+その他のオプションは下記の通り。
+
+~~~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.
+    -p, --port NUM                   Run as server on specified port(default: 8080).
+    -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 prompts.
+~~~
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/xlogin/cli.rb

@@ -64,7 +64,7 @@ module Xlogin
           load_templates(*config.templates.map { |file| File.expand_path(file, ENV['PWD']) })
         end
 
-        config.hostlist  = host.to_s.split(/\s+/).map { |pattern| Xlogin.factory.list(pattern) }.reduce(&:&)
+        config.hostlist  = Xlogin.factory.list(*host.to_s.split(/\s+/))
         raise "No host found: `#{host}`" if config.hostlist.empty?
       rescue => e
         $stderr.puts e, '', parser
@@ -75,9 +75,9 @@ module Xlogin
     end
 
     def list(config)
-      wid1 = config.hostlist.map { |e| e[:name].length }.max
-      wid2 = config.hostlist.map { |e| e[:type].length }.max
-      list = config.hostlist.map { |e| "#{e[:name].to_s.ljust(wid1)} #{e[:type].to_s.ljust(wid2)} #{e[:uri]}" }.sort
+      wid1 = config.hostlist.map { |e| e[:type].length }.max
+      wid2 = config.hostlist.map { |e| e[:name].length }.max
+      list = config.hostlist.map { |e| "#{e[:type].to_s.ljust(wid1)} #{e[:name].to_s.ljust(wid2)} #{e[:uri]}" }.sort
       $stdout.puts list
     end
 

data/lib/xlogin/delegator.rb

@@ -36,7 +36,7 @@ module Xlogin
     # vyos      'vyos01',        'telnet://user:pass@host:port'
     # relay_srv 'vyos01::relay', 'telnet://relay_user:relay_pass@relay_host:relay_port', relay: 'vyos01'
     #
-    ## Write firmware definition
+    ## Write firmware template for 'relay_srv'
     #
     # login do |username, password|
     #   waitfor(/login:\s*\z/)    && puts(username)

data/lib/xlogin/factory.rb

@@ -1,5 +1,4 @@
 require 'singleton'
-require 'thread'
 require 'xlogin/template'
 
 module Xlogin
@@ -28,10 +27,15 @@ module Xlogin
       @database[name]
     end
 
-    def list(pattern = nil)
-      key, val = pattern.to_s.split(':')
-      key, val = 'name', (key || '*') if val.nil?
-      val.split(',').map { |e| @database.values.select { |info| File.fnmatch(e, info[key.to_sym]) } }.reduce(&:|)
+    def list(*patterns)
+      return @database.values if patterns.empty?
+
+      values = patterns.map do |pattern|
+        key, val = pattern.to_s.split(':')
+        key, val = 'name', key if val.nil?
+        val.split(',').map { |e| @database.values.select { |info| File.fnmatch(e, info[key.to_sym]) } }.reduce(&:|)
+      end
+      values.reduce(&:&).uniq
     end
 
     def source_template(*files)
@@ -75,6 +79,8 @@ module Xlogin
       name = args.shift
       uri  = args.shift
       opts = args.shift || {}
+
+      super if [type, name, uri].any? { |e| e.nil? }
       set(type: type, name: name, uri: uri, **opts)
     end
 

data/lib/xlogin/template.rb

@@ -45,12 +45,11 @@ module Xlogin
       klass = Class.new(Xlogin.const_get(uri.scheme.capitalize))
       klass.class_exec(@methods) do |methods|
         methods.each do |name, block|
-          case name
-          when :enable
-            define_method(name) { |args = opts[:enable]| instance_exec(args, &block) }
-          else
-            define_method(name, &block)
+          if name == :enable
+            define_method(name) { |*args| instance_exec([*args, opts[name]].first, &block) }
+            next
           end
+          define_method(name, &block)
         end
       end
 
@@ -58,7 +57,7 @@ module Xlogin
     end
 
     def method_missing(name, *, &block)
-      super unless RESERVED_METHODS.include? name
+      super unless RESERVED_METHODS.include?(name) and block_given?
       bind(name) { |*args| instance_exec(*args, &block) }
     end
   end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-telnet
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: rancid clogin alternative