engineyard-serverside 1.5.19 → 1.5.20

Sign up to get free protection for your applications and to get access to all the features.
@@ -17,7 +17,7 @@ module EY
17
17
 
18
18
  def initialize(opts={})
19
19
  @release_path = opts[:release_path]
20
- config = JSON.parse(opts["config"] || "{}")
20
+ config = JSON.parse(opts.delete("config") || "{}")
21
21
  @configuration = DEFAULT_CONFIG.merge(config).merge(opts)
22
22
  end
23
23
 
@@ -174,10 +174,8 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
174
174
  # TODO - This logic likely fails when people change deploy keys.
175
175
  def ssh_executable
176
176
  path = ssh_wrapper_path
177
- unless File.executable?(path)
178
- roles :app_master, :app, :solo, :util do
179
- run(generate_ssh_wrapper)
180
- end
177
+ roles :app_master, :app, :solo, :util do
178
+ run(generate_ssh_wrapper)
181
179
  end
182
180
  path
183
181
  end
@@ -191,7 +189,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
191
189
  path = ssh_wrapper_path
192
190
  identity_file = "~/.ssh/#{c.app}-deploy-key"
193
191
  <<-WRAP
194
- cat > #{path} <<'SSH'
192
+ [[ -x #{path} ]] || cat > #{path} <<'SSH'
195
193
  #!/bin/sh
196
194
  unset SSH_AUTH_SOCK
197
195
  ssh -o 'CheckHostIP no' -o 'StrictHostKeyChecking no' -o 'PasswordAuthentication no' -o 'LogLevel DEBUG' -o 'IdentityFile #{identity_file}' -o 'IdentitiesOnly yes' -o 'UserKnownHostsFile /dev/null' $*
@@ -438,7 +436,7 @@ Deploy again if your services configuration appears incomplete or out of date.
438
436
  # diff exits with 0 for same and 1/2 for different/file not found.
439
437
  check_ruby = "#{c.ruby_version_command} | diff - #{c.ruby_version_file} >/dev/null 2>&1"
440
438
  check_system = "#{c.system_version_command} | diff - #{c.system_version_file} >/dev/null 2>&1"
441
- say_cleaning = "echo 'System version change detected, cleaning bundled gems.'"
439
+ say_cleaning = "echo 'New deploy or system version change detected, cleaning bundled gems.'"
442
440
  clean_bundle = "rm -Rf #{c.bundled_gems_path}"
443
441
 
444
442
  run "#{check_ruby} && #{check_system} || (#{say_cleaning} && #{clean_bundle})"
@@ -1,5 +1,5 @@
1
1
  module EY
2
2
  module Serverside
3
- VERSION = '1.5.19'
3
+ VERSION = '1.5.20'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: engineyard-serverside
3
3
  version: !ruby/object:Gem::Version
4
- hash: 37
4
+ hash: 43
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 5
9
- - 19
10
- version: 1.5.19
9
+ - 20
10
+ version: 1.5.20
11
11
  platform: ruby
12
12
  authors:
13
13
  - EY Cloud Team
@@ -15,11 +15,10 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-11-27 00:00:00 Z
18
+ date: 2011-12-08 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: rspec
22
- type: :development
23
22
  prerelease: false
24
23
  requirement: &id001 !ruby/object:Gem::Requirement
25
24
  none: false
@@ -32,10 +31,10 @@ dependencies:
32
31
  - 3
33
32
  - 2
34
33
  version: 1.3.2
34
+ type: :development
35
35
  version_requirements: *id001
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rake
38
- type: :development
39
38
  prerelease: false
40
39
  requirement: &id002 !ruby/object:Gem::Requirement
41
40
  none: false
@@ -49,6 +48,7 @@ dependencies:
49
48
  - 2
50
49
  - 2
51
50
  version: 0.9.2.2
51
+ type: :development
52
52
  version_requirements: *id002
53
53
  description:
54
54
  email: cloud@engineyard.com