capistrano-gitflow 1.4.2 → 1.4.3

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/capistrano-gitflow.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-gitflow}
-  s.version = "1.4.2"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2010-11-30}
+  s.date = %q{2011-04-07}
   s.description = %q{Capistrano recipe for a deployment workflow based on git tags}
   s.email = %q{josh@technicalpickles.com}
   s.extra_rdoc_files = [

data/lib/capistrano/gitflow.rb

@@ -61,7 +61,7 @@ Your #{local_branch} branch is not up to date with origin/#{local_branch}.
 Please make sure you have pulled and pushed all code before deploying:
 
     git pull origin #{local_branch}
-    #run tests, etc
+    # run tests, etc
     git push origin #{local_branch}
 
     """
@@ -75,11 +75,13 @@ Please make sure you have pulled and pushed all code before deploying:
               # make sure we have any other deployment tags that have been pushed by others so our auto-increment code doesn't create conflicting tags
               `git fetch`
 
-              send "tag_#{stage}" if respond_to?(stage)
+              if respond_to?("tag_#{stage}")
+                send "tag_#{stage}" 
 
-              system "git push --tags origin #{local_branch}"
-              if $? != 0
-                abort "git push failed"
+                system "git push --tags origin #{local_branch}"
+                if $? != 0
+                  abort "git push failed"
+                end
               end
             end
           end
@@ -130,7 +132,7 @@ Please make sure you have pulled and pushed all code before deploying:
                                    end
 
             if last_staging_tag_sha == current_sha
-              puts "Not re-tagging staging because the most recent tag (#{last_staging_tag}) already points to current head"
+              puts "Not re-tagging staging because latest tag (#{last_staging_tag}) already points to HEAD"
               new_staging_tag = last_staging_tag
             else
               new_staging_tag = next_staging_tag
@@ -153,16 +155,23 @@ Please make sure you have pulled and pushed all code before deploying:
             end
 
             promote_to_production_tag =~ /^staging-(.*)$/
-              new_production_tag = "production-#{$1}"
-            puts "Preparing to promote staging tag #{promote_to_production_tag} to production as #{new_production_tag}'"
-            unless capistrano_configuration[:tag]
-              really_deploy = Capistrano::CLI.ui.ask("Do you really want to deploy #{new_production_tag}? [y/N]").to_url
-              unless really_deploy =~ /^[Yy]$/
-                exit(1)
+            new_production_tag = "production-#{$1}"
+
+            if new_production_tag == last_production_tag
+              puts "Not re-tagging #{last_production_tag} because it already exists"
+             really_deploy = Capistrano::CLI.ui.ask("Do you really want to deploy #{last_production_tag}? [y/N]").to_url
+
+             exit(1) unless really_deploy =~ /^[Yy]$/
+            else
+              puts "Preparing to promote staging tag '#{promote_to_production_tag}' to '#{new_production_tag}'"
+              unless capistrano_configuration[:tag]
+                really_deploy = Capistrano::CLI.ui.ask("Do you really want to deploy #{new_production_tag}? [y/N]").to_url
+
+                exit(1) unless really_deploy =~ /^[Yy]$/
               end
+              puts "Promoting staging tag #{promote_to_production_tag} to production as '#{new_production_tag}'"
+              system "git tag -a -m 'tagging current code for deployment to production' #{new_production_tag} #{promote_to_production_tag}"
             end
-            puts "promoting staging tag #{promote_to_production_tag} to production as '#{new_production_tag}'"
-            system "git tag -a -m 'tagging current code for deployment to production' #{new_production_tag} #{promote_to_production_tag}"
 
             set :branch, new_production_tag
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-gitflow
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Joshua Nichols
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -05:00
+date: 2011-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency