lib/marvin/irc/server/channel.rb lib/marvin/irc/server/named_store.rb lib/marvin/irc/server/user_connection.rb rfcs/README rfcs/ctcp.txt rfcs/ctcp_ext.txt rfcs/dcc.txt rfcs/rfc1459.txt rfcs/rfc2810.txt rfcs/rfc2811.txt rfcs/rfc2812.txt rfcs/rfc2813.txt @@ -2,6 +2,9 @@ module Marvin module IRC module Server + # Server utilities + autoload :NamedStore, 'marvin/irc/server/named_store' + autoload :Channel, 'marvin/irc/server/channel' # The actual network connection autoload :BaseConnection, 'marvin/irc/server/base_connection' # An our implementations of protocol-specific stuff. @@ -9,6 +12,22 @@ module Marvin autoload :UserConnection, 'marvin/irc/server/user_connection' autoload :ServerConnection, 'marvin/irc/server/server_connection' + # Store each user + UserStore = NamedStore.new(:nicks, :user) do + def nick_taken?(nick) + has_key?(nick) + end + + def each_user_except(user) + self.each_user do |u| + yield u unless user == u + end + end + end + + # Store each channel + ChannelStore = NamedStore(:names, :channel) + # call start_server w/ the default options # and inside an EM::run block. def self.run lib/marvin/irc/server.rb @@ -49,6 +49,25 @@ module Marvin::IRC::Server end end + + private + + def rpl(number, *args) + code = Marvin::IRC::Replies["RPL_#{number.to_s.upcase}"] + return command(code, *args) + end + + def err(number, *args) + code = Marvin::IRC::Replies["ERR_#{number.to_s.upcase}"] + return command(code, *args) + end + + def command(name, *args) + opts = args.extract_options! + formatted = [name.to_s.upcase, *args].join(" ") + formatted = ":#{opts[:prefix]} #{formatted}" if opts[:prefix] + send_line formatted + end end end \ No newline at end of file lib/marvin/irc/server/abstract_connection.rb @@ -1,6 +1,13 @@ module Marvin module Util + GLOB_PATTERN_MAP = { + '*' => '.*', + '?' => '.', + '[' => '[', + ']' => ']' + } + # Return the channel-name version of a string by # appending "#" to the front if it doesn't already # start with it. @@ -20,9 +27,19 @@ module Marvin # specify parameters which have spaces etc (for example, # the actual message part of a response). def last_param(section) - section && ":#{section.to_s.strip} " + section && ":#{section.to_s.strip}" end alias lp last_param + + # Converts a glob-like pattern into a regular + # expression for easy / fast matching. Code is + # from PLEAC at http://pleac.sourceforge.net/pleac_ruby/patternmatching.html + def glob2pattern(glob_string) + inner_pattern = glob_string.gsub(/(.)/) do |c| + GLOB_PATTERN_MAP[c] || Regexp::escape(c) + end + return Regexp.new("^#{inner_pattern}$") + end extend self lib/marvin/util.rb 07620fcc15d96d73124ea9ca9aa4fc2e98e878be Darcy Laycock sutto@sutto.net http://github.com/Sutto/marvin/commit/38686dabe5881d18ae92421bef4e6e22feec55c1 38686dabe5881d18ae92421bef4e6e22feec55c1 2008-11-22T03:22:31-08:00 2008-11-22T03:22:31-08:00 More server work, added RFC's to the checkout and the like 88a3c42eb83f9b7424d7e4ff9f7e9515def814ed Darcy Laycock sutto@sutto.net