Some stuff to not need an application.yml in CI

app/models/app_config.rb

@@ -5,14 +5,14 @@ require 'uri'
 
 class AppConfig < Settingslogic
 
-  def self.source_file
-    if Rails.env == 'test'
+  def self.source_file_name
+    if Rails.env == 'test' || ENV["CI"]
       File.join(Rails.root, "config", "application.yml.example")
     else
       File.join(Rails.root, "config", "application.yml")
     end
   end
-  source source_file
+  source source_file_name
   namespace Rails.env
 
   def self.load!

ci-19.sh

@@ -8,4 +8,4 @@ rm -f Gemfile.lock &&
 source /usr/local/rvm/scripts/rvm &&
 rvm use ruby-1.9.2-p0@diaspora --create &&
 bundle install &&
-bundle exec rake cruise
+CI=true bundle exec rake cruise

ci.sh

@@ -16,5 +16,4 @@ rm -rf /usr/local/rvm/gems/ree-1.8.7-2010.02@diaspora/cache &&
 rm -rf /usr/local/rvm/gems/ree-1.8.7-2010.02@global/cache &&
 rm -rf /usr/local/rvm/gems/ree-1.8.7-2010.02/cache &&
 bundle install &&
-cp config/application.yml.example config/application.yml &&
-bundle exec rake cruise
+CI=true bundle exec rake cruise

lib/tasks/cruise.rake

@@ -4,7 +4,7 @@ namespace :cruise do
     puts "Starting virtual display..."
     `sh -e /etc/init.d/xvfb start`
     puts "Starting specs..."
-    system('export DISPLAY=:99.0 && bundle exec rake')
+    system('export DISPLAY=:99.0 && CI=true bundle exec rake')
     exit_status = $?.exitstatus
     puts "Stopping virtual display..."
     `sh -e /etc/init.d/xvfb stop`