From 5595dc5f485df9cce3113d7a350ad391d210a981 Mon Sep 17 00:00:00 2001
From: Stephen Caudill <scaudill@gmail.com>
Date: Thu, 16 Sep 2010 10:46:12 +0800
Subject: [PATCH] Retab the project

---
 app/models/user.rb                   | 10 +++++-----
 config/deploy.rb                     | 10 +++++-----
 config/sprinkle/packages/database.rb | 16 ++++++++--------
 config/sprinkle/packages/ruby.rb     | 20 ++++++++++----------
 config/sprinkle/packages/scm.rb      |  2 +-
 config/sprinkle/provision.rb         |  6 +++---
 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index c02ea7d5b..d09f55ea2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -295,11 +295,11 @@ class User
     aspect(:name => "Family")
     aspect(:name => "Work")
   end
-	
-	def self.create(opts ={})
-	  puts opts.inspect
-	end
-	
+  
+  def self.create(opts ={})
+    puts opts.inspect
+  end
+  
   def terse_url
     terse = self.url.gsub(/(https?:|www\.)\/\//, '')
     terse = terse.chop! if terse[-1, 1] == '/'
diff --git a/config/deploy.rb b/config/deploy.rb
index 51664fb6a..b4870f94d 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -58,17 +58,17 @@ namespace :deploy do
    task :start do
       start_mongo
       start_thin
-	end
+  end
 
   task :start_mongo do
-			run("mkdir -p -v #{current_path}/log/db/ ")
+      run("mkdir -p -v #{current_path}/log/db/ ")
       run("mkdir -p -v #{shared_path}/db/")
-			run("mongod  --fork --logpath #{current_path}/log/db/mongolog.txt --dbpath #{shared_path}/db/ " )
+      run("mongod  --fork --logpath #{current_path}/log/db/mongolog.txt --dbpath #{shared_path}/db/ " )
   end
 
   task :start_thin do
-			run("mkdir -p -v #{current_path}/log/thin/ ")
-			run("cd #{current_path} && bundle exec thin start -C config/thin.yml")
+      run("mkdir -p -v #{current_path}/log/thin/ ")
+      run("cd #{current_path} && bundle exec thin start -C config/thin.yml")
   end
 
   task :stop do
diff --git a/config/sprinkle/packages/database.rb b/config/sprinkle/packages/database.rb
index ab0eb1614..2463007ff 100644
--- a/config/sprinkle/packages/database.rb
+++ b/config/sprinkle/packages/database.rb
@@ -6,23 +6,23 @@
 
 #package :mongo, :provides => :database do
 #  description 'Mongodb'
-#	version '1.4.3'
-#	source "http://downloads.mongodb.org/src/mongodb-src-r#{version}.tar.gz"
+#  version '1.4.3'
+#  source "http://downloads.mongodb.org/src/mongodb-src-r#{version}.tar.gz"
 #end
 
 package :mongodb, :provides => :database do
   description 'Mongodb debian package.'
-	version '1.4.3'
+  version '1.4.3'
 
   binary "http://downloads.mongodb.org/linux/mongodb-linux-x86_64-static-legacy-#{version}.tgz" do
-		post :install, "ln -s -f /usr/local/bin/mongodb-linux-x86_64-static-#{version}/bin/mongod /usr/bin/mongod"
-	end
+    post :install, "ln -s -f /usr/local/bin/mongodb-linux-x86_64-static-#{version}/bin/mongod /usr/bin/mongod"
+  end
 end
 
 package :mongo_driver do
   description 'Ruby mongo database driver'
   gem 'mongo'
-	gem 'bson'
-	gem 'bson_ext'
-	requires :rubygems
+  gem 'bson'
+  gem 'bson_ext'
+  requires :rubygems
 end
diff --git a/config/sprinkle/packages/ruby.rb b/config/sprinkle/packages/ruby.rb
index fa02c6adb..708ab0eeb 100644
--- a/config/sprinkle/packages/ruby.rb
+++ b/config/sprinkle/packages/ruby.rb
@@ -25,25 +25,25 @@ package :rubygems do
   source "http://production.cf.rubygems.org/rubygems/rubygems-#{version}.tgz" do
     custom_install 'ruby setup.rb'
   end
-	run( "PATH=$PATH:/var/lib/gems/1.8/bin")
-	run( "export PATH")
+  run( "PATH=$PATH:/var/lib/gems/1.8/bin")
+  run( "export PATH")
   requires :ruby
 end
 
 package :bundler do
-	description 'bundler'
-	version '0.9.26'
-	gem 'bundler'
-	requires :rubygems
+  description 'bundler'
+  version '0.9.26'
+  gem 'bundler'
+  requires :rubygems
 end
 
 package :diaspora_dependencies do
-	description 'random dependencies'
-	apt %w(libxslt1.1 libxslt1-dev libxml2 libgpgme11-dev imagemagick libmagick9-dev)
+  description 'random dependencies'
+  apt %w(libxslt1.1 libxslt1-dev libxml2 libgpgme11-dev imagemagick libmagick9-dev)
 end
 #package :diaspora do
-#	description 'Diaspora'
-	
+#  description 'Diaspora'
+  
 =begin
 package :rails do
   description 'Ruby on Rails'
diff --git a/config/sprinkle/packages/scm.rb b/config/sprinkle/packages/scm.rb
index 722baab39..22ece7d98 100644
--- a/config/sprinkle/packages/scm.rb
+++ b/config/sprinkle/packages/scm.rb
@@ -6,7 +6,7 @@
 
 package :git, :provides => :scm do
   description 'Git Distributed Version Control'
-	apt %w( git-core )
+  apt %w( git-core )
   requires :pubkey
 
 end
diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index f04866431..9f983399e 100644
--- a/config/sprinkle/provision.rb
+++ b/config/sprinkle/provision.rb
@@ -17,7 +17,7 @@ policy :diaspora, :roles => [:tom,:backer] do
 #  requires :clean_dreamhost
   requires :tools
   requires :rubygems
-	requires :bundler
+  requires :bundler
   requires :diaspora_dependencies
   requires :database
   requires :webserver
@@ -40,8 +40,8 @@ deployment do
     archives '/usr/local/sources'
     builds   '/usr/local/build'
   end
-	binary do
-		prefix   '/usr/local/bin'
+  binary do
+    prefix   '/usr/local/bin'
     archives '/usr/local/sources'
   end
 end