@@ -120,7 +120,7 @@ module Cabar else if opts[:write] unless opts[:prefix] == false - @output.write " #{level.to_s.upcase}: " + @output.write " #{'%8s' % level.to_s.upcase}: " end msg.each do | msg | @output.write msg.to_s @@ -129,7 +129,7 @@ module Cabar else msg.each do | msg | unless opts[:prefix] == false - @output.write " #{level.to_s.upcase}: " + @output.write " #{'%8s' % level.to_s.upcase}: " end @output.puts msg.to_s end comp/cabar_core/lib/ruby/cabar/logger.rb @@ -119,7 +119,7 @@ module Cabar # While there are still component paths to search. @component_search_path_pending.cabar_each! do | path | _logger.debug do - "search path #{path.inspect}" + " search path #{path.inspect}" end @component_search_path << path @@ -131,7 +131,7 @@ module Cabar @component_directories_pending.cabar_each! do | dir | @component_directories << dir _logger.debug do - "component dir #{dir.inspect}" + " component dir #{dir.inspect}" end parse_component! dir @@ -193,7 +193,7 @@ module Cabar x = x.cabar_uniq_return! _logger.debug do - "result #{x.inspect}" + "search_for_component_directories #{path.inspect} => #{x.inspect}" end x @@ -230,7 +230,6 @@ module Cabar def create_component opts opts[:_loader] = self c = Component.factory.new opts - # c.resolver = self.resolver # YUCK! components know about Resolvers. c end @@ -291,8 +290,24 @@ private comps = { name => comps } end - # Handle plugins. - # Use component name as the default Plugin name. + + # Load plugins. + load_component_plugins! name, conf, directory + + + _logger.info do + " loading #{conf_file.inspect}: DONE" + end + + [ conf, comps, conf_file ] + end + + + # Loads a component's plugins. + # Use component name as the default Plugin name. + def load_component_plugins! name, conf, directory + + # Install plugins. if plugin = conf['plugin'] begin plugin = [ plugin ] unless Array === plugin @@ -322,12 +337,6 @@ private main.plugin_manager.delete_observer(self, :plugin_installed) end end - - _logger.info do - " loading #{conf_file.inspect}: DONE" - end - - [ conf, comps, conf_file ] end lib/ruby/cabar/loader.rb @@ -65,7 +65,10 @@ module Cabar super @file = $1 if /^(.*):\d+:in / === @file + @name ||= @@default_name + raise ArgumentError, "Component in #{@file} does not have a name" unless @name + @component ||= @@default_component @block = blk @@ -150,7 +153,7 @@ module Cabar def register_plugin! plugin # Overlay configuration options. - config_opts = main.resolver.configuration.config['plugin'] + config_opts = main.configuration.config['plugin'] config_opts &&= config_opts[plugin.name] _logger.debug { "plugin: #{plugin} configuration #{config_opts.inspect}" } @@ -163,13 +166,17 @@ module Cabar end # Do not register if disabled. - return unless plugin.enabled? + unless plugin.enabled? + _logger.debug { "plugin: #{plugin} named #{name} disabled" } + return + end name = plugin.name.to_s # Unfortunately we need to allow multiple plugins to be # loaded but not registered. if @plugin_by_name[name] + _logger.debug { "plugin: #{plugin} named #{name} already exists" } return end @@ -182,6 +189,8 @@ module Cabar notify_observers(:plugin_installed, plugin) + _logger.info { "plugin: #{plugin} installed #{opts.inspect}" } + self end end lib/ruby/cabar/plugin.rb 1faccc4ca30e62059717d3afe9bb3acc29c82bb8 Kurt Stephens kstephens ks.github@kurtstephens.com http://github.com/kstephens/cabar/commit/b7067d25fb8f7b84d9993ff05d689cf16187bcb4 b7067d25fb8f7b84d9993ff05d689cf16187bcb4 2009-06-28T22:52:28-07:00 2009-06-28T22:52:28-07:00 Separate plugin loading from component loading. e850c9768b45912c65cd80d4e08bc7956eb5d534 Kurt Stephens kstephens ks.github@kurtstephens.com