diff options
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 7971accef3..b62d1fff14 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -1,7 +1,7 @@ require 'digest/md5' require 'securerandom' require 'active_support/core_ext/string/strip' -require 'rails/version' unless defined?(Rails.version) +require 'rails/version' unless defined?(Rails::VERSION) require 'rbconfig' require 'open-uri' require 'uri' @@ -115,7 +115,11 @@ module Rails end def database_gemfile_entry - options[:skip_active_record] ? "" : "gem '#{gem_for_database}'" + options[:skip_active_record] ? "" : + <<-GEMFILE.gsub(/^ {12}/, '').strip + # Use #{options[:database]} as the database for ActiveRecord + gem '#{gem_for_database}' + GEMFILE end def include_all_railties? @@ -142,7 +146,7 @@ module Rails else <<-GEMFILE.strip_heredoc # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' - gem 'rails', '#{Rails.version}' + gem 'rails', '#{Rails::VERSION::STRING}' GEMFILE end end @@ -185,16 +189,16 @@ module Rails # Use SCSS for stylesheets gem 'sass-rails', github: 'rails/sass-rails' - # To use Uglifier as compressor for JavaScript assets - gem 'uglifier', '>= 1.3.0' + # Use Uglifier as compressor for JavaScript assets + gem 'uglifier', '~> 1.3' GEMFILE else <<-GEMFILE.gsub(/^ {12}/, '') # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.0.beta1' - # To use uglifier as compressor for JavaScript assets - gem 'uglifier', '>= 1.3.0' + # Use Uglifier as compressor for JavaScript assets + gem 'uglifier', '~> 1.3' GEMFILE end @@ -225,14 +229,12 @@ module Rails end def javascript_gemfile_entry - args = {'jquery' => ", github: 'rails/jquery-rails'"} - unless options[:skip_javascript] <<-GEMFILE.gsub(/^ {12}/, '').strip_heredoc #{coffee_gemfile_entry} #{javascript_runtime_gemfile_entry} - - gem '#{options[:javascript]}-rails'#{args[options[:javascript]]} + # Use #{options[:javascript]} as the JavaScript library + gem '#{options[:javascript]}-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' |