test/deploy/scm/mercurial_test.rb @@ -1,5 +1,7 @@ *SVN* +* Add support for password prompts from the Mercurial SCM [ches] + * Add support for :max_hosts option in task definition or run() [Rob Holland <rob@inversepath.com>] * Distributed git support for better operability with remote_cache strategy [voidlock] CHANGELOG @@ -70,24 +70,25 @@ module Capistrano logger.info "[#{stream}] #{text}" case text when /^user:/mi - if variable(:scm_user) - "#{variable(:scm_user)}\n" + # support :scm_user for backwards compatibility of this module + if user = variable(:scm_username) || variable(:scm_user) + "#{user}\n" else - raise "No variable :scm_user specified and Mercurial asked!\n" + + raise "No variable :scm_username specified and Mercurial asked!\n" + "Prompt was: #{text}" end - when /^password:/mi - if variable(:scm_password) - "#{variable(:scm_password)}\n" - else + when /\bpassword:/mi + unless pass = scm_password_or_prompt + # fall back on old behavior of erroring out with msg raise "No variable :scm_password specified and Mercurial asked!\n" + "Prompt was: #{text}" end + "#{pass}\n" when /yes\/no/i "yes\n" end end - + private # Fine grained mercurial commands @@ -122,6 +123,12 @@ module Capistrano else "--verbose" end end + + # honor Cap 2.1+'s :scm_prefer_prompt if present + def scm_password_or_prompt + @scm_password_or_prompt ||= variable(:scm_password) || + (Capistrano::CLI.password_prompt("hg password: ") if variable(:scm_prefer_prompt)) + end end end lib/capistrano/recipes/deploy/scm/mercurial.rb c6ff8b9fe617ef6fa02939bc56a686c81a2cb4f6 Jamis Buck jamis@37signals.com http://github.com/jamis/capistrano/commit/07d777b74625a5373e326b43304c592b05ff456f 07d777b74625a5373e326b43304c592b05ff456f 2008-02-22T20:04:27-08:00 2008-02-22T20:04:27-08:00 Add support for password prompts for Mercurial SCM (closes #11187) git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@8925 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 3e736634176f91b7c847d949687fd7cfd8a62622 Jamis Buck jamis@37signals.com