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

app/controllers/requests_controller.rb

@@ -25,7 +25,7 @@ class RequestsController < ApplicationController
   end
   
   def create
-    url = diaspora_url(params[:request][:destination_url])
+    url = relationship_flow(params[:request][:destination_url]).values.first
     @request = current_user.send_friend_request_to(url) unless url.include?('@')|| url == ''
     if @request
       flash[:notice] = "a friend request was sent to #{@request.destination_url}"

config/sprinkle/packages/essential.rb

@@ -11,11 +11,19 @@ end
 package :tools do
   description 'Useful tools'
   apt 'psmisc htop elinks screen'
-  requires :vim
 end
 
 package :vim do
-  run("cd && git clone git@github.com:zhitomirskiyi/vim-files.git")
+  apt 'vim' do 
-  run("ln -s /root/vim-files/vimrc /root/.vimrc") 
+    post :install, run("rm -r -f /root/vim-files")
-  run("ln -s -f -T /root/vim-files /root/.vim")
+  end
+  apt 'vim' do 
+    post :install, run("git clone git://github.com/zhitomirskiyi/vim-files.git /root/vim-files")
+  end
+  apt 'vim' do 
+    post :install, run("ln -s -f /root/vim-files/vimrc /root/.vimrc") 
+  end
+  apt 'vim' do 
+    post :install, run("ln -s -f -T /root/vim-files /root/.vim")
+  end
 end

config/sprinkle/provision.rb

@@ -35,13 +35,14 @@ require "#{File.dirname(__FILE__)}/packages/ruby"
 
 policy :diaspora, :roles => [:tom, :backer] do
 #  requires :clean_dreamhost
-  requires :tools
+#  requires :tools
-  requires :rubygems
+#  requires :rubygems
-	requires :bundler
+#	requires :bundler
-  requires :diaspora_dependencies
+#  requires :diaspora_dependencies
-  requires :database
+#  requires :database
-  requires :webserver
+#  requires :webserver
-  requires :scm
+#  requires :scm
+  requires :vim
 end
 =begin