Allow double quotes around RAILS_GEM_VERSION also. Closes #10443 [James Cox]

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

2 files changed, 6 insertions, 1 deletions

diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb
index b71c198db3..1e9f1b109d 100644
--- a/railties/environments/boot.rb
+++ b/railties/environments/boot.rb
@@ -93,7 +93,7 @@ module Rails
       end
 
       def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*'([!~<>=]*\s*[\d.]+)'/
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
       end
 
       private
diff --git a/railties/test/boot_test.rb b/railties/test/boot_test.rb
index 375ce52e31..36fae307ca 100644
--- a/railties/test/boot_test.rb
+++ b/railties/test/boot_test.rb
@@ -128,6 +128,11 @@ class ParseGemVersionTest < Test::Unit::TestCase
     assert_equal nil, parse(nil)
   end
 
+  def test_should_accept_either_single_or_double_quotes
+    assert_equal "1.2.3", parse("RAILS_GEM_VERSION = '1.2.3'")
+    assert_equal "1.2.3", parse('RAILS_GEM_VERSION = "1.2.3"')
+  end
+
   def test_should_return_nil_if_no_lines_match
     assert_equal nil, parse('nothing matches on this line\nor on this line')
   end