From 9a01221c5527a170c09bba5d9dd5a742200011e0 Mon Sep 17 00:00:00 2001 From: wilkie Date: Mon, 18 Feb 2013 20:39:17 -0500 Subject: [PATCH 1/2] Puts therubyracer in asset group and only install if on linux. --- Gemfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 18067d23..436930c5 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,11 @@ group :assets do gem 'coffee-rails', "~> 3.2.2" gem 'uglifier', "~> 1.0.0" gem 'jquery-ui-rails', "~> 2.0.0" + + # Many Linux environments do not have a javascript environment which is + # required by the asset generators. However, windows and os x have one + # provided by the system. + gem "therubyracer", "~> 0.9.9" unless RUBY_PLATFORM.match(/darwin|mswin/) end gem "haml", "~> 3.1.4" @@ -68,5 +73,4 @@ end group :test do gem "webmock", "~> 1.6.4" - gem "therubyracer", "~> 0.9.9" end From 66bb57c12078ceaeadc7ae0d738b4a8b724b8abf Mon Sep 17 00:00:00 2001 From: wilkie Date: Mon, 18 Feb 2013 20:49:13 -0500 Subject: [PATCH 2/2] Updates therubyracer. --- Gemfile | 2 +- Gemfile.lock | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 436930c5..41108107 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ group :assets do # Many Linux environments do not have a javascript environment which is # required by the asset generators. However, windows and os x have one # provided by the system. - gem "therubyracer", "~> 0.9.9" unless RUBY_PLATFORM.match(/darwin|mswin/) + gem "therubyracer", "~> 0.11.3" unless RUBY_PLATFORM.match(/darwin|mswin/) end gem "haml", "~> 3.1.4" diff --git a/Gemfile.lock b/Gemfile.lock index 0848ca8c..3e33c0f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -134,7 +134,7 @@ GEM kgio (2.7.4) launchy (2.0.5) addressable (~> 2.2.6) - libv8 (3.3.10.4) + libv8 (3.11.8.13) libwebsocket (0.1.5) addressable libxml-ruby (2.3.3) @@ -212,6 +212,7 @@ GEM rdoc (3.12.1) json (~> 1.4) redcarpet (1.17.2) + ref (1.0.2) rest-client (1.6.7) mime-types (>= 1.16) rsa (0.1.4) @@ -238,8 +239,9 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - therubyracer (0.9.10) - libv8 (~> 3.3.10) + therubyracer (0.11.3) + libv8 (~> 3.11.8.12) + ref thin (1.5.0) daemons (>= 1.0.9) eventmachine (>= 0.12.6) @@ -324,7 +326,7 @@ DEPENDENCIES sass-rails (~> 3.2.5) show_me_the_cookies (~> 1.1.0) simplecov (~> 0.4.0) - therubyracer (~> 0.9.9) + therubyracer (~> 0.11.3) thin (~> 1.5.0) tire (~> 0.4.1) twitter (~> 3.5.0)