@@ -1,4 +1,3 @@ Simple XMPP client built on EventMachine. -Requires eventmachine-xmlpushparser. To install on OSX: - gem install eventmachine-xmlpushparser -- --with-xml2-include=/usr/include/libxml2 \ No newline at end of file +Requires eventmachine-xmlpushparser (in vendor/) and eventmachine 0.12.1 README @@ -1,31 +1,4 @@ require 'rubygems' require 'eventmachine' - -module EventMachine - def self.start(background = nil, &block) - if EM::reactor_running? - # Attention: here we loose the ability to catch - # immediate connection errors. - EM::next_tick(&block) - sleep unless background # this blocks the thread as it was inside a reactor - else - if background - Thread.abort_on_exception = true - $em_reactor_thread = Thread.new do - EM::old_run(&block) - end - else - EM::old_run(&block) - end - end - end - - class << self - alias :old_run :run - alias :run :start - end unless EM.respond_to? :old_run -end - require 'evma_xmlpushparser' - EM.epoll em.rb @@ -171,12 +171,12 @@ module XMPP4EM end def connect host = jid.domain, port = 5222 - EM.run(true) do + EM.run { EM.connect host, port, Connection, host do |conn| @connection = conn conn.client = self end - end + } end def connected? xmpp4em.rb 6ffb457d7ae67f6aeb463a72fe048371261a422b Aman Gupta aman@tmm1.net http://github.com/tmm1/xmpp4em/commit/7a606938a6c76c7c15bb0cc58ce2923c8dc0e38c 7a606938a6c76c7c15bb0cc58ce2923c8dc0e38c 2008-06-17T14:09:07-07:00 2008-06-17T14:09:07-07:00 switch to new nestable EM.run in EM 0.12.1 56eabaa31492e9524e74f4e589ed61a05af182cc Aman Gupta aman@tmm1.net