lib/mack_app.rb lib/mack_core.rb @@ -23,6 +23,7 @@ * [#49] mack-active_record: mack-active_record.rb will require mack-active_record_tasks.rb * [#49] mack-data_mapper: mack-data_mapper.rb will require mack-data_mapper_tasks.rb * [#49] Updated warning message if orm is defined in app_config (i.e. user only needs to require mack-[orm_name], instead of both that and mack-[orm_name]_tasks). +* [#50] Mack will now have 2 environment files: mack_core and mack_app. Mack.rb will load both files, but it gives other module a chance to load just the core files and not the application's files. * gem: application_configuration 1.5.1 * gem: ruby-debug 0.10.0 CHANGELOG @@ -16,7 +16,8 @@ module Mack module Configuration # :nodoc: class << self - attr_accessor :initialized + attr_accessor :initialized_core + attr_accessor :initialized_application end # use local memory and store stuff for 24 hours: lib/initialization/configuration.rb @@ -1,58 +1,2 @@ -require 'rubygems' -require 'rack' -require 'digest' -require 'mack-facets' -require 'application_configuration' -require 'cachetastic' -require 'fileutils' -require 'log4r' -require 'crypt/rijndael' -require 'singleton' -require 'uri' -require 'drb' -require 'rinda/ring' -require 'rinda/tuplespace' -require 'builder' -require 'erubis' -require 'erb' -require 'genosaurus' -require 'net/http' -require 'pp' -require 'test/unit' -require 'ruby-debug' - -require File.join(File.dirname(__FILE__), "initialization", "configuration.rb") - -unless Mack::Configuration.initialized - - puts "Initializing logging..." - require File.join(File.dirname(__FILE__), "initialization", "logging.rb") - - fl = File.join(File.dirname(__FILE__)) - - Mack.logger.info "Starting application in #{Mack.env} mode." - Mack.logger.info "Mack root: #{Mack.root}" - - Mack.logger.info "Initializing core classes..." - # Require all the necessary files to make Mack actually work! - lib_dirs = ["errors", "core_extensions", "utils", "runner_helpers", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators", "distributed"] - lib_dirs << "testing" if Mack.env == "test" - lib_dirs.each do |dir| - dir_globs = Dir.glob(File.join(fl, dir, "**/*.rb")) - dir_globs.each do |d| - require d - end - end - - require File.join(File.dirname(__FILE__), "runner") - - require File.join(File.dirname(__FILE__), "initialization", "orm_support.rb") - - require File.join(File.dirname(__FILE__), "initialization", "application.rb") - - require File.join(File.dirname(__FILE__), "initialization", "helpers.rb") - - Mack::Configuration.initialized = true if Mack::Configuration.initialized.nil? - - Mack.logger.info "Initialization finished." -end \ No newline at end of file +require 'mack_core' +require 'mack_app' \ No newline at end of file lib/mack.rb @@ -3,15 +3,10 @@ require 'rake/testtask' require 'rake/rdoctask' require 'rubygems' require 'application_configuration' -require 'mack-facets' -require 'log4r' require File.join(File.dirname(__FILE__), "initialization", "configuration.rb") -# Load all the supporting files, so we can load the required gems -require File.join(File.dirname(__FILE__), "core_extensions", "kernel.rb") -require File.join(File.dirname(__FILE__), "utils", "gem_manager.rb") -require File.join(File.dirname(__FILE__), "initialization", "logging.rb") +require 'mack_core' require File.join(Mack.root, "config", "initializers", "gems.rb") Mack::Utils::GemManager.instance.do_requires lib/mack_tasks.rb f621ed5ccb0db8bf2678ff3cac2d43e5f5bc00a7 dsutedja dsutedja@helium.com http://github.com/markbates/mack/commit/32b713745821c03fefedeebfcfb00fb7fb3a3b45 32b713745821c03fefedeebfcfb00fb7fb3a3b45 2008-07-23T12:01:36-07:00 2008-07-23T12:01:36-07:00 Adding mack_core and mack_app as part of the environment loading sequence [#50 state:resolved] 9739dc4361315829b78ca4afee719ded2209fdf5 dsutedja dsutedja@helium.com