lib/botfly.rb in botfly-0.1.1 vs lib/botfly.rb in botfly-0.2.1

@@ -1,24 +1,29 @@
 require 'rubygems'
 
 require 'xmpp4r'
 require 'xmpp4r/muc'
+require 'forwardable'
+require 'logger'
 
+require 'botfly/common_block_acceptor'
 require 'botfly/responder'
 require 'botfly/bot'
 require 'botfly/matcher'
+require 'botfly/muc_client'
 
-require 'logger'
+Thread.abort_on_exception = true
 
 module Botfly
   def Botfly.logger
     @logger = Logger.new(@logfile)
     return @logger
   end
   def Botfly.login(jid,pass,logfile=STDOUT,&block)
     @logfile = logfile
     Botfly.logger.info("BOTFLY: #login")
     bot = Botfly::Bot.new(jid,pass)
-    bot.instance_eval(&block)
+    bot.connect
+    bot.instance_exec(&block)
     return bot # At this point doesn't get returned, as the thread is stopped
   end
-end
\ No newline at end of file
+end