Changeset 1268

Show
Ignore:
Timestamp:
01/10/08 13:22:49 (8 months ago)
Author:
in..@loobmedia.com
Message:

fixed some issues related to Rake tasks and Merb.environment (MERB_ENV)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/templates/Rakefile

    r1267 r1268  
    1010 
    1111require File.dirname(__FILE__)+'/config/boot.rb' 
    12 Merb.environment = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
     12#Merb.environment = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
    1313require Merb::framework_root+'/tasks' 
    1414Merb.root = File.dirname(__FILE__) 
    …… 
    2424desc "load merb_init.rb" 
    2525task :merb_init do 
    26   require 'merb' 
    27   require File.dirname(__FILE__)+'/config/merb_init.rb' 
    28 end   
     26  # deprecated - here for BC 
     27  Rake::Task['merb_env'].invoke 
     28end 
    2929 
    3030task :uninstall => [:clean] do 

  • trunk/app_generators/merb/templates/config/merb_init.rb

    r1228 r1268  
    1414 
    1515# Load environment-specific configuration 
    16 require File.join(Merb.root, 'config', 'environments', Merb.environment) 
     16begin 
     17  require File.join(Merb.root, 'config', 'environments', Merb.environment) 
     18rescue LoadError 
     19end 

  • trunk/lib/merb.rb

    r1260 r1268  
    7070  # This is where Merb-global variables are set and held 
    7171  class << self 
     72     
    7273                def environment 
    7374                        @environment 
    …… 
    7576                 
    7677                def environment=(value) 
    77                         @environment ||= value 
     78                        @environment = value 
    7879                end 
    7980                 
    …… 
    134135                end 
    135136                 
    136                  
    137137                # Logger settings 
    138138                attr :logger, true 

  • trunk/lib/merb/config.rb

    r1256 r1268  
    2121       
    2222      def [](key) 
    23         (@configuration||{})[key] 
     23        (@configuration||={})[key] 
    2424      end 
    2525       

  • trunk/lib/tasks/merb.rake

    r1266 r1268  
    5050  require 'merb'  
    5151  Merb::Config[:environment] = ENV['MERB_ENV'] if ENV['MERB_ENV']  
    52   Merb.environment = Merb::Config[:environment].nil? ? 'development' : Merb::Config[:environment]  
     52  Merb.environment = Merb::Config[:environment].nil? ? 'development' : Merb::Config[:environment]  
    5353  load Merb.root+'/config/merb_init.rb'  
    5454end