@@ -15,6 +15,10 @@ * [#7] Added support for Extlib::Hook in a few places. * [#41] Deprecate orm_support.rb * [#6] RJS support +* [#49] Making sure the orm tasks is available when orm_support is removed from the app_config +* [#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). * gem: application_configuration 1.5.1 * gem: ruby-debug 0.10.0 CHANGELOG @@ -11,7 +11,7 @@ unless orm.nil? orm: data_mapper from the app_config/default.yml file 2. In gem.rb, add the following line in the require_gems block: - gem.add "mack-data_mapper", :version => "0.6.0", :libs => ["mack-data_mapper", "mack-data_mapper_tasks"] + gem.add "mack-data_mapper", :version => "0.6.0", :libs => ["mack-data_mapper"] ** if you use active record, then change it to mack-active_record instead of mack-data_mapper } Mack.logger.info "Initializing #{orm} orm..." lib/initialization/orm_support.rb @@ -3,10 +3,30 @@ 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 File.join(Mack.root, "config", "initializers", "gems.rb") +Mack::Utils::GemManager.instance.do_requires + orm = app_config.orm unless orm.nil? + Mack.logger.warn %{ + Please note that setting up orm in app_config has been deprecated, and will not be supported in future mack releases. + Here's how to update your existing application: + 1. Remove the line: + orm: data_mapper + from the app_config/default.yml file + 2. In gem.rb, add the following line in the require_gems block: + gem.add "mack-data_mapper", :version => "0.6.0", :libs => ["mack-data_mapper"] + ** if you use active record, then change it to mack-active_record instead of mack-data_mapper + } require "mack-#{orm}_tasks" end lib/mack_tasks.rb 6455ed89edd2f9179f0fb0e806901ad82af474c3 dsutedja dsutedja@helium.com http://github.com/markbates/mack/commit/69a51e3b1dea6244fb1cb1bb1347e2641fb4476d 69a51e3b1dea6244fb1cb1bb1347e2641fb4476d 2008-07-23T08:44:22-07:00 2008-07-23T08:44:22-07:00 fixed 'orm tasks aren't available' [#49 state:resolved] 18219558cedc53ece68a440f90889f1b93d85a30 dsutedja dsutedja@helium.com