engineyard-serverside 1.5.4 → 1.5.6

data/lib/engineyard-serverside/deploy.rb

@@ -164,7 +164,8 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       end
 
       def clean_environment
-        "unset BUNDLE_PATH BUNDLE_FROZEN BUNDLE_WITHOUT BUNDLE_BIN BUNDLE_GEMFILE"
+        # 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]
       end
 
       # task

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

@@ -5,7 +5,6 @@ module EY
     module Strategies
       class Git
         module Helpers
-
           def update_repository_cache
             unless strategy.fetch && strategy.checkout
               abort "*** [Error] Git could not checkout (#{strategy.to_checkout}) ***"
@@ -42,7 +41,6 @@ module EY
 
         def initialize(opts)
           @opts = opts
-          set_up_git_ssh(@opts[:app])
         end
 
         def usable_repository?
@@ -107,37 +105,6 @@ module EY
           end
           false
         end
-
-        def set_up_git_ssh(app)
-          # hold references to the tempfiles so they don't get finalized
-          # unexpectedly; tempfile finalization unlinks the files
-          @git_ssh = Tempfile.open("git-ssh")
-          @config = Tempfile.open("git-ssh-config")
-
-          @config.write "StrictHostKeyChecking no\n"
-          @config.write "CheckHostIP no\n"
-          @config.write "PasswordAuthentication no\n"
-          @config.write "LogLevel DEBUG\n"
-          @config.write "IdentityFile ~/.ssh/#{app}-deploy-key\n"
-          @config.chmod(0600)
-          @config.close
-
-          @git_ssh.write "#!/bin/sh\n"
-          @git_ssh.write "unset SSH_AUTH_SOCK\n"
-          @git_ssh.write "ssh -F \"#{@config.path}\" $*\n"
-          @git_ssh.chmod(0700)
-          # NB: this file _must_ be closed before git looks at it.
-          #
-          # Linux won't let you execve a file that's open for writing,
-          # so if this file stays open, then git will complain about
-          # being unable to exec it and will exit with a message like
-          #
-          # fatal: exec /tmp/git-ssh20100417-21417-d040rm-0 failed.
-          @git_ssh.close
-
-          ENV['GIT_SSH'] = @git_ssh.path
-        end
-
       end
     end
   end

data/lib/engineyard-serverside/version.rb

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

data/spec/bundler_deploy_spec.rb

@@ -115,6 +115,11 @@ describe "Deploying an application that uses Bundler" do
     it "creates a system version file" do
       File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'SYSTEM_VERSION')).should be_true
     end
+
+    it "Sets GIT_SSH environment variable" do
+      install_cmd = @deployer.commands.grep(/GIT_SSH/).first
+      install_cmd.should match(/export GIT_SSH.*install_bundler/)
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 5
-  - 4
-  version: 1.5.4
+  - 6
+  version: 1.5.6
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 -07:00
+date: 2011-10-25 00:00:00 -04:00
 default_executable: engineyard-serverside
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
   type: :development
+  name: rspec
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,9 +35,9 @@ dependencies:
         version: 1.3.2
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
   type: :development
+  name: rake
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -323,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances