vlad 2.2.5 → 2.3.0

data/History.txt

@@ -1,3 +1,16 @@
+=== 2.3.0 / 2012-11-23
+
+* 2 minor enhancements:
+
+  * Add the possibility to create ancillary directories during setup_app
+  * Updated rake dep to be >= 0.8 and < 11.0 for the new wack version scheme. (MichaelXavier)
+
+* 3 bug fixes:
+
+  * Allow umask to be nil
+  * Rake tasks are equivalent to Proc.new, not lambda, therefore stricter (le ugh). (jaswope)
+  * Trust umask for releases file tree
+
 === 2.2.5 / 2012-02-22
 
 * 1 bug fix:

data/Rakefile

@@ -13,7 +13,7 @@ Hoe.spec 'vlad' do
   developer 'Eric Hodel',       'drbrain@segment7.net'
   developer 'Wilson Bilkovich', 'wilson@supremetyrant.com'
 
-  dependency 'rake',             '~> 0.8'
+  dependency 'rake',             ['>= 0.8', '< 11.0']
   dependency 'rake-remote_task', '~> 2.0'
 
   multiruby_skip << "rubinius"

data/doco/faq.txt

@@ -100,6 +100,7 @@ OR: Alternatively, you can do this within your recipes like so:
 
   ControlMaster auto
   ControlPath ~/.ssh/master-%r@%h:%p
+  ControlPersist 1h
 
 === Q: I'm tired of typing in my password!
 === A: Me too!

data/lib/vlad/core.rb

@@ -26,6 +26,8 @@ namespace :vlad do
     y Rake::RemoteTask.roles
   end
 
+  append :ancillary_dir
+
   desc "Setup your servers. Before you can use any of the deployment
     tasks with your project, you will need to make sure all of your
     servers have been prepared with 'rake vlad:setup'. It is safe to
@@ -42,12 +44,14 @@ namespace :vlad do
     dirs = [deploy_to, releases_path, shared_path]
     dirs << scm_path unless skip_scm
     dirs += shared_paths.keys.map { |d| File.join(shared_path, d) }
+    dirs += ancillary_dir
     dirs = dirs.join(' ')
 
-    commands = [
-      "umask #{umask}",
-      "mkdir -p #{dirs}"
-    ]
+    commands = []
+
+    commands << "umask #{umask}" if umask
+    commands << "mkdir -p #{dirs}"
+
     commands << "chown #{perm_owner} #{dirs}" if perm_owner
     commands << "chgrp #{perm_group} #{dirs}" if perm_group
 
@@ -62,13 +66,13 @@ namespace :vlad do
   remote_task :update, :roles => :app do
     symlink = false
     begin
-      commands = ["umask #{umask}"]
+      commands = []
+      commands << "umask #{umask}" if umask
       unless skip_scm
         commands << "cd #{scm_path}"
         commands << "#{source.checkout revision, scm_path}"
       end
       commands << "#{source.export revision, release_path}"
-      commands << "chmod -R g+w #{latest_release}"
       
       unless shared_paths.empty?
         commands << "rm -rf #{shared_paths.values.map { |p| File.join(latest_release, p) }.join(' ')}"
@@ -87,12 +91,16 @@ namespace :vlad do
       Rake::Task['vlad:update_symlinks'].invoke
 
       symlink = true
-      commands = [
-        "umask #{umask}",
+      commands = []
+
+      commands << "umask #{umask}" if umask
+
+      commands += [
         "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
 

data/lib/vlad/rails.rb

@@ -17,7 +17,7 @@ namespace :vlad do
   # No application files are on the DB machine, also migrations should only be
   # run once.
   remote_task :migrate, :roles => :app do
-    break unless target_host == Rake::RemoteTask.hosts_for(:app).first
+    next unless target_host == Rake::RemoteTask.hosts_for(:app).first
 
     directory = case migrate_target.to_sym
                 when :current then current_path

data/lib/vlad.rb

@@ -21,7 +21,7 @@ module Vlad
 
   ##
   # This is the version of Vlad you are running.
-  VERSION = '2.2.5'
+  VERSION = '2.3.0'
 
   ##
   # Loads tasks file +tasks_file+ and various recipe styles as a hash
@@ -65,7 +65,7 @@ module Vlad
     set :skip_scm, false
 
     Kernel.load recipes[:config]
-    Kernel.load "config/deploy_#{ENV['to']}.rb" if ENV['to']
+    Kernel.load "#{File.dirname(recipes[:config])}/deploy_#{ENV['to']}.rb" if ENV['to']
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vlad
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 2
-  - 2
-  - 5
-  version: 2.2.5
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -38,7 +38,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-02-22 00:00:00 Z
+date: 2012-11-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -46,13 +46,20 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
         - 0
         - 8
         version: "0.8"
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 11
+        - 0
+        version: "11.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -78,11 +85,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 29
         segments: 
-        - 2
-        - 11
-        version: "2.11"
+        - 4
+        - 3
+        version: "4.3"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -108,11 +115,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 1
         segments: 
-        - 2
-        - 14
-        version: "2.14"
+        - 3
+        - 3
+        version: "3.3"
   type: :development
   version_requirements: *id005
 description: |-
@@ -197,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Vlad the Deployer is pragmatic application deployment automation, without mercy