Rename Version constant to VERSION. Closes #2802.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3065 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

7 files changed, 10 insertions, 8 deletions

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index b3e274505c..2144215884 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 * Update to latest script.aculo.us version (as of [3031])
 
 * Eliminate Subversion dependencies in scripts/plugin.  Correct install options.  Introduce --force option to reinstall a plugin.  Remove useless --long option for list.  Use --quiet to quiet the download output and --revision to update to a specific svn revision.  #2842 [Chad Fowler, Rick Olson]
diff --git a/railties/Rakefile b/railties/Rakefile
index e425f9a4dd..6d9a7a61bb 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -11,7 +11,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'rails_version')
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = 'rails'
-PKG_VERSION     = Rails::Version::STRING + PKG_BUILD
+PKG_VERSION     = Rails::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
diff --git a/railties/bin/rails b/railties/bin/rails
index fdbb4d93f3..54417750b3 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -12,7 +12,7 @@ end
 Signal.trap("INT") { puts; exit }
 
 require File.dirname(__FILE__) + '/../lib/rails_version'
-abort "Rails #{Rails::Version::STRING}" if %w(--version -v).include? ARGV.first
+abort "Rails #{Rails::VERSION::STRING}" if %w(--version -v).include? ARGV.first
 
 require File.dirname(__FILE__) + '/../lib/rails_generator'
 
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 69deedf179..81578e484e 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -123,7 +123,7 @@ module Rails
       configuration.frameworks.each { |framework| require(framework.to_s) }
     end
     
-    # Loads Rails::Version and Rails::Info.
+    # Loads Rails::VERSION and Rails::Info.
     # TODO: Make this work via dependencies.rb/const_missing instead.
     def load_framework_info
       require 'rails_info'
diff --git a/railties/lib/rails_info.rb b/railties/lib/rails_info.rb
index 5c71a289c2..eb60955db5 100644
--- a/railties/lib/rails_info.rb
+++ b/railties/lib/rails_info.rb
@@ -26,7 +26,7 @@ module Rails
       
       def component_version(component)
         require "#{component}/version"
-        "#{component.classify}::Version::STRING".constantize
+        "#{component.classify}::VERSION::STRING".constantize
       end
     
       def edge_rails_revision(info = svn_info)
@@ -70,7 +70,7 @@ module Rails
   
     # The Rails version.
     property 'Rails version' do
-      Rails::Version::STRING
+      Rails::VERSION::STRING
     end
   
     # Versions of each Rails component (Active Record, Action Pack, 
diff --git a/railties/lib/rails_version.rb b/railties/lib/rails_version.rb
index 27c50644d5..a36f45bd6f 100644
--- a/railties/lib/rails_version.rb
+++ b/railties/lib/rails_version.rb
@@ -1,5 +1,5 @@
 module Rails
-  module Version #:nodoc:
+  module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 14
     TINY  = 3
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index e3daf0bcd5..926f254c2e 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -62,7 +62,7 @@ EOS
   end
   
   def test_component_version
-    assert_property 'Active Support version', ActiveSupport::Version::STRING
+    assert_property 'Active Support version', ActiveSupport::VERSION::STRING
   end
 
 protected
@@ -89,4 +89,4 @@ protected
       property_defined? property_name
     assert_equal value, properties.value_for(property_name)
   end
-end
\ No newline at end of file
+end