diff options
author | Carl Lerche <carllerche@mac.com> | 2009-09-30 12:05:34 -0700 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2009-09-30 12:05:34 -0700 |
commit | 2370e87ae0babf0fb4b21254c8120f7a93189d40 (patch) | |
tree | 163ba90026e407ff88ce2c2a71c723012e85bbda /railties/lib/rails/initializer.rb | |
parent | 34aae6d739918d972e5273b56c767dae76aa7c00 (diff) | |
download | rails-2370e87ae0babf0fb4b21254c8120f7a93189d40.tar.gz rails-2370e87ae0babf0fb4b21254c8120f7a93189d40.tar.bz2 rails-2370e87ae0babf0fb4b21254c8120f7a93189d40.zip |
Remove all calls to Rails::Initializer from boot.rb
This is starting a refactor of the rails initialization process. The boot.rb file will not remain the same.
Diffstat (limited to 'railties/lib/rails/initializer.rb')
-rw-r--r-- | railties/lib/rails/initializer.rb | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/railties/lib/rails/initializer.rb b/railties/lib/rails/initializer.rb index f75bd917bf..2d63ac4d39 100644 --- a/railties/lib/rails/initializer.rb +++ b/railties/lib/rails/initializer.rb @@ -123,33 +123,16 @@ module Rails require 'rails/ruby_version_check' end - # If Rails is vendored and RubyGems is available, install stub GemSpecs - # for Rails, Active Support, Active Record, Action Pack, Action Mailer, and - # Active Resource. This allows Gem plugins to depend on Rails even when - # the Gem version of Rails shouldn't be loaded. - Initializer.default.add :install_gem_spec_stubs do - unless Rails.respond_to?(:vendor_rails?) + # Bail if boot.rb is outdated + Initializer.default.add :freak_out_if_boot_rb_is_outdated do + unless defined?(Rails::BOOTSTRAP_VERSION) abort %{Your config/boot.rb is outdated: Run "rake rails:update".} end - - if Rails.vendor_rails? - begin; require "rubygems"; rescue LoadError; return; end - - %w(rails activesupport activerecord actionpack actionmailer activeresource).each do |stub| - Gem.loaded_specs[stub] ||= Gem::Specification.new do |s| - s.name = stub - s.version = Rails::VERSION::STRING - s.loaded_from = "" - end - end - end end # Set the <tt>$LOAD_PATH</tt> based on the value of # Configuration#load_paths. Duplicates are removed. Initializer.default.add :set_load_path do - # TODO: Think about unifying this with the general Rails paths - configuration.framework_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) } configuration.paths.add_to_load_path $LOAD_PATH.uniq! end |