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

fix the class name

Browse source
This commit is contained in:
Aaron Patterson 2013-10-27 16:12:56 -03:00
parent 93857528fd
commit 61c65a0aef
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,7 +122,7 @@ module Rails
def database_gemfile_entry def database_gemfile_entry
return [] if options[:skip_active_record] return [] if options[:skip_active_record]
gem = GemfileGem.version gem_for_database, nil, gem = GemfileEntry.version gem_for_database, nil,
"Use #{options[:database]} as the database for Active Record" "Use #{options[:database]} as the database for Active Record"
return [gem] return [gem]
end end
@ -135,7 +135,7 @@ module Rails
options[value] ? '# ' : '' options[value] ? '# ' : ''
end end
class GemfileGem < Struct.new(:name, :comment, :version, :options, :commented_out) class GemfileEntry < Struct.new(:name, :comment, :version, :options, :commented_out)
def initialize(name, comment, version, options = {}, commented_out = false) def initialize(name, comment, version, options = {}, commented_out = false)
super super
end end
@ -164,17 +164,17 @@ module Rails
def rails_gemfile_entry def rails_gemfile_entry
if options.dev? if options.dev?
[ [
GemfileGem.path('rails', Rails::Generators::RAILS_DEV_PATH), GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH),
GemfileGem.github('arel', 'rails/arel'), GemfileEntry.github('arel', 'rails/arel'),
] ]
elsif options.edge? elsif options.edge?
[ [
GemfileGem.path('rails', 'rails/rails'), GemfileEntry.path('rails', 'rails/rails'),
GemfileGem.path('arel', 'rails/arel'), GemfileEntry.path('arel', 'rails/arel'),
] ]
else else
[ [
GemfileGem.new('rails', "Bundle edge Rails instead: gem 'rails', github: 'rails/rails'", Rails::VERSION::STRING) GemfileEntry.new('rails', "Bundle edge Rails instead: gem 'rails', github: 'rails/rails'", Rails::VERSION::STRING)
] ]
end end
end end
@ -211,17 +211,17 @@ module Rails
gems = [] gems = []
gemfile = if options.dev? || options.edge? gemfile = if options.dev? || options.edge?
gems << GemfileGem.github('sprockets-rails', 'rails/sprockets-rails', gems << GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails',
'Use edge version of sprockets-rails') 'Use edge version of sprockets-rails')
gems << GemfileGem.github('sass-rails', 'rails/sass-rails', gems << GemfileEntry.github('sass-rails', 'rails/sass-rails',
'Use SCSS for stylesheets') 'Use SCSS for stylesheets')
else else
gems << GemfileGem.version('sass-rails', gems << GemfileEntry.version('sass-rails',
'~> 4.0.0.rc1', '~> 4.0.0.rc1',
'Use SCSS for stylesheets') 'Use SCSS for stylesheets')
end end
gems << GemfileGem.version('uglifier', gems << GemfileEntry.version('uglifier',
'>= 1.3.0', '>= 1.3.0',
'Use Uglifier as compressor for JavaScript assets') 'Use Uglifier as compressor for JavaScript assets')
@ -236,9 +236,9 @@ module Rails
def coffee_gemfile_entry def coffee_gemfile_entry
comment = 'Use CoffeeScript for .js.coffee assets and views' comment = 'Use CoffeeScript for .js.coffee assets and views'
if options.dev? || options.edge? if options.dev? || options.edge?
GemfileGem.github 'coffee-rails', 'rails/coffee-rails', comment GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', comment
else else
GemfileGem.version 'coffee-rails', '~> 4.0.0', comment GemfileEntry.version 'coffee-rails', '~> 4.0.0', comment
end end
end end
@ -247,10 +247,10 @@ module Rails
[] []
else else
gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry] gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry]
gems << GemfileGem.version("#{options[:javascript]}-rails", nil, gems << GemfileEntry.version("#{options[:javascript]}-rails", nil,
"Use #{options[:javascript]} as the JavaScript library") "Use #{options[:javascript]} as the JavaScript library")
gems << GemfileGem.version("turbolinks", nil, gems << GemfileEntry.version("turbolinks", nil,
"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")
end end
end end
@ -258,9 +258,9 @@ module Rails
def javascript_runtime_gemfile_entry def javascript_runtime_gemfile_entry
comment = 'See https://github.com/sstephenson/execjs#readme for more supported runtimes' comment = 'See https://github.com/sstephenson/execjs#readme for more supported runtimes'
runtime = if defined?(JRUBY_VERSION) runtime = if defined?(JRUBY_VERSION)
GemfileGem.version 'therubyrhino', comment, nil GemfileEntry.version 'therubyrhino', comment, nil
else else
GemfileGem.new 'therubyracer', comment, nil, { :platforms => :ruby }, true GemfileEntry.new 'therubyracer', comment, nil, { :platforms => :ruby }, true
end end
end end