Merge pull request #4 from apatel/master

added therubyracer gem
berkmancenter · Mar 26, 2012 · 944bc84 · 944bc84
2 parents 507beb3 + 6f494f6
commit 944bc84
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 27 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,9 +6,10 @@ gem 'rails', '3.2.2'
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 gem 'pg'
-gem 'devise', '2.0.0'
+gem 'devise'
 gem 'formtastic'
 gem 'carmen', '0.2.12'
+gem 'therubyracer'
 
 group :development, :test do
   gem 'rspec-rails'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -39,32 +39,33 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    devise (2.0.0)
+    devise (2.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       railties (~> 3.1)
-      warden (~> 1.1)
+      warden (~> 1.1.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    formtastic (2.0.2)
-      rails (~> 3.0)
+    formtastic (2.1.1)
+      actionpack (~> 3.0)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
-    jquery-rails (2.0.0)
-      railties (>= 3.2.0.beta, < 5.0)
+    jquery-rails (2.0.1)
+      railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.5)
+    json (1.6.6)
+    libv8 (3.3.10.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
     multi_json (1.1.0)
-    orm_adapter (0.0.6)
-    pg (0.12.2)
+    orm_adapter (0.0.7)
+    pg (0.13.2)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -91,53 +92,60 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
-    sass (3.1.12)
-    sass-rails (3.2.4)
+      rspec (~> 2.9.0)
+    sass (3.1.15)
+    sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    shoulda (2.11.3)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    therubyracer (0.9.10)
+      libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.32)
-    uglifier (1.2.2)
+    uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    warden (1.1.0)
+    warden (1.1.1)
       rack (>= 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  carmen
+  carmen (= 0.2.12)
   coffee-rails (~> 3.2.1)
-  devise (= 2.0.0)
+  devise
   formtastic
   jquery-rails
   pg
   rails (= 3.2.2)
   rspec-rails
   sass-rails (~> 3.2.3)
   shoulda
+  therubyracer
   uglifier (>= 1.0.3)