From 9cbc963539603a11a63809ea3cf3c2c63be7a920 Mon Sep 17 00:00:00 2001
From: root <root@Integrity.(none)>
Date: Wed, 7 Jul 2010 01:40:11 +0000
Subject: [PATCH 1/7] RS, MJS build script for integrity

---
 script/build | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100755 script/build

diff --git a/script/build b/script/build
new file mode 100755
index 000000000..587274166
--- /dev/null
+++ b/script/build
@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+system('bundle exec rake')

From 8f9edaf7ca6283d7a3e971a7e5cf594572cdf05e Mon Sep 17 00:00:00 2001
From: root <root@Integrity.(none)>
Date: Wed, 7 Jul 2010 01:44:26 +0000
Subject: [PATCH 2/7] tweaking integrity script

---
 script/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/build b/script/build
index 587274166..c3fb95e9d 100755
--- a/script/build
+++ b/script/build
@@ -1,2 +1,2 @@
 #!/usr/bin/env ruby
-system('bundle exec rake')
+system('BUNDLE_GEMFILE=./Gemfile bundle exec rake')

From 73445c07808ddd000e6f8444cbb587810630946a Mon Sep 17 00:00:00 2001
From: root <root@Integrity.(none)>
Date: Wed, 7 Jul 2010 02:11:27 +0000
Subject: [PATCH 3/7] RS MJS Try to change the working directory in a crazy way

---
 script/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/build b/script/build
index 587274166..63674d814 100755
--- a/script/build
+++ b/script/build
@@ -1,2 +1,2 @@
 #!/usr/bin/env ruby
-system('bundle exec rake')
+system('cd builds/17 && bundle exec bundle install --gemfile Gemfile && bundle exec rspec spec')

From f7ce67b768a9e48a54822bb3fa8d96325fd75257 Mon Sep 17 00:00:00 2001
From: Diaspora <daniel@joindiaspora.com>
Date: Tue, 6 Jul 2010 19:17:35 -0700
Subject: [PATCH 4/7]

---
 script/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 script/build

diff --git a/script/build b/script/build
old mode 100755
new mode 100644
index 63674d814..3e80078ae
--- a/script/build
+++ b/script/build
@@ -1,2 +1,2 @@
 #!/usr/bin/env ruby
-system('cd builds/17 && bundle exec bundle install --gemfile Gemfile && bundle exec rspec spec')
+system('pwd && cd builds/17 && bundle exec bundle install --gemfile Gemfile && bundle exec rspec spec')

From f8e20eca164f98fe2c9d7e80d87e0dc11b2364e1 Mon Sep 17 00:00:00 2001
From: Diaspora <daniel@joindiaspora.com>
Date: Tue, 6 Jul 2010 19:18:26 -0700
Subject: [PATCH 5/7]

---
 script/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/build b/script/build
index 3e80078ae..d13a8776f 100644
--- a/script/build
+++ b/script/build
@@ -1,2 +1,2 @@
 #!/usr/bin/env ruby
-system('pwd && cd builds/17 && bundle exec bundle install --gemfile Gemfile && bundle exec rspec spec')
+system('pwd')

From 5e78163df377ef05a5c3762c861d438f75eb15c8 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Tue, 6 Jul 2010 19:23:34 -0700
Subject: [PATCH 6/7] added bundler to gemfile

---
 Gemfile                      |  2 +-
 config/sprinkle/provision.rb | 12 +++++++++++-
 script/build                 |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index fca45187a..fb8243e53 100644
--- a/Gemfile
+++ b/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"
diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index 0ede8866d..a2f89d829 100644
--- a/config/sprinkle/provision.rb
+++ b/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
 #
diff --git a/script/build b/script/build
index d13a8776f..a89d95e51 100644
--- a/script/build
+++ b/script/build
@@ -1,2 +1,2 @@
 #!/usr/bin/env ruby
-system('pwd')
+system('bundle install --gemfile ./Gemfile && rspec spec')

From ae968bce90e4c89ec2ab64949e7f094091fe2514 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Tue, 6 Jul 2010 19:24:50 -0700
Subject: [PATCH 7/7] rechmoded build

---
 script/build | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 script/build

diff --git a/script/build b/script/build
old mode 100644
new mode 100755