lib/hipbot.rb in hipbot-1.0.3 vs lib/hipbot.rb in hipbot-1.0.4

@@ -5,37 +5,34 @@
 require 'active_support/core_ext/string/inflections'
 require 'ostruct'
 require 'json'
 require 'eventmachine'
 require 'em-http-request'
-require 'xmpp4r-hipchat'
 
-require 'hipbot/cache'
+require 'hipbot/utilities/cache'
+require 'hipbot/utilities/logger'
 require 'hipbot/patches/encoding'
-require 'hipbot/logger'
 require 'hipbot/callbacks/base'
 require 'hipbot/callbacks/message'
 require 'hipbot/callbacks/private_message'
 require 'hipbot/callbacks/room_message'
+require 'hipbot/callbacks/room_topic'
 require 'hipbot/callbacks/presence'
 require 'hipbot/callbacks/lobby_presence'
 require 'hipbot/callbacks/room_presence'
-require 'hipbot/callbacks/invite'
-require 'hipbot/adapter'
-require 'hipbot/adapters/hipchat/initializer'
-require 'hipbot/adapters/hipchat'
-require 'hipbot/adapters/telnet'
-require 'hipbot/adapters/shell'
+require 'hipbot/callbacks/room_invite'
 require 'hipbot/reaction_factory'
 require 'hipbot/reactable'
 require 'hipbot/matchable'
 require 'hipbot/configuration'
 require 'hipbot/configurable'
+require 'hipbot/adapter'
 require 'hipbot/bot'
+require 'hipbot/adaptable'
+require 'hipbot/adapters/hipchat'
 require 'hipbot/plugin'
 require 'hipbot/storages/base'
 require 'hipbot/storages/hash'
-require 'hipbot/http'
 require 'hipbot/helpers'
 require 'hipbot/match'
 require 'hipbot/message'
 require 'hipbot/reaction'
 require 'hipbot/response'