@@ -59,6 +59,22 @@ module FreeBASE end ## + # Requires all the plugins based on the load list calculated by the dependency resolution + # + def require_plugins + num = 0 + if @load_list.size == 0 + puts "[FreeBASE] no plugins to require" if ARGV.include?("--debug-freebase") + exit + end + while num < @load_list.size + plugin = @load_list[num] + plugin.instance.require_files + num += 1 + end + end + + ## # Loads all the plugins based on the load list calculated by the dependency resolution # def load_plugins freebase2/lib/freebase/configuration.rb @@ -41,6 +41,10 @@ module FreeBASE Core.new(propertiesFile, defaultPropertiesFile, :load_only => true) end + def self.require(propertiesFile, defaultPropertiesFile) + Core.new(propertiesFile, defaultPropertiesFile, :require_only => true) + end + # The master bus FreeBASE::DataBus attr_reader :bus @@ -65,8 +69,12 @@ module FreeBASE @bus["/log/info"] << "--- #{@properties['config/product_name']} Started on #{Time.now.to_s}" @bus["/system/state/all_plugins_loaded"].data = false @plugin_config = Configuration.new(self, @properties["config/plugin_path"]) - @plugin_config.load_plugins - @plugin_config.start_plugins unless options[:load_only] + if options[:require_only] + @plugin_config.require_plugins + else + @plugin_config.load_plugins + @plugin_config.start_plugins unless options[:load_only] + end @bus["/system/state/all_plugins_loaded"].data = true @core_thread = Thread.current unless options[:load_only] freebase2/lib/freebase/core.rb @@ -198,6 +198,27 @@ module FreeBASE @base_slot['state'].data end + # Require the plugins files + def require_files + log_requires do + $LOAD_PATH << File.expand_path( + File.join( + @plugin_configuration.full_base_path, + "lib")) + if @plugin_configuration.require_path + require @plugin_configuration.require_path + else + # loads from default path plugin_dir/lib/plugin_name if no load path given + path = File.expand_path( + File.join( + @plugin_configuration.full_base_path, + "lib", + @plugin_configuration.name)) + require path + end + end + end + ## # Loads the plugin instance by calling load on the Module defined by startup_module. # @@ -206,25 +227,9 @@ module FreeBASE begin raise Exception.new("unment dependencies") unless @plugin_configuration.dependencies_met? require @plugin_configuration.dependencies_path if @plugin_configuration.dependencies_path - log_requires do - $LOAD_PATH << File.expand_path( - File.join( - @plugin_configuration.full_base_path, - "lib")) - if @plugin_configuration.require_path - require @plugin_configuration.require_path - else - # loads from default path plugin_dir/lib/plugin_name if no load path given - path = File.expand_path( - File.join( - @plugin_configuration.full_base_path, - "lib", - @plugin_configuration.name)) - require path - end - object = eval(@plugin_configuration.startup_module) - object.load if object.respond_to?(:load) - end + require_files + object = eval(@plugin_configuration.startup_module) + object.load if object.respond_to?(:load) transition(FreeBASE::LOADED) rescue Exception => error puts error freebase2/lib/freebase/plugin.rb @@ -24,6 +24,10 @@ module Redcar FreeBASE::Core.load_plugins("properties.yaml","config/default.yaml") end + def self.require + FreeBASE::Core.require("properties.yaml","config/default.yaml") + end + def self.pump bus["/system/ui/messagepump"].call() end lib/redcar.rb 31e4cb735be068182aefd5023c78747e4ad9b213 Daniel Lucraft dan@fluentradical.com http://github.com/danlucraft/redcar/commit/9d4d458e9d4809ab8b0bf890e11a4b1ba6abecdb 9d4d458e9d4809ab8b0bf890e11a4b1ba6abecdb 2009-10-24T00:32:19-07:00 2009-10-24T00:31:37-07:00 Added FreeBASE::Core#require_plugins method for just requiring plugin files without loading the plugins. 8c79a2e9c06993f8ee65a0baa4c20a33299d428d Daniel Lucraft dan@fluentradical.com