vlad 1.2.0 → 1.3.0

data/History.txt

@@ -1,31 +1,89 @@
-== 1.1.1 / 2008-01-14
+=== 1.3.0 / 2009-03-04
+
+* 9 major enhancements:
+
+  * Added darcs support. (Brian Palmer)
+  * Added git support. (Garry Dolley)
+  * Added lighttpd support.
+  * Added merb support. (Jamie Macey)
+  * Added passenger support. (Alan Harper)
+  * Added/merged god, nginx, thin, and maintenance tasks. (github clusterfuck)
+  * Allow set to specify that a proc value is :per_thread.
+  * Apply Mercurial SCM support patch. Closes ticket 13475
+  * remote_task now supports args and supplies task (by Daniel P. Kionka).
+
+* 19 minor enhancements:
+
+  * Add role toplevel method similar to namespace.
+  * Added #put method that wraps up Tempfile/rsync pattern.
+  * Added #role toplevel method, similar to #namespace.
+  * Added FAQ for using vlad through a gateway.
+  * Added Phil Hagelburg's one-line multi-stage deployment patch
+  * Added rake tracing for rsync command.
+  * Added umask variable.
+  * Adds specific order to loading. Should fix a number of bugs.
+  * Extended vladdemo.sh to allow for N simulated hosts (mostly for testing)
+  * Fixed tempfile dependency in #put if you don't load lighttpd or perforce (yipstar)
+  * Mercurial now automatically initializes the repository. (Jamie Macey)
+  * Moved everything over to put.
+  * Now requires rake 0.8.1+.
+  * Parameterized 'head' into 'revision' variable (with head as default).
+  * Split shared symlink creation to a separate task. (Steve Purcell)
+  * Support rake 0.8.
+  * Switched to ThreadGroup for Action#execute
+  * Updated rakefile for new hoe abilities
+  * remote_task :role now allows an empty list of hosts.
+
+* 11 bug fixes:
+
+	* Fixed vladdemo.rb, now uses my checkout for further stress testing.
+	* Moved core recipe to front. Was breaking mongrel setup.
+  * Added automatic client setup for perforce.
+  * Fix mercurial support.
+  * Fixed 'too many files' error.
+  * Fixed a lame warning in the tests.
+  * Fixed cleanup to actually properly clean up.
+  * Fixed rake var doco
+  * Moved generic app setup to core from mongrel.
+  * SSH flags are now an Array for proper inclusion in the command. (Guillaume Pierronnet)
+  * git archive now specifically specifies tar format. (knaveofdiamonds)
+
+=== 1.1.1 / 2008-01-14
 
 * 5 major enhancements:
+
   * Support for Rake 0.8. Should still work for Rake 0.7.
   * Added git support (contributed by Garry Dolley).
     * Reviewed for accuracy by Evan Phoenix.
   * Added lighttpd.rb
   * Added automatic client setup for perforce.
   * Added mercurial SCM support patch. Closes ticket 13475.
+
 * 6 minor enhancements:
+
   * Added #put method that wraps up Tempfile/rsync pattern.
   * Added automatic p4 client setup for perforce.
   * Added vladdemo.sh
   * Moved everything over to put.
   * Moved generic app setup to core from mongrel.
   * Parameterized 'head' into 'revision' variable (with head as default).
+
 * 1 bug fix
+
   * Fixed cleanup to actually properly clean up.
 
-== 1.1.0 / 2007-09-12
+=== 1.1.0 / 2007-09-12
 
 * 3 major enhancements:
+
   * Vlad.load now takes a hash of recipe overrides, eg: Vlad.load :web => :nginx.
     See rdoc for defaults.
   * Removed vlad_tasks.rb and split into vlad/apache.rb, vlad/mongrel.rb,
     and vlad/core.rb.
   * The flog ratio between capistrano+deps / vlad+deps is pi (or, damn close)!
+
 * 12 minor enhancements:
+
   * Added $TRACE to make it more available and cleaner to read.
   * Added :svn_cmd variable.
   * Added Rake.clear_tasks *str_or_regexp
@@ -38,12 +96,15 @@
   * Removed :application var. Use it if you want it. We don't require it.
   * Renamed :p4cmd to :p4_cmd.
   * Renamed :rake var to :rake_cmd.
+
 * 2 (important) bug fixes:
-  * HUGE: Fixed sudo hang bug #13072.  Fix suggested by Chris Van Pelt.
+
+  * HUGE: Fixed sudo hang bug #13072. Fix suggested by Chris Van Pelt.
   * HUGE: Vlad.load calls user config last, allowing variable overrides.
     ACK! Sorry!
 
-== 1.0.0 / 2007-08-04
+=== 1.0.0 / 2007-08-04
 
 * 1 major enhancement
+
   * Birthday!

data/Manifest.txt

@@ -12,12 +12,19 @@ lib/rake_remote_task.rb
 lib/vlad.rb
 lib/vlad/apache.rb
 lib/vlad/core.rb
+lib/vlad/darcs.rb
 lib/vlad/git.rb
+lib/vlad/god.rb
 lib/vlad/lighttpd.rb
+lib/vlad/maintenance.rb
+lib/vlad/merb.rb
 lib/vlad/mercurial.rb
 lib/vlad/mongrel.rb
+lib/vlad/nginx.rb
+lib/vlad/passenger.rb
 lib/vlad/perforce.rb
 lib/vlad/subversion.rb
+lib/vlad/thin.rb
 test/test_rake_remote_task.rb
 test/test_vlad.rb
 test/test_vlad_git.rb

data/README.txt

@@ -1,9 +1,9 @@
-Vlad the Deployer
-    by the Ruby Hit Squad
-    http://rubyhitsquad.com/
-    http://rubyforge.org/projects/hitsquad/
+= Vlad the Deployer by the Ruby Hit Squad
 
-== DESCRIPTION:
+* http://rubyhitsquad.com/
+* http://rubyforge.org/projects/hitsquad/
+
+== DESCRIPTION
 
 Vlad the Deployer is pragmatic application deployment automation,
 without mercy. Much like Capistrano, but with 1/10th the
@@ -12,7 +12,7 @@ and standard tools like ssh and rsync.
 
 Impale your application on the heartless spike of the Deployer.
 
-== FEATURES/PROBLEMS:
+== FEATURES/PROBLEMS
 
 * Full deployment automation stack.
 * Turnkey deployment for mongrel+apache+svn.
@@ -27,36 +27,36 @@ Impale your application on the heartless spike of the Deployer.
 * Ships with tests that actually pass in 0.028 seconds!
 * Does NOT support Windows right now (we think). Coming soon in 1.2.
 
-== SYNOPSIS:
+== SYNOPSIS
 
     % rake vlad:setup   # first time only
     % rake vlad:update
     % rake vlad:migrate # optional
     % rake vlad:start
 
-== REQUIREMENTS:
+== REQUIREMENTS
 
 * Rake
 * Hoe
 * Rubyforge
 * open4
 
-== INSTALL:
+== INSTALL
 
-* sudo gem install -y vlad
+* sudo gem install vlad
 
-== SPECIAL THANKS:
+== SPECIAL THANKS
 
 * First, of course, to Capistrano. For coming up with the idea and
   providing a lot of meat for the recipes.
 * Scott Baron for coming up with one of the best project names evar.
 * Bradley Taylor for giving us permission to use RailsMachine recipes sans-LGPL.
 
-== LICENSE:
+== LICENSE
 
 (The MIT License)
 
-Copyright (c) 2007 Ryan Davis and the rest of the Ruby Hit Squad
+Copyright (c) 2007-2009 Ryan Davis and the rest of the Ruby Hit Squad
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -5,16 +5,17 @@ require 'hoe'
 $: << 'lib'
 require 'vlad'
 
-Hoe.new('vlad', Vlad::VERSION) do |p|
-  p.rubyforge_name = 'hitsquad'
-  p.author = ["Ryan Davis", "Eric Hodel", "Wilson Bilkovich"]
-  p.email = "ryand-ruby@zenspider.com"
-  p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/).map { |s| s.strip }[2..-1]
-  p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
-  p.summary = p.paragraphs_of('README.txt', 2).join
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.extra_deps << 'rake'
-  p.extra_deps << 'open4'
+Hoe.new('vlad', Vlad::VERSION) do |vlad|
+  vlad.rubyforge_name = 'hitsquad'
+
+  vlad.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
+  vlad.developer('Eric Hodel', 'drbrain@segment7.net')
+  vlad.developer('Wilson Bilkovich', 'wilson@supremetyrant.com')
+
+  vlad.extra_deps << ['rake', '>= 0.8.1']
+  vlad.extra_deps << 'open4'
+
+  vlad.multiruby_skip << "1.9" << "rubinius"
 end
 
 desc "quick little hack to see what the state of the nation looks like"

data/doco/faq.txt

@@ -72,4 +72,10 @@ Put a password on your key, distribute your public key to the server and then us
 
 Check out this tiny tutorial at LBL: A brief ssh-agent tutorial <http://upc.lbl.gov/docs/user/sshagent.html>
 
-If you're on a mac, use SSHKeychain, we love it. <http://www.sshkeychain.org/>
+If you're on a mac (on tiger, not leopard), use SSHKeychain, we love it. <http://www.sshkeychain.org/>. If you are on leopard, you get all of this for free.
+
+=== Q: How do I use Vlad with a gateway?
+=== A: Add the following to your deploy.rb variables:
+
+  set :ssh_flags, "-A #{mygateway}"
+  set :rsync_flags, "--rsh ssh -A #{mygateway} ssh"

data/doco/variables.txt

@@ -21,7 +21,7 @@ migrate_target::       Set this if you need to specify a particular migration
                        'VERSION' number. Defaults to "latest".
 rails_env::            Specifies the RAILS_ENV environment variable that will
                        be used. Defaults to "production".
-rake::                 Set this if you need to specify an alternate path to
+rake_cmd::             Set this if you need to specify an alternate path to
                        'rake'. Defaults to "rake".
 release_name::         Name of the release directory, if deploy_timestamped is
                        true. Defaults to timestamp: "YYYYMMDDHHMMSS".
@@ -39,10 +39,11 @@ scm_path::             Path on the remote host that will be used as 'working
 shared_path::          Full path to remote 'shared' directory, symlinked into
                        your app by default. Defaults to "#{deploy_to}/shared".
 ssh_cmd::              Path to ssh. Defaults to "ssh".
-ssh_flags::            Flags for ssh. Defaults to "".
+ssh_flags::            Flags for ssh. Defaults to [].
 sudo_cmd::             Path to sudo command. Defaults to "sudo".
 sudo_flags::           Flogs for sudo. Defaults to nil.
 sudo_password::        Asks for password when referenced.
+umask::                Sets your umask value. Defaults to "02".
 
 == Apache Web Variables:
 

data/lib/rake_remote_task.rb

@@ -5,31 +5,7 @@ require 'vlad'
 
 $TESTING ||= false
 $TRACE = Rake.application.options.trace
-
-module Rake
-  module TaskManager
-    ##
-    # This gives us access to the tasks already defined in rake.
-    def all_tasks
-      @tasks
-    end
-  end
-
-  ##
-  # Hooks into rake and allows us to clear out a task by name or
-  # regexp. Use this if you want to completely override a task instead
-  # of extend it.
-  def self.clear_tasks(*tasks)
-    tasks.flatten.each do |name|
-      case name
-      when Regexp then
-        Rake.application.all_tasks.delete_if { |k,_| k =~ name }
-      else
-        Rake.application.all_tasks.delete(name)
-      end
-    end
-  end
-end
+$-w = true if $TRACE # asshat, don't mess with my warn.
 
 ##
 # Declare a remote host and its roles. Equivalent to <tt>role</tt>,
@@ -44,6 +20,7 @@ end
 # base_name for the tempfile (aids in debugging).
 
 def put remote_path, base_name = 'vlad.unknown'
+  require 'tempfile'
   Tempfile.open base_name do |fp|
     fp.puts yield
     fp.flush
@@ -55,16 +32,28 @@ end
 # Declare a Vlad task that will execute on all hosts by default. To
 # limit that task to specific roles, use:
 #
-#     remote_task :example, :roles => [:app, :web] do
-def remote_task name, options = {}, &b
-  Rake::RemoteTask.remote_task name, options, &b
+#     remote_task :example, :arg1, :roles => [:app, :web] do
+def remote_task name, *args_options, &b
+  Rake::RemoteTask.remote_task name, *args_options, &b
 end
 
 ##
 # Declare a role and assign a remote host to it. Equivalent to the
 # <tt>host</tt> method; provided for capistrano compatibility.
-def role role_name, host, args = {}
-  Rake::RemoteTask.role role_name, host, args
+def role role_name, host = nil, args = {}
+  if block_given? then
+    raise ArgumentError, 'host not allowed with block' unless host.nil?
+
+    begin
+      Rake::RemoteTask.current_roles << role_name
+      yield
+    ensure
+      Rake::RemoteTask.current_roles.delete role_name
+    end
+  else
+    raise ArgumentError, 'host required' if host.nil?
+    Rake::RemoteTask.role role_name, host, args
+  end
 end
 
 ##
@@ -106,12 +95,39 @@ if Gem::Version.new(RAKEVERSION) < Gem::Version.new('0.8') then
   end
 end
 
+module Rake
+  module TaskManager
+    ##
+    # This gives us access to the tasks already defined in rake.
+    def all_tasks
+      @tasks
+    end
+  end
+
+  ##
+  # Hooks into rake and allows us to clear out a task by name or
+  # regexp. Use this if you want to completely override a task instead
+  # of extend it.
+  def self.clear_tasks(*tasks)
+    tasks.flatten.each do |name|
+      case name
+      when Regexp then
+        Rake.application.all_tasks.delete_if { |k,_| k =~ name }
+      else
+        Rake.application.all_tasks.delete(name)
+      end
+    end
+  end
+end
+
 ##
 # Rake::RemoteTask is a subclass of Rake::Task that adds
 # remote_actions that execute in parallel on multiple hosts via ssh.
 
 class Rake::RemoteTask < Rake::Task
 
+  @@current_roles = []
+
   include Open4
 
   ##
@@ -130,6 +146,10 @@ class Rake::RemoteTask < Rake::Task
 
   attr_reader :remote_actions
 
+  def self.current_roles
+    @@current_roles
+  end
+
   ##
   # Create a new task named +task_name+ attached to Rake::Application +app+.
 
@@ -160,19 +180,22 @@ class Rake::RemoteTask < Rake::Task
 
   def execute(args = nil)
     raise(Vlad::ConfigurationError,
-          "No target hosts specified for task: #{self.name}") if
-      target_hosts.empty?
+          "No target hosts specified on task #{self.name} for roles #{options[:roles].inspect}") if
+      ! defined_target_hosts?
 
     super args
 
-    @remote_actions.each { |act| act.execute(target_hosts, args) }
+    @remote_actions.each { |act| act.execute(target_hosts, self, args) }
   end
 
   ##
   # Use rsync to send +local+ to +remote+ on target_host.
 
   def rsync local, remote
-    cmd = [rsync_cmd, rsync_flags, local, "#{@target_host}:#{remote}"].flatten.compact
+    cmd = [rsync_cmd, rsync_flags, local, "#{target_host}:#{remote}"]
+    cmd = cmd.flatten.compact
+
+    warn cmd.join(' ') if $TRACE
 
     success = system(*cmd)
 
@@ -186,10 +209,11 @@ class Rake::RemoteTask < Rake::Task
   # sudo password will be prompted for then saved for subsequent sudo commands.
 
   def run command
-    cmd = [ssh_cmd, ssh_flags, target_host, command].compact
+    cmd = [ssh_cmd, ssh_flags, target_host, command].flatten
     result = []
 
-    warn cmd.join(' ') if $TRACE
+    trace = [ssh_cmd, ssh_flags, target_host, "'#{command}'"].flatten.join(' ')
+    warn trace if $TRACE
 
     pid, inn, out, err = popen4(*cmd)
 
@@ -237,6 +261,10 @@ class Rake::RemoteTask < Rake::Task
     end
 
     result.join
+  ensure
+    inn.close rescue nil
+    out.close rescue nil
+    err.close rescue nil
   end
 
   ##
@@ -254,6 +282,10 @@ class Rake::RemoteTask < Rake::Task
     @@default_env
   end
 
+  def self.per_thread
+    @@per_thread
+  end
+
   ##
   # The vlad environment.
 
@@ -270,7 +302,8 @@ class Rake::RemoteTask < Rake::Task
     if @@env.has_key? name then
       protect_env(name) do
         v = @@env[name]
-        v = @@env[name] = v.call if Proc === v
+        v = @@env[name] = v.call if Proc === v unless per_thread[name]
+        v = v.call if Proc === v
         v
       end
     elsif default
@@ -330,8 +363,11 @@ class Rake::RemoteTask < Rake::Task
   # Adds a remote task named +name+ with options +options+ that will
   # execute +block+.
 
-  def self.remote_task name, options = {}, &block
-    t = Rake::RemoteTask.define_task(name, &block)
+  def self.remote_task name, *args, &block
+    options = (Hash === args.last) ? args.pop : {}
+    t = Rake::RemoteTask.define_task(name, *args, &block)
+    options[:roles] = Array options[:roles]
+    options[:roles] |= @@current_roles
     t.options = options
     t
   end
@@ -348,10 +384,11 @@ class Rake::RemoteTask < Rake::Task
   # to the defaults.
 
   def self.reset
-    @@roles = Hash.new { |h,k| h[k] = {} }
-    @@env = {}
-    @@tasks = {}
-    @@env_locks = Hash.new { |h,k| h[k] = Mutex.new }
+    @@def_role_hash = {}                # official default role value
+    @@env           = {}
+    @@tasks         = {}
+    @@roles         = Hash.new { |h,k| h[k] = @@def_role_hash }
+    @@env_locks     = Hash.new { |h,k| h[k] = Mutex.new }
 
     @@default_env.each do |k,v|
       case v
@@ -367,7 +404,10 @@ class Rake::RemoteTask < Rake::Task
   # Adds role +role_name+ with +host+ and +args+ for that host.
 
   def self.role role_name, host, args = {}
-    raise ArgumentError, "invalid host" if host.nil? or host.empty?
+    [*host].each do |hst|
+      raise ArgumentError, "invalid host: #{hst}" if hst.nil? or hst.empty?
+    end
+    @@roles[role_name] = {} if @@def_role_hash.eql? @@roles[role_name]
     @@roles[role_name][host] = args
   end
 
@@ -389,12 +429,18 @@ class Rake::RemoteTask < Rake::Task
 
   def self.set name, value = nil, &default_block
     raise ArgumentError, "cannot provide both a value and a block" if
-      value and default_block
+      value and default_block unless
+      value == :per_thread
     raise ArgumentError, "cannot set reserved name: '#{name}'" if
       Rake::RemoteTask.reserved_name?(name) unless $TESTING
 
-    Rake::RemoteTask.default_env[name.to_s] = Rake::RemoteTask.env[name.to_s] =
-      value || default_block
+    name = name.to_s
+
+    Rake::RemoteTask.per_thread[name] = true if
+      default_block && value == :per_thread
+
+    Rake::RemoteTask.default_env[name] = Rake::RemoteTask.env[name] =
+      default_block || value
 
     Object.send :define_method, name do
       Rake::RemoteTask.fetch name
@@ -407,6 +453,7 @@ class Rake::RemoteTask < Rake::Task
 
   def self.set_defaults
     @@default_env ||= {}
+    @@per_thread  ||= {}
     self.reset
 
     mandatory :repository, "repository path"
@@ -424,9 +471,10 @@ class Rake::RemoteTask < Rake::Task
                :rsync_cmd,          "rsync",
                :rsync_flags,        ['-azP', '--delete'],
                :ssh_cmd,            "ssh",
-               :ssh_flags,          nil,
+               :ssh_flags,          [],
                :sudo_cmd,           "sudo",
-               :sudo_flags,         nil)
+               :sudo_flags,         nil,
+               :umask,              '02')
 
     set(:current_release)    { File.join(releases_path, releases[-1]) }
     set(:latest_release)     { deploy_timestamped ?release_path: current_release }
@@ -503,11 +551,31 @@ class Rake::RemoteTask < Rake::Task
     if hosts = ENV["HOSTS"] then
       hosts.strip.gsub(/\s+/, '').split(",")
     else
-      roles = options[:roles]
-      roles ? Rake::RemoteTask.hosts_for(roles) : Rake::RemoteTask.all_hosts
+      roles = Array options[:roles]
+
+      if roles.empty? then
+        Rake::RemoteTask.all_hosts
+      else
+        Rake::RemoteTask.hosts_for roles
+      end
     end
   end
 
+  ##
+  # Similar to target_hosts, but returns true if user defined any hosts, even
+  # an empty list.
+
+  def defined_target_hosts?
+    return true if ENV["HOSTS"]
+    roles = Array options[:roles]
+    return true if roles.empty?
+    # borrowed from hosts_for:
+    roles.flatten.each { |r|
+      return true unless @@def_role_hash.eql? Rake::RemoteTask.roles[r] 
+    }
+    return false
+  end
+
   ##
   # Action is used to run a task's remote_actions in parallel on each
   # of its hosts. Actions are created automatically in
@@ -536,7 +604,7 @@ class Rake::RemoteTask < Rake::Task
     def initialize task, block
       @task  = task
       @block = block
-      @workers = []
+      @workers = ThreadGroup.new
     end
 
     def == other # :nodoc:
@@ -548,17 +616,23 @@ class Rake::RemoteTask < Rake::Task
     # Execute this action on +hosts+ in parallel. Returns when block
     # has completed for each host.
 
-    def execute hosts, args = nil
+    def execute hosts, task, args
       hosts.each do |host|
         t = task.clone
         t.target_host = host
         thread = Thread.new(t) do |task|
           Thread.current[:task] = task
-          block.call args
+          case block.arity
+          when 1
+            block.call task
+          else
+            block.call task, args
+          end
+          Thread.current[:task] = nil
         end
-        @workers << thread
+        @workers.add thread
       end
-      @workers.each { |w| w.join }
+      @workers.list.each { |thr| thr.join }
     end
   end
 end

data/lib/vlad.rb

@@ -20,7 +20,7 @@ module Vlad
 
   ##
   # This is the version of Vlad you are running.
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 
   ##
   # Base error class for all Vlad errors.
@@ -58,6 +58,8 @@ module Vlad
   # Rakefile. YAY for simple and clean!
   def self.load options = {}
     options = {:config => options} if String === options
+    order = [:core, :app, :config, :scm, :web]
+    order += options.keys - order
 
     recipes = {
       :app    => :mongrel,
@@ -67,12 +69,14 @@ module Vlad
       :web    => :apache,
     }.merge(options)
 
-    recipes.each do |flavor, recipe|
+    order.each do |flavor|
+      recipe = recipes[flavor]
       next if recipe.nil? or flavor == :config
       require "vlad/#{recipe}"
     end
 
     Kernel.load recipes[:config]
+    Kernel.load "config/deploy_#{ENV['to']}.rb" if ENV['to']
   end
 end
 

data/lib/vlad/core.rb

@@ -41,7 +41,7 @@ namespace :vlad do
   remote_task :setup_app, :roles => :app do
     dirs = [deploy_to, releases_path, scm_path, shared_path]
     dirs += %w(system log pids).map { |d| File.join(shared_path, d) }
-    run "umask 02 && mkdir -p #{dirs.join(' ')}"
+    run "umask #{umask} && mkdir -p #{dirs.join(' ')}"
   end
 
   desc "Updates your application server to the latest revision.  Syncs
@@ -53,15 +53,13 @@ namespace :vlad do
     symlink = false
     begin
       run [ "cd #{scm_path}",
-            "#{source.checkout revision, '.'}",
-            "#{source.export ".", release_path}",
+            "#{source.checkout revision, scm_path}",
+            "#{source.export scm_path, release_path}",
             "chmod -R g+w #{latest_release}",
             "rm -rf #{latest_release}/log #{latest_release}/public/system #{latest_release}/tmp/pids",
-            "mkdir -p #{latest_release}/db #{latest_release}/tmp",
-            "ln -s #{shared_path}/log #{latest_release}/log",
-            "ln -s #{shared_path}/system #{latest_release}/public/system",
-            "ln -s #{shared_path}/pids #{latest_release}/tmp/pids",
+            "mkdir -p #{latest_release}/db #{latest_release}/tmp"
           ].join(" && ")
+      Rake::Task['vlad:update_symlinks'].invoke
 
       symlink = true
       run "rm -f #{current_path} && ln -s #{latest_release} #{current_path}"
@@ -75,6 +73,14 @@ namespace :vlad do
     end
   end
 
+  desc "Updates the symlinks for shared paths".cleanup
+
+  remote_task :update_symlinks, :roles => :app do
+    run [ "ln -s #{shared_path}/log #{latest_release}/log",
+          "ln -s #{shared_path}/system #{latest_release}/public/system",
+          "ln -s #{shared_path}/pids #{latest_release}/tmp/pids" ].join(" && ")
+  end
+
   desc "Run the migrate rake task for the the app. By default this is run in
     the latest app directory.  You can run migrations for the current app
     directory by setting :migrate_target to :current.  Additional environment

data/lib/vlad/darcs.rb

@@ -0,0 +1,24 @@
+class Vlad::Darcs
+
+  set :source, Vlad::Darcs.new
+  set :darcs_cmd, "darcs"
+
+  ##
+  # Ignores +revision+ for now, exports into directory +destination+
+
+  def checkout(revision, destination)
+    [ %{(test ! -d #{destination}/_darcs && #{darcs_cmd} init "--repodir=#{destination}") || true},
+      %{#{darcs_cmd} pull -a "--repodir=#{destination}" #{repository}},
+    ].join(" && ")
+  end
+
+  def export(dir, dest)
+    [ %{mkdir -p #{dest}},
+      %{ls | grep ^[^_] | xargs -I vlad cp -R vlad #{dest}}
+    ].join(" && ")
+  end
+
+  def revision(revision)
+    revision
+  end
+end

data/lib/vlad/git.rb

@@ -27,7 +27,7 @@ class Vlad::Git
     revision = 'HEAD' if revision == "."
 
     [ "mkdir -p #{destination}",
-      "#{git_cmd} archive #{revision} | (cd #{destination} && tar xf -)"
+      "#{git_cmd} archive --format=tar #{revision} | (cd #{destination} && tar xf -)"
     ].join(" && ")
   end
 

data/lib/vlad/god.rb

@@ -0,0 +1,23 @@
+require 'vlad'
+
+namespace :vlad do
+  ## God module for merb app server
+
+  desc "Prepares application servers for deployment.".cleanup
+
+  remote_task :setup_app, :roles => :app do
+    # do nothing?
+  end
+
+  desc "Restart the app servers"
+
+  remote_task :start_app, :roles => :app do
+    run "god restart #{cluster_name}"
+  end
+
+  desc "Stop the app servers"
+
+  remote_task :stop_app, :roles => :app do
+    run "god stop #{cluster_name}"
+  end
+end

data/lib/vlad/maintenance.rb

@@ -0,0 +1,13 @@
+require 'vlad'
+
+namespace :vlad do
+  namespace :maintenance do
+    remote_task :on, :roles => [:web] do
+      run "cp -f #{shared_path}/config/maintenance.html #{shared_path}/system/"
+    end
+
+    remote_task :off, :roles => [:web] do
+      run "rm -f #{shared_path}/system/maintenance.html"
+    end
+  end
+end

data/lib/vlad/merb.rb

@@ -0,0 +1,51 @@
+require 'vlad'
+
+namespace :vlad do
+  ##
+  # Merb app server
+
+  set :merb_address,       "127.0.0.1"
+  set :merb_command,       'merb'
+  set :merb_environment,   "production"
+  set :merb_port,          8000
+  set :merb_servers,       2
+
+  # maybe needed later
+  #set :merb_clean,         false
+  #set(:merb_conf)          { "#{current_path}/config/merb.yml" }
+  #set :merb_config_script, nil
+  #set :merb_group,         nil
+  #set :merb_log_file,      nil
+  #set :merb_pid_file,      nil
+  #set :merb_prefix,        nil
+  #set :merb_user,          nil
+
+  desc "Start the app servers"
+  remote_task :start_app, :roles => :app do
+    cmd = [
+            "cd #{current_path} &&", # work around merb bug,
+                                     # http://merb.devjavu.com/ticket/469
+            "#{merb_command}",
+          #"-m #{current_path}",     # the buggy behaviour
+            "-e #{merb_environment}",
+            "-p #{merb_port}",
+            "-c #{merb_servers}"
+          ].compact.join ' '
+    run cmd
+  end
+
+  desc "Stop the app servers"
+  remote_task :stop_app, :roles => :app do
+    merb_servers.times do |i|
+      cmd = "#{current_path}/script/stop_merb #{merb_port + i}"
+      puts "$ #{cmd}"
+      run cmd
+    end
+  end
+  
+  desc "Stop, then restart the app servers"
+  remote_task :restart_app, :roles => :app do
+    Rake::Task['vlad:stop_app'].invoke
+    Rake::Task['vlad:start_app'].invoke
+  end
+end

data/lib/vlad/mercurial.rb

@@ -8,7 +8,10 @@ class Vlad::Mercurial
 
   def checkout(revision, destination)
     revision = 'tip' if revision =~ /^head$/i
-    "hg pull -r #{revision} -R #{destination} #{repository}"
+
+    [ "if [ ! -d #{destination}/.hg ]; then hg init -R #{destination}; fi",
+      "hg pull -r #{revision} -R #{destination} #{repository}"
+    ].join(' && ')
   end
 
   ##

data/lib/vlad/mongrel.rb

@@ -23,28 +23,29 @@ configuration is set via the mongrel_* variables.".cleanup
 
   remote_task :setup_app, :roles => :app do
     cmd = [
-           "#{mongrel_command} cluster::configure",
+           'cluster::configure',
            "-N #{mongrel_servers}",
            "-p #{mongrel_port}",
            "-e #{mongrel_environment}",
            "-a #{mongrel_address}",
            "-c #{current_path}",
-           "-C #{mongrel_conf}",
            ("-P #{mongrel_pid_file}" if mongrel_pid_file),
            ("-l #{mongrel_log_file}" if mongrel_log_file),
            ("--user #{mongrel_user}" if mongrel_user),
            ("--group #{mongrel_group}" if mongrel_group),
            ("--prefix #{mongrel_prefix}" if mongrel_prefix),
            ("-S #{mongrel_config_script}" if mongrel_config_script),
-          ].compact.join ' '
+          ]
 
-    run cmd
+    run mongrel(*cmd)
   end
 
-  def mongrel(cmd) # :nodoc:
-    cmd = "#{mongrel_command} #{cmd} -C #{mongrel_conf}"
-    cmd << ' --clean' if mongrel_clean
-    cmd
+  def mongrel(cmd, *opts) # :nodoc:
+    cmd = ["#{mongrel_command} #{cmd} -C #{mongrel_conf}"]
+    cmd << ' --clean' if mongrel_clean unless cmd == 'cluster::configure'
+    cmd.push(*opts)
+
+    cmd.compact.join ' '
   end
 
   desc "Restart the app servers"

data/lib/vlad/nginx.rb

@@ -0,0 +1,48 @@
+require 'vlad'
+
+namespace :vlad do
+  ##
+  # Nginx web server on Gentoo/Debian init.d systems FIX
+
+  set :web_command, "/etc/init.d/nginx"
+
+  remote_task :setup_app, :roles => :web do
+    config_file = "/etc/nginx/vhosts/#{application}_#{environment}.conf"
+    raise "not yet... must review this code"
+    run [ "sudo test -e #{config_file} || ",
+          "sudo sh -c \"ruby ",
+          "  /etc/sliceconfig/install/interactive/nginx_config.rb ",
+          "'#{app_domain}' '#{application}' '#{environment}' ",
+          "'#{app_port}' '#{app_servers}' #{only_www ? 1 : 0} ",
+          "> #{config_file}\""
+        ].join(" ")
+  end
+
+  desc "(Re)Start the web servers"
+
+  remote_task :start_web, :roles => :web  do
+    run "#{web_command} restart"
+    # TODO: run %Q(sudo #{web_command} configtest && sudo #{web_command} reload)
+  end
+
+  desc "Stop the web servers"
+
+  remote_task :stop_web, :roles => :web  do
+    run "#{web_command} stop"
+  end
+
+  ##
+  # Everything HTTP.
+
+  desc "(Re)Start the web and app servers"
+
+  remote_task :start do
+    Rake::Task['vlad:start_app'].invoke
+    Rake::Task['vlad:start_web'].invoke
+  end
+
+  remote_task :stop do
+    Rake::Task['vlad:stop_app'].invoke
+    Rake::Task['vlad:stop_web'].invoke
+  end
+end

data/lib/vlad/passenger.rb

@@ -0,0 +1,8 @@
+require 'vlad'
+
+namespace :vlad do
+  desc 'Restart Passenger'
+  remote_task :start_app, :roles => :app do
+    run "touch #{release_path}/tmp/restart.txt"
+  end
+end

data/lib/vlad/thin.rb

@@ -0,0 +1,63 @@
+# $GEM_HOME/gems/vlad-1.2.0/lib/vlad/thin.rb
+# Thin tasks for Vlad the Deployer
+# By cnantais
+require 'vlad'
+
+namespace :vlad do
+  ##
+  # Thin app server
+
+  set :thin_address,       "127.0.0.1"
+  set :thin_command,       'thin'
+  set(:thin_conf)          { "#{shared_path}/thin_cluster.conf" }
+  set :thin_environment,   "production"
+  set :thin_group,         nil
+  set :thin_log_file,      nil
+  set :thin_pid_file,      nil
+  set :thin_port,          nil
+  set :thin_socket,        "/tmp/thin.sock"
+  set :thin_prefix,        nil
+  set :thin_servers,       2
+  set :thin_user,          nil
+  set :thin_rackup,        nil
+
+  desc "Prepares application servers for deployment. thin
+configuration is set via the thin_* variables.".cleanup
+
+  remote_task :setup_app, :roles => :app do
+    cmd = [
+           "#{thin_command} config",
+           "-s #{thin_servers}",
+           "-S #{thin_socket}",
+           "-e #{thin_environment}",
+           "-c #{current_path}",
+           "-C #{thin_conf}",
+           ("-a #{thin_address}"      if thin_address),
+           ("-R #{thin_rackup}"       if thin_rackup),
+           ("-P #{thin_pid_file}"     if thin_pid_file),
+           ("-l #{thin_log_file}"     if thin_log_file),
+           ("--user #{thin_user}"     if thin_user),
+           ("--group #{thin_group}"   if thin_group),
+           ("--prefix #{thin_prefix}" if thin_prefix),
+           ("-p #{thin_port}"         if thin_port),
+          ].compact.join ' '
+
+    run cmd
+  end
+
+  def thin(cmd) # :nodoc:
+    "#{thin_command} #{cmd} -C #{thin_conf}"
+  end
+
+  desc "Restart the app servers"
+
+  remote_task :start_app, :roles => :app do
+    run thin("restart -s #{thin_servers}")
+  end
+
+  desc "Stop the app servers"
+
+  remote_task :stop_app, :roles => :app do
+    run thin("stop -s #{thin_servers}")
+  end
+end

data/test/test_rake_remote_task.rb

@@ -26,7 +26,6 @@ class TestRakeRemoteTask < VladTestCase
     task = @vlad.remote_task(:some_task) { x += some_variable }
     task.execute nil
     assert_equal 1, task.some_variable
-    assert_equal 2, task.remote_actions.first.workers.size
     assert_equal 7, x
   end
 
@@ -41,13 +40,15 @@ class TestRakeRemoteTask < VladTestCase
     @vlad.host "app.example.com", :app
     t = @vlad.remote_task(:flunk, :roles => :db) { flunk "should not have run" }
     e = assert_raise(Vlad::ConfigurationError) { t.execute nil }
-    assert_equal "No target hosts specified for task: flunk", e.message
+    assert_equal "No target hosts specified on task flunk for roles [:db]",
+                 e.message
   end
 
   def test_execute_with_no_roles
     t = @vlad.remote_task(:flunk, :roles => :junk) { flunk "should not have run" }
     e = assert_raise(Vlad::ConfigurationError) { t.execute nil }
-    assert_equal "No target hosts specified for task: flunk", e.message
+    assert_equal "No target hosts specified on task flunk for roles [:junk]",
+                 e.message
   end
 
   def test_execute_with_roles

data/test/test_vlad.rb

@@ -26,7 +26,6 @@ class TestVlad < VladTestCase
   end
 
   def test_host_invalid
-    assert_raise(ArgumentError) { @vlad.host "", :app, :db }
     assert_raise(ArgumentError) { @vlad.host nil, :web }
   end
 
@@ -102,7 +101,7 @@ class TestVlad < VladTestCase
   def test_remote_task
     t = @vlad.remote_task(:test_task) { 5 }
     assert_equal @task_count + 1, Rake.application.tasks.size
-    assert_equal Hash.new, t.options
+    assert_equal({ :roles => [] }, t.options)
   end
 
   def test_remote_task_all_hosts_by_default

data/test/test_vlad_git.rb

@@ -26,7 +26,7 @@ class TestVladGit < VladTestCase
 
   def test_export
     cmd = @scm.export 'master', 'the/release/path'
-    assert_equal 'mkdir -p the/release/path && git archive master | (cd the/release/path && tar xf -)', cmd
+    assert_equal 'mkdir -p the/release/path && git archive --format=tar master | (cd the/release/path && tar xf -)', cmd
   end
 
   def test_revision

data/test/test_vlad_mercurial.rb

@@ -10,7 +10,11 @@ class TestVladMercurial < Test::Unit::TestCase
 
   def test_checkout
     cmd = @scm.checkout 'head', '/the/place'
-    assert_equal 'hg pull -r tip -R /the/place http://repo/project', cmd
+
+    expected = "if [ ! -d /the/place/.hg ]; then hg init -R /the/place; fi " \
+               "&& hg pull -r tip -R /the/place http://repo/project"
+
+    assert_equal expected, cmd
   end
 
   def test_export
@@ -24,3 +28,4 @@ class TestVladMercurial < Test::Unit::TestCase
     assert_equal expected, cmd
   end
 end
+

data/test/vlad_test_case.rb

@@ -12,8 +12,12 @@ module Process
     @@expected << status
   end
 
-  def self.waitpid2(pid)
-    [ @@expected.shift ]
+  class << self
+    alias :waitpid2_old :waitpid2
+
+    def waitpid2(pid)
+      [ @@expected.shift ]
+    end
   end
 end
 

data/vladdemo.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+N=$1; shift
+
 killall mongrel svnserve 2> /dev/null
 
 rm -rf ~/demo
@@ -23,6 +25,16 @@ echo "anon-access = write" >> svnrepo/conf/svnserve.conf
 
 svnserve -d --foreground -r svnrepo --listen-host localhost &
 
+echo "cd ~/demo
+rm -rf website_*
+svnserve -d --foreground -r svnrepo --listen-host localhost &
+
+cd mydemoapp
+ruby -I ~/Work/p4/zss/src/vlad/dev/lib -S rake -t vlad:setup vlad:update
+
+kill %1" > go.sh
+chmod u+x go.sh
+
 rails mydemoapp
 
 cd mydemoapp
@@ -33,23 +45,44 @@ Vlad.load" >> Rakefile
 
 echo "set :repository, 'svn://localhost/blah'
 set :domain, 'localhost'
-set :deploy_to, '/Users/ryan/demo/website'
 set :web_command, 'sudo apachectl'" > config/deploy.rb
 
+# TODO: add a knob
+if [ -n "$N" ]; then
+    echo "set(:deploy_to, :per_thread) {
+  File.expand_path(\"~/demo/website_#{target_host}\")
+}
+
+%w(current_path current_release latest_release
+   previous_release releases_path release_path
+   scm_path shared_path).each do |name|
+  Rake::RemoteTask.per_thread[name] = true
+end
+
+(1..$N).each do |n|
+  host 'localhost%02d' % n, :web, :app
+end" >> config/deploy.rb
+else
+    echo "set :deploy_to, File.expand_path('~/demo/website')" >> config/deploy.rb
+fi
+
 svn import -m Added . svn://localhost/blah
 
+echo
+echo "Here is your config:"
+cat config/deploy.rb
 echo
 echo "Here are the tasks available:"
 echo
 
-rake -T vlad
+ruby -I ~/Work/p4/zss/src/vlad/dev/lib -S rake -T vlad
 
 echo
 echo "The next step deploys and fires up the application"
 echo
 pause
 
-rake -t vlad:setup vlad:update vlad:start
+ruby -I ~/Work/p4/zss/src/vlad/dev/lib -S rake -t vlad:setup vlad:update vlad:start
 
 open http://localhost:8000/
 
@@ -58,7 +91,7 @@ echo "done! check it out"
 echo
 pause
 
-rake vlad:stop
+ruby -I ~/Work/p4/zss/src/vlad/dev/lib -S rake vlad:stop
 
 kill %1
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vlad
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -11,20 +11,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-14 00:00:00 -08:00
+date: 2009-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: open4
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -34,15 +36,19 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.9.0
     version: 
-description: "Vlad the Deployer is pragmatic application deployment automation, without mercy. Much like Capistrano, but with 1/10th the complexity. Vlad integrates seamlessly with Rake, and uses familiar and standard tools like ssh and rsync.  Impale your application on the heartless spike of the Deployer.  == FEATURES/PROBLEMS:  * Full deployment automation stack. * Turnkey deployment for mongrel+apache+svn. * Supports single server deployment with just 3 variables defined. * Built on rake. Easy. Engine is small. * Very few dependencies. All simple. * Uses ssh with your ssh settings already in place. * Uses rsync for efficient transfers. * Run remote commands on one or more servers. * Mix and match local and remote tasks. * Compatible with all of your tab completion shell script rake-tastic goodness. * Ships with tests that actually pass in 0.028 seconds! * Does NOT support Windows right now (we think). Coming soon in 1.2."
-email: ryand-ruby@zenspider.com
+description: Vlad the Deployer is pragmatic application deployment automation, without mercy. Much like Capistrano, but with 1/10th the complexity. Vlad integrates seamlessly with Rake, and uses familiar and standard tools like ssh and rsync.  Impale your application on the heartless spike of the Deployer.
+email: 
+- ryand-ruby@zenspider.com
+- drbrain@segment7.net
+- wilson@supremetyrant.com
 executables: []
 
 extensions: []
@@ -72,12 +78,19 @@ files:
 - lib/vlad.rb
 - lib/vlad/apache.rb
 - lib/vlad/core.rb
+- lib/vlad/darcs.rb
 - lib/vlad/git.rb
+- lib/vlad/god.rb
 - lib/vlad/lighttpd.rb
+- lib/vlad/maintenance.rb
+- lib/vlad/merb.rb
 - lib/vlad/mercurial.rb
 - lib/vlad/mongrel.rb
+- lib/vlad/nginx.rb
+- lib/vlad/passenger.rb
 - lib/vlad/perforce.rb
 - lib/vlad/subversion.rb
+- lib/vlad/thin.rb
 - test/test_rake_remote_task.rb
 - test/test_vlad.rb
 - test/test_vlad_git.rb
@@ -109,10 +122,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Vlad the Deployer is pragmatic application deployment automation, without mercy. Much like Capistrano, but with 1/10th the complexity. Vlad integrates seamlessly with Rake, and uses familiar and standard tools like ssh and rsync.
+summary: Vlad the Deployer is pragmatic application deployment automation, without mercy
 test_files: 
 - test/test_rake_remote_task.rb
 - test/test_vlad.rb