Adding Jruby-openssl in gemfile for 3-0-stable.

jdelStrother · Jun 11, 2011 · 7f4bf01 · 7f4bf01
1 parent bcd9145
commit 7f4bf01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -7,6 +7,7 @@ gem 'rails', :git => 'git://github.com/rails/rails.git'
 <%- else -%>
 gem 'rails', '<%= Rails::VERSION::STRING %>'
 
+<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%>
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 <%- end -%>

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
@@ -169,6 +169,9 @@ def test_config_jdbcmysql_database
     run_generator([destination_root, "-d", "jdbcmysql"])
     assert_file "config/database.yml", /jdbcmysql/
     assert_file "Gemfile", /^gem\s+["']activerecord-jdbcmysql-adapter["']$/
+    # TODO: When the JRuby guys merge jruby-openssl in
+    # jruby this will be removed
+    assert_file "Gemfile", /^gem\s+["']jruby-openssl["']$/ if defined?(JRUBY_VERSION)
   end
 
   def test_config_jdbcsqlite3_database