From fe21c8589fc44d3e08fb45baa4da8321a7c8f00c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 1 Nov 2013 11:58:40 -0200 Subject: Use consistent order of the arguments --- railties/lib/rails/generators/app_base.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index ca299273ae..5a4691dc0f 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -171,21 +171,21 @@ module Rails options[value] ? '# ' : '' end - class GemfileEntry < Struct.new(:name, :comment, :version, :options, :commented_out) - def initialize(name, comment, version, options = {}, commented_out = false) + class GemfileEntry < Struct.new(:name, :version, :comment, :options, :commented_out) + def initialize(name, version, comment, options = {}, commented_out = false) super end def self.github(name, github, comment = nil) - new(name, comment, nil, github: github) + new(name, nil, comment, github: github) end def self.version(name, version, comment = nil) - new(name, comment, version) + new(name, version, comment) end def self.path(name, path, comment = nil) - new(name, comment, nil, path: path) + new(name, nil, comment, path: path) end def padding(max_width) @@ -263,12 +263,12 @@ module Rails def webconsole_gemfile_entry comment = 'Run `rails console` in the browser. Read more: https://github.com/rails/web-console' - GemfileEntry.new('web-console', comment, nil, group: :development) + GemfileEntry.new('web-console', nil, comment, group: :development) end def sdoc_gemfile_entry comment = 'bundle exec rake doc:rails generates the API under doc/api.' - GemfileEntry.new('sdoc', comment, nil, { :group => :doc, :require => false }) + GemfileEntry.new('sdoc', nil, comment, { group: :doc, require: false }) end def coffee_gemfile_entry @@ -297,9 +297,9 @@ module Rails def javascript_runtime_gemfile_entry comment = 'See https://github.com/sstephenson/execjs#readme for more supported runtimes' if defined?(JRUBY_VERSION) - GemfileEntry.version 'therubyrhino', comment, nil + GemfileEntry.version 'therubyrhino', nil,comment else - GemfileEntry.new 'therubyracer', comment, nil, { :platforms => :ruby }, true + GemfileEntry.new 'therubyracer', nil, comment, { platforms: :ruby }, true end end -- cgit v1.2.3