ey-deploy 0.6.0 → 0.6.1

data/lib/ey-deploy/deploy.rb

@@ -98,11 +98,14 @@ module EY
       roles :app_master, :app, :solo do
         restart_command = case c.stack
         when "nginx_unicorn"
+          sudo(%Q{if [ ! -d /proc/`cat /var/run/engineyard/unicorn_#{c.app}.pid` ]; then rm -f /var/run/engineyard/unicorn_#{c.app}.pid; fi})
           sudo("/etc/init.d/unicorn_#{c.app} deploy")
         when "nginx_mongrel"
           sudo("monit restart all -g #{c.app}")
-        when "nginx_passenger", "apache_passenger"
+        when "nginx_passenger"
           sudo("touch #{c.latest_release}/tmp/restart.txt")
+        else
+          raise "Unknown stack #{c.stack}; restart failed!"
         end
       end
       @restart_failed = false

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

@@ -33,10 +33,15 @@ module EY
         set_up_git_ssh(@opts[:app])
       end
 
+      def usable_repository?
+        File.directory?(opts[:repository_cache]) && `#{git} remote -v | grep origin`[opts[:repo]]
+      end
+
       def fetch
-        if File.directory?(File.join(opts[:repository_cache], ".git"))
+        if usable_repository?
           system("#{git} fetch origin")
         else
+          FileUtils.rm_rf(opts[:repository_cache])
           system("git clone #{opts[:repo]} #{opts[:repository_cache]}")
         end
       end

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -07:00
+date: 2010-06-23 00:00:00 -07:00
 default_executable: eysd
 dependencies: 
 - !ruby/object:Gem::Dependency