xlogin 0.4.10 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 603669f804c8c3037a1c0e72c4414dfb88fe1c2e
-  data.tar.gz: e718bb1d9d4b298f7894caef257f5ab7c3af8ffe
+  metadata.gz: ee6e8c428e1f71f7454b78db8c10a43212fb1819
+  data.tar.gz: c0e1b1f9a6fc303be6f13faff6ba696602b5fe28
 SHA512:
-  metadata.gz: 2bdd5accabfbafe89efbe9441eadeaf59e0e1f8fcb89dd12c0dd3e0e4d0e98219a2777abf4f4d874bd8aad87efe348aa6d45af4e4ecf3dfce7b6010e9b65c97c
-  data.tar.gz: 69dfbe6ec79c77b7223d6bd16615261410eece519e50cf0177fa0710c354dd2b674279a3a6adce4659848cdacc17b6577409857c7d0aa67d7ad3226b1f25c411
+  metadata.gz: abdaa6ea16194a13a77498dd17ceb15893a3147dfb93ab8f49a5bdc55f715bcee879b1c04cbe70ecea5c4994bc0722b8c208137c5f59b616ce846ba5dfe71545
+  data.tar.gz: a4695e113fe14bd9a9e7e7c908c96bd9b0b78aae448ea699d6cf9337f6b0ec58f75b6495f58136d76d84e16d94c7708ffd07df0095a7cdd667b036cfbddc5469

data/Gemfile.lock

@@ -0,0 +1,29 @@
+PATH
+  remote: .
+  specs:
+    xlogin (0.4.12)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    net-ssh (4.1.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
+    net-ssh-telnet (0.2.0)
+      net-ssh (>= 2.0.1)
+    net-telnet (0.1.1)
+    rake (10.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.13)
+  net-ssh-gateway
+  net-ssh-telnet
+  net-telnet
+  rake (~> 10.0)
+  xlogin!
+
+BUNDLED WITH
+   1.15.3

data/lib/xlogin/firmware.rb

@@ -1,4 +1,5 @@
 require 'uri'
+require 'xlogin/ssh'
 require 'xlogin/telnet'
 
 module Xlogin

data/lib/xlogin/session.rb

@@ -25,6 +25,20 @@ module Xlogin
       @mutex    = Mutex.new
     end
 
+    def waitfor(*expect)
+      if expect.compact.empty?
+        super(Regexp.union(*@prompts.map(&:first)), &@logger)
+      else
+        line = super(*expect, &@logger)
+        _, process = @prompts.find { |r, p| r =~ line && p }
+        if process
+          instance_eval(&process)
+          line += waitfor(*expect)
+        end
+        line
+      end
+    end
+
     def lock(timeout: @timeout)
       granted = false
 

data/lib/xlogin/ssh.rb

@@ -1,150 +1,28 @@
-require 'net/ssh'
+require 'net/ssh/telnet'
 require 'xlogin/session'
 
 module Xlogin
-  class Ssh
+  class Ssh < Net::SSH::Telnet
+
     include Session
 
     def initialize(**opts)
       configure_session(opts.merge(port: opts[:port] || 22))
+      username, password = @userinfo
 
-      begin
-        username, password = *@userinfo
-
-        @ssh = Net::SSH.start(
-          @host,
-          username,
-          :port =>     @port,
-          :timeout =>  @timeout,
-          :password => password,
-        )
-      rescue TimeoutError
-        raise TimeoutError, 'timed out while opening a connection to the host'
-      rescue
-        raise
-      end
-
-      @buf = ''
-      @eof = false
-      @channel = nil
-
-      @ssh.open_channel do |channel|
-        channel.on_data { |ch, data| @buf << data }
-        channel.on_close { @eof = true }
-
-        channel.request_pty do |ch, success|
-          raise 'Failed to open ssh pty'   unless success
-        end
-
-        channel.send_channel_request('shell') do |ch, success|
-          raise 'Failed to open ssh shell' unless success
-
-          @channel = ch
-          waitfor
-          return
-        end
-      end
-
-      @ssh.loop
-    end
-
-    def close
-      @channel.close if @channel
-      @ssh.close     if @ssh
-    end
-
-    def waitfor(opts = nil)
-      time_out = @timeout
-      waittime = @timeout
-
-      case opts
-      when Hash
-        prompt   = if opts.has_key?('Match')
-                     opts['Match']
-                   elsif opts.has_key?('Prompt')
-                     opts['Prompt']
-                   elsif opts.has_key?('String')
-                     Regexp.new( Regexp.quote(opts['String']) )
-                   end
-        time_out = opts['Timeout']  if opts.has_key?('Timeout')
-        waittime = opts['Waittime'] if opts.has_key?('Waittime')
-      else
-        prompt = opts || Regexp.union(*@prompts.map(&:first))
-      end
-
-      buf  = ''
-      rest = ''
-      line = ''
-      sock = @ssh.transport.socket
-
-      until sock.available == 0 && @buf == "" && prompt != line && (@eof || (!sock.closed? && !IO::select([sock], nil, nil, waittime)))
-        if  sock.available == 0 && @buf == "" && prompt !~ line && !IO::select([sock], nil, nil, time_out)
-          raise Net::ReadTimeout, 'timed out while waiting for more data'
-        end
-
-        process_connection
-        if @buf != ''
-          buf  = rest + @buf
-          rest = ''
-
-          if pt = buf.rindex(/\r\z/no)
-            buf  = buf[0...pt]
-            rest = buf[pt..-1]
-          end
-
-          @buf = ''
-          line += buf
-          @logger.call(buf)
-        elsif @eof
-          break
-        end
-      end
-
-      _, process = @prompts.find { |r, p| r =~ line && p }
-      if process
-        instance_eval(&process)
-        line += waitfor(opts)
-      end
-      line
-    end
-
-    def print(string)
-      @channel.send_data(string)
-      process_connection
-    end
-
-    def puts(string)
-      print(string + "\n")
-    end
-
-    def cmd(opts)
-      match    = Regexp.union(*@prompts.map(&:first))
-      time_out = @timeout
-
-      if opts.kind_of?(Hash)
-        string   = opts['String']
-        match    = opts['Match']   if opts.has_key?('Match')
-        time_out = opts['Timeout'] if opts.has_key?('Timeout')
-      else
-        string = opts
-      end
-
-      puts(string)
-      waitfor('Prompt' => match, 'Timeout' => time_out)
+      super(
+        'Host'     => @host,
+        'Port'     => @port,
+        'Username' => username,
+        'Password' => password,
+        'Timeout'  => @timeout,
+        'Prompt'   => Regexp.union(*@prompts.map(&:first))
+      )
     end
 
     def interact!
       raise 'Not implemented'
     end
 
-    private
-    def process_connection
-      begin
-        @channel.connection.process(0)
-      rescue IOError
-        @eof = true
-      end
-    end
-
   end
 end

data/lib/xlogin/telnet.rb

@@ -20,20 +20,6 @@ module Xlogin
       login(*@userinfo) if respond_to?(:login) && !@userinfo.empty?
     end
 
-    def waitfor(*expect)
-      if expect.compact.empty?
-        super(Regexp.union(*@prompts.map(&:first)), &@logger)
-      else
-        line = super(*expect, &@logger)
-        _, process = @prompts.find { |r, p| r =~ line && p }
-        if process
-          instance_eval(&process)
-          line += waitfor(*expect)
-        end
-        line
-      end
-    end
-
     def renew(opts = @opts)
       self.class.new(opts).tap { |s| @sock = s.sock }
     end

data/lib/xlogin/version.rb

@@ -1,3 +1,3 @@
 module Xlogin
-  VERSION = "0.4.10"
+  VERSION = "0.4.12"
 end

data/lib/xlogin.rb

@@ -42,8 +42,7 @@ module Xlogin
     end
 
     def get(hostname, args = {})
-      _factory = Xlogin::FirmwareFactory.instance
-      session = _factory.build_from_hostname(hostname, args)
+      session = factory.build_from_hostname(hostname, args)
 
       if block_given?
         begin yield session ensure session.close end

data/xlogin.gemspec

@@ -32,5 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "net-telnet"
+  spec.add_development_dependency "net-ssh-telnet"
   spec.add_development_dependency "net-ssh-gateway"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlogin
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.12
 platform: ruby
 authors:
 - haccht
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: net-telnet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh-telnet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +90,7 @@ files:
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile