capistrano-gity 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/capistrano-gity.rb

@@ -62,12 +62,29 @@ Capistrano::Configuration.instance.load do
       uptip
     end
 
+    def quit?
+      upstream_master = `git rev-parse #{remote}/master` 
+      here = `git rev-parse HEAD`
+      if here != upstream_master
+        puts <<-MSG
+        The commit you are pushing is different from #{remote} master.
+        This means that a subsequent deploy might not include your work.
+        Consider pushing to master now or later.
+        MSG
+        answer = Capistrano::CLI.ui.ask("Do you want to coninue? (y/n)")
+        return !answer.downcase.start_with?('y')
+      end
+      return false
+    end
+
     task :prepare_deploy do
+      sync
+      exit if quit?
       push
       uptip
     end
 
-    before 'deploy', 'gity:prepare_deploy'
+    before 'deploy:update_code', 'gity:prepare_deploy'
 
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Skroutz.gr Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +02:00
+date: 2010-04-14 00:00:00 +03:00
 default_executable: 
 dependencies: []