Changeset 826

Show
Ignore:
Timestamp:
11/03/07 07:20:04 (1 year ago)
Author:
e.@brainspl.at
Message:

added boot.rb and normalized so framework is loaded properly for testing as well as working with frozen frameowork thanks bryan closes #258

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/merb_generator.rb

    r804 r826  
    3333      m.file_copy_each %w( master.css ), "public/stylesheets" 
    3434      m.file_copy_each %w( merb.fcgi ), "public" 
    35       m.file_copy_each %w( merb_init.rb router.rb upload.conf dependencies.rb), "config" 
     35      m.file_copy_each %w( boot.rb merb_init.rb router.rb upload.conf dependencies.rb), "config" 
    3636      m.file_copy_each %w( development.rb production.rb test.rb ), "config/environments" 
    3737      m.file_copy_each %w( spec_helper.rb ), "spec" 

  • trunk/app_generators/merb/templates/script/destroy

    r707 r826  
    99end 
    1010 
    11 require 'merb' 
     11require File.join(File.dirname(__FILE__), "..", 'config', 'boot') 
    1212module Kernel 
    1313  undef dependency if defined?(Kernel.dependency) 

  • trunk/app_generators/merb/templates/script/generate

    r824 r826  
    99end 
    1010 
    11 require 'merb' 
     11require File.join(File.dirname(__FILE__), "..", 'config', 'boot') 
    1212require (APP_ROOT / "config" / "merb_init" ) 
    1313module Kernel 

  • trunk/app_generators/merb/templates/spec/spec_helper.rb

    r800 r826  
     1require File.join(File.dirname(__FILE__), "..", 'config', 'boot') 
     2 
    13$TESTING=true 
    2 FROZEN_FRAMEWORK_PATH=File.join(File.dirname(__FILE__), "../framework") 
    3 if File.directory?(FROZEN_FRAMEWORK_PATH) 
    4   $:.unshift FROZEN_FRAMEWORK_PATH 
    5   require FROZEN_FRAMEWORK_PATH + "/merb" 
    6 else   
    7   require 'merb' 
    8 end 
    94 
    105require File.join(MERB_ROOT, 'config', 'merb_init') 

  • trunk/app_generators/merb/templates/test/test_helper.rb

    r804 r826  
     1require File.join(File.dirname(__FILE__), "..", 'config', 'boot') 
     2 
    13$TESTING=true 
     4 
    25require 'rubygems' 
    36require 'test/unit' 
    4 FROZEN_FRAMEWORK_PATH=File.join(File.dirname(__FILE__), "../framework") 
    5 if File.directory?(FROZEN_FRAMEWORK_PATH) 
    6   $:.unshift FROZEN_FRAMEWORK_PATH 
    7   require FROZEN_FRAMEWORK_PATH + "/merb" 
    8 else   
    9   require 'merb' 
    10 end 
    117require File.join(MERB_ROOT, 'config', 'merb_init') 
    128