lib/rails/generators/app_base.rb in railties-3.2.0.rc2 vs lib/rails/generators/app_base.rb in railties-3.2.0

- old
+ new

@@ -200,31 +200,43 @@ # Gems used only for assets and not required # in production environments by default. group :assets do gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git', :branch => '3-2-stable' gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git', :branch => '3-2-stable' - #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)} + + # See https://github.com/sstephenson/execjs#readme for more supported runtimes + #{javascript_runtime_gemfile_entry} gem 'uglifier', '>= 1.0.3' end GEMFILE else <<-GEMFILE # Gems used only for assets and not required # in production environments by default. group :assets do gem 'sass-rails', '~> 3.2.3' - gem 'coffee-rails', '~> 3.2.0' - #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)} + gem 'coffee-rails', '~> 3.2.1' + + # See https://github.com/sstephenson/execjs#readme for more supported runtimes + #{javascript_runtime_gemfile_entry} gem 'uglifier', '>= 1.0.3' end GEMFILE end gemfile.strip_heredoc.gsub(/^[ \t]*$/, '') end def javascript_gemfile_entry "gem '#{options[:javascript]}-rails'" unless options[:skip_javascript] + end + + def javascript_runtime_gemfile_entry + if defined?(JRUBY_VERSION) + "gem 'therubyrhino'\n" + else + "# gem 'therubyracer'\n" + end end def bundle_command(command) say_status :run, "bundle #{command}"