engineyard-serverside 1.5.6 → 1.5.9

data/lib/engineyard-serverside/deploy.rb

@@ -163,15 +163,48 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
         "/engineyard/bin/app_#{c.app} deploy"
       end
 
+      # GIT_SSH needs to be defined in the environment for customers with private bundler repos in their Gemfile.
       def clean_environment
-        # GIT_SSH needs to be defined in the environment for customers with private bundler repos in their Gemfile.
-        %Q[export GIT_SSH="ssh -o 'StrictHostKeyChecking no' -o 'PasswordAuthentication no' -o 'LogLevel DEBUG' -i ~/.ssh/#{c.app}-deploy-key" && unset BUNDLE_PATH BUNDLE_FROZEN BUNDLE_WITHOUT BUNDLE_BIN BUNDLE_GEMFILE]
+        %Q[export GIT_SSH="#{ssh_executable}" && unset BUNDLE_PATH BUNDLE_FROZEN BUNDLE_WITHOUT BUNDLE_BIN BUNDLE_GEMFILE]
+      end
+
+      # If we don't have a local version of the ssh wrapper script yet,
+      # create it on all the servers that will need it.
+      # 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
+        end
+        path
+      end
+
+      # We specify 'IdentitiesOnly' to avoid failures on systems with > 5 private keys available.
+      def generate_ssh_wrapper
+        path = ssh_wrapper_path
+        identity_file = "~/.ssh/#{c.app}-deploy-key"
+<<-WRAP
+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' $*
+SSH
+chmod 0700 #{path}
+WRAP
+      end
+
+      def ssh_wrapper_path
+        "#{c.shared_path}/config/#{c.app}-ssh-wrapper"
       end
 
       # task
       def bundle
-        check_ruby_bundler
-        check_node_npm
+        roles :app_master, :app, :solo, :util do
+          check_ruby_bundler
+          check_node_npm
+        end
       end
 
       # task

data/lib/engineyard-serverside/rails_asset_support.rb

@@ -29,10 +29,14 @@ module EY
           info "~> application.rb has disabled asset compilation. Skipping."
           return
         end
+# This check is very expensive, and has been deemed not worth the time.
+# Leaving this here in case someone comes up with a faster way.
+=begin
         unless app_has_asset_task?
           info "~> No 'assets:precompile' Rake task found. Skipping."
           return
         end
+=end
         true
       end
 

data/lib/engineyard-serverside/strategies/git.rb

@@ -20,6 +20,8 @@ module EY
           end
 
           def strategy
+            # Ensure the git ssh config is up to date with the current app.
+            ENV['GIT_SSH'] = ssh_executable
             klass = Module.nesting[1]
             # Use [] to access attributes instead of calling methods so
             # that we get nils instead of NoMethodError.

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.6'
+    VERSION = '1.5.9'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 5
-  - 6
-  version: 1.5.6
+  - 9
+  version: 1.5.9
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 -04:00
+date: 2011-10-26 00:00:00 -04:00
 default_executable: engineyard-serverside
 dependencies: 
 - !ruby/object:Gem::Dependency