github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make edge and dev options use edge mysql2

Browse Source
This commit is contained in:
Santiago Pastorino
2011-03-27 19:37:18 -03:00
parent 0e1fed537a
commit b023bcf71b
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
railties/lib/rails/generators/app_base.rb
View File

@@ -112,7 +112,15 @@ module Rails
end
def database_gemfile_entry
options[:skip_active_record] ? "" : "gem '#{gem_for_database}'"
entry = options[:skip_active_record] ? "" : "gem '#{gem_for_database}'"
if options[:database] == 'mysql'
if options.dev? || options.edge?
entry += ", :git => 'git://github.com/brianmario/mysql2.git'"
else
entry += "\n# gem 'mysql2', :git => 'git://github.com/brianmario/mysql2.git'"
end
end
entry
end
def rails_gemfile_entry
@@ -120,22 +128,22 @@ module Rails
<<-GEMFILE
gem 'rails', :path => '#{Rails::Generators::RAILS_DEV_PATH}'
gem 'arel', :git => 'git://github.com/rails/arel.git'
gem "rack", :git => "git://github.com/rack/rack.git"
gem 'rack', :git => 'git://github.com/rack/rack.git'
GEMFILE
elsif options.edge?
<<-GEMFILE
gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'arel', :git => 'git://github.com/rails/arel.git'
gem "rack", :git => "git://github.com/rack/rack.git"
gem 'rack', :git => 'git://github.com/rack/rack.git'
GEMFILE
else
<<-GEMFILE
gem 'rails', '#{Rails::VERSION::STRING}'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
# gem 'arel', :git => 'git://github.com/rails/arel.git'
# gem "rack", :git => "git://github.com/rack/rack.git"
# gem 'rails', :git => 'git://github.com/rails/rails.git'
# gem 'arel', :git => 'git://github.com/rails/arel.git'
# gem 'rack', :git => 'git://github.com/rack/rack.git'
GEMFILE
end
end