Permalink
Browse files

More gem updates, hold off on Procfile for now, it's just for dev.

  • Loading branch information...
1 parent 7d01807 commit 89683b82d0c3edc3d8d0f8cea8ec5b8626eccb69 @nz nz committed Oct 13, 2011
Showing with 17 additions and 20 deletions.
  1. +5 −7 Gemfile
  2. +12 −11 Gemfile.lock
  3. +0 −2 Procfile
View
12 Gemfile
@@ -2,13 +2,11 @@ source 'http://rubygems.org'
gem 'rails', '3.1.1'
-gem 'unicorn'
-
-# Asset template engines
-gem 'json'
-gem 'sass'
-gem 'coffee-script'
-gem 'uglifier'
+group :assets do
+ gem 'coffee-rails', '3.1.1'
+ gem 'sass-rails', '3.1.4'
+ gem 'uglifier', '1.0.3'
+end
gem 'jquery-rails'
gem 'pjax-rails' # just for the controller stuff for now
View
23 Gemfile.lock
@@ -31,6 +31,9 @@ GEM
multi_json (~> 1.0)
arel (2.2.1)
builder (3.0.0)
+ coffee-rails (3.1.1)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
@@ -54,7 +57,6 @@ GEM
railties (~> 3.0)
thor (~> 0.14)
json (1.6.1)
- kgio (2.6.0)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -91,7 +93,6 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- raindrops (0.7.0)
rake (0.9.2)
rb-fsevent (0.4.3.1)
rdoc (3.10)
@@ -112,6 +113,12 @@ GEM
railties (~> 3.0)
rspec (~> 2.6.0)
sass (3.1.10)
+ sass-rails (3.1.4)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
+ sass (>= 3.1.4)
+ sprockets (~> 2.0.0)
+ tilt (~> 1.3.2)
sprockets (2.0.2)
hike (~> 1.2)
rack (~> 1.0)
@@ -134,28 +141,22 @@ GEM
uglifier (1.0.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- unicorn (4.1.1)
- kgio (~> 2.4)
- rack
- raindrops (~> 0.6)
PLATFORMS
ruby
DEPENDENCIES
- coffee-script
+ coffee-rails (= 3.1.1)
foreman
growl
guard-rspec
jquery-rails
- json
pg
pjax-rails
rails (= 3.1.1)
rb-fsevent
rspec-rails
- sass
+ sass-rails (= 3.1.4)
sqlite3
sunspot_rails (= 1.3.0.rc4)
- uglifier
- unicorn
+ uglifier (= 1.0.3)
View
2 Procfile
@@ -1,2 +0,0 @@
-solr: rake sunspot:solr:run
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb

0 comments on commit 89683b8

Please sign in to comment.