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

Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 source 'http://gemcutter.org'
 
 gem 'rails', '3.0.0.beta4'
-
+gem 'bundler'
 gem 'mongo_mapper', :git => "http://github.com/BadMinus/mongomapper.git"
 gem 'devise', :git => "http://github.com/BadMinus/devise.git"
 gem 'jnunemaker-validatable', :git => "http://github.com/BadMinus/validatable.git"

config/sprinkle/provision.rb

@@ -33,7 +33,7 @@ require "#{File.dirname(__FILE__)}/packages/ruby"
 #   If there's only one implementation of a virtual package, it's selected automatically, otherwise
 #   the user is requested to select which one to use.
 
-policy :diaspora, :roles => :app do
+policy :diaspora, :roles => :tom, :backer do
 #  requires :clean_dreamhost
   requires :tools
   requires :rubygems
@@ -44,6 +44,16 @@ policy :diaspora, :roles => :app do
   requires :scm
 end
 
+policy :ci, :roles => :ci do
+  requires :tools
+  requires :rubygems
+	requires :bundler
+  requires :diaspora_dependencies
+  requires :database
+  requires :webserver
+  requires :scm
+  #add sqlite
+end
 
 # Deployment
 #

script/build

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+system('bundle install --gemfile ./Gemfile && rspec spec')