capistrano 2.15.6 → 2.15.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 09f391e9aa754cd9e2b9414b047993aaee463747
4
- data.tar.gz: 5cb90bd02e70dcb1551dc57d1a4ff2ccdeb7c131
3
+ metadata.gz: 9559e130b1e011df3d72d3e425f36845cc56927a
4
+ data.tar.gz: 734dd623ccbe334f5b8046d81ab927d38214226d
5
5
  SHA512:
6
- metadata.gz: d4be16d73d6fb8358d51a7c6fa5086322a12fb4827aa6781fb068867af4fb1cb780482303460bacef63b7c10c79dda937e24d3b9eb6e96c26648f91ed786a4fa
7
- data.tar.gz: 58d9a81ec729dce023d40601a2ccb9b2b17b683fd7b6f5b5412c4efbc92a29458a452226aa89d060777efe3bed183050346b0032c7297c47298e011ace4b8bc4
6
+ metadata.gz: 3135facd3855830586e7e0b8ffc76b16ff22fd848bd6ba9ffa14379765e7ffa8143c792945534bae6f02e58deddd2de2e316222118c9be71447e466525a44ea5
7
+ data.tar.gz: f4814055d7d7fac0f7678440f90010ef4c8a0aa86c6cedf526e2f76861ea0457bf096614700244fb67f359504941d82b6f32a618622c66c22f2d4ada1a32ecc2
data/CHANGELOG CHANGED
@@ -1,4 +1,4 @@
1
- ## 2.15.5 / June 17 2015
1
+ ## 2.15.6 / June 17 2015
2
2
 
3
3
  * Handle new Sprockets manifest name (@skaes)
4
4
 
@@ -7,7 +7,7 @@ _cset :assets_prefix, "assets"
7
7
  _cset :shared_assets_prefix, "assets"
8
8
  _cset :assets_role, [:web]
9
9
  _cset :expire_assets_after, (3600 * 24 * 7)
10
- _cset :asset_manifest_prefix, (`sprockets -v`.chomp < "3.0" ? "manifest" : ".sprockets-manifest") rescue "manifest"
10
+ _cset(:asset_manifest_prefix) { (`sprockets -v`.chomp < "3.0" ? "manifest" : ".sprockets-manifest") rescue "manifest" }
11
11
 
12
12
  _cset :normalize_asset_timestamps, false
13
13
 
@@ -242,6 +242,12 @@ module Capistrano
242
242
  command = scm('rev-parse --revs-only', origin + '/' + revision)
243
243
  newrev = yield(command).to_s.strip
244
244
 
245
+ # fallback for expected legacy default functionality
246
+ unless newrev =~ /^[0-9a-f]{40}$/
247
+ command = scm('rev-parse --revs-only', revision)
248
+ newrev = yield(command).to_s.strip
249
+ end
250
+
245
251
  raise "Unable to resolve revision for '#{revision}' on repository '#{repository}'." unless newrev =~ /^[0-9a-f]{40}$/
246
252
  return newrev
247
253
  end
@@ -98,8 +98,8 @@ module Capistrano
98
98
  username = variable(:scm_username)
99
99
  return "" unless username
100
100
  result = %(--username "#{variable(:scm_username)}")
101
- result << %(--password "#{variable(:scm_password)}") unless variable(:scm_auth_cache) || variable(:scm_prefer_prompt)
102
- result << "--no-auth-cache " unless variable(:scm_auth_cache)
101
+ result << %( --password "#{variable(:scm_password)}") unless variable(:scm_auth_cache) || variable(:scm_prefer_prompt)
102
+ result << " --no-auth-cache " unless variable(:scm_auth_cache)
103
103
  result
104
104
  end
105
105
 
@@ -2,7 +2,7 @@ module Capistrano
2
2
  class Version
3
3
  MAJOR = 2
4
4
  MINOR = 15
5
- PATCH = 6
5
+ PATCH = 7
6
6
 
7
7
  def self.to_s
8
8
  "#{MAJOR}.#{MINOR}.#{PATCH}"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.15.6
4
+ version: 2.15.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jamis Buck
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-07-18 00:00:00.000000000 Z
12
+ date: 2015-11-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: highline