Sutto-marvin 0.8.0.0 → 0.8.0.1

data/lib/marvin.rb

@@ -5,19 +5,14 @@ require 'perennial'
 module Marvin
   include Perennial
   
-  VERSION = [0, 8, 0, 0]
+  VERSION = [0, 8, 0, 1]
   
-  # Misc.
-  #autoload :Util,             'marvin/util'
   # Client
-  #autoload :AbstractClient,   'marvin/abstract_client'
-  #autoload :IRC,              'marvin/irc'
   autoload :TestClient,       'marvin/test_client'
   # Console of DOOM.
   autoload :Console,          'marvin/console'
   # Distributed
   autoload :Distributed,      'marvin/distributed'
-  autoload :Status,           'marvin/status'
   # Handler
   autoload :Base,             'marvin/base'
   autoload :CommandHandler,   'marvin/command_handler'
@@ -25,7 +20,6 @@ module Marvin
   autoload :CoreCommands,     'marvin/core_commands'
   autoload :MiddleMan,        'marvin/middle_man'
   # These should be namespaced under IRC
-  #autoload :AbstractParser,   'marvin/abstract_parser'
   autoload :Parsers,          'marvin/parsers'
   
   

data/lib/marvin/abstract_client.rb

@@ -57,10 +57,7 @@ module Marvin
     end
     
     def process_development
-      if @@development
-        Marvin::Reloading.reload!
-        setup_handlers
-      end
+      Marvin::Reloading.reload! if @@development
     end
     
     def dispatch(*args)

data/lib/marvin/base.rb

@@ -76,9 +76,11 @@ module Marvin
           before = dispatcher.handlers
           register!(dispatcher)
           after = dispatcher.handlers
-          (after - before).each { |h| h.handle(:reloaded, {}) }
+          (after - before).each do |h|
+            h.client = dispatcher
+            h.handle(:reloaded, {})
+          end
         end
-        
       end
     
     end

data/lib/marvin/command_handler.rb

@@ -8,7 +8,6 @@ module Marvin
     
     @@exposed_method_mapping = Hash.new { |h,k| h[k] = [] }
     @@method_descriptions    = Hash.new { |h,k| h[k] = {} }
-    @@registered_classes     = Set.new
     
     class << self
       
@@ -48,6 +47,12 @@ module Marvin
         "#{command_prefix}#{method}"
       end
       
+      def reloading!
+        super
+        @@exposed_method_mapping.delete(self)
+        @@method_descriptions.delete(self)
+      end
+      
     end
     
     on_event :incoming_message, :check_for_commands

data/lib/marvin/logging_handler.rb

@@ -21,20 +21,23 @@ module Marvin
       end
     end
     
-    on_event :client_connected do
-      @server = self.client.host_with_port
-      @nick   = self.client.nickname
-      setup_logging
-    end
+    on_event :client_connected, :presetup_logging
+    on_event :client_connected, :setup_logging
+    on_event :reloaded, :presetup_logging
+    on_event :reloaded, :setup_logging
 
-    on_event :client_disconnected do
-      teardown_logging
-    end
+    on_event :client_disconnected, :teardown_logging
+    on_event :reloaded, :teardown_logging
     
     on_event :outgoing_nick do
       @nick = options.new_nick
     end
     
+    def presetup_logging
+      @server = self.client.host_with_port
+      @nick   = self.client.nickname
+    end
+    
     # Called when the client connects, over ride it to
     # do any of your specific setup.
     def setup_logging

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Sutto-marvin
 version: !ruby/object:Gem::Version 
-  version: 0.8.0.0
+  version: 0.8.0.1
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 -07:00
-default_executable: 
+date: 2009-09-17 00:00:00 -07:00
+default_executable: marvin
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: Sutto-perennial
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.4.6
+        version: 1.0.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine-eventmachine
@@ -44,8 +44,8 @@ dependencies:
     version: 
 description: 
 email: sutto@sutto.net
-executables: []
-
+executables: 
+- marvin
 extensions: []
 
 extra_rdoc_files: []