engineyard-serverside 1.5.19 → 1.5.20

data/lib/engineyard-serverside/configuration.rb

@@ -17,7 +17,7 @@ module EY
 
       def initialize(opts={})
         @release_path = opts[:release_path]
-        config = JSON.parse(opts["config"] || "{}")
+        config = JSON.parse(opts.delete("config") || "{}")
         @configuration = DEFAULT_CONFIG.merge(config).merge(opts)
       end
 

data/lib/engineyard-serverside/deploy.rb

@@ -174,10 +174,8 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       # TODO - This logic likely fails when people change deploy keys.
       def ssh_executable
         path = ssh_wrapper_path
-        unless File.executable?(path)
-          roles :app_master, :app, :solo, :util do
-            run(generate_ssh_wrapper)
-          end
+        roles :app_master, :app, :solo, :util do
+          run(generate_ssh_wrapper)
         end
         path
       end
@@ -191,7 +189,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
         path = ssh_wrapper_path
         identity_file = "~/.ssh/#{c.app}-deploy-key"
 <<-WRAP
-cat > #{path} <<'SSH'
+[[ -x #{path} ]] || cat > #{path} <<'SSH'
 #!/bin/sh
 unset SSH_AUTH_SOCK
 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.
         # diff exits with 0 for same and 1/2 for different/file not found.
         check_ruby   = "#{c.ruby_version_command} | diff - #{c.ruby_version_file} >/dev/null 2>&1"
         check_system = "#{c.system_version_command} | diff - #{c.system_version_file} >/dev/null 2>&1"
-        say_cleaning = "echo 'System version change detected, cleaning bundled gems.'"
+        say_cleaning = "echo 'New deploy or system version change detected, cleaning bundled gems.'"
         clean_bundle = "rm -Rf #{c.bundled_gems_path}"
 
         run "#{check_ruby} && #{check_system} || (#{say_cleaning} && #{clean_bundle})"

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.19'
+    VERSION = '1.5.20'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 43
   prerelease: 
   segments: 
   - 1
   - 5
-  - 19
-  version: 1.5.19
+  - 20
+  version: 1.5.20
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-27 00:00:00 Z
+date: 2011-12-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,10 +31,10 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :development
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -49,6 +48,7 @@ dependencies:
         - 2
         - 2
         version: 0.9.2.2
+  type: :development
   version_requirements: *id002
 description: 
 email: cloud@engineyard.com