From 669a7cabb2d0028f67a6be50435e22a10b91d2c3 Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Wed, 20 Oct 2010 21:43:03 -0700
Subject: [PATCH] Use diaspora gemset. Simplify rake runner.
---
cruise_config.rb | 2 +-
lib/cruise/build.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cruise_config.rb b/cruise_config.rb
index 1e19998aec..ee3c7f72be 100644
--- a/cruise_config.rb
+++ b/cruise_config.rb
@@ -1,5 +1,5 @@
require 'fileutils'
Project.configure do |project|
- project.build_command = 'source /usr/local/rvm/scripts/rvm && rvm use ruby-1.8.7-p249 && gem update --system && ruby lib/cruise/build.rb'
+ project.build_command = 'source /usr/local/rvm/scripts/rvm && rvm use ruby-1.8.7-p249@diaspora && gem update --system && ruby lib/cruise/build.rb'
end
diff --git a/lib/cruise/build.rb b/lib/cruise/build.rb
index df4c3250be..90bd5a7fb0 100644
--- a/lib/cruise/build.rb
+++ b/lib/cruise/build.rb
@@ -8,7 +8,7 @@ end
def rake(*tasks)
tasks.each do |task|
- return false unless system("#{root_dir}/bin/rake", task, 'RAILS_ENV=test')
+ return false unless system("rake", task, 'RAILS_ENV=test')
end
end
--
GitLab