vlad 2.1.0 → 2.2.0

data/History.txt

@@ -1,3 +1,18 @@
+=== 2.2.0 / 2011-02-18
+
+* 5 minor enhancements:
+
+  * Added support for setting owner and group of deploy. (RichGuk)
+  * Allow shared_paths, mkdirs, and symlinks to be excluded (RichGuk/zaius)
+  * Cleaned up update task to correspond to rake-remote-task changes. (RichGuk)
+  * Do not run symlink commands if there are no operations to run. (jsmecham)
+  * Obey the umask across the board. (RichGuk)
+
+* 2 bug fixes:
+
+  * Fixed migrate task shell cmd. (cheba)
+  * Fixed passenger touch file location. (richinsr)
+
 === 2.1.0 / 2010-07-15
 
 * 1 major enhancement:

data/lib/vlad.rb

@@ -21,7 +21,7 @@ module Vlad
 
   ##
   # This is the version of Vlad you are running.
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 
   ##
   # Loads tasks file +tasks_file+ and various recipe styles as a hash

data/lib/vlad/core.rb

@@ -41,7 +41,16 @@ namespace :vlad do
   remote_task :setup_app, :roles => :app do
     dirs = [deploy_to, releases_path, scm_path, shared_path]
     dirs += shared_paths.keys.map { |d| File.join(shared_path, d) }
-    run "umask #{umask} && mkdir -p #{dirs.join(' ')}"
+    dirs = dirs.join(' ')
+
+    commands = [
+      "umask #{umask}",
+      "mkdir -p #{dirs}"
+    ]
+    commands << "chown #{perm_owner} #{dirs}" if perm_owner
+    commands << "chgrp #{perm_group} #{dirs}" if perm_group
+
+    run commands.join(' && ')
   end
 
   desc "Updates your application server to the latest revision.  Syncs
@@ -52,19 +61,40 @@ namespace :vlad do
   remote_task :update, :roles => :app do
     symlink = false
     begin
-      run [ "cd #{scm_path}",
-            "#{source.checkout revision, scm_path}",
-            "#{source.export revision, release_path}",
-            "chmod -R g+w #{latest_release}",
-            "rm -rf #{shared_paths.values.map { |p| File.join(latest_release, p) }.join(' ')}",
-            "mkdir -p #{mkdirs.map { |d| File.join(latest_release, d) }.join(' ')}"
-          ].join(" && ")
+      commands = [
+        "umask #{umask}",
+        "cd #{scm_path}",
+        "#{source.checkout revision, scm_path}",
+        "#{source.export revision, release_path}",
+        "chmod -R g+w #{latest_release}",
+      ]
+      unless shared_paths.empty?
+        commands << "rm -rf #{shared_paths.values.map { |p| File.join(latest_release, p) }.join(' ')}"
+      end
+      unless mkdirs.empty?
+        dirs = mkdirs.map { |d| File.join(latest_release, d) }.join(' ')
+        commands << "mkdir -p #{dirs}"
+        commands << "chown -R #{perm_owner} #{dirs}" if perm_owner
+        commands << "chgrp -R #{perm_group} #{dirs}" if perm_group
+      end
+
+      commands << "chown -R #{perm_owner} #{latest_release}" if perm_owner
+      commands << "chgrp -R #{perm_group} #{latest_release}" if perm_group
+
+      run commands.join(" && ")
       Rake::Task['vlad:update_symlinks'].invoke
 
       symlink = true
-      run "rm -f #{current_path} && ln -s #{latest_release} #{current_path}"
-
-      run "echo #{now} $USER #{revision} #{File.basename release_path} >> #{deploy_to}/revisions.log"
+      commands = [
+        "umask #{umask}",
+        "rm -f #{current_path}",
+        "ln -s #{latest_release} #{current_path}",
+        "echo #{now} $USER #{revision} #{File.basename(release_path)} >> #{deploy_to}/revisions.log"
+      ]
+      commands << "chown #{perm_owner} #{deploy_to}/revisions.log" if perm_owner
+      commands << "chgrp #{perm_group} #{deploy_to}/revisions.log" if perm_group
+
+      run commands.join(' && ')
     rescue => e
       run "rm -f #{current_path} && ln -s #{previous_release} #{current_path}" if
         symlink
@@ -76,10 +106,12 @@ namespace :vlad do
   desc "Updates the symlinks for shared paths".cleanup
 
   remote_task :update_symlinks, :roles => :app do
-    ops = shared_paths.map do |sp, rp|
-      "ln -s #{shared_path}/#{sp} #{latest_release}/#{rp}"
+    unless shared_paths.empty?
+      ops = shared_paths.map do |sp, rp|
+        "ln -s #{shared_path}/#{sp} #{latest_release}/#{rp}"
+      end
+      run ops.join(' && ') unless ops.empty?
     end
-    run ops.join(' && ')
   end
 
   desc "Invoke a single command on every remote server. This is useful for

data/lib/vlad/passenger.rb

@@ -3,6 +3,6 @@ require 'vlad'
 namespace :vlad do
   desc 'Restart Passenger'
   remote_task :start_app, :roles => :app do
-    run "touch #{latest_release}/tmp/restart.txt"
+    run "touch #{current_release}/tmp/restart.txt"
   end
 end

data/lib/vlad/rails.rb

@@ -29,6 +29,6 @@ namespace :vlad do
 
     run ["cd #{directory}",
          "#{rake_cmd} RAILS_ENV=#{rails_env} db:migrate #{migrate_args}"
-        ].join(" ")
+        ].join(" && ")
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vlad
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -38,7 +38,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2010-07-15 00:00:00 -07:00
+date: 2011-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,53 +89,37 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: minitest
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
         - 2
         - 0
-        - 4
-        version: 2.0.4
+        - 2
+        version: 2.0.2
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 7
-        - 0
-        version: 1.7.0
-  type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 41
         segments: 
         - 2
-        - 6
+        - 9
         - 1
-        version: 2.6.1
+        version: 2.9.1
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 description: |-
   Vlad the Deployer is pragmatic application deployment automation,
   without mercy. Much like Capistrano, but with 1/10th the
@@ -187,6 +171,7 @@ files:
 - test/test_vlad.rb
 - test/test_vlad_subversion.rb
 - vladdemo.sh
+- .gemtest
 has_rdoc: true
 homepage: http://rubyhitsquad.com/
 licenses: []
@@ -218,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Vlad the Deployer is pragmatic application deployment automation, without mercy