em-ssh 0.6.2 → 0.6.5

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.6.5
+- [#26](https://github.com/simulacre/em-ssh/issues/26) - Remove echo binary
+
+0.6.4
+- [#24](https://github.com/simulacre/em-ssh/issues/24) - Don't zap Em::Ssh::Shell callbacks when sharing them with Net::Ssh::Connection::Channel
+
+0.6.3
+- [#25](https://github.com/simulacre/em-ssh/issues/25) - Failed negotiations are properly caught
+
 0.6.2
 - [#24](https://github.com/simulacre/em-ssh/pull/24) - Fix callbacks defined on EM::Ssh::Shell don't work [@mandre](https://github.com/mandre)
 

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

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

data/lib/em-ssh/shell.rb

@@ -184,7 +184,7 @@ module EventMachine
                   @shell  = shell
                   shell.extend(EventMachine::Ssh::Connection::Channel::Interactive)
                   # Share callbacks with shell
-                  send(:callbacks=, shell.callbacks)
+                  shell.callbacks       = callbacks
                   shell.line_terminator = @line_terminator if @line_terminator
                   shell.on(:data) { |data| debug("#{shell.dump_buffer}") }
                   set_open_status(self)

data/lib/em-ssh/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class Ssh
-    VERSION='0.6.2'
+    VERSION='0.6.5'
   end # class::Ssh
 end # module::EventMachine

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-ssh
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: An EventMachine compatible net-ssh