@@ -6,7 +6,7 @@ Marvin::Application.processing(ARGV) do |a| a.banner = "Marvin v#{Marvin::VERSION}" - a.option :development, "Runs the app in development mode (single managed distributed client)" + a.option :development, "Runs the app in development mode (handler reloading)", :shortcut => "D" a.controller! :client, "Starts the actual Marvin client instance" a.controller! :console, "Opens a friendly IRB prompt with Marvin pre-loaded" a.controller! :distributed_client, "Starts a distributed client instance" bin/marvin_new @@ -32,7 +32,7 @@ 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! end \ No newline at end of file config/setup.rb @@ -1,6 +1,6 @@ # Not Yet Complete: Twitter Client in Channel. class TweetTweet < Marvin::Base - + on_event :client_connected do start_tweeting end handlers/tweet_tweet.rb @@ -15,7 +15,7 @@ module Marvin @pass = opts.pass end - cattr_accessor :events, :configuration, :is_setup, :connections + cattr_accessor :events, :configuration, :is_setup, :connections, :development attr_accessor :channels, :nickname, :server, :port, :nicks, :pass, :disconnect_expected, :connection_config @@ -23,7 +23,8 @@ module Marvin @@events = [] @@configuration = Marvin::Nash.new @@connections = [] - + @@development = false + # Initializes the instance variables used for the # current connection, dispatching a :client_connected event # once it has finished. During this process, it will @@ -34,7 +35,7 @@ module Marvin @channels = [] connections << self logger.info "Setting the client for each handler" - handlers.each { |h| h.client = self if h.respond_to?(:client=) } + setup_handlers logger.info "Dispatching the default :client_connected event" dispatch :client_connected end @@ -51,6 +52,22 @@ module Marvin end end + def setup_handlers + handlers.each { |h| h.client = self if h.respond_to?(:client=) } + end + + def process_development + if @@development + Marvin::Reloading.reload! + setup_handlers + end + end + + def dispatch(*args) + process_development + super + end + # Sets the current class-wide settings of this IRC Client # to either an OpenStruct or the results of #to_hash on # any other value that is passed in. lib/marvin/abstract_client.rb @@ -1,4 +1,9 @@ module Marvin + + def self.handler_parent_classes + @@handler_parent_classes ||= Hash.new { |h,k| h[k] = Set.new } + end + class Base is :loggable @@ -52,6 +57,28 @@ module Marvin def register!(parent = Marvin::Settings.client) return if self == Marvin::Base # Only do it for sub-classes. parent.register_handler self.new unless parent.handlers.any? { |h| h.class == self } + Marvin.handler_parent_classes[self.name] << parent + end + + def reloading! + Marvin.handler_parent_classes[self.name].each do |dispatcher| + parent_handlers = dispatcher.handlers + related = parent_handlers.select { |h| h.class == self } + related.each do |h| + h.handle(:reloading, {}) + dispatcher.delete_handler(h) + end + end + end + + def reloaded! + Marvin.handler_parent_classes[self.name].each do |dispatcher| + before = dispatcher.handlers + register!(dispatcher) + after = dispatcher.handlers + (after - before).each { |h| h.handle(:reloaded, {}) } + end + end end lib/marvin/base.rb @@ -92,7 +92,8 @@ module Marvin::IRC # Starts the EventMachine loop and hence starts up the actual # networking portion of the IRC Client. - def run(force = false) + def run(opts = {}, force = false) + self.development = opts[:development] return if @stopped && !force self.setup # So we have options etc connections_file = Marvin::Settings.root / "config" / "connections.yml" lib/marvin/irc/client.rb bce7de4c9f9d398a766d2cae32032ebc5122f1e7 Darcy Laycock sutto@sutto.net http://github.com/Sutto/marvin/commit/03c8c67bf3966a765126fb197268ce417e49549b 03c8c67bf3966a765126fb197268ce417e49549b 2009-09-15T19:49:28-07:00 2009-09-15T19:49:28-07:00 Added code reloading in 'development' mode 9a74331683c5351c9ce2deb89f40b17fddfc2084 Darcy Laycock sutto@sutto.net