Merge branch 'master' of git://github.com/diaspora/diaspora

ci-19.sh

 #!/bin/bash
 
-echo "*************************************************************************************************" &&
-echo "*                                   ruby 1.9.2-p0 build                                         *" &&
-echo "*************************************************************************************************" &&
+echo "*********************************************************************************" &&
+echo "*                            ruby 1.9.2-p0 build                                *" &&
+echo "*     Runs tests we can't run on travis because their VMs are a bit puny.       *" &&
+echo "*********************************************************************************" &&
 echo "" &&
 rm -f Gemfile.lock &&
 source /usr/local/rvm/scripts/rvm &&
 rvm use ruby-1.9.2-p0@diaspora --create &&
 bundle install &&
-CI=true bundle exec rake cruise
+CI=true bundle exec rake ci:hard_things

ci.sh

 #!/bin/bash
 
-echo "*************************************************************************************************" &&
-echo "*                                  ruby 1.8.7 REE build                                         *" &&
-echo "*************************************************************************************************" &&
+echo "*********************************************************************************" &&
+echo "*                          ruby 1.8.7 REE build                                 *" &&
+echo "*     Runs tests we can't run on travis because their VMs are a bit puny.       *" &&
+echo "*********************************************************************************" &&
 echo "" &&
 rm -f Gemfile.lock &&
 source /usr/local/rvm/scripts/rvm &&
@@ -16,4 +17,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 &&
-CI=true bundle exec rake cruise
+CI=true bundle exec rake ci:hard_things

lib/tasks/cruise.rake → lib/tasks/ci.rake

-namespace :cruise do
-  desc "Run all specs and features"
-  task :cruise => [:environment, :'cruise:migrate'] do
+namespace :ci do
+
+  desc "Run tests in the cloud. ZOMG!"
+  task :travis do
+    ["rspec spec", "rake jasmine:ci", "rake cucumber"].each do |cmd|
+      puts "Starting to run #{cmd}..."
+      system("export DISPLAY=:99.0 && bundle exec #{cmd}")
+      raise "#{cmd} failed!" unless $?.exitstatus == 0
+    end
+  end
+
+  desc "Run tests that can't run on travis"
+  task :hard_things => [:environment, :'ci:migrate'] do
     puts "Starting virtual display..."
     `sh -e /etc/init.d/xvfb start`
     puts "Starting specs..."
-    system('export DISPLAY=:99.0 && CI=true bundle exec rake')
+    system('export DISPLAY=:99.0 && CI=true bundle exec rake cucumber')
     exit_status = $?.exitstatus
     puts "Stopping virtual display..."
     `sh -e /etc/init.d/xvfb stop`
@@ -19,14 +29,6 @@ namespace :cruise do
     system('bundle exec rake db:test:prepare')
     raise "migration failed!" unless $?.exitstatus == 0
   end
-
-  task :travis do
-    ["rspec spec", "rake jasmine:ci", "rake cucumber"].each do |cmd|
-      puts "Starting to run #{cmd}..."
-      system("export DISPLAY=:99.0 && bundle exec #{cmd}")
-      raise "#{cmd} failed!" unless $?.exitstatus == 0
-    end
-  end
 end
-task :cruise => "cruise:cruise"
-task :travis => "cruise:travis"
+
+task :travis => "ci:travis"