From 71732dc7530ea021955293aec25937834ef9ced4 Mon Sep 17 00:00:00 2001 From: Will Bradley Date: Tue, 14 May 2013 00:57:07 -0700 Subject: [PATCH] Adjusted gemfile for heroku --- Gemfile | 10 +++++++++- Gemfile.lock | 26 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9a2ccae..bf11a83 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,15 @@ gem 'rails', '3.2.13' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'sqlite3' +# for deployment on Heroku +gem "heroku" +group :development, :test do + gem 'sqlite3' +end +group :production do + gem 'pg' + gem 'thin' +end # Gems used only for assets and not required diff --git a/Gemfile.lock b/Gemfile.lock index 55c7053..98d1902 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,6 +28,7 @@ GEM activesupport (3.2.13) i18n (= 0.6.1) multi_json (~> 1.0) + addressable (2.3.4) arel (3.0.2) builder (3.0.4) coffee-rails (3.2.2) @@ -37,9 +38,20 @@ GEM coffee-script-source execjs coffee-script-source (1.6.2) + daemons (1.1.9) erubis (2.7.0) + eventmachine (1.0.3) + excon (0.21.0) execjs (1.4.0) multi_json (~> 1.0) + heroku (2.39.2) + heroku-api (~> 0.3.7) + launchy (>= 0.3.2) + netrc (~> 0.7.7) + rest-client (~> 1.6.1) + rubyzip + heroku-api (0.3.10) + excon (~> 0.21.0) hike (1.2.2) i18n (0.6.1) journey (1.0.4) @@ -47,11 +59,15 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.0) + launchy (2.3.0) + addressable (~> 2.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.23) multi_json (1.7.3) + netrc (0.7.7) + pg (0.15.1) polyglot (0.3.3) rack (1.4.5) rack-cache (1.2) @@ -78,6 +94,9 @@ GEM rake (10.0.4) rdoc (3.12.2) json (~> 1.4) + rest-client (1.6.7) + mime-types (>= 1.16) + rubyzip (0.9.9) sass (3.2.9) sass-rails (3.2.6) railties (~> 3.2.0) @@ -89,6 +108,10 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) + thin (1.5.1) + daemons (>= 1.0.9) + eventmachine (>= 0.12.6) + rack (>= 1.0.0) thor (0.18.1) tilt (1.4.1) treetop (1.4.12) @@ -104,8 +127,11 @@ PLATFORMS DEPENDENCIES coffee-rails (~> 3.2.1) + heroku jquery-rails + pg rails (= 3.2.13) sass-rails (~> 3.2.3) sqlite3 + thin uglifier (>= 1.0.3)