From 55fab64391593641b7722d35fc8099da205ffc1a Mon Sep 17 00:00:00 2001 From: Sam Stephenson Date: Sat, 5 Nov 2005 18:04:52 +0000 Subject: 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 --- railties/CHANGELOG | 2 + railties/lib/info.rb | 86 ------------------------------------ railties/lib/initializer.rb | 8 ++++ railties/lib/rails_info.rb | 94 ++++++++++++++++++++++++++++++++++++++++ railties/test/info_test.rb | 73 ------------------------------- railties/test/rails_info_test.rb | 73 +++++++++++++++++++++++++++++++ 6 files changed, 177 insertions(+), 159 deletions(-) delete mode 100644 railties/lib/info.rb create mode 100644 railties/lib/rails_info.rb delete mode 100644 railties/test/info_test.rb create mode 100644 railties/test/rails_info_test.rb 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/info.rb b/railties/lib/info.rb deleted file mode 100644 index 2104f4d6e6..0000000000 --- a/railties/lib/info.rb +++ /dev/null @@ -1,86 +0,0 @@ -module Rails - module Info - mattr_accessor :properties - class << (@@properties = []) - def names - map {|(name, )| name} - end - - def value_for(property_name) - find {|(name, )| name == property_name}.last rescue nil - end - end - - class << self #:nodoc: - def property(name, value = nil) - value ||= yield - properties << [name, value] if value - rescue Exception - end - - def components - %w(active_record action_pack action_web_service - action_mailer active_support) - end - - def component_version(component) - require "#{component}/version" - "#{component.classify}::Version::STRING".constantize - end - - def edge_rails_revision - svn_info[/^Revision: (\d+)/, 1] || 'unknown' - end - - def to_s - column_width = properties.names.map {|name| name.length}.max - ["About your application's environment", *properties.map do |property| - "%-#{column_width}s %s" % property - end] * "\n" - end - - alias inspect to_s - - protected - def svn_info - Dir.chdir("#{RAILS_ROOT}/vendor/rails") do - IO.popen('svn info') { |f| f.read } - end - end - end - - # The Ruby version and platform, e.g. "1.8.2 (powerpc-darwin8.2.0)". - property 'Ruby version', "#{RUBY_VERSION} (#{RUBY_PLATFORM})" - - # The RubyGems version, if it's installed. - property 'RubyGems version' do - Gem::RubyGemsVersion - end - - # Versions of each Rails component (Active Record, Action Pack, - # Action Web Service, Action Mailer, and Active Support). - components.each do |component| - property "#{component.titlecase} version" do - component_version(component) - end - end - - # The Rails SVN revision, if it's checked out into vendor/rails. - property 'Edge Rails revision' do - edge_rails_revision - end - - # The application's location on the filesystem. - property 'Application root', File.expand_path(RAILS_ROOT) - - # The current Rails environment (development, test, or production). - property 'Environment' do - RAILS_ENV - end - - # The name of the database adapter for the current environment. - property 'Database adapter' do - ActiveRecord::Base.configurations[RAILS_ENV]['adapter'] - end - end -end 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 vendor/plugins directory. Each # subdirectory of vendor/plugins is inspected as follows: # diff --git a/railties/lib/rails_info.rb b/railties/lib/rails_info.rb new file mode 100644 index 0000000000..edd90b36ad --- /dev/null +++ b/railties/lib/rails_info.rb @@ -0,0 +1,94 @@ +require 'rails_version' + +module Rails + module Info + mattr_accessor :properties + class << (@@properties = []) + def names + map {|(name, )| name} + end + + def value_for(property_name) + find {|(name, )| name == property_name}.last rescue nil + end + end + + class << self #:nodoc: + def property(name, value = nil) + value ||= yield + properties << [name, value] if value + rescue Exception + end + + def components + %w( active_record action_pack action_web_service action_mailer active_support ) + end + + def component_version(component) + require "#{component}/version" + "#{component.classify}::Version::STRING".constantize + end + + def edge_rails_revision + svn_info[/^Revision: (\d+)/, 1] || 'unknown' + end + + def to_s + column_width = properties.names.map {|name| name.length}.max + ["About your application's environment", *properties.map do |property| + "%-#{column_width}s %s" % property + end] * "\n" + end + + alias inspect to_s + + protected + def svn_info + Dir.chdir("#{RAILS_ROOT}/vendor/rails") do + IO.popen('svn info') { |f| f.read } + end + end + end + + # The Ruby version and platform, e.g. "1.8.2 (powerpc-darwin8.2.0)". + property 'Ruby version', "#{RUBY_VERSION} (#{RUBY_PLATFORM})" + + # The RubyGems version, if it's installed. + property 'RubyGems version' do + 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| + property "#{component.titlecase} version" do + component_version(component) + end + end + + # The Rails SVN revision, if it's checked out into vendor/rails. + property 'Edge Rails revision' do + edge_rails_revision + end + + # The application's location on the filesystem. + property 'Application root' do + File.expand_path(RAILS_ROOT) + end + + # The current Rails environment (development, test, or production). + property 'Environment' do + RAILS_ENV + end + + # The name of the database adapter for the current environment. + property 'Database adapter' do + ActiveRecord::Base.configurations[RAILS_ENV]['adapter'] + end + end +end diff --git a/railties/test/info_test.rb b/railties/test/info_test.rb deleted file mode 100644 index 8faef428a8..0000000000 --- a/railties/test/info_test.rb +++ /dev/null @@ -1,73 +0,0 @@ -$:.unshift File.dirname(__FILE__) + "/../lib" -$:.unshift File.dirname(__FILE__) + "/../../activesupport/lib" - -require 'test/unit' -require 'active_support' -require 'info' - -class << Rails::Info -protected - def svn_info - <<-EOS -Path: . -URL: http://www.rubyonrails.com/svn/rails/trunk -Repository UUID: 5ecf4fe2-1ee6-0310-87b1-e25e094e27de -Revision: 2881 -Node Kind: directory -Schedule: normal -Last Changed Author: sam -Last Changed Rev: 2881 -Last Changed Date: 2005-11-04 21:04:41 -0600 (Fri, 04 Nov 2005) -Properties Last Updated: 2005-10-28 19:30:00 -0500 (Fri, 28 Oct 2005) - - EOS - end -end - -class InfoTest < Test::Unit::TestCase - def test_edge_rails_revision_extracted_from_svn_info - assert_equal '2881', Rails::Info.edge_rails_revision - end - - def test_property_with_block_swallows_exceptions_and_ignores_property - assert_nothing_raised do - Rails::Info.module_eval do - property('Bogus') {raise} - end - end - assert !property_defined?('Bogus') - end - - def test_property_with_string - Rails::Info.module_eval do - property 'Hello', 'World' - end - assert_property 'Hello', 'World' - end - - def test_property_with_block - Rails::Info.module_eval do - property('Goodbye') {'World'} - end - assert_property 'Goodbye', 'World' - end - - def test_component_version - assert_property 'Active Support version', ActiveSupport::Version::STRING - end - -protected - def properties - Rails::Info.properties - end - - def property_defined?(property_name) - properties.names.include? property_name - end - - def assert_property(property_name, value) - raise "Property #{property_name.inspect} not defined" unless - property_defined? property_name - assert_equal value, properties.value_for(property_name) - end -end \ No newline at end of file diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb new file mode 100644 index 0000000000..4d85d8dae8 --- /dev/null +++ b/railties/test/rails_info_test.rb @@ -0,0 +1,73 @@ +$:.unshift File.dirname(__FILE__) + "/../lib" +$:.unshift File.dirname(__FILE__) + "/../../activesupport/lib" + +require 'test/unit' +require 'active_support' +require 'rails_info' + +class << Rails::Info +protected + def svn_info + <<-EOS +Path: . +URL: http://www.rubyonrails.com/svn/rails/trunk +Repository UUID: 5ecf4fe2-1ee6-0310-87b1-e25e094e27de +Revision: 2881 +Node Kind: directory +Schedule: normal +Last Changed Author: sam +Last Changed Rev: 2881 +Last Changed Date: 2005-11-04 21:04:41 -0600 (Fri, 04 Nov 2005) +Properties Last Updated: 2005-10-28 19:30:00 -0500 (Fri, 28 Oct 2005) + + EOS + end +end + +class InfoTest < Test::Unit::TestCase + def test_edge_rails_revision_extracted_from_svn_info + assert_equal '2881', Rails::Info.edge_rails_revision + end + + def test_property_with_block_swallows_exceptions_and_ignores_property + assert_nothing_raised do + Rails::Info.module_eval do + property('Bogus') {raise} + end + end + assert !property_defined?('Bogus') + end + + def test_property_with_string + Rails::Info.module_eval do + property 'Hello', 'World' + end + assert_property 'Hello', 'World' + end + + def test_property_with_block + Rails::Info.module_eval do + property('Goodbye') {'World'} + end + assert_property 'Goodbye', 'World' + end + + def test_component_version + assert_property 'Active Support version', ActiveSupport::Version::STRING + end + +protected + def properties + Rails::Info.properties + end + + def property_defined?(property_name) + properties.names.include? property_name + end + + def assert_property(property_name, value) + raise "Property #{property_name.inspect} not defined" unless + property_defined? property_name + assert_equal value, properties.value_for(property_name) + end +end \ No newline at end of file -- cgit v1.2.3