engineyard-serverside 1.5.15 → 1.5.16

data/lib/engineyard-serverside/configuration.rb

@@ -143,6 +143,10 @@ module EY
         File.join(shared_path, "bundled_gems")
       end
 
+      def gemfile_path
+        File.join(release_path, "Gemfile")
+      end
+
       def ruby_version_file
         File.join(bundled_gems_path, "RUBY_VERSION")
       end

data/lib/engineyard-serverside/deploy.rb

@@ -183,6 +183,10 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       end
 
       # We specify 'IdentitiesOnly' to avoid failures on systems with > 5 private keys available.
+      # We set UserKnownHostsFile to /dev/null because StrickHostKeyChecking no doesn't
+      # ignore existing entries in known_hosts; we want to actively ignore all such.
+      # Learned this at http://lists.mindrot.org/pipermail/openssh-unix-dev/2009-February/027271.html
+      # (Thanks Jim L.)
       def generate_ssh_wrapper
         path = ssh_wrapper_path
         identity_file = "~/.ssh/#{c.app}-deploy-key"
@@ -190,7 +194,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
 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 -o 'CheckHostIP no' -o 'StrictHostKeyChecking no' -o 'PasswordAuthentication no' -o 'LogLevel DEBUG' -o 'IdentityFile #{identity_file}' -o 'IdentitiesOnly yes' -o 'UserKnownHostsFile /dev/null' $*
 SSH
 chmod 0700 #{path}
 WRAP
@@ -393,6 +397,7 @@ Deploy again if your services configuration appears incomplete or out of date.
       def bundler_config
         version = LockfileParser.default_version
         options = [
+          "--gemfile #{c.gemfile_path}",
           "--path #{c.bundled_gems_path}",
           "--binstubs #{c.binstubs_path}",
           "--without #{c.bundle_without}"

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.15'
+    VERSION = '1.5.16'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 35
+  prerelease: 
   segments: 
   - 1
   - 5
-  - 15
-  segments_generated: true
-  version: 1.5.15
+  - 16
+  version: 1.5.16
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,37 +15,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 -08:00
+date: 2011-11-15 00:00:00 -05:00
 default_executable: engineyard-serverside
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 3
         - 2
-        segments_generated: true
         version: 1.3.2
-  requirement: *id001
   name: rspec
-  prerelease: false
   type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id002
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
   name: rake
-  prerelease: false
   type: :development
+  version_requirements: *id002
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -261,6 +266,37 @@ files:
 - lib/vendor/thor/thor.gemspec
 - lib/vendor/thor/Thorfile
 - LICENSE
+- spec/basic_deploy_spec.rb
+- spec/bundler_deploy_spec.rb
+- spec/custom_deploy_spec.rb
+- spec/deploy_hook_spec.rb
+- spec/deprecation_spec.rb
+- spec/fixtures/gitrepo/foo
+- spec/fixtures/gitrepo.tar.gz
+- spec/fixtures/invalid_hook.rb
+- spec/fixtures/lockfiles/0.9-no-bundler
+- spec/fixtures/lockfiles/0.9-with-bundler
+- spec/fixtures/lockfiles/1.0-no-bundler
+- spec/fixtures/lockfiles/1.0.0.rc.1-with-bundler
+- spec/fixtures/lockfiles/1.0.18-do_mysql
+- spec/fixtures/lockfiles/1.0.18-do_postgres
+- spec/fixtures/lockfiles/1.0.18-mysql
+- spec/fixtures/lockfiles/1.0.18-mysql2
+- spec/fixtures/lockfiles/1.0.18-pg
+- spec/fixtures/lockfiles/1.0.6-no-bundler
+- spec/fixtures/lockfiles/1.0.6-with-any-bundler
+- spec/fixtures/lockfiles/1.0.6-with-bundler
+- spec/fixtures/lockfiles/not-a-lockfile
+- spec/fixtures/valid_hook.rb
+- spec/git_strategy_spec.rb
+- spec/lockfile_parser_spec.rb
+- spec/nodejs_deploy_spec.rb
+- spec/rails31_deploy_spec.rb
+- spec/restart_spec.rb
+- spec/server_spec.rb
+- spec/services_deploy_spec.rb
+- spec/spec_helper.rb
+- spec/support/integration.rb
 has_rdoc: true
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
@@ -271,25 +307,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances