em-ssh 0.2.1 → 0.3.0.pre0

data/README.md

@@ -7,45 +7,50 @@ Em-ssh is not associated with the Jamis Buck's [net-ssh](http://net-ssh.github.c
 
 ##Synopsis
 	EM.run do
-	  EM::Ssh.start(host, user, :password => password) do |ssh|
-	    # capture all stderr and stdout output from a remote process
-	    ssh.exec!('uname -a').tap {|r| puts "\nuname: #{r}"}
-    
-	    # capture only stdout matching a particular pattern
-	    stdout = ""
-	    ssh.exec!("ls -l /home") do |channel, stream, data|
-	      stdout << data if stream == :stdout
-	    end
-	    puts "\n#{stdout}"
-    
-	    # run multiple processes in parallel to completion
-	    ssh.exec('ping -c 1 www.google.com')
-	    ssh.exec('ping -c 1 www.yahoo.com')
-	    ssh.exec('ping -c 1 www.rakuten.co.jp')
-    
-	    #open a new channel and configure a minimal set of callbacks, then wait for the channel to finishes (closees).
-	    channel = ssh.open_channel do |ch|
-	      ch.exec "/usr/local/bin/ruby /path/to/file.rb" do |ch, success|
-	        raise "could not execute command" unless success
-    
-	        # "on_data" is called when the process writes something to stdout
-	        ch.on_data do |c, data|
-	          $stdout.print data
-	        end
-        
-	        # "on_extended_data" is called when the process writes something to stderr
-	        ch.on_extended_data do |c, type, data|
-	          $stderr.print data
-	        end
-        
-	        ch.on_close { puts "done!" }
-	      end
-	    end
-    
-	    channel.wait
-
-	    ssh.close
-	    EM.stop
+	  EM::Ssh.start(host, user, :password => password) do |connection|
+      connection.errback do |err|
+        $stderr.puts "#{err} (#{err.class})"
+      end
+      connection.callback do |ssh|
+        # capture all stderr and stdout output from a remote process
+        ssh.exec!('uname -a').tap {|r| puts "\nuname: #{r}"}
+      
+        # capture only stdout matching a particular pattern
+        stdout = ""
+        ssh.exec!("ls -l /home") do |channel, stream, data|
+          stdout << data if stream == :stdout
+        end
+        puts "\n#{stdout}"
+      
+        # run multiple processes in parallel to completion
+        ssh.exec('ping -c 1 www.google.com')
+        ssh.exec('ping -c 1 www.yahoo.com')
+        ssh.exec('ping -c 1 www.rakuten.co.jp')
+      
+        #open a new channel and configure a minimal set of callbacks, then wait for the channel to finishes (closees).
+        channel = ssh.open_channel do |ch|
+          ch.exec "/usr/local/bin/ruby /path/to/file.rb" do |ch, success|
+            raise "could not execute command" unless success
+      
+            # "on_data" is called when the process writes something to stdout
+            ch.on_data do |c, data|
+              $stdout.print data
+            end
+          
+            # "on_extended_data" is called when the process writes something to stderr
+            ch.on_extended_data do |c, type, data|
+              $stderr.print data
+            end
+          
+            ch.on_close { puts "done!" }
+          end
+        end
+      
+        channel.wait
+
+        ssh.close
+        EM.stop
+      end
 	  end
 	end
 

data/bin/em-ssh

@@ -66,37 +66,45 @@ end
 
 
 EM.run do
-  EM::Ssh.start(host, options[:user], options) do |connection|
-    debug "**** connected: #{connection}"
-    connection.open_channel do |channel|
-      debug "**** channel: #{channel}"
-      channel.request_pty(options[:pty] || {}) do |pty,suc|
-        debug "***** pty: #{pty}; suc: #{suc}"
-        pty.send_channel_request("shell") do |shell,success|
-          raise ConnectionError, "Failed to create shell." unless success
-          debug "***** shell: #{shell}"
-          connected = true
-
-          shell.on_data { |c,d| $stdout.print d } 
-          shell.on_extended_data { |c,data| $STDERR.print data }
-          shell.on_eof do
-            shell.close
-            EM.stop
-          end # 
-
-          trap("SIGINT") { shell.send_data("\C-c") }
-          trap("SIGEXIT") do
-            shell.close
-            trap("SIGINT", "SIG_DFL")
-          end # 
-
-          conn        = EM.watch($stdin, CInput)
-          conn.shell  = shell
-          conn.notify_readable = true
-
-        end # |shell,success|
-      end # |pty,suc|
-    end # |channel|
+  EM::Ssh.start(host, options[:user], options) do |ssh|
+    ssh.errback do |err|
+      puts "#{err} (#{err.class})"
+      EM.stop
+    end 
+
+    ssh.callback do |connection|
+      debug "**** connected: #{connection}"
+      connection.open_channel do |channel|
+        debug "**** channel: #{channel}"
+        channel.request_pty(options[:pty] || {}) do |pty,suc|
+          debug "***** pty: #{pty}; suc: #{suc}"
+          pty.send_channel_request("shell") do |shell,success|
+            raise ConnectionError, "Failed to create shell." unless success
+            debug "***** shell: #{shell}"
+            connected = true
+
+            shell.on_data { |c,d| $stdout.print d } 
+            shell.on_extended_data { |c,data| $STDERR.print data }
+            shell.on_eof do
+              shell.close
+              EM.stop
+            end # 
+
+            trap("SIGINT") { shell.send_data("\C-c") }
+            trap("SIGEXIT") do
+              shell.close
+              trap("SIGINT", "SIG_DFL")
+            end # 
+
+            conn        = EM.watch($stdin, CInput)
+            conn.shell  = shell
+            conn.notify_readable = true
+
+          end # |shell,success|
+        end # |pty,suc|
+      end # |channel|
+    end
+
   end #  |connection|  
 end # EM.start
 

data/lib/em-ssh.rb

@@ -50,8 +50,8 @@ module EventMachine
       #      channel.request_pty(options[:pty] || {}) do |pty,suc|
       def connect(host, user, opts = {}, &blk)
         logger.debug("#{self}.connect(#{host}, #{user}, #{opts})")
-        options = { :host => host, :user => user, :port => DEFAULT_PORT, :callback => blk }.merge(opts)
-        EM.connect(options[:host], options[:port], Connection, options)
+        options = { :host => host, :user => user, :port => DEFAULT_PORT }.merge(opts)
+        EM.connect(options[:host], options[:port], Connection, options, &blk)
       end
       alias :start :connect
     end # << self

data/lib/em-ssh/connection.rb

@@ -5,6 +5,7 @@ module EventMachine
     # itself into Net::SSH so that the EventMachine reactor loop can take the place of the Net::SSH event loop.
     # Most of the methods here are only for compatibility with Net::SSH
     class Connection < EventMachine::Connection
+      include EM::Deferrable
       include Log
 
       # Allows other objects to register callbacks with events that occur on a Ssh instance
@@ -127,11 +128,26 @@ module EventMachine
         @timeout        = options[:timeout] || TIMEOUT
 
         begin
-          on(:connected, &options[:callback]) if options[:callback]
-          @nocon          = on(:closed) { raise ConnectionFailed, @host }
-          @contimeout     = EM::Timer.new(@timeout) { raise ConnectionTimeout, @host }
+          on(:connected) do |session|
+            succeed(session, @host)
+          end
+          on(:error) do |e|
+            fail(e)
+            close_connection
+          end
+          @nocon          = on(:closed) do
+            fail(SshError.new(@host))
+            close_connection
+          end
+          @contimeout     = EM::Timer.new(@timeout) do
+            fail(ConnectionTimeout.new(@host))
+            close_connection
+          end
 
-          @error_callback = lambda { |code| raise SshError.new(code) }
+          @error_callback = lambda do |code|
+            fail(SshError.new(code))
+            close_connection
+          end
 
           @host_key_verifier = select_host_key_verifier(options[:paranoid])
           @server_version    = ServerVersion.new(self)
@@ -149,7 +165,6 @@ module EventMachine
                   fire(:connected, Session.new(self, options))
                 else
                   fire(:error, Net::SSH::AuthenticationFailed.new(user))
-                  close_connection
                 end # auth.authenticate("ssh-connection", user, options[:password])
               end.resume # Fiber
             end # :algo_init
@@ -157,7 +172,7 @@ module EventMachine
 
         rescue Exception => e
           log.fatal("caught an error during initialization: #{e}\n   #{e.backtrace.join("\n   ")}")
-          Process.exit
+          fail(e)
         end # begin
         self
       end # initialize(options = {})
@@ -273,7 +288,12 @@ module EventMachine
         when :very then
           Net::SSH::Verifiers::Strict.new
         else
-          paranoid.respond_to?(:verify) ? paranoid : (raise ArgumentError.new("argument to :paranoid is not valid: #{paranoid.inspect}"))
+          if paranoid.respond_to?(:verify)
+            paranoid
+          else
+            fail(@host, ArgumentError.new("argument to :paranoid is not valid: #{paranoid.inspect}"))
+            close_connection
+          end # paranoid.respond_to?(:verify)
         end # paranoid
       end # select_host_key_verifier(paranoid)
     end # class::Connection < EventMachine::Connection

data/lib/em-ssh/packet-stream.rb

@@ -61,7 +61,9 @@ module EventMachine
           @packet_length = @packet.read_long
         end
         need = @packet_length + 4 - server.block_size
-        raise SshError, "padding error, need #{need} block #{server.block_size}" if need % server.block_size != 0
+        if need % server.block_size != 0
+          @connection.fire(:error, SshError.new("padding error, need #{need} block #{server.block_size}"))
+        end
 
         return nil if available < need + server.hmac.mac_length
 
@@ -82,7 +84,10 @@ module EventMachine
         padding = @packet.read(padding_length) if padding_length > 0
 
         my_computed_hmac = server.hmac.digest([server.sequence_number, @packet.content].pack("NA*"))
-        raise Net::SSH::Exception, "corrupted mac detected" if real_hmac != my_computed_hmac
+        if real_hmac != my_computed_hmac
+          @connection.fire(:error, Net::SSH::Exception.new("corrupted mac detected"))
+          return
+        end
 
         # try to decompress the payload, in case compression is active
         payload = server.decompress(payload)

data/lib/em-ssh/server-version.rb

@@ -23,7 +23,9 @@ module EventMachine
           if @version[-1] == "\n"
             @version.chomp!
             log.debug("server version: #{@version}")
-            raise SshError.new("incompatible SSH version `#{@version}'") unless @version.match(/^SSH-(1\.99|2\.0)-/)
+            unless @version.match(/^SSH-(1\.99|2\.0)-/)
+              return connection.fire(:error, SshError.new("incompatible SSH version `#{@version}'"))
+            end
             log.debug("local version: #{Net::SSH::Transport::ServerVersion::PROTO_VERSION}")
             connection.send_data("#{Net::SSH::Transport::ServerVersion::PROTO_VERSION}\r\n")
             cb.cancel

data/lib/em-ssh/session.rb

@@ -34,7 +34,10 @@ module EventMachine
 
       def register_callbacks
         transport.on(:packet) do |packet|
-          raise SshError, "unexpected response #{packet.type} (#{packet.inspect})" unless MAP.key?(packet.type)
+          unless MAP.key?(packet.type)
+            transport.fire(:error, SshError.new("unexpected response #{packet.type} (#{packet.inspect})"))
+            return
+          end
           send(MAP[packet.type], packet)
         end #  |packet|
 

data/lib/em-ssh/shell.rb

@@ -236,11 +236,15 @@ module EventMachine
         return if connected?
         trace = caller
         f = Fiber.current
-        con = ::EM::Ssh.start(host, user, connect_opts) { |connection| f.resume(@connection = connection) }
-        con.on(:error) do |e|
-          e.set_backtrace(trace + Array(e.backtrace))
-          fire(:error, e)
-          f.resume(e)
+        ::EM::Ssh.start(host, user, connect_opts) do |connection|
+          connection.callback do |ssh|
+            f.resume(@connection = ssh)
+          end # ssh
+          connection.errback do |e|
+            e.set_backtrace(trace + Array(e.backtrace))
+            fire(:error, e)
+            f.resume(e)
+          end # err
         end
         return Fiber.yield
       end

data/lib/em-ssh/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class Ssh
-    VERSION='0.2.1'
+    VERSION='0.3.0.pre0'
   end # class::Ssh
 end # module::EventMachine

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: em-ssh
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0.pre0
+  prerelease: 6
 platform: ruby
 authors:
 - Caleb Crane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70209705582020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209705582020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70209705581560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209705581560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-termios
-  requirement: &70209705581140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209705581140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70209705580720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209705580720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - em-ssh@simulacre.org
@@ -98,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: An EventMachine compatible net-ssh