Apply [3065] to stable. Rename Version constant to VERSION. Closes #2802

. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3066 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Nov 17, 2005 · afcd3eb · afcd3eb
1 parent b35d05f
commit afcd3eb
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 18 deletions.
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
@@ -1,3 +1,5 @@
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 *1.1.3* (November 7th, 2005)
 
 * Allow Mailers to have custom initialize methods that set default instance variables for all mail actions #2563 [mrj@bigpond.net.au]

diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
@@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'action_mailer', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionmailer'
-PKG_VERSION   = ActionMailer::Version::STRING + PKG_BUILD
+PKG_VERSION   = ActionMailer::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"

diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
@@ -1,5 +1,5 @@
 module ActionMailer
-  module Version #:nodoc:
+  module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
     TINY  = 3

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 * Remove the unused, slow response_dump and session_dump variables from error pages.  #1222 [lmarlow@yahoo.com]
 
 * Update to latest script.aculo.us version (as of [3031])

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
@@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'action_pack', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = ActionPack::Version::STRING + PKG_BUILD
+PKG_VERSION   = ActionPack::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"

diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
@@ -1,5 +1,5 @@
 module ActionPack
-  module Version #:nodoc:
+  module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 11
     TINY  = 0

diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 * Fix that XML-RPC date/time values did not have well-defined behaviour (#2516, #2534). This fix has one caveat, in that we can't support pre-1970 dates from XML-RPC clients.
 
 *0.9.3* (November 7th, 2005)

diff --git a/actionwebservice/Rakefile b/actionwebservice/Rakefile
@@ -10,7 +10,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'action_web_service', 'version'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionwebservice'
-PKG_VERSION   = ActionWebService::Version::STRING + PKG_BUILD
+PKG_VERSION   = ActionWebService::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 

diff --git a/actionwebservice/lib/action_web_service/version.rb b/actionwebservice/lib/action_web_service/version.rb
@@ -1,5 +1,5 @@
 module ActionWebService
-  module Version
+  module VERSION
     MAJOR = 0
     MINOR = 9
     TINY  = 3

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 * SQLServer: insert uses given primary key value if not nil rather than SELECT @@IDENTITY.  #2866 [kajism@yahoo.com, Tom Ward <tom@popdog.net>]
 
 * Correct documentation for Base.delete_all.  #1568 [Newhydra]

diff --git a/activerecord/Rakefile b/activerecord/Rakefile
@@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'active_record', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'activerecord'
-PKG_VERSION   = ActiveRecord::Version::STRING + PKG_BUILD
+PKG_VERSION   = ActiveRecord::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"

diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
@@ -1,5 +1,5 @@
 module ActiveRecord
-  module Version #:nodoc:
+  module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 13
     TINY  = 0

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
@@ -1,3 +1,7 @@
+*SVN*
+
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
 *1.2.3* (November 7th, 2005)
 
 * Change Inflector#constantize to use eval instead of const_get. [Nicholas Seckar]

diff --git a/activesupport/Rakefile b/activesupport/Rakefile
@@ -6,7 +6,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'active_support', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'activesupport'
-PKG_VERSION   = ActiveSupport::Version::STRING + PKG_BUILD
+PKG_VERSION   = ActiveSupport::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"

diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
@@ -1,5 +1,5 @@
 module ActiveSupport
-  module Version #:nodoc:
+  module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
     TINY  = 3

diff --git 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])
 
 * SQLite: the clone_structure_to_test and purge_test_database Rake tasks should always use the test environment.  #2846 [Rick Olson]

diff --git 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
@@ -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
@@ -123,7 +123,7 @@ def require_frameworks
       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
@@ -26,7 +26,7 @@ def components
 
       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 @@ def svn_info
 
     # 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
@@ -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
@@ -62,7 +62,7 @@ def test_property_with_block
   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 @@ def assert_property(property_name, value)
       property_defined? property_name
     assert_equal value, properties.value_for(property_name)
   end
-end
+end