capistrano 2.15.6 → 2.15.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09f391e9aa754cd9e2b9414b047993aaee463747
-  data.tar.gz: 5cb90bd02e70dcb1551dc57d1a4ff2ccdeb7c131
+  metadata.gz: 9559e130b1e011df3d72d3e425f36845cc56927a
+  data.tar.gz: 734dd623ccbe334f5b8046d81ab927d38214226d
 SHA512:
-  metadata.gz: d4be16d73d6fb8358d51a7c6fa5086322a12fb4827aa6781fb068867af4fb1cb780482303460bacef63b7c10c79dda937e24d3b9eb6e96c26648f91ed786a4fa
-  data.tar.gz: 58d9a81ec729dce023d40601a2ccb9b2b17b683fd7b6f5b5412c4efbc92a29458a452226aa89d060777efe3bed183050346b0032c7297c47298e011ace4b8bc4
+  metadata.gz: 3135facd3855830586e7e0b8ffc76b16ff22fd848bd6ba9ffa14379765e7ffa8143c792945534bae6f02e58deddd2de2e316222118c9be71447e466525a44ea5
+  data.tar.gz: f4814055d7d7fac0f7678440f90010ef4c8a0aa86c6cedf526e2f76861ea0457bf096614700244fb67f359504941d82b6f32a618622c66c22f2d4ada1a32ecc2

data/CHANGELOG

@@ -1,4 +1,4 @@
-## 2.15.5 / June 17 2015
+## 2.15.6 / June 17 2015
 
 * Handle new Sprockets manifest name (@skaes)
 

data/lib/capistrano/recipes/deploy/assets.rb

@@ -7,7 +7,7 @@ _cset :assets_prefix, "assets"
 _cset :shared_assets_prefix, "assets"
 _cset :assets_role, [:web]
 _cset :expire_assets_after, (3600 * 24 * 7)
-_cset :asset_manifest_prefix, (`sprockets -v`.chomp < "3.0" ? "manifest" : ".sprockets-manifest") rescue "manifest"
+_cset(:asset_manifest_prefix) { (`sprockets -v`.chomp < "3.0" ? "manifest" : ".sprockets-manifest") rescue "manifest" }
 
 _cset :normalize_asset_timestamps, false
 

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

@@ -242,6 +242,12 @@ module Capistrano
           command = scm('rev-parse --revs-only', origin + '/' + revision)
           newrev = yield(command).to_s.strip
 
+          # fallback for expected legacy default functionality
+          unless newrev =~ /^[0-9a-f]{40}$/
+            command = scm('rev-parse --revs-only', revision)
+            newrev = yield(command).to_s.strip
+          end
+
           raise "Unable to resolve revision for '#{revision}' on repository '#{repository}'." unless newrev =~ /^[0-9a-f]{40}$/
           return newrev
         end

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

@@ -98,8 +98,8 @@ module Capistrano
             username = variable(:scm_username)
             return "" unless username
             result = %(--username "#{variable(:scm_username)}")
-            result << %(--password "#{variable(:scm_password)}") unless variable(:scm_auth_cache) || variable(:scm_prefer_prompt)
-            result << "--no-auth-cache " unless variable(:scm_auth_cache)
+            result << %( --password "#{variable(:scm_password)}") unless variable(:scm_auth_cache) || variable(:scm_prefer_prompt)
+            result << " --no-auth-cache " unless variable(:scm_auth_cache)
             result
           end
 

data/lib/capistrano/version.rb

@@ -2,7 +2,7 @@ module Capistrano
   class Version
     MAJOR = 2
     MINOR = 15
-    PATCH = 6
+    PATCH = 7
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 2.15.6
+  version: 2.15.7
 platform: ruby
 authors:
 - Jamis Buck
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline