fixes the Gemfile generator templates

The templates were written as if for a given gem you could either pass a version
or options, but not both. But you may want to specify a version and also a group
or whether the gem has to be required, for example.

railties/lib/rails/generators/rails/app/templates/Gemfile

@@ -6,12 +6,10 @@ source 'https://rubygems.org'
 
 # <%= gem.comment %>
 <% end -%>
-<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<% if gem.version -%>
-, '<%= gem.version %>'
-<% elsif gem.options.any? -%>
+<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<%= %(, '#{gem.version}') if gem.version -%>
+<% if gem.options.any? -%>
 ,<%= gem.padding(max_width) %><%= gem.options.map { |k,v|
   "#{k}: #{v.inspect}" }.join(', ') %>
-<% else %>
 <% end -%>
 <% end -%>
 

railties/lib/rails/generators/rails/plugin/templates/Gemfile

@@ -29,12 +29,10 @@ end
 
 # <%= gem.comment %>
 <% end -%>
-<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<% if gem.version -%>
-, '<%= gem.version %>'
-<% elsif gem.options.any? -%>
+<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<%= %(, '#{gem.version}') if gem.version -%>
+<% if gem.options.any? -%>
 ,<%= gem.padding(max_width) %><%= gem.options.map { |k,v|
   "#{k}: #{v.inspect}" }.join(', ') %>
-<% else %>
 <% end -%>
 <% end -%>