ey-deploy 1.1.2 → 1.1.3

data/lib/ey-deploy/deploy.rb

@@ -103,12 +103,12 @@ module EY
         when "nginx_unicorn"
           pidfile = "/var/run/engineyard/unicorn_#{c.app}.pid"
           condition = "[ -e #{pidfile} ] && [ ! -d /proc/`cat #{pidfile}` ]"
-          sudo("if #{condition}; then rm -f #{pidfile}; fi")
-          sudo("/etc/init.d/unicorn_#{c.app} deploy")
+          run("if #{condition}; then rm -f #{pidfile}; fi")
+          run("/engineyard/bin/app_#{c.app} deploy")
         when "nginx_mongrel"
           sudo("monit restart all -g #{c.app}")
         when "nginx_passenger"
-          sudo("touch #{c.current_path}/tmp/restart.txt")
+          run("touch #{c.current_path}/tmp/restart.txt")
         else
           raise "Unknown stack #{c.stack}; restart failed!"
         end
@@ -126,7 +126,7 @@ module EY
                               get_bundler_installer(lockfile)
                             else
                               warn_about_missing_lockfile
-                              DEFAULT_09_BUNDLER
+                              BundleInstaller.new(DEFAULT_09_BUNDLER, "--without=development --without=test")
                             end
 
         sudo "#{$0} _#{VERSION}_ install_bundler #{bundler_installer.version}"
@@ -176,7 +176,7 @@ module EY
     # task
     def copy_repository_cache
       info "~> Copying to #{c.release_path}"
-      sudo("mkdir -p #{c.release_path} && rsync -aq #{c.exclusions} #{c.repository_cache}/ #{c.release_path}")
+      run("mkdir -p #{c.release_path} && rsync -aq #{c.exclusions} #{c.repository_cache}/ #{c.release_path}")
 
       info "~> Ensuring proper ownership"
       sudo("chown -R #{c.user}:#{c.group} #{c.deploy_to}")
@@ -198,18 +198,18 @@ module EY
         "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}",
-        "if [ -f \"#{c.shared_path}/config/newrelic.yml\" ]; then ln -nfs #{c.shared_path}/config/newrelic.yml #{release_to_link}/config/newrelic.yml; fi",
-
       ].each do |cmd|
-        sudo cmd
+        run cmd
       end
+
+      sudo "chown -R #{c.user}:#{c.group} #{release_to_link}"
+      run "if [ -f \"#{c.shared_path}/config/newrelic.yml\" ]; then ln -nfs #{c.shared_path}/config/newrelic.yml #{release_to_link}/config/newrelic.yml; fi"
     end
 
     # task
     def symlink(release_to_link=c.release_path)
       info "~> Symlinking code"
-      sudo "rm -f #{c.current_path} && ln -nfs #{release_to_link} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"
+      run "rm -f #{c.current_path} && ln -nfs #{release_to_link} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"
       @symlink_changed = true
     rescue Exception
       sudo "rm -f #{c.current_path} && ln -nfs #{c.previous_release(release_to_link)} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey-deploy
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -07:00
+date: 2010-08-13 00:00:00 -07:00
 default_executable: ey-deploy
 dependencies: []