ey-deploy 0.2.4.pre2 → 0.2.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 YOUR NAME
+Copyright (c) 2010 Engine Yard, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/ey-deploy/deploy.rb

@@ -34,18 +34,15 @@ module EY
     # task
     def restart
       puts "~> Restarting app servers"
+      puts "~> restarting app: #{c.latest_release}"
       roles :app_master, :app, :solo do
         restart_command = case c.stack
         when "nginx_unicorn"
-          "/etc/init.d/unicorn_#{c.app} restart"
+          sudo("/etc/init.d/unicorn_#{c.app} deploy")
         when "nginx_mongrel"
-          "monit restart all -g #{c.app}"
+          sudo("monit restart all -g #{c.app}")
         when "nginx_passenger", "apache_passenger"
-          "touch #{c.latest_release}/tmp/restart.txt"
-        end
-        if restart_command
-          puts "~> restarting app: #{c.latest_release}"
-          sudo("cd #{c.current_path} && INLINEDIR=/tmp #{c.framework_envs} #{restart_command}")
+          sudo("touch #{c.latest_release}/tmp/restart.txt")
         end
         callback(:after_restart)
       end
@@ -109,6 +106,7 @@ module EY
         "ln -nfs #{c.shared_path}/system #{release_to_link}/public/system",
         "ln -nfs #{c.shared_path}/pids #{release_to_link}/tmp/pids",
         "ln -nfs #{c.shared_path}/config/database.yml #{release_to_link}/config/database.yml",
+        "ln -nfs #{c.shared_path}/config/mongrel_cluster.yml #{release_to_link}/config/mongrel_cluster.yml",
         "chown -R #{c.user}:#{c.group} #{release_to_link}"
         ].join(" && ")
     end

data/lib/ey-deploy/strategies/git.rb

@@ -7,6 +7,7 @@ module EY
 
           strategy = klass.new(
             :repository_cache => c.repository_cache,
+            :app => c.app,
             :repo => c.repo,
             :branch => c.branch
           )
@@ -20,6 +21,7 @@ module EY
 
       def initialize(opts)
         @opts = opts
+        set_up_git_ssh(@opts[:app])
       end
 
       def fetch
@@ -31,13 +33,42 @@ module EY
       end
 
       def checkout
-         `#{git} reset --hard origin/#{opts[:branch]}`
+        `#{git} reset --hard origin/#{opts[:branch]}`
       end
 
     private
       def git
         "git --git-dir #{opts[:repository_cache]}/.git --work-tree #{opts[:repository_cache]}"
       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 "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/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = "0.2.4.pre2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ey-deploy
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 2
   - 4
-  - pre2
-  version: 0.2.4.pre2
+  version: 0.2.4
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,21 +14,21 @@ autorequire: ey-deploy
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -07:00
+date: 2010-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
+  name: json
+  prerelease: false
 description: A gem that deploys ruby applications on EY Cloud instances
 email: cloud@engineyard.com
 executables: 
@@ -108,13 +107,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: