From 93857528fdb5eed93646931d3134fb4df051fee1 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Sun, 27 Oct 2013 16:01:26 -0300 Subject: refactor Gemfile template --- railties/lib/rails/generators/rails/app/templates/Gemfile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'railties') diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 589066cc12..42d62c6d93 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -6,14 +6,12 @@ source 'https://rubygems.org' # <%= gem.comment %> <% end -%> -<% if gem.version -%> -gem '<%= gem.name %>',<%= gem.padding(max_width) %>'<%= gem.version %>' -<% elsif gem.path -%> -gem '<%= gem.name %>',<%= gem.padding(max_width) %>path: '<%= gem.path %>' -<% elsif gem.github -%> -gem '<%= gem.name %>',<%= gem.padding(max_width) %>github: '<%= gem.github %>' -<% else -%> -gem '<%= gem.name %>' +gem '<%= gem.name %>'<% if gem.version -%> +, '<%= gem.version %>' +<% elsif gem.options.any? -%> +,<%= gem.padding(max_width) %><%= gem.options.map { |k,v| + "#{k}: '#{v}'" }.join(', ') %> +<% else %> <% end -%> <% end -%> -- cgit v1.2.3