test/util_test.rb @@ -1,12 +1,12 @@ -# "irc.freenode.net": -# port: 6667 -# channels: -# - "#marvin-testing" -# - "#relayrelay" - -"localhost": +"irc.freenode.net": port: 6667 channels: - - "#webjam" - - "#eotw" - - "#general" \ No newline at end of file + - "#marvin-testing" + - "#relayrelay" + +# "localhost": +# port: 6667 +# channels: +# - "#webjam" +# - "#eotw" +# - "#general" \ No newline at end of file config/connections.yml @@ -27,7 +27,16 @@ Marvin::Loader.before_run do # And any other code here that will be run before the client - HelloWorld.register! - DebugHandler.register! + #HelloWorld.register! + #DebugHandler.register! + + if Marvin::Loader.server? + rails_dir = "/Users/sutto/Code/RelayRelay/PowWow" + ENV['RAILS_ENV'] ||= "development" + require File.join(rails_dir, 'config/environment') + require File.join(rails_dir, 'lib/marvin_event_processor') + # Register our super-dooper processer thingy + Marvin::IRC::Server::UserConnection.register_handler MarvinEventProcessor.new + end end \ No newline at end of file config/setup.rb @@ -41,7 +41,7 @@ module Marvin unless command_name.nil? logger.debug "Command Exists - processing" # Dispatch the command. - self.send(command_name, data.split(" ")) if self.respond_to?(command_name) + self.send(command_name, data.to_s.split(" ")) if self.respond_to?(command_name) end end lib/marvin/command_handler.rb @@ -55,6 +55,7 @@ module Marvin logger.warn "Dispatch handler queue is currently holding #{size} items" end else + logger.debug "Writing #{@queued_messages.size} message to the ring server" @queued_messages.dup.each do |t| ring_server.write(t) @queued_messages.delete(t) lib/marvin/distributed/dispatch_handler.rb @@ -55,6 +55,11 @@ module Marvin::IRC::Server end + def dispatch(name, opts = {}) + opts[:connection] ||= self + super + end + private def command(name, *args) lib/marvin/irc/server/abstract_connection.rb @@ -18,13 +18,15 @@ module Marvin def self.start DRb.start_service instance = self.new # Create the new instance - rs = Rinda::RingFinger.primary - unless rs.blank? + begin + rs = Rinda::RingFinger.primary renewer = Rinda::SimpleRenewer.new tuple = [:marvin_server, Marvin::Settings.distributed_namespace, instance] Marvin::Logger.info "Publishing information about service to the tuplespace" Marvin::Logger.debug "Pushing #{tuple.inspect}" rs.write(tuple, renewer) + rescue + Marvin::Logger.warn "No ring server found - remote interface not running" end end lib/marvin/irc/server/remote_interface.rb @@ -19,7 +19,7 @@ module Marvin::IRC::Server::User::HandleMixin # Get all users and let them now we've changed nick from @nick to nick users = [self] @channels.each do |c| - users += c.members.values + users += c.members end users.uniq.each { |u| u.notify :NICK, nick, :prefix => prefix } dispatch :outgoing_nick, :nick => @nick, :new_nick => nick lib/marvin/irc/server/user/handle_mixin.rb @@ -6,6 +6,8 @@ require File.join(File.dirname(__FILE__), 'test_helper') # 3) The two different types of prefixes # 4) The Event class class ParserTest < Test::Unit::TestCase + + # The default parser @@parser = Marvin::Parsers::SimpleParser context "When parsing a LIST" do test/parser_test.rb ff4c52354139ca6f2867e2c18efc9d009f06201e Darcy Laycock sutto@sutto.net http://github.com/Sutto/marvin/commit/70e473d07a8ee64d61bdf798f344b42f1a34f07d 70e473d07a8ee64d61bdf798f344b42f1a34f07d 2008-12-30T20:57:56-08:00 2008-12-30T20:57:56-08:00 More work on improving marvin a10e2bafb5343790dc841ac7daa15ca099c8a563 Darcy Laycock sutto@sutto.net