Skip to content
Browse files

Remove several redundant gem requirements and use group :assets

rails depends on sprockets
sass-rails depends on sass

The group :assets call allows us to determine whether we actually need
to load these gems.  If we're pre-compiling assets, we don't need the
gems.
  • Loading branch information...
1 parent 2b15d2d commit 256956e1d88b7e0acf8401be5ee0f8b10765fcce @jgaskins jgaskins committed Sep 14, 2011
Showing with 12 additions and 9 deletions.
  1. +7 −5 Gemfile
  2. +5 −4 Gemfile.lock
View
12 Gemfile
@@ -1,18 +1,20 @@
source 'http://rubygems.org'
gem 'rails', '3.1.0'
-gem 'sprockets', '2.0.0'
gem 'sqlite3'
gem 'backports', :platform => :rbx
# Asset template engines
-gem 'sass'
-gem 'sass-rails', '3.1.0'
gem 'compass', :git => "git://github.com/chriseppstein/compass.git", :branch => "rails31"
-gem 'coffee-script'
-gem 'uglifier'
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+ gem 'sass-rails', " ~> 3.1.0"
+ gem 'coffee-rails', "~> 3.1.0"
+ gem 'uglifier'
+end
gem "haml-rails"
gem 'jquery-rails'
View
9 Gemfile.lock
@@ -115,6 +115,9 @@ GEM
childprocess (0.2.1)
ffi (~> 1.0.6)
chunky_png (1.2.0)
+ coffee-rails (3.1.1)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
@@ -316,7 +319,7 @@ DEPENDENCIES
bcrypt-ruby
bson_ext
capybara
- coffee-script
+ coffee-rails (~> 3.1.0)
compass!
database_cleaner
delayed_job!
@@ -345,11 +348,9 @@ DEPENDENCIES
rocco
rsa
ruby-stemmer
- sass
- sass-rails (= 3.1.0)
+ sass-rails (~> 3.1.0)
simplecov (~> 0.4.0)
sinatra
- sprockets (= 2.0.0)
sqlite3
twitter
tzinfo

0 comments on commit 256956e

Please sign in to comment.
Something went wrong with that request. Please try again.