More tweaks, getting somewhere now

CHANGELOG.rdoc

@@ -1,10 +1,11 @@
 == 2.5.6 / 25 May 2009
 
-* Fixes perforce issues reported at http://bit.ly/wt0es [Scott Johnson]
+* Fixes perforce issues reported at http://bit.ly/wt0es (via mailing list) [Scott Johnson]
 * Improved back-tick handling code in relation to the above.
-* Removes rails-assumptions, more info see .......
-* Fixes a Git issue when submodules update upstream. [sneakin]
+* Removes rails-assumptions, more info see a freshly generated config/deploy.rb
+* Fixes a Git issue when submodules update upstream. (via mailing list) [sneakin]
 * Ensures that the deploy_to directory is chowned :user/:user during deploy:setup
+* Capify now creates the config directory in directories without one.
 
 == 2.5.5 / 24 Feb 2009
 

README.rdoc

@@ -5,23 +5,6 @@ Capistrano is a utility and framework for executing commands in parallel on mult
 Capistrano was originally designed to simplify and automate deployment of web applications to distributed environments, and originally came bundled with a set of tasks designed for deploying Rails applications. The deployment tasks are now (as of Capistrano 2.0) opt-in and require clients to explicitly put
 "load 'deploy'" in their recipes.
 
-As of 2.5.6 the default deploy.rb nolonger makes assumptions about your choice of platform. Deploys are versioned, but the expectation that you are using Mongrel with the Rails framework has expired.
-
-Since 2.5.6 you must include one, or more of the following if you require the Rails code, and you may include only the ones you require.
-
-* capistrano-rails
-  * capistrano-rails/mongrel
-  * capistrano-rails/mod_rails
-  * capistrano-rails/nginx
-
-* capistrano-alt/apache
-
-Each of the capistrano-rails libraries includes a start, stop and restart task appropriate for each environment.
-
-Where applicable they also include web:disable and web:enable tasks.
-
-The capistrano-atl/apache file contains generic apache restart methods, and will attempt to call `sudo apachectl {{re,}start,stop}`. This can be configured through the :apachectl variable.
-
 == DEPENDENCIES
 
 * Net::SSH v2 (http://net-ssh.rubyforge.org)

lib/capistrano/recipes/deploy.rb

@@ -179,7 +179,9 @@ def try_runner(*args)
     dirs = [deploy_to, releases_path, shared_path]
     dirs += shared_children.map { |d| File.join(shared_path, d) }
     run "#{try_sudo} mkdir -p #{dirs.join(' ')} && #{try_sudo} chmod g+w #{dirs.join(' ')}"
-    run "#{try_sudo} chown -R #{user}:#{user} #{dirs.join(' ')}"
+    unless user.nil?
+      run "#{try_sudo} chown -R #{user}:#{user} #{dirs.join(' ')}"
+    end
   end
 
   desc <<-DESC