mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Pull spring gem entry into the Gemfile template instead of gemfile_entries so it can be grouped with the other development tools
This commit is contained in:
parent
089661b69a
commit
fbe38c9e9d
2 changed files with 12 additions and 10 deletions
railties/lib/rails/generators
|
@ -113,7 +113,6 @@ module Rails
|
||||||
javascript_gemfile_entry,
|
javascript_gemfile_entry,
|
||||||
jbuilder_gemfile_entry,
|
jbuilder_gemfile_entry,
|
||||||
sdoc_gemfile_entry,
|
sdoc_gemfile_entry,
|
||||||
spring_gemfile_entry,
|
|
||||||
psych_gemfile_entry,
|
psych_gemfile_entry,
|
||||||
@extra_entries].flatten.find_all(&@gem_filter)
|
@extra_entries].flatten.find_all(&@gem_filter)
|
||||||
end
|
end
|
||||||
|
@ -306,12 +305,6 @@ module Rails
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def spring_gemfile_entry
|
|
||||||
return [] unless spring_install?
|
|
||||||
comment = 'Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring'
|
|
||||||
GemfileEntry.new('spring', nil, comment, group: :development)
|
|
||||||
end
|
|
||||||
|
|
||||||
def psych_gemfile_entry
|
def psych_gemfile_entry
|
||||||
return [] unless defined?(Rubinius)
|
return [] unless defined?(Rubinius)
|
||||||
|
|
||||||
|
|
|
@ -21,14 +21,23 @@ source 'https://rubygems.org'
|
||||||
# Use Capistrano for deployment
|
# Use Capistrano for deployment
|
||||||
# gem 'capistrano-rails', group: :development
|
# gem 'capistrano-rails', group: :development
|
||||||
|
|
||||||
|
group :development, :test do
|
||||||
<% unless defined?(JRUBY_VERSION) -%>
|
<% unless defined?(JRUBY_VERSION) -%>
|
||||||
# To use a debugger
|
# Call 'debugger' anywhere in the code to stop execution and get a debugger console
|
||||||
<%- if RUBY_VERSION < '2.0.0' -%>
|
<%- if RUBY_VERSION < '2.0.0' -%>
|
||||||
# gem 'debugger', group: [:development, :test]
|
gem 'debugger'
|
||||||
<%- else -%>
|
<%- else -%>
|
||||||
# gem 'byebug', group: [:development, :test]
|
gem 'byebug'
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
|
|
||||||
|
# Access an IRB console on exceptions page and /console in development
|
||||||
|
gem 'web-console'
|
||||||
|
<%- if spring_install? %>
|
||||||
|
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
|
||||||
|
gem 'spring'
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
<% end -%>
|
||||||
|
end
|
||||||
|
|
||||||
<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince/) -%>
|
<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince/) -%>
|
||||||
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
||||||
|
|
Loading…
Reference in a new issue