Merge pull request #14101 from sikachu/master-fix-versioning-task

Introduce `Rails.gem_version`

2 files changed, 19 insertions, 7 deletions

diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb
new file mode 100644
index 0000000000..4a7aace460
--- /dev/null
+++ b/activerecord/lib/active_record/gem_version.rb
@@ -0,0 +1,15 @@
+module ActiveRecord
+  # Returns the version of the currently loaded ActiveRecord as a <tt>Gem::Version</tt>
+  def self.gem_version
+    Gem::Version.new VERSION::STRING
+  end
+
+  module VERSION
+    MAJOR = 4
+    MINOR = 2
+    TINY  = 0
+    PRE   = "alpha"
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+  end
+end
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index 5eb7f7e205..cf76a13b44 100644
--- a/activerecord/lib/active_record/version.rb
+++ b/activerecord/lib/active_record/version.rb
@@ -1,11 +1,8 @@
+require_relative 'gem_version'
+
 module ActiveRecord
-  # Returns the version of the currently loaded ActiveRecord as a Gem::Version
+  # Returns the version of the currently loaded ActiveRecord as a <tt>Gem::Version</tt>
   def self.version
-    Gem::Version.new "4.2.0.alpha"
-  end
-
-  module VERSION #:nodoc:
-    MAJOR, MINOR, TINY, PRE = ActiveRecord.version.segments
-    STRING = ActiveRecord.version.to_s
+    gem_version
   end
 end