Permalink
Browse files

Move the asset template engines to the user-generated Gemfile

  • Loading branch information...
dhh committed Apr 13, 2011
1 parent 23aa7da commit e3273f5cce500ec19ceb4817daa3762753c5347b
@@ -134,7 +134,6 @@ def rails_gemfile_entry
gem 'arel', :git => 'git://github.com/rails/arel.git'
gem 'rack', :git => 'git://github.com/rack/rack.git'
gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git"
- gem 'coffee-script'
gem 'json' # CoffeeScript and Sprockets dependency
GEMFILE
elsif options.edge?
@@ -143,7 +142,6 @@ def rails_gemfile_entry
gem 'arel', :git => 'git://github.com/rails/arel.git'
gem 'rack', :git => 'git://github.com/rack/rack.git'
gem 'sprockets', :git => "git://github.com/sstephenson/sprockets.git"
- gem 'coffee-script'
gem 'json' # CoffeeScript and Sprockets dependency
GEMFILE
else
@@ -125,7 +125,7 @@ def vendor_javascripts
empty_directory_with_gitkeep "vendor/assets/javascripts"
else
copy_file "vendor/assets/javascripts/#{options[:javascript]}.js"
- copy_file "vendor/assets/javascripts/#{options[:javascript]}_ujs.js"
+ copy_file "vendor/assets/javascripts/#{options[:javascript]}_ujs.js", "vendor/assets/javascripts/rails.js"
if options[:javascript] == "prototype"
copy_file "vendor/assets/javascripts/controls.js"
@@ -4,6 +4,10 @@ source 'http://rubygems.org'
<%= database_gemfile_entry -%>
+# Asset template engines
+gem 'coffee-script'
+gem 'sass'
+
# Use unicorn as the web server
# gem 'unicorn'

5 comments on commit e3273f5

@vijaydev

This comment has been minimized.

Show comment
Hide comment
@vijaydev

vijaydev Apr 13, 2011

Member

Wow Sass! Is there a Rails road-map where such decisions can be made known beforehand? Can't wait till the commits :-)

Member

vijaydev replied Apr 13, 2011

Wow Sass! Is there a Rails road-map where such decisions can be made known beforehand? Can't wait till the commits :-)

@jeremy

This comment has been minimized.

Show comment
Hide comment
@jeremy

jeremy Apr 13, 2011

Member

@vijaydev these commits are the road map ;)

Member

jeremy replied Apr 13, 2011

@vijaydev these commits are the road map ;)

@grimen

This comment has been minimized.

Show comment
Hide comment
@grimen

grimen Apr 13, 2011

Was Compass ever considered? Just curious.

Was Compass ever considered? Just curious.

@shayfrendt

This comment has been minimized.

Show comment
Hide comment
@shayfrendt

shayfrendt Apr 13, 2011

Pimp! New hotness.

Pimp! New hotness.

@marcandre

This comment has been minimized.

Show comment
Hide comment
@marcandre

marcandre Apr 16, 2011

Contributor

+1 for compass. And what about haml?

Contributor

marcandre replied Apr 16, 2011

+1 for compass. And what about haml?

Please sign in to comment.