diff options
author | Sam Stephenson <sam@37signals.com> | 2005-11-05 18:04:52 +0000 |
---|---|---|
committer | Sam Stephenson <sam@37signals.com> | 2005-11-05 18:04:52 +0000 |
commit | 55fab64391593641b7722d35fc8099da205ffc1a (patch) | |
tree | a5db58ba6803ff8132df97a4ce1799e970f9f846 | |
parent | 71b032a0a6a4f68354db7cb41e77443aa091580b (diff) | |
download | rails-55fab64391593641b7722d35fc8099da205ffc1a.tar.gz rails-55fab64391593641b7722d35fc8099da205ffc1a.tar.bz2 rails-55fab64391593641b7722d35fc8099da205ffc1a.zip |
Move info.rb to rails_info.rb and load Rails::Info after initialization
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2884 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r-- | railties/CHANGELOG | 2 | ||||
-rw-r--r-- | railties/lib/initializer.rb | 8 | ||||
-rw-r--r-- | railties/lib/rails_info.rb (renamed from railties/lib/info.rb) | 16 | ||||
-rw-r--r-- | railties/test/rails_info_test.rb (renamed from railties/test/info_test.rb) | 2 |
4 files changed, 23 insertions, 5 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index e520f04fc1..58b90a8aaa 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Load Rails::Info after initialization [Sam Stephenson] + * Added script/about to display formatted Rails::Info output [Sam Stephenson] * Added Rails::Info to catalog assorted information about a Rails application's environment [Sam Stephenson] diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 368bf88039..9035138779 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -87,6 +87,8 @@ module Rails # could overwrite anything set from the defaults/global through # the individual base class configurations. load_environment + + load_framework_info load_plugins end @@ -113,6 +115,12 @@ module Rails configuration.frameworks.each { |framework| require(framework.to_s) } end + # Loads Rails::Version and Rails::Info. + # TODO: Make this work via dependencies.rb/const_missing instead. + def load_framework_info + require 'rails_info' + end + # Loads all plugins in the <tt>vendor/plugins</tt> directory. Each # subdirectory of <tt>vendor/plugins</tt> is inspected as follows: # diff --git a/railties/lib/info.rb b/railties/lib/rails_info.rb index 2104f4d6e6..edd90b36ad 100644 --- a/railties/lib/info.rb +++ b/railties/lib/rails_info.rb @@ -1,3 +1,5 @@ +require 'rails_version' + module Rails module Info mattr_accessor :properties @@ -19,8 +21,7 @@ module Rails end def components - %w(active_record action_pack action_web_service - action_mailer active_support) + %w( active_record action_pack action_web_service action_mailer active_support ) end def component_version(component) @@ -57,6 +58,11 @@ module Rails Gem::RubyGemsVersion end + # The Rails version. + property 'Rails version' do + Rails::Version::STRING + end + # Versions of each Rails component (Active Record, Action Pack, # Action Web Service, Action Mailer, and Active Support). components.each do |component| @@ -71,8 +77,10 @@ module Rails end # The application's location on the filesystem. - property 'Application root', File.expand_path(RAILS_ROOT) - + property 'Application root' do + File.expand_path(RAILS_ROOT) + end + # The current Rails environment (development, test, or production). property 'Environment' do RAILS_ENV diff --git a/railties/test/info_test.rb b/railties/test/rails_info_test.rb index 8faef428a8..4d85d8dae8 100644 --- a/railties/test/info_test.rb +++ b/railties/test/rails_info_test.rb @@ -3,7 +3,7 @@ $:.unshift File.dirname(__FILE__) + "/../../activesupport/lib" require 'test/unit' require 'active_support' -require 'info' +require 'rails_info' class << Rails::Info protected |