* allow to use this template with jruby with newer rails versions as …

…well * since 'bundle install' runs at the end of the rails template then it install the rails version with which the application got generated
mkristian · Nov 28, 2011 · 5705632 · 5705632
1 parent c071ba3
commit 5705632
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/templates/rails/database.yml.rb b/templates/rails/database.yml.rb
@@ -1,7 +1,7 @@
 # TODO think about a better way
 db_name = app_path.split('/').last
 
-database = options[:database]
+database = options[:database].sub(/jdbc/, '')
 database = 'postgres' if database == 'postgresql'
 database = 'sqlite'   if database == 'sqlite3'
 

diff --git a/templates/rails/gemfile.rb b/templates/rails/gemfile.rb
@@ -3,7 +3,7 @@
 DATAMAPPER = '#{DATAMAPPER}'
 RSPEC      = '#{RSPEC}'
 
-database = options[:database]
+database = options[:database].sub(/jdbc/, '')
 database = 'postgres' if database == 'postgresql'
 database = 'sqlite'   if database == 'sqlite3'
 
@@ -12,7 +12,7 @@
 <<-GEMFILE
 source 'http://rubygems.org'
 
-RAILS_VERSION = '~> 3.1.1'
+RAILS_VERSION = '#{Rails::VERSION::STRING}'
 DM_VERSION    = '~> 1.2.0'
 
 gem 'activesupport',      RAILS_VERSION, :require => 'active_support'