capistrano 2.5.13 → 2.5.14

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+== 2.5.14 / 18 January 2010
+
+Fixes a low-value bug, thanks to Chris G for the well submitted patch:
+
+  * #139 - Improves consistency of variable lookup, scm variables with a local_ prefix will be honoured with priority locally (Chris Griego)
+
+== 2.5.13 / 6 January 2010
+
+* Small maintenance release:
+
+  * #118 - Modified CLI test to not load user or system configuration file (Emily Price)
+  * #88  - Re-fixed a problem here, massive apologies to all concerned. (Hangover from 2.5.12)
+
 == 2.5.12 / 5 January 2010
 
 * Tweak the directory version listing (caused a lot of problems, please upgrade immediately)

data/VERSION

@@ -1 +1 @@
-2.5.13
+2.5.14

data/lib/capistrano/recipes/deploy/scm/git.rb

@@ -120,11 +120,11 @@ module Capistrano
         # default, Git's reference of HEAD (the latest changeset in the default
         # branch, usually called "master").
         def head
-          configuration[:branch] || 'HEAD'
+          variable(:branch) || 'HEAD'
         end
 
         def origin
-          configuration[:remote] || 'origin'
+          variable(:remote) || 'origin'
         end
 
         # Performs a clone on the remote machine, then checkout on the branch
@@ -135,21 +135,21 @@ module Capistrano
 
           args = []
           args << "-o #{remote}" unless remote == 'origin'
-          if depth = configuration[:git_shallow_clone]
+          if depth = variable(:git_shallow_clone)
             args << "--depth #{depth}"
           end
 
           execute = []
           if args.empty?
-            execute << "#{git} clone #{verbose} #{configuration[:repository]} #{destination}"
+            execute << "#{git} clone #{verbose} #{variable(:repository)} #{destination}"
           else
-            execute << "#{git} clone #{verbose} #{args.join(' ')} #{configuration[:repository]} #{destination}"
+            execute << "#{git} clone #{verbose} #{args.join(' ')} #{variable(:repository)} #{destination}"
           end
 
           # checkout into a local branch rather than a detached HEAD
           execute << "cd #{destination} && #{git} checkout #{verbose} -b deploy #{revision}"
           
-          if configuration[:git_enable_submodules]
+          if variable(:git_enable_submodules)
             execute << "#{git} submodule #{verbose} init"
             execute << "#{git} submodule #{verbose} sync"
             execute << "#{git} submodule #{verbose} update"
@@ -180,14 +180,14 @@ module Capistrano
           # changes between calls, but as long as the repositories are all
           # based from each other it should still work fine.
           if remote != 'origin'
-            execute << "#{git} config remote.#{remote}.url #{configuration[:repository]}"
+            execute << "#{git} config remote.#{remote}.url #{variable(:repository)}"
             execute << "#{git} config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/*"
           end
 
           # since we're in a local branch already, just reset to specified revision rather than merge
           execute << "#{git} fetch #{verbose} #{remote} && #{git} reset #{verbose} --hard #{revision}"
 
-          if configuration[:git_enable_submodules]
+          if variable(:git_enable_submodules)
             execute << "#{git} submodule #{verbose} init"
             execute << "for mod in `#{git} submodule status | awk '{ print $2 }'`; do #{git} config -f .git/config submodule.${mod}.url `#{git} config -f .gitmodules --get submodule.${mod}.url` && echo Synced $mod; done"
             execute << "#{git} submodule #{verbose} sync"
@@ -234,7 +234,7 @@ module Capistrano
 
         def command
           # For backwards compatibility with 1.x version of this module
-          configuration[:git] || super
+          variable(:git) || super
         end
 
         # Determines what the response should be for a particular bit of text
@@ -246,7 +246,7 @@ module Capistrano
           case text
           when /\bpassword.*:/i
             # git is prompting for a password
-            unless pass = configuration[:scm_password]
+            unless pass = variable(:scm_password)
               pass = Capistrano::CLI.password_prompt
             end
             "#{pass}\n"
@@ -255,7 +255,7 @@ module Capistrano
             "yes\n"
           when /passphrase/i
             # git is asking for the passphrase for the user's key
-            unless pass = configuration[:scm_passphrase]
+            unless pass = variable(:scm_passphrase)
               pass = Capistrano::CLI.password_prompt
             end
             "#{pass}\n"

data/lib/capistrano/recipes/deploy/scm/mercurial.rb

@@ -18,7 +18,7 @@ module Capistrano
         # For mercurial HEAD == tip except that it bases this assumption on what
         # tip is in the current repository (so push before you deploy)
         def head
-          configuration[:branch] || "tip"
+          variable(:branch) || "tip"
         end
 
         # Clone the repository and update to the specified changeset.

data/lib/capistrano/version.rb

@@ -6,7 +6,7 @@ module Capistrano
   class Version < Net::SSH::Version
     MAJOR = 2
     MINOR = 5
-    TINY  = 13
+    TINY  = 14
 
     # The current version, as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 2.5.13
+  version: 2.5.14
 platform: ruby
 authors: 
 - Jamis Buck
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +00:00
+date: 2010-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency