Skip to content
This repository
Browse code

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...
commit 256956e1d88b7e0acf8401be5ee0f8b10765fcce 1 parent 2b15d2d
Jamie Gaskins jgaskins authored

Showing 2 changed files with 12 additions and 9 deletions. Show diff stats Hide diff stats

  1. +7 5 Gemfile
  2. +5 4 Gemfile.lock
12 Gemfile
... ... @@ -1,18 +1,20 @@
1 1 source 'http://rubygems.org'
2 2
3 3 gem 'rails', '3.1.0'
4   -gem 'sprockets', '2.0.0'
5 4
6 5 gem 'sqlite3'
7 6
8 7 gem 'backports', :platform => :rbx
9 8
10 9 # Asset template engines
11   -gem 'sass'
12   -gem 'sass-rails', '3.1.0'
13 10 gem 'compass', :git => "git://github.com/chriseppstein/compass.git", :branch => "rails31"
14   -gem 'coffee-script'
15   -gem 'uglifier'
  11 +# Gems used only for assets and not required
  12 +# in production environments by default.
  13 +group :assets do
  14 + gem 'sass-rails', " ~> 3.1.0"
  15 + gem 'coffee-rails', "~> 3.1.0"
  16 + gem 'uglifier'
  17 +end
16 18
17 19 gem "haml-rails"
18 20 gem 'jquery-rails'
9 Gemfile.lock
@@ -115,6 +115,9 @@ GEM
115 115 childprocess (0.2.1)
116 116 ffi (~> 1.0.6)
117 117 chunky_png (1.2.0)
  118 + coffee-rails (3.1.1)
  119 + coffee-script (>= 2.2.0)
  120 + railties (~> 3.1.0)
118 121 coffee-script (2.2.0)
119 122 coffee-script-source
120 123 execjs
@@ -316,7 +319,7 @@ DEPENDENCIES
316 319 bcrypt-ruby
317 320 bson_ext
318 321 capybara
319   - coffee-script
  322 + coffee-rails (~> 3.1.0)
320 323 compass!
321 324 database_cleaner
322 325 delayed_job!
@@ -345,11 +348,9 @@ DEPENDENCIES
345 348 rocco
346 349 rsa
347 350 ruby-stemmer
348   - sass
349   - sass-rails (= 3.1.0)
  351 + sass-rails (~> 3.1.0)
350 352 simplecov (~> 0.4.0)
351 353 sinatra
352   - sprockets (= 2.0.0)
353 354 sqlite3
354 355 twitter
355 356 tzinfo

0 comments on commit 256956e

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