Changeset 675

Show
Ignore:
Timestamp:
09/22/07 08:48:34 (1 year ago)
Author:
iv..@gweezlebur.com
Message:

Apply merb part of patch to move migration tasks out of merb itself (refs #171) (thanks gthiesfeld)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/templates/Rakefile

    r633 r675  
    2929  require File.dirname(__FILE__)+'/config/merb_init.rb' 
    3030end   
    31  
    32 desc "Load db schema" 
    33 task :load_schema => [:merb_init] do 
    34   require File.dirname(__FILE__)+'/schema/schema.rb' 
    35 end 
    3631 
    3732task :uninstall => [:clean] do 

  • trunk/lib/tasks/merb.rake

    r416 r675  
    4343   
    4444end 
     45 
     46desc "Setup the Merb Environment by requiring merb and loading your merb_init.rb"  
     47task :merb_env do  
     48  require 'rubygems'  
     49  require 'merb'  
     50  Merb::Server.config[:environment] = ENV['MERB_ENV'] if ENV['MERB_ENV']  
     51  MERB_ENV  = Merb::Server.config[:environment].nil? ? 'development' : Merb::Server.config[:environment]  
     52  load MERB_ROOT+'/config/merb_init.rb'  
     53end