kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #10170 from rubys/editorial_pass_over_generated_gemfile

Browse source 
Editorial pass over generated Gemfile
This commit is contained in:
Carlos Antonio da Silva 2013-04-10 16:44:51 -07:00
commit c0163cc5f2
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
railties/lib/rails/generators/app_base.rb
View file

@ -115,7 +115,11 @@ module Rails
end end
def database_gemfile_entry def database_gemfile_entry
options[:skip_active_record] ? "" : "gem '#{gem_for_database}'" options[:skip_active_record] ? "" :
<<-GEMFILE.gsub(/^ {12}/, '').strip
# Use #{options[:database]} as the database for ActiveRecord
gem '#{gem_for_database}'
GEMFILE
end end
def include_all_railties? def include_all_railties?
@ -185,7 +189,7 @@ module Rails
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails', github: 'rails/sass-rails' gem 'sass-rails', github: 'rails/sass-rails'
# To use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '~> 1.3' gem 'uglifier', '~> 1.3'
GEMFILE GEMFILE
else else
@ -193,7 +197,7 @@ module Rails
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.0.beta1' gem 'sass-rails', '~> 4.0.0.beta1'
# To use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '~> 1.3' gem 'uglifier', '~> 1.3'
GEMFILE GEMFILE
end end
@ -229,7 +233,7 @@ module Rails
<<-GEMFILE.gsub(/^ {12}/, '').strip_heredoc <<-GEMFILE.gsub(/^ {12}/, '').strip_heredoc
#{coffee_gemfile_entry} #{coffee_gemfile_entry}
#{javascript_runtime_gemfile_entry} #{javascript_runtime_gemfile_entry}
# Use #{options[:javascript]} as the JavaScript library
gem '#{options[:javascript]}-rails' gem '#{options[:javascript]}-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks

6
railties/lib/rails/generators/rails/app/templates/Gemfile
View file

@ -17,16 +17,16 @@ end
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 1.0.1' gem 'jbuilder', '~> 1.0.1'
# To use ActiveModel has_secure_password # Use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0' # gem 'bcrypt-ruby', '~> 3.0.0'
# Use unicorn as the app server # Use unicorn as the app server
# gem 'unicorn' # gem 'unicorn'
# Deploy with Capistrano # Use Capistrano for deployment
# gem 'capistrano', group: :development # gem 'capistrano', group: :development
<% unless defined?(JRUBY_VERSION) -%> <% unless defined?(JRUBY_VERSION) -%>
# To use debugger # Use debugger
# gem 'debugger', group: [:development, :test] # gem 'debugger', group: [:development, :test]
<% end -%> <% end -%>