vlad 2.2.1 → 2.2.2

data/History.txt

@@ -1,3 +1,15 @@
+=== 2.2.2 / 2011-09-06
+
+* 1 minor enhancement:
+
+  * Added FAQ item about bundler breaking stuff. *sigh*
+
+* 3 bug fixes:
+
+  * Fix an scm bug when using skip_scm (richinsr)
+  * Fixed typo in variables (flog->flag). (appfertigung)
+  * Fixed vlad:start_app for passenger computing a new latest_release (dbloete)
+
 === 2.2.1 / 2011-06-22
 
 * 1 bug fix:

data/README.txt

@@ -1,7 +1,8 @@
 = Vlad the Deployer by the Ruby Hit Squad
 
-* http://rubyhitsquad.com/
-* http://rubyforge.org/projects/hitsquad/
+home :: http://rubyhitsquad.com/
+repo :: https://github.com/seattlerb/vlad
+rdoc :: http://hitsquad.rubyforge.org/vlad
 
 == DESCRIPTION
 
@@ -56,7 +57,7 @@ Impale your application on the heartless spike of the Deployer.
 
 (The MIT License)
 
-Copyright (c) 2007-2009 Ryan Davis and the rest of the Ruby Hit Squad
+Copyright (c) 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

@@ -18,7 +18,7 @@ Hoe.spec 'vlad' do
   dependency 'open4',            '~> 0.9.0'
 
   # TODO: remove 1.9
-  multiruby_skip << "1.9" << "rubinius"
+  multiruby_skip << "rubinius"
 end
 
 desc "quick little hack to see what the state of the nation looks like"

data/doco/faq.txt

@@ -57,12 +57,12 @@ To prepend on a task, add a dependency:
 NOTE: Rake.clear_tasks was moved to Hoe so it could be used more generally.
 
   require 'hoe/rake'
-  
+
   namespace :vlad do
     # Clear existing update task so that we can redefine instead of
     # adding to it.
-    Rake.clear_tasks('vlad:update') 
-  
+    Rake.clear_tasks('vlad:update')
+
     remote_task :update, :roles => :app do
       #custom update stuff
     end
@@ -73,7 +73,7 @@ NOTE: Rake.clear_tasks was moved to Hoe so it could be used more generally.
 
   task :shazam! => [:action1, :action2]
 
- The other way is to look it up and call invoke:
+The other way is to look it up and call invoke:
 
   task :shazam! do
     Rake::Task[:action1].invoke
@@ -113,8 +113,8 @@ If you're on a mac (on tiger, not leopard), use SSHKeychain, we love it. <http:/
 === 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"
+  set :ssh_flags,   ['-A', mygateway, 'ssh', '-A']
+  set :rsync_flags, ['--rsh', 'ssh', '-A', mygateway, 'ssh']
 
 === Q: OMG subversion is stupid! It keeps asking for "Authentication Realm"
 === A: Yes, yes it is.
@@ -134,3 +134,15 @@ checkout over ssh should work fine.
     ... works fine ...
   % ssh localhost svn co https://blah/blah /tmp/happy2
     ... works fine ...
+
+== Using Bundler
+
+=== Q: OMG Bundler is stupid! It requires vlad in my app and that breaks stuff!
+=== A: Yes, yes it is.
+
+As far as we're concerned, that "feature" in bundler is a bug. One
+workaround is to tell bundler not to require vlad for you.
+
+  group :development do
+    gem 'vlad', :require => false
+  end

data/doco/variables.txt

@@ -41,7 +41,7 @@ shared_path::          Full path to remote 'shared' directory, symlinked into
 ssh_cmd::              Path to ssh. Defaults to "ssh".
 ssh_flags::            Flags for ssh. Defaults to [].
 sudo_cmd::             Path to sudo command. Defaults to "sudo".
-sudo_flags::           Flogs for sudo. Defaults to ["-p Password:"].
+sudo_flags::           Flags for sudo. Defaults to ["-p Password:"].
 sudo_prompt::          Regexp for sudo password prompt. Defaults to /^Password:/.
 sudo_password::        Asks for password when referenced.
 umask::                Sets your umask value. Defaults to "02".

data/lib/vlad.rb

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

data/lib/vlad/core.rb

@@ -39,7 +39,8 @@ namespace :vlad do
   desc "Prepares application servers for deployment.".cleanup
 
   remote_task :setup_app, :roles => :app do
-    dirs = [deploy_to, releases_path, scm_path, shared_path]
+    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 = dirs.join(' ')
 
@@ -61,13 +62,14 @@ namespace :vlad do
   remote_task :update, :roles => :app do
     symlink = false
     begin
-      commands = [
-        "umask #{umask}",
-        "cd #{scm_path}",
-        "#{source.checkout revision, scm_path}",
-        "#{source.export revision, release_path}",
-        "chmod -R g+w #{latest_release}",
-      ]
+      commands = ["umask #{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(' ')}"
       end

data/lib/vlad/rails.rb

@@ -21,7 +21,7 @@ namespace :vlad do
 
     directory = case migrate_target.to_sym
                 when :current then current_path
-                when :latest  then current_release
+                when :latest  then latest_release
                 else
                   raise(ArgumentError,
                         "unknown migration target #{migrate_target.inspect}")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vlad
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Ryan Davis
@@ -38,7 +38,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-06-23 00:00:00 Z
+date: 2011-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -94,11 +94,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 9
         segments: 
         - 2
-        - 3
-        version: "2.3"
+        - 5
+        version: "2.5"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -109,11 +109,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 27
         segments: 
         - 2
-        - 9
-        version: "2.9"
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id005
 description: |-
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Vlad the Deployer is pragmatic application deployment automation, without mercy