capistrano 1.4.0 → 1.4.1

data/CHANGELOG

@@ -1,3 +1,14 @@
+*1.4.1* (February 24, 2007)
+
+* Use the no-auth-cache option with subversion so that username/password tokens do not get cached by capistrano usage [jonathan]
+
+* Deprecated upper-cased variables [Jamis Buck]
+
+* Make sure Actor#get does not close the SFTP channel (so subsequent SFTP operations work) [Dov Murik]
+
+* Add :env option to 'run' (and friends) so that you can specify environment variables to be injected into the new process' environment [Mathieu Lajugie]
+
+
 *1.4.0* (February 3, 2007)
 
 * Use the auth info for subversion more consistently [Jamis Buck]
@@ -24,10 +35,12 @@
 
 * Fix off-by-one bug in show_tasks width-computation [NeilW]
 
+
 *1.3.1* (January 5, 2007)
 
 * Fix connection problems when using gateways [Ezra Zygmuntowicz]
 
+
 *1.3.0* (December 23, 2006)
 
 * Deprecate rake integration in favor of invoking `cap' directly [Jamis Buck]
@@ -58,6 +71,7 @@
 
 * Added :as option to sudo, so you can specify who the command is executed as [Mark Imbriaco]
 
+
 *1.2.0* (September 14, 2006)
 
 * Add experimental 'shell' task [Jamis Buck]

data/lib/capistrano/actor.rb

@@ -272,9 +272,9 @@ module Capistrano
       if Capistrano::SFTP && options.fetch(:sftp, true)
         execute_on_servers(options.merge(:once => true)) do |servers|
           logger.debug "downloading #{servers.first}:#{remote_path} to #{path}" 
-          sessions[servers.first].sftp.connect do |tsftp|
-            tsftp.get_file remote_path, path
-          end
+          sftp = sessions[servers.first].sftp
+          sftp.connect unless sftp.state == :open
+          sftp.get_file remote_path, path
           logger.trace "download finished" 
         end
       else

data/lib/capistrano/command.rb

@@ -9,7 +9,7 @@ module Capistrano
 
     def initialize(servers, command, callback, options, actor) #:nodoc:
       @servers = servers
-      @command = command.strip.gsub(/\r?\n/, "\\\n")
+      @command = extract_environment(options) + command.strip.gsub(/\r?\n/, "\\\n")
       @callback = callback
       @options = options
       @actor = actor
@@ -96,5 +96,18 @@ module Capistrano
           end
         end
       end
+
+      # prepare a space-separated sequence of variables assignments
+      # intended to be prepended to a command, so the shell sets
+      # the environment before running the command.
+      # i.e.: options[:env] = {'PATH' => '/opt/ruby/bin:$PATH',
+      #                        'TEST' => '( "quoted" )'}
+      # extract_environment(options) returns:
+      # "TEST=(\ \"quoted\"\ ) PATH=/opt/ruby/bin:$PATH"
+      def extract_environment(options)
+        Array(options[:env]).inject("") do |string, (name, value)|
+          string << %|#{name}=#{value.gsub(/"/, "\\\"").gsub(/ /, "\\ ")} |
+        end
+      end
   end
 end

data/lib/capistrano/configuration.rb

@@ -68,6 +68,7 @@ module Capistrano
       # actor. This is to allow uppercase "variables" to be set and referenced
       # in recipes.
       if variable.to_s[0].between?(?A, ?Z)
+        warn "[DEPRECATION] You setting an upper-cased variable, `#{variable}'. Variables should start with a lower-case letter. Support for upper-cased variables will be removed in version 2."
         klass = @actor.metaclass
         klass.send(:remove_const, variable) if klass.const_defined?(variable)
         klass.const_set(variable, value)

data/lib/capistrano/scm/subversion.rb

@@ -80,7 +80,7 @@ module Capistrano
         def authorization
           username = configuration[:svn_username] ? "--username #{configuration[:svn_username]}" : ""
           password = configuration[:svn_password] ? "--password #{configuration[:svn_password]}" : ""
-          "#{username} #{password}"
+          "--no-auth-cache #{username} #{password}"
         end
 
         def svn_log(path)

data/lib/capistrano/version.rb

@@ -20,7 +20,7 @@ module Capistrano
 
     MAJOR = 1
     MINOR = 4
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join(".")
     

data/test/scm/subversion_test.rb

@@ -78,7 +78,7 @@ MSG
     @actor.story = []
     assert_nothing_raised { @scm.checkout(@actor) }
     assert_nil @actor.channels.last.sent_data
-    assert_match %r{/path/to/svn co\s+-q}, @actor.command
+    assert_match %r{/path/to/svn\b.*\bco\b.* -q}, @actor.command
   end
 
   def test_checkout_via_export
@@ -86,14 +86,14 @@ MSG
     @config[:checkout] = "export"
     assert_nothing_raised { @scm.checkout(@actor) }
     assert_nil @actor.channels.last.sent_data
-    assert_match %r{/path/to/svn export\s+-q}, @actor.command
+    assert_match %r{/path/to/svn\b.*\bexport\b.* -q}, @actor.command
   end
 
   def test_update
     @actor.story = []
     assert_nothing_raised { @scm.update(@actor) }
     assert_nil @actor.channels.last.sent_data
-    assert_match %r{/path/to/svn up}, @actor.command
+    assert_match %r{/path/to/svn\b.*\bup\b}, @actor.command
   end
 
   def test_checkout_needs_ssh_password
@@ -132,6 +132,6 @@ MSG
     @config[:svn_username] = "turtledove"
     assert_nothing_raised { @scm.checkout(@actor) }
     assert_nil @actor.channels.last.sent_data
-    assert_match %r{/path/to/svn co --username turtledove}, @actor.command
+    assert_match %r{/path/to/svn\b.*\bco\b.* --username turtledove}, @actor.command
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
-date: 2007-02-03 00:00:00 -07:00
+  version: 1.4.1
+date: 2007-02-24 00:00:00 -07:00
 summary: Capistrano is a framework and utility for executing commands in parallel on multiple remote machines, via SSH. The primary goal is to simplify and automate the deployment of web applications.
 require_paths: 
 - lib