From efc52e7266d72fa043b0f2cdcd59657810789171 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 7 Dec 2012 11:44:45 -0800
Subject: switch to therubyrhino

---
 Gemfile      | 11 ++++-------
 Gemfile.lock | 42 ++++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/Gemfile b/Gemfile
index 086560b..e01634d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,13 +17,13 @@ group :assets do
   gem 'RedCloth'
 
   # see https://github.com/iain/http_accept_language
-  gem 'http_accept_language'
+  #gem 'http_accept_language'
   #gem 'http_accept_language', '>= 2.0.0.pre'
 
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer'
-
   gem 'uglifier', '>= 1.0.3'
+  gem 'execjs'
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  gem 'therubyrhino'
 end
 
 gem 'jquery-rails'
@@ -42,6 +42,3 @@ gem 'capistrano'
 
 # To use debugger
 # gem 'ruby-debug'
-
-gem 'execjs'
-gem 'therubyracer'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4368d55..1004d33 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,8 +30,8 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
-    capistrano (2.13.3)
+    builder (3.0.4)
+    capistrano (2.13.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -41,27 +41,25 @@ GEM
     execjs (1.4.0)
       multi_json (~> 1.0)
     haml (3.1.7)
-    highline (1.6.13)
+    highline (1.6.15)
     hike (1.2.1)
-    http_accept_language (1.0.2)
-    i18n (0.6.0)
+    i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.1)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     json (1.7.5)
-    libv8 (3.3.10.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    multi_json (1.3.6)
+    multi_json (1.4.0)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.5.2)
+    net-ssh (2.6.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     polyglot (0.3.3)
@@ -70,7 +68,7 @@ GEM
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.8)
       actionmailer (= 3.2.8)
@@ -87,10 +85,10 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
-    sass (3.2.1)
+    sass (3.2.3)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -100,17 +98,18 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    therubyracer (0.10.2)
-      libv8 (~> 3.3.10)
+    therubyrhino (2.0.2)
+      therubyrhino_jar (>= 1.7.3)
+    therubyrhino_jar (1.7.4)
     thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    uglifier (1.2.7)
+    tzinfo (0.3.35)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.3)
+      multi_json (~> 1.0, >= 1.0.2)
 
 PLATFORMS
   ruby
@@ -120,11 +119,10 @@ DEPENDENCIES
   capistrano
   execjs
   haml
-  http_accept_language
   jquery-rails
   json
   rails (= 3.2.8)
   sass-rails
   sqlite3
-  therubyracer
+  therubyrhino
   uglifier (>= 1.0.3)
-- 
cgit v1.2.3