net-ssh-xlogin 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77c1fda96670f9f13507600f76ce45f27ca0471873d71fdca476f1920e59a3ff
-  data.tar.gz: 1edb07fce74f21a418d14b11151e81198510ea8d3872cd74aa3fa167242cd323
+  metadata.gz: 18c8fc6e098ac2b9b1ed5afa083f7a7afb4fa1ce04b9d8fb5dfa183e3cd5782c
+  data.tar.gz: 686efa8e6793a4eece0a0440d70ab622c6ee175bb6555d7e6e1b152cf9da517a
 SHA512:
-  metadata.gz: e3b8986b8bad4a84c9a03039ece04ecdf2950557cff3bf9b6add3b5c18edc3264e4523947e06587e01fba8d8f3214febcc20a6f09b350495271bef417e37770d
-  data.tar.gz: 101d59331e00c077d63eee827113cf6110df4085f383ebb989492daad7e932373bc308c0102e3c7ecbc99f3c5abde24dbb061b13e7a55f5b20151bf761f57073
+  metadata.gz: 2009700c3d15ec329126bc626f673b3e7eec66f6c47de9d0c6d3a53121d08d97058dc5a8cec7718f6dbb47474afa06add8083ca7f03334d7995ff2e3e8c9e555
+  data.tar.gz: f2c166bdd18fbae04e301ac1bad0e1929b536887e1be5004406ef477e2834a91baead80cfb4349d717af79d7e15a1a875c1b589fa7cbbc4c1f60b961e8a33b80

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    net-ssh-xlogin (0.1.4)
+    net-ssh-xlogin (0.2.0)
       bcrypt_pbkdf
       ed25519
       net-ssh

data/README.md

@@ -1,8 +1,5 @@
 # Net::Ssh::Xlogin
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/net/ssh/xlogin`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
@@ -22,7 +19,54 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```: ruby
+require 'net/ssh/xlogin'
+
+Net::SSH::Xlogin.configure do
+  source   "centos7 'exsample-server', 'ssh://vagrant:vagrant@localhost', port: 2222"
+  template(type: :centos7){}
+end
+
+
+s = Net::SSH::Xlogin.get('exsample-server', log: 'test.log')
+
+puts s.cmd('ls')
+puts s.cmd('hostname')
+puts s.iplist
+s.close
+
+
+#=> ==== output ls ====
+#=> ls
+#=> [vagrant@exsample-server ~]$
+#=> 
+#=> ==== output hostname ====
+#=> hostname
+#=> exsample-server
+#=> [vagrant@exsample-server ~]$
+#=> 
+#=> ==== output ifconfig ====
+#=> ifconfig
+#=> enp0s3: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
+#=>         inet 10.0.2.15  netmask 255.255.255.0  broadcast 10.0.2.255
+#=>         inet6 fe80::1f59:5849:f41f:7979  prefixlen 64  scopeid 0x20<link>
+#=>         ether 08:00:27:37:f8:46  txqueuelen 1000  (Ethernet)
+#=>         RX packets 777  bytes 99545 (97.2 KiB)
+#=>         RX errors 0  dropped 0  overruns 0  frame 0
+#=>         TX packets 565  bytes 114880 (112.1 KiB)
+#=>         TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+#=> 
+#=> lo: flags=73<UP,LOOPBACK,RUNNING>  mtu 65536
+#=>         inet 127.0.0.1  netmask 255.0.0.0
+#=>         inet6 ::1  prefixlen 128  scopeid 0x10<host>
+#=>         loop  txqueuelen 1  (Local Loopback)
+#=>         RX packets 68  bytes 5524 (5.3 KiB)
+#=>         RX errors 0  dropped 0  overruns 0  frame 0
+#=>         TX packets 68  bytes 5524 (5.3 KiB)
+#=>         TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+#=> 
+#=> [vagrant@exsample-server ~]$
+```
 
 ## Development
 

data/exsampes/centos.rb

@@ -0,0 +1,13 @@
+# exsample template file
+#
+# - usage
+# Net::SSH::Xlogin.configure do
+#   template 'centos7.rb'
+# end
+
+
+prompt(/[$%#>] ?\z/n)
+
+bind(:iplist) do
+  cmd('ipconfig')
+end

data/exsampes/xloginrc

@@ -0,0 +1,9 @@
+# exsample source file
+#
+# - usage
+# Net::SSH::Xlogin.configure do
+#   source 'xloginrc'
+# end
+
+centos7 'exsample-server',  'ssh://vagrant:vagrant@localhost', port: 2222
+centos7 'exsample-server2', 'ssh://vagrant:vagrant@localhost', port: 2222, log: 'test.log'

data/exsampes/xloginrc.yml

@@ -0,0 +1,4 @@
+- host: exsampe-server
+  host_name: localhost
+  password: vagrant
+  log: test.log

data/lib/net/ssh/xlogin.rb

@@ -2,37 +2,64 @@ require 'yaml'
 
 require 'net/ssh/xlogin/version'
 require 'net/ssh/xlogin/factory'
-require 'net/ssh/xlogin/connection'
+require 'net/ssh/xlogin/template'
 
 module Net::SSH::Xlogin
   class Error < StandardError; end
   class << self
-    def get(name)
-      session = Connection.new(name)
+    def get(name, **opts)
+      opts  = factory.inventory[name].merge(opts)
+      type  = opts[:type]
+      klass = factory.templates[type]
+      klass.build(name, **opts)
     end
 
-    def configure(&bk)
-      instance_eval(&bk)
+    def configure(&block)
+      instance_eval(&block)
     end
 
-    def config(file)
-      yaml = case file
-             when /\.y(a)?ml$/
-               raise Error, 'not cofnig file' unless File.exist?(file)
-               YAML.load_file(file)
-             when String
-               YAML.load(YAML.dump(file))
-             when Hash
-               file
-             when YAML
-               YAML.dump(file)
-             end
-      factory.create(yaml)
+    def source(*args)
+      args.each do |src|
+        src = case src
+              when /\.y(a)?ml$/
+                factory.yaml(src)
+              when String
+                if File.exist?(src)
+                  factory.dsl(IO.read(src))
+                else
+                  factory.dsl(src)
+                end
+              when Hash
+                name = src.delete(:host)
+                factory.set_source(name, **src)
+              end
+      end
     end
 
+    def template(*templates, **opts, &block)
+      name = opts[:type]
+
+      if block
+        template = factory.templates[name] || Template.new(name)
+        template.instance_eval(&block)
+        factory.templates[name] = template
+        return
+      end
+
+      templates = templates.map{|path| Dir.exist?(path) ? Dir.glob(File.join(path, '*.rb')) : path }.flatten
+      templates.each do |path|
+        name     ||= File.basename(path, '.rb').scan(/\w+/).join('_').to_sym
+        text       = IO.read(path)
+        template   = factory.templates[name] || Template.new(name)
+        template.instance_eval(text)
+
+        factory.templates[name] = template
+      end
+    end
+
+    private
     def factory
       @factory ||= Factory.instance
     end
-
   end
 end

data/lib/net/ssh/xlogin/connection.rb

@@ -1,34 +1,50 @@
-require 'net/ssh/xlogin/factory'
-require 'net/ssh/telnet'
 require 'net/ssh'
+require 'net/ssh/telnet'
+require 'net/ssh/xlogin/factory'
+
 module Net::SSH::Xlogin
   class Connection < Net::SSH::Telnet
-    attr_reader :name, :user
-    def initialize(name, **opt)
-      @name        = name
-      @config      = Net::SSH::Xlogin.factory.get(name)
-      @user        = @config.delete(:user)
-      @ssh_options = @config.slice(*Net::SSH::VALID_OPTIONS, :password)
-      @ssh         = Net::SSH.start(@name, @user, @ssh_options.merge(config: true))
-
-      args         = Hash.new
-      max_retry    = opt[:retry  ] || 1
-      timeout      = opt[:timeout] || 10
+
+    attr_reader :name
+
+    def initialize(template, name, **opts)
+      @name     = name
+      @options  = opts
+
+      log       = @options[:log] || @options[:output_log]
+      max_retry = @options[:max_retry] || 1
+
+      @options[:timeout]   ||= template.timeout
+      @options[:host_name] ||= name
 
       begin
-        args['Timeout'] = timeout
-        args['FailEOF'] = true
-        args['Session'] = @ssh
+        args = Hash.new
+        args["Output_log"]  = log if log
+        args["Dump_log"]    = @options[:dump_log]   if @options[:dump_log]
+        args["Prompt"]      = @options[:prompt]     || template.prompt_patten
+        args["Timeout"]     = @options[:timeout]    || 10
+        args["Waittime"]    = @options[:waittime]   || 0
+        args["Terminator"]  = @options[:terminator] || LF
+        args["Binmode"]     = @options[:binmode]    || false
+        args["PTYOptions"]  = @options[:ptyoptions] || {}
+
+        if @options[:proxy]
+          args["Host"]      = @options[:host_name]
+          args["Port"]      = @options[:port]
+          args["Username"]  = @options[:user]
+          args["Password"]  = @options[:password]
+          args["Proxy"]     = @options[:proxy]
+        else
+          ssh_options       = @options.slice(*Net::SSH::VALID_OPTIONS)
+          ssh_options       = @options[:host] unless @options[:host_name]
+          args['Session']   = Net::SSH.start(nil, nil, ssh_options)
+        end
+
         super(args)
       rescue => e
         retry if (max_retry -= 1) > 0
         raise e
       end
     end
-
-    def cmd(*args)
-      res = super
-      res.gsub(/\e\[\d{1,3}[mK]|\e\[\d{1,3};\d{1,3}[mK]|\e\]\d{1,3};/, '')
-    end
   end
 end

data/lib/net/ssh/xlogin/factory.rb

@@ -1,27 +1,52 @@
 require 'singleton'
+require 'uri'
 
 module Net::SSH::Xlogin
   class Factory
     include Singleton
+    attr_accessor :inventory
+    attr_accessor :templates
+
     def initialize
       @inventory = Hash.new
+      @templates = Hash.new
     end
 
-    def create(yaml)
-      yaml.each do |name, info|
-        name = name
-        info = info.reduce({}){|h, (k, v)| h = h.merge(k.to_sym => v)}
-        set name, info
-      end
+    def set_source(name, **args)
+      @inventory[name] = args
     end
 
-    def set(name, args)
-      @inventory[name] = args
+    def set_template(name, klass)
+      @templates[name] = klass
     end
 
-    def get(name)
-      @inventory[name]
+    def yaml(file)
+      raise Error, 'not cofnig file' unless File.exist?(file)
+      srcs = YAML.load_file(file)
+      srcs.each do |src|
+        src  = src.inject({}){|h, (k,v)| h = h.merge(k.sym => v) }
+        name = src.delete(:host)
+        factory.source_set(name, **src)
+      end
     end
 
+    def dsl(str)
+      instance_eval(str)
+    end
+
+    def method_missing(method, *args, **options)
+      super unless args.size == 2
+
+      name = args.shift
+      uri  = URI.parse(args.shift)
+
+      options[:type]       = method
+      options[:uri]        = uri
+      options[:host_name]  = uri.host
+      options[:user]       = uri.user
+      options[:password]   = uri.password
+
+      set_source(name, **options)
+    end
   end
 end

data/lib/net/ssh/xlogin/template.rb

@@ -0,0 +1,42 @@
+require 'net/ssh/xlogin/connection'
+
+module Net::SSH::Xlogin
+  class Template
+
+    DEFAULT_TIMEOUT  = 10
+    DEFAULT_PROMPT   = /[$%#>] ?\z/n
+
+    attr_reader :methods
+    attr_reader :prompts
+    attr_reader :timeout
+
+    def initialize(name)
+      @name    = name
+      @prompts = Array.new
+      @timeout = DEFAULT_TIMEOUT
+      @methods = Hash.new
+    end
+
+    def prompt(expect = nil, &block)
+      return [[DEFAULT_PROMPT, nil]] if expect.nil? && @prompts.empty?
+      @prompts << [Regexp.new(expect.to_s), block] if expect
+      @prompts
+    end
+
+    def prompt_patten
+      Regexp.union(prompt.map(&:first))
+    end
+
+    def bind(name, &block)
+      @methods[name] = block
+    end
+
+    def build(name, **opts)
+      klass = Class.new(Net::SSH::Xlogin.const_get('Connection'))
+      klass.class_exec(self) do |template|
+        template.methods.each {|name, block| define_method(name, &block) }
+      end
+      klass.new(self, name, **opts)
+    end
+  end
+end

data/lib/net/ssh/xlogin/version.rb

@@ -1,7 +1,7 @@
 module Net
   module SSH
     module Xlogin
-      VERSION = '0.1.4'
+      VERSION = '0.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh-xlogin
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - ito.toshifumi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -108,9 +108,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exsampes/centos.rb
+- exsampes/xloginrc
+- exsampes/xloginrc.yml
 - lib/net/ssh/xlogin.rb
 - lib/net/ssh/xlogin/connection.rb
 - lib/net/ssh/xlogin/factory.rb
+- lib/net/ssh/xlogin/template.rb
 - lib/net/ssh/xlogin/version.rb
 - net-ssh-xlogin.gemspec
 homepage: https://github.com/Gen-Arch/net-ssh-xlogin