vlad 1.3.2 → 1.4.0

data/.autotest

@@ -0,0 +1,24 @@
+# -*- ruby -*-
+
+require 'autotest/restart'
+
+Autotest.add_hook :initialize do |at|
+  at.testlib = "minitest/autorun"
+#   at.extra_files << "../some/external/dependency.rb"
+#
+#   at.libs << ":../some/external"
+#
+#   at.add_exception 'vendor'
+#
+#   at.add_mapping(/dependency.rb/) do |f, _|
+#     at.files_matching(/test_.*rb$/)
+#   end
+#
+#   %w(TestA TestB).each do |klass|
+#     at.extra_class_map[klass] = "test/test_misc.rb"
+#   end
+end
+
+# Autotest.add_hook :run_command do |at|
+#   system "rake build"
+# end

data/History.txt

@@ -1,3 +1,28 @@
+=== 1.4.0 / 2009-06-23
+
+* 1 major enhancement:
+
+  * Switched to passenger as default app server.
+
+* 11 minor enhancements:
+
+  * #rsync now takes ANY number of arguments and expects to you add "host:".
+  * Added Rake::RemoteTask#get.
+  * Added doco for why we don't ship a deploy task
+  * Added links to example maintenance recipes
+  * Added multi-env doco to getting_started.txt
+  * Added svn-over-ssh faq item. gah.
+  * Flipped tests to minitest
+  * Merged global #role and Rake::RemoteTask::role.
+  * Moved all global methods to Rake::RemoteTask and wrote #external to clean up.
+  * Moved rake extensions to hoe so everyone can enjoy the fun.
+  * put names the tempfile based on the remote path to ease debugging
+
+* 2 bug fixes:
+
+  * passenger:start_app wasn't using the latest_release path
+  * set/fetch wasn't dealing with a default of false well. (Seth Falcon)
+
 === 1.3.2 / 2009-03-16
 
 * 3 minor enhancements:

data/Manifest.txt

@@ -1,3 +1,4 @@
+.autotest
 History.txt
 Manifest.txt
 README.txt

data/Rakefile

@@ -2,20 +2,20 @@
 
 require 'rubygems'
 require 'hoe'
-$: << 'lib'
-require 'vlad'
 
-Hoe.new('vlad', Vlad::VERSION) do |vlad|
-  vlad.rubyforge_name = 'hitsquad'
+Hoe.plugin :seattlerb
 
-  vlad.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
-  vlad.developer('Eric Hodel', 'drbrain@segment7.net')
-  vlad.developer('Wilson Bilkovich', 'wilson@supremetyrant.com')
+Hoe.spec 'vlad' do
+  self.rubyforge_name = 'hitsquad'
 
-  vlad.extra_deps << ['rake', '>= 0.8.1']
-  vlad.extra_deps << 'open4'
+  developer 'Ryan Davis',       'ryand-ruby@zenspider.com'
+  developer 'Eric Hodel',       'drbrain@segment7.net'
+  developer 'Wilson Bilkovich', 'wilson@supremetyrant.com'
 
-  vlad.multiruby_skip << "1.9" << "rubinius"
+  extra_deps << ['rake', '>= 0.8.1']
+  extra_deps << 'open4'
+
+  multiruby_skip << "1.9" << "rubinius"
 end
 
 desc "quick little hack to see what the state of the nation looks like"
@@ -28,14 +28,6 @@ task :debug do
   Rake::Task['vlad:debug'].invoke
 end
 
-task :flog do
-  sh 'flog -s lib'
-end
-
-task :flog_full do
-  sh 'flog -a lib'
-end
-
 task :mana_from_heaven do
   # vlad = vlad + rake + open4
   # rake sans-contrib = 2035.98356718206
@@ -49,4 +41,4 @@ task :mana_from_heaven do
   puts "%14.8f = %s" % [target - vlad, "needed delta"]
 end
 
-# vim: syntax=Ruby
+# vim: syntax=ruby

data/doco/faq.txt

@@ -5,6 +5,25 @@
 
 We don't want to have to think about what state we're in and where. So vlad:start does a restart if necessary. Restart is just "start again" after all... That is what start does.
 
+=== Q: Why is there no vlad:deploy?
+=== A: Because everyone is a unique beautiful flower.
+
+Everyone's deployment is different. Everyone. Unique scaling
+requirements. Yadda yadda yadda. So rather than supply something that
+nobody will use, we decided not to supply anything at all. Here is an
+example deploy that I stole from the web (and improved) that you may like:
+
+    desc "Full deployment cycle"
+    task "vlad:deploy" => %w[
+      vlad:update
+      vlad:migrate
+      vlad:reset_session
+      vlad:start
+      vlad:cleanup
+    ]
+
+Just pop that in your config/deploy.rb, tweak it as necessary, and have at it.
+
 === Q: Why are there no before_action and after_action hooks?
 === A: Because we use rake!
 
@@ -91,3 +110,22 @@ If you're on a mac (on tiger, not leopard), use SSHKeychain, we love it. <http:/
 
   set :ssh_flags, "-A #{mygateway}"
   set :rsync_flags, "--rsh ssh -A #{mygateway} ssh"
+
+=== Q: OMG subversion is stupid! It keeps asking for "Authentication Realm"
+=== A: Yes, yes it is.
+
+If you're seeing local checkouts work fine but they don't over ssh
+(even to localhost!) then ssh into that machine (yes, even localhost)
+and do a checkout there to a temporary directory. From then on,
+checkout over ssh should work fine.
+
+  % svn co https://blah/blah /tmp/happy
+    ... works fine ...
+  % ssh localhost svn co https://blah/blah /tmp/sad
+    ... asks for authentication and then hangs ...
+  % ssh localhost
+  % svn co https://blah/blah /tmp/sad-no-happy
+    ... asks for authentication ...
+    ... works fine ...
+  % ssh localhost svn co https://blah/blah /tmp/happy2
+    ... works fine ...

data/doco/getting_started.txt

@@ -14,6 +14,26 @@ This defaults to using 'svn export' from +repository+, and a single
 server for +app+, +db+, and +www+. If you need to tweak these things,
 refer to the variable documentation.
 
+* If you want a multi-config environment, change your config like so:
+
+    set :application, "project"
+    set :repository, 'http://svn.example.com/project/branches/stable/'
+    
+    task :beta do
+      set :domain,    "beta.example.com"
+      set :deploy_to, "/path/to/install-beta"
+    end
+    
+    task :dev do
+      set :domain,    "dev.example.com"
+      set :deploy_to, "/path/to/install-dev"
+    end
+    
+    task :prod do
+      set :domain,    "example.com"
+      set :deploy_to, "/path/to/install"
+    end
+
 * Add the following to your Rakefile:
 
     begin

data/lib/rake_remote_task.rb

@@ -7,123 +7,14 @@ $TESTING ||= false
 $TRACE = Rake.application.options.trace
 $-w = true if $TRACE # asshat, don't mess with my warn.
 
-##
-# Declare a remote host and its roles. Equivalent to <tt>role</tt>,
-# but shorter for multiple roles.
-def host host_name, *roles
-  Rake::RemoteTask.host host_name, *roles
-end
-
-##
-# Copy a (usually generated) file to +remote_path+. Contents of block
-# are copied to +remote_path+ and you may specify an optional
-# 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
-    rsync fp.path, remote_path
-  end
-end
-
-##
-# Declare a Vlad task that will execute on all hosts by default. To
-# limit that task to specific roles, use:
-#
-#     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 = 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
-
-##
-# Execute the given command on the <tt>target_host</tt> for the
-# current task.
-def run *args, &b
-  Thread.current[:task].run(*args, &b)
-end
-
-# rsync the given files to <tt>target_host</tt>.
-def rsync local, remote
-  Thread.current[:task].rsync local, remote
-end
-
-# run the command w/ sudo
-def sudo command
-  Thread.current[:task].sudo(command)
-end
-
-# Declare a variable called +name+ and assign it a value. A
-# globally-visible method with the name of the variable is defined.
-# If a block is given, it will be called when the variable is first
-# accessed. Subsequent references to the variable will always return
-# the same value. Raises <tt>ArgumentError</tt> if the +name+ would
-# conflict with an existing method.
-def set name, val = nil, &b
-  Rake::RemoteTask.set name, val, &b
-end
-
-# Returns the name of the host that the current task is executing on.
-# <tt>target_host</tt> can uniquely identify a particular task/host
-# combination.
-def target_host
-  Thread.current[:task].target_host
-end
-
-if Gem::Version.new(RAKEVERSION) < Gem::Version.new('0.8') then
-  class Rake::Task
-    alias vlad_original_execute execute
-
-    def execute(args = nil)
-      vlad_original_execute
-    end
+def export receiver, *methods
+  methods.each do |method|
+    eval "def #{method} *args, &block; #{receiver}.#{method}(*args, &block);end"
   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
+export "Thread.current[:task]", :get, :put, :rsync, :run, :sudo, :target_host
+export "Rake::RemoteTask",      :host, :remote_task, :role, :set
 
 ##
 # Rake::RemoteTask is a subclass of Rake::Task that adds
@@ -160,7 +51,9 @@ class Rake::RemoteTask < Rake::Task
 
   def initialize(task_name, app)
     super
+
     @remote_actions = []
+    @happy = false # used for deprecation warnings on get/put/rsync
   end
 
   ##
@@ -194,19 +87,53 @@ class Rake::RemoteTask < Rake::Task
   end
 
   ##
-  # Use rsync to send +local+ to +remote+ on target_host.
+  # Pull +files+ from the remote +host+ using rsync to +local_dir+.
+  # TODO: what if role has multiple hosts & the files overlap? subdirs?
+
+  def get local_dir, *files
+    @happy = true
+    host = target_host
+    rsync files.map { |f| "#{host}:#{f}" }, local_dir
+    @happy = false
+  end
+
+  ##
+  # Copy a (usually generated) file to +remote_path+. Contents of block
+  # are copied to +remote_path+ and you may specify an optional
+  # base_name for the tempfile (aids in debugging).
+
+  def put remote_path, base_name = File.basename(remote_path)
+    require 'tempfile'
+    Tempfile.open base_name do |fp|
+      fp.puts yield
+      fp.flush
+      @happy = true
+      rsync fp.path, "#{target_host}:#{remote_path}"
+      @happy = false
+    end
+  end
+
+  ##
+  # Execute rsync with +args+. Tacks on pre-specified +rsync_cmd+ and
+  # +rsync_flags+.
+  #
+  # Favor #get and #put for most tasks. Old-style direct use where the
+  # target_host was implicit is now deprecated.
+
+  def rsync *args
+    unless @happy || args[-1] =~ /:/ then
+      warn "rsync deprecation: pass target_host:remote_path explicitly"
+      args[-1] = "#{target_host}:#{args[-1]}"
+    end
 
-  def rsync local, remote
-    cmd = [rsync_cmd, rsync_flags, local, "#{target_host}:#{remote}"]
-    cmd = cmd.flatten.compact
+    cmd    = [rsync_cmd, rsync_flags, args].flatten.compact
+    cmdstr = cmd.join ' '
 
-    warn cmd.join(' ') if $TRACE
+    warn cmdstr if $TRACE
 
     success = system(*cmd)
 
-    unless success then
-      raise Vlad::CommandFailedError, "execution failed: #{cmd.join ' '}"
-    end
+    raise Vlad::CommandFailedError, "execution failed: #{cmdstr}" unless success
   end
 
   ##
@@ -311,7 +238,7 @@ class Rake::RemoteTask < Rake::Task
         v = v.call if Proc === v
         v
       end
-    elsif default
+    elsif default || default == false
       v = @@env[name] = default
     else
       raise Vlad::FetchError
@@ -407,13 +334,29 @@ class Rake::RemoteTask < Rake::Task
 
   ##
   # Adds role +role_name+ with +host+ and +args+ for that host.
+  # TODO: merge:
+  # Declare a role and assign a remote host to it. Equivalent to the
+  # <tt>host</tt> method; provided for capistrano compatibility.
 
-  def self.role role_name, host, args = {}
-    [*host].each do |hst|
-      raise ArgumentError, "invalid host: #{hst}" if hst.nil? or hst.empty?
+  def self.role role_name, host = nil, args = {}
+    if block_given? then
+      raise ArgumentError, 'host not allowed with block' unless host.nil?
+
+      begin
+        current_roles << role_name
+        yield
+      ensure
+        current_roles.delete role_name
+      end
+    else
+      raise ArgumentError, 'host required' if host.nil?
+
+      [*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
-    @@roles[role_name] = {} if @@def_role_hash.eql? @@roles[role_name]
-    @@roles[role_name][host] = args
   end
 
   ##

data/lib/vlad.rb

@@ -20,7 +20,7 @@ module Vlad
 
   ##
   # This is the version of Vlad you are running.
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'
 
   ##
   # Base error class for all Vlad errors.
@@ -42,7 +42,7 @@ module Vlad
   # Loads tasks file +tasks_file+ and various recipe styles as a hash
   # of category/style pairs. Recipes default to:
   #
-  #     :app    => :mongrel
+  #     :app    => :passenger
   #     :config => 'config/deploy.rb'
   #     :core   => :core
   #     :scm    => :subversion
@@ -62,7 +62,7 @@ module Vlad
     order += options.keys - order
 
     recipes = {
-      :app    => :mongrel,
+      :app    => :passenger,
       :config => 'config/deploy.rb',
       :core   => :core,
       :scm    => :subversion,

data/lib/vlad/maintenance.rb

@@ -1,5 +1,12 @@
 require 'vlad'
 
+##
+# See the following documents for recipes:
+#
+# * http://clarkware.com/cgi/blosxom/2007/01/05/CustomMaintenancePages
+# * http://blog.nodeta.fi/2009/03/11/stopping-your-rails-application-with-phusion-passenger/
+#
+
 namespace :vlad do
   namespace :maintenance do
     remote_task :on, :roles => [:web] do

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 #{release_path}/tmp/restart.txt"
+    run "touch #{latest_release}/tmp/restart.txt"
   end
-end
+end

data/test/test_rake_remote_task.rb

@@ -2,6 +2,16 @@ require 'test/vlad_test_case'
 require 'vlad'
 
 class TestRakeRemoteTask < VladTestCase
+  # TODO: move to minitest
+  def assert_silent
+    out, err = capture_io do
+      yield
+    end
+
+    assert_empty err
+    assert_empty out
+  end
+
   def test_enhance
     util_set_hosts
     body = Proc.new { 5 }
@@ -29,6 +39,21 @@ class TestRakeRemoteTask < VladTestCase
     assert_equal 7, x
   end
 
+  def test_set_false
+    set :can_set_nil, nil
+    set :lies_are, false
+
+    assert_equal nil,   task.can_set_nil
+
+    assert_equal false, task.lies_are
+    assert_equal false, Rake::RemoteTask.fetch(:lies_are)
+  end
+
+
+  def test_fetch_false
+    assert_equal false, Rake::RemoteTask.fetch(:unknown, false)
+  end
+
   def test_execute_exposes_target_host
     host "app.example.com", :app
     task = remote_task(:target_task) { set(:test_target_host, target_host) }
@@ -39,14 +64,14 @@ class TestRakeRemoteTask < VladTestCase
   def test_execute_with_no_hosts
     @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 }
+    e = assert_raises(Vlad::ConfigurationError) { t.execute nil }
     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 }
+    e = assert_raises(Vlad::ConfigurationError) { t.execute nil }
     assert_equal "No target hosts specified on task flunk for roles [:junk]",
                  e.message
   end
@@ -65,13 +90,15 @@ class TestRakeRemoteTask < VladTestCase
     util_setup_task
     @task.target_host = "app.example.com"
 
-    @task.rsync 'localfile', 'remotefile'
+    assert_silent do
+      @task.rsync 'localfile', 'host:remotefile'
+    end
 
     commands = @task.commands
 
     assert_equal 1, commands.size, 'not enough commands'
-    assert_equal %w[rsync -azP --delete localfile app.example.com:remotefile],
-                 commands.first, 'rsync'
+    assert_equal(%w[rsync -azP --delete localfile host:remotefile],
+                 commands.first)
   end
 
   def test_rsync_fail
@@ -79,8 +106,68 @@ class TestRakeRemoteTask < VladTestCase
     @task.target_host = "app.example.com"
     @task.action = lambda { false }
 
-    e = assert_raise(Vlad::CommandFailedError) { @task.rsync 'local', 'remote' }
-    assert_equal "execution failed: rsync -azP --delete local app.example.com:remote", e.message
+    e = assert_raises Vlad::CommandFailedError do
+      assert_silent do
+        @task.rsync 'local', 'host:remote'
+      end
+    end
+    exp = "execution failed: rsync -azP --delete local host:remote"
+    assert_equal exp, e.message
+  end
+
+  def test_rsync_deprecation
+    util_setup_task
+    @task.target_host = "app.example.com"
+
+    out, err = capture_io do
+      @task.rsync 'localfile', 'remotefile'
+    end
+
+    commands = @task.commands
+
+    assert_equal 1, commands.size, 'not enough commands'
+    assert_equal(%w[rsync -azP --delete localfile app.example.com:remotefile],
+                 commands.first)
+
+    assert_equal("rsync deprecation: pass target_host:remote_path explicitly\n",
+                 err)
+    assert_empty out
+    # flunk "not yet"
+  end
+
+  def test_get
+    util_setup_task
+    @task.target_host = "app.example.com"
+
+    assert_silent do
+      @task.get 'tmp', "remote1", "remote2"
+    end
+
+    commands = @task.commands
+
+    expected = %w[rsync -azP --delete app.example.com:remote1 app.example.com:remote2 tmp]
+
+    assert_equal 1, commands.size
+    assert_equal expected, commands.first
+  end
+
+  def test_put
+    util_setup_task
+    @task.target_host = "app.example.com"
+
+    assert_silent do
+      @task.put 'dest' do
+        "whatever"
+      end
+    end
+
+    commands = @task.commands
+
+    expected  = %w[rsync -azP --delete HAPPY app.example.com:dest]
+    commands.first[3] = 'HAPPY'
+
+    assert_equal 1, commands.size
+    assert_equal expected, commands.first
   end
 
   def test_run
@@ -89,7 +176,7 @@ class TestRakeRemoteTask < VladTestCase
     @task.target_host = "app.example.com"
     result = nil
 
-    out, err = util_capture do
+    out, err = capture_io do
       result = @task.run("ls")
     end
 
@@ -100,8 +187,8 @@ class TestRakeRemoteTask < VladTestCase
                  commands.first, 'app'
     assert_equal "file1\nfile2\n", result
 
-    assert_equal "file1\nfile2\n", out.read
-    assert_equal '', err.read
+    assert_equal "file1\nfile2\n", out
+    assert_equal '', err
   end
 
   def test_run_failing_command
@@ -111,7 +198,7 @@ class TestRakeRemoteTask < VladTestCase
     @task.target_host =  'app.example.com'
     @task.action = lambda { 1 }
 
-    e = assert_raise(Vlad::CommandFailedError) { @task.run("ls") }
+    e = assert_raises(Vlad::CommandFailedError) { @task.run("ls") }
     assert_equal "execution failed with status 1: ssh app.example.com ls", e.message
 
     assert_equal 1, @task.commands.size
@@ -125,7 +212,7 @@ class TestRakeRemoteTask < VladTestCase
     def @task.sudo_password() "my password" end # gets defined by set
     result = nil
 
-    out, err = util_capture do
+    out, err = capture_io do
       result = @task.run("sudo ls")
     end
 
@@ -143,14 +230,14 @@ class TestRakeRemoteTask < VladTestCase
     # testing model.
     assert_equal "file1\nfile2\nPassword:\n", result
 
-    assert_equal "file1\nfile2\n", out.read
-    assert_equal "Password:\n", err.read
+    assert_equal "file1\nfile2\n", out
+    assert_equal "Password:\n", err
   end
 
   def test_sudo
     util_setup_task
     @task.target_host = "app.example.com"
-    @task.sudo "ls" 
+    @task.sudo "ls"
 
     commands = @task.commands
 
@@ -159,23 +246,6 @@ class TestRakeRemoteTask < VladTestCase
                  commands.first, 'app'
   end
 
-  def util_capture
-    require 'stringio'
-    orig_stdout = $stdout.dup
-    orig_stderr = $stderr.dup
-    captured_stdout = StringIO.new
-    captured_stderr = StringIO.new
-    $stdout = captured_stdout
-    $stderr = captured_stderr
-    yield
-    captured_stdout.rewind
-    captured_stderr.rewind
-    return captured_stdout, captured_stderr
-  ensure
-    $stdout = orig_stdout
-    $stderr = orig_stderr
-  end
-
   def util_setup_task(options = {})
     @task = @vlad.remote_task :test_task, options
     @task.commands = []

data/test/test_vlad.rb

@@ -26,7 +26,7 @@ class TestVlad < VladTestCase
   end
 
   def test_host_invalid
-    assert_raise(ArgumentError) { @vlad.host nil, :web }
+    assert_raises(ArgumentError) { @vlad.host nil, :web }
   end
 
   def test_host_multiple_hosts
@@ -40,8 +40,8 @@ class TestVlad < VladTestCase
 
     assert_equal expected, @vlad.roles[:app]
     assert_equal expected, @vlad.roles[:db]
-    assert_not_equal(@vlad.roles[:db]["test.example.com"].object_id,
-                     @vlad.roles[:app]["test.example.com"].object_id)
+    refute_equal(@vlad.roles[:db]["test.example.com"].object_id,
+                 @vlad.roles[:app]["test.example.com"].object_id)
   end
 
   def test_hosts_for_array_of_roles
@@ -68,9 +68,9 @@ class TestVlad < VladTestCase
 
   def test_initialize
     @vlad.set_defaults # ensure these three are virginal
-    assert_raise(Vlad::ConfigurationError) { @vlad.repository }
-    assert_raise(Vlad::ConfigurationError) { @vlad.deploy_to }
-    assert_raise(Vlad::ConfigurationError) { @vlad.domain }
+    assert_raises(Vlad::ConfigurationError) { @vlad.repository }
+    assert_raises(Vlad::ConfigurationError) { @vlad.deploy_to }
+    assert_raises(Vlad::ConfigurationError) { @vlad.domain }
   end
 
   def test_role
@@ -160,21 +160,21 @@ class TestVlad < VladTestCase
   end
 
   def test_set
-    set :test, 5
-    assert_equal 5, @vlad.test
+    set :win, 5
+    assert_equal 5, @vlad.win
   end
 
   def test_set_lazy_block_evaluation
-    set(:test) { fail "lose" }
-    assert_raise(RuntimeError) { @vlad.test }
+    set(:lose) { raise "lose" }
+    assert_raises(RuntimeError) { @vlad.lose }
   end
 
   def test_set_with_block
     x = 1
-    set(:test) { x += 2 }
+    set(:win) { x += 2 }
 
-    assert_equal 3, @vlad.test
-    assert_equal 3, @vlad.test
+    assert_equal 3, @vlad.win
+    assert_equal 3, @vlad.win
   end
 
   def test_set_with_reference
@@ -188,20 +188,20 @@ class TestVlad < VladTestCase
   end
 
   def test_set_with_block_and_value
-    e = assert_raise(ArgumentError) do
-      set(:test, 5) { 6 }
+    e = assert_raises(ArgumentError) do
+      set(:loser, 5) { 6 }
     end
     assert_equal "cannot provide both a value and a block", e.message
   end
 
   def test_set_with_nil
-    set(:test, nil)
-    assert_equal nil, @vlad.test
+    set(:win, nil)
+    assert_equal nil, @vlad.win
   end
 
   def test_set_with_reserved_name
     $TESTING = false
-    e = assert_raise(ArgumentError) { set(:all_hosts, []) }
+    e = assert_raises(ArgumentError) { set(:all_hosts, []) }
     assert_equal "cannot set reserved name: 'all_hosts'", e.message
   ensure
     $TESTING = true

data/test/test_vlad_mercurial.rb

@@ -2,7 +2,7 @@ require 'test/vlad_test_case'
 require 'vlad'
 require 'vlad/mercurial'
 
-class TestVladMercurial < Test::Unit::TestCase
+class TestVladMercurial < MiniTest::Unit::TestCase
   def setup
     @scm = Vlad::Mercurial.new
     set :repository, "http://repo/project"

data/test/vlad_test_case.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'stringio'
 require 'vlad'
 
@@ -21,7 +21,6 @@ module Process
   end
 end
 
-
 class Rake::RemoteTask
   attr_accessor :commands, :action, :input, :output, :error
 
@@ -57,9 +56,7 @@ class Rake::RemoteTask
 
 end
 
-class VladTestCase < Test::Unit::TestCase
-  undef_method :default_test
-
+class VladTestCase < MiniTest::Unit::TestCase
   def setup
     @vlad = Rake::RemoteTask
     @vlad.reset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vlad
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -32,7 +32,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2009-03-16 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,9 +63,15 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.10.0
+        version: 2.3.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.
+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
@@ -87,6 +93,7 @@ extra_rdoc_files:
 - doco/perforce.txt
 - doco/variables.txt
 files: 
+- .autotest
 - History.txt
 - Manifest.txt
 - README.txt
@@ -126,6 +133,8 @@ files:
 - vladdemo.sh
 has_rdoc: true
 homepage: http://rubyhitsquad.com/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -147,9 +156,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Vlad the Deployer is pragmatic application deployment automation, without mercy
 test_files: 
 - test/test_rake_remote_task.rb

metadata.gz.sig

@@ -1,3 +1,2 @@
-�#���A
�]
��8�m=�A�.�$�X(7�ՋU�e���jf��$Y���y���#�
!\��֙�fx��ֈ0�]��Z���[E�A�L	F1;��9@���ũ��?�}�Y�w%��m0D@@���	��������v��C�
-y�%LmU�����NZ�ǀp=,wA����F�7��T�H�O����>�U���
-J��8�']1��$���P@����݅����� ��^�z�$�`el�~ׄe�Y]��d�8��&��
+��R0�¾8Qi��2����(pJ+\u�O_��sdq���)ڶ6��Oh#F3��� h�r�b�J���l�[��� ��A=��0�o�o�kP௟ep�]�P�/��"Z�o��,�e�� ��I_��i�sa�W�^�p������a��x�h��|O�P~ഁ������
+:�'��|�)�v7�^��:����Ψ��0�r e�<cT0��Ǭ�#Bjt���)ث�ON�@O���uѺ6Uy�X��w7��-%B(��