konn-rupircd 0.6.3 → 0.6.4

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/lib/rupircd/server.rb

@@ -35,7 +35,7 @@ class IRCServer < WEBrick::GenericServer
     def define_oper_command(mtd, &pr)
       define_method(mtd){|usr, param|
         if usr.operator || usr.local_operator
-          instance_eval(&pr)
+          instance_exec(usr, param, &pr)
         else
           send_server_message(usr, "481", "Permission Denied - You're not an IRC operator")
         end
@@ -235,7 +235,6 @@ class IRCServer < WEBrick::GenericServer
   
   define_oper_command :on_rehash do |usr, params|
     cnf = @fconf.load
-    
     if Hash === cnf
       config.replace(cnf)
       send_server_message(usr, "382", "#{@fconf.path} :Rehashing")
@@ -281,6 +280,10 @@ class IRCServer < WEBrick::GenericServer
     send_server_message(user, "219", c.chr, "End of STATS report")
   end
 
+  def class_for_chname(chname)
+    # overridden in sub-classes
+  end
+
   def on_join(user, params)
     if params[0] == "0"
       user.joined_channels.each{|ch|
@@ -292,11 +295,6 @@ class IRCServer < WEBrick::GenericServer
       keys = params[1].split(",") if params.size >= 2
       keys ||= []
       chs.each_with_index{|ch, i|
-        unless channame?(ch)
-          send_server_message(user, "403", ch, "No such channel")
-          next
-        end
-        
         chclass = case ch
         when /^\+/
           NoModeChannel
@@ -304,6 +302,13 @@ class IRCServer < WEBrick::GenericServer
           Channel
         when /^!#/
           SafeChannel
+        else
+          if klass = class_for_chname(ch)
+            klass
+          else
+            send_server_message(user, "403", ch, "No such channel")
+            next
+          end
         end
         unless @channels.has_key?(ch.downcase)
           set_channel(ch, chclass.new(self, user, ch) )

data/rupircd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rupircd}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["konn"]
-  s.date = %q{2009-08-13}
+  s.date = %q{2009-08-16}
   s.description = %q{rupircd is a light IRC daemon written in 100% pure ruby.}
   s.email = %q{mr_konn[at]jcom[dot]home[dot]ne[dot]jp}
   s.executables = ["mkpassword", "rupircd"]

data/sample.conf

@@ -1,9 +1,9 @@
-Conf = {
+{
   :Motd => open("motd.txt"){|f| f.read },
   :Info => open("info.txt"){|f| f.read },
   :Port => 6667,
   :Opers => {"superoper*"=>"329435e5e66be809a656af105f42401e"},
-#  :Encoding => "UTF-8",
+  :Encoding => "UTF-8",
   :MaxClients => 100,
   :PINGInterval => 10,
   :PINGLimit => 90,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: konn-rupircd
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - konn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-13 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: []