remove references to *::VERSION, replace with *.version

9 files changed, 11 insertions, 15 deletions

diff --git a/Rakefile b/Rakefile
index 490627d22c..e577c079df 100644
--- a/Rakefile
+++ b/Rakefile
@@ -141,7 +141,7 @@ task :update_versions do
   require File.dirname(__FILE__) + "/version"
 
   File.open("RAILS_VERSION", "w") do |f|
-    f.write Rails::VERSION::STRING + "\n"
+    f.puts Rails.version
   end
 
   constants = {
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index bb98bbe5bf..84f8b82ad5 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -82,10 +82,6 @@ module Rails
       groups
     end
 
-    def version
-      VERSION::STRING
-    end
-
     def public_path
       application && Pathname.new(application.paths["public"].first)
     end
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index 2ff29418c6..d7b8ff4439 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -1,7 +1,7 @@
 require 'rails/version'
 
 if ['--version', '-v'].include?(ARGV.first)
-  puts "Rails #{Rails::VERSION::STRING}"
+  puts "Rails #{Rails.version}"
   exit(0)
 end
 
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 4e703151ba..e312afa091 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -1,7 +1,7 @@
 require 'digest/md5'
 require 'securerandom'
 require 'active_support/core_ext/string/strip'
-require 'rails/version' unless defined?(Rails::VERSION)
+require 'rails/version' unless defined?(Rails.version)
 require 'rbconfig'
 require 'open-uri'
 require 'uri'
@@ -142,7 +142,7 @@ module Rails
         else
           <<-GEMFILE.strip_heredoc
             # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-            gem 'rails', '#{Rails::VERSION::STRING}'
+            gem 'rails', '#{Rails.version}'
           GEMFILE
         end
       end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
index f7c12e67dd..6373ca711e 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir["test/**/*"]
 <% end -%>
 
-  <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", "~> <%= Rails::VERSION::STRING %>"
+  <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", "~> <%= Rails.version %>"
 <% unless options[:skip_active_record] -%>
 
   s.add_development_dependency "<%= gem_for_database %>"
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
index 3f2b78f2fd..de00ab057d 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 <% if options[:skip_gemspec] -%>
-<%= '# ' if options.dev? || options.edge? -%>gem "rails", "~> <%= Rails::VERSION::STRING %>"
+<%= '# ' if options.dev? || options.edge? -%>gem "rails", "~> <%= Rails.version %>"
 <% else -%>
 # Declare your gem's dependencies in <%= name %>.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index 592e74726e..f06ce659c5 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -29,7 +29,7 @@ module Rails
       def framework_version(framework)
         if Object.const_defined?(framework.classify)
           require "#{framework}/version"
-          "#{framework.classify}::VERSION::STRING".constantize
+          framework.classify.constantize.version.to_s
         end
       end
 
@@ -75,7 +75,7 @@ module Rails
 
     # The Rails version.
     property 'Rails version' do
-      Rails::VERSION::STRING
+      Rails.version.to_s
     end
 
     property 'JavaScript Runtime' do
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 34441ef679..48425cbf81 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -292,7 +292,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_no_file "bukkits.gemspec"
     assert_file "Gemfile" do |contents|
       assert_no_match('gemspec', contents)
-      assert_match(/gem "rails", "~> #{Rails::VERSION::STRING}"/, contents)
+      assert_match(/gem "rails", "~> #{Rails.version}"/, contents)
       assert_match(/group :development do\n  gem "sqlite3"\nend/, contents)
       assert_no_match(/# gem "jquery-rails"/, contents)
     end
@@ -303,7 +303,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_no_file "bukkits.gemspec"
     assert_file "Gemfile" do |contents|
       assert_no_match('gemspec', contents)
-      assert_match(/gem "rails", "~> #{Rails::VERSION::STRING}"/, contents)
+      assert_match(/gem "rails", "~> #{Rails.version}"/, contents)
       assert_match(/group :development do\n  gem "sqlite3"\nend/, contents)
     end
   end
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index b9fb071d23..47a58a7ab6 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -38,7 +38,7 @@ class InfoTest < ActiveSupport::TestCase
   end
 
   def test_framework_version
-    assert_property 'Active Support version', ActiveSupport::VERSION::STRING
+    assert_property 'Active Support version', ActiveSupport.version
   end
 
   def test_frameworks_exist