conn 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90e93eaa79ddc505e353b15ac75843249db7f134
-  data.tar.gz: f195af2a62f54c6c76ced7d1fee3e7cfca302e2e
+  metadata.gz: 1e697aab8b46137d969752cbb5b8b7757aa6b7ff
+  data.tar.gz: c8e6841c7f1495110de6f40c23dfa6828e862134
 SHA512:
-  metadata.gz: 2635278be5bc18f70249cae4d4b3ec01883445fd78373c0eb573c25a5291b7ff27741fcb48cbd498c25398552fa73064174b710cca87489c16492dfbef010a8a
-  data.tar.gz: 22f8670512f88061f17c63d3fedde1ca0375ebf7342decce5608449490064343db821af1a51f1a7806d56ecb6a3e82580bc531cc701bf581f6a59075a769138e
+  metadata.gz: 219bf093cadabd36f006a09a8631797302378d2f74dae9e7e1278e6ed3de739379e17a62552f1b556abec8c95e6003ce3834adbc9b491f4598adc56ebea46f69
+  data.tar.gz: f71f33a9da416deb6cf671487f3ebc91c8ac90cd5e685532db35725885dc6813a996a2c54066f27111c8ec4c5f00bf050baf93aa236a2862fda31fb62bc16f66

data/lib/conn/dsl.rb

@@ -8,14 +8,12 @@ require 'conn/pty_ssh'
 module Conn
   module DSL
     def ssh(hostname, &blk)
-      config = Net::SSH::Config.for(hostname)
-      user = config[:user] || Etc.getlogin
       queue = Queue.new
       cmd_loop = Thread.new do
         blk.call(queue)
         queue.respond_to?(:close) ? queue.close : (queue << false)
       end
-      Net::SSH.start(hostname, user, config) do |ssh|
+      Net::SSH.start(*to_ssh_config(hostname)) do |ssh|
         ssh.loop do
           msg = queue.pop
           if msg
@@ -36,6 +34,25 @@ module Conn
       cmd_loop.join if cmd_loop.alive?
     end
 
+    def ssh_try!(hostname)
+      Net::SSH.start(*to_ssh_config(hostname, timeout: 3)) do |ssh|
+        ssh.exec! 'uptime'
+      end
+    end
+
+    def ssh_try(hostname)
+      ssh_try!(hostname)
+    rescue => e
+      false
+    end
+
+    private
+    def to_ssh_config(hostname, **opts)
+      config = Net::SSH::Config.for(hostname).merge(opts)
+      user = config[:user] || Etc.getlogin
+      [hostname, user, config]
+    end
+
     def input(str)
       puts "%s %s" % ["SSH<<".green.bold, str.yellow]
     end
@@ -48,16 +65,15 @@ module Conn
       puts "%s %s" % ["SSH!>".red.bold, str.red]
     end
 
+    public
     using Conn::PtySSH
     def ssh_pty(hostname, &blk)
-      config = Net::SSH::Config.for(hostname)
-      user = config[:user] || Etc.getlogin
       queue = Queue.new
       cmd_loop = Thread.new do
         blk.call(queue)
         queue.respond_to?(:close) ? queue.close : (queue << false)
       end
-      Net::SSH.start(hostname, user, config) do |ssh|
+      Net::SSH.start(*to_ssh_config(hostname)) do |ssh|
         ssh.loop do
           msg = queue.pop
           if msg

data/lib/conn/version.rb

@@ -1,3 +1,3 @@
 module Conn
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conn
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Uchio KONDO
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Super simple server connector