gitscape 1.6.4 → 1.6.5

data/lib/gitscape/base.rb

@@ -212,6 +212,9 @@ class Gitscape::Base
     # Check if the working copy is clean, if not, exit
     exit 1 unless git_working_copy_is_clean
 
+    # Do a git fetch to ensure everything all refs are sync with origin
+    puts `git fetch`
+
     # Get the right release_branch_name to merge
     current_version_number = live_iteration
     new_version_number = current_version_number + 1
@@ -236,17 +239,14 @@ class Gitscape::Base
       end
     end
 
-    # Checkout release branch
+    # Checkout and pull release_branch
     puts `git checkout #{release_branch}`
     puts `git pull origin #{release_branch}`
 
-    # Checkout live
+    # Checkout and pull live
     puts `git checkout live`
     puts `git pull origin live`
 
-    # Record the revision of live used for the rollback tag
-    live_rollback_revision = `git log -n1 --oneline`.scan(/(^[^ ]+) .*$/).flatten[0]
-
     merge_options = "--no-ff -s recursive -Xignore-space-change"
 
     # Merge the release branch into live
@@ -261,11 +261,11 @@ class Gitscape::Base
     end
 
     # Ensure there is zero diff between what was tested on origin/qa and the new live
-    critical_diff = `git diff --stat live origin/qa`
+    critical_diff = `git diff live origin/qa`
     if critical_diff.length > 0
-      puts "This live merge has code that was not on the qa branch."
+      puts "\n!!! This live merge has code that was not on the qa branch !!!\nDiff:"
       puts critical_diff
-      puts "Run the command 'git reset --hard' to undo the merge, and raise this error with Phil and others involved to determine whether the release should happen."
+      puts "!!! Run the command 'git reset --hard' to undo the merge, and raise this error with Phil and others involved to determine next step !!!"
       exit 3
     end
 
@@ -286,7 +286,7 @@ class Gitscape::Base
     end
 
     # Tag the state of live for both release and rollback
-    puts `git tag rollback-to/i#{current_version_number} #{live_rollback_revision}`
+    puts `git tag rollback-to/i#{current_version_number} live~`
     if !$?.success? then
       puts "=== WARNING: Failed to create rollback-to/i#{current_version_number} tag"
     end
@@ -304,9 +304,9 @@ class Gitscape::Base
     end
   end
   
-  def tag_cleanup options={:push => true}
+  def tag_cleanup options
     # Handle default options
-    options[:push] = true if options[:push].nil?
+    options[:push] = false if options[:push].nil?
     
     # Do a fetch in order to ensure we have all the latest tags
     `git fetch`

data/lib/gitscape/version.rb

@@ -1,3 +1,3 @@
 module Gitscape
-  VERSION = '1.6.4'
+  VERSION = '1.6.5'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 4
-  version: 1.6.4
+  - 5
+  version: 1.6.5
 platform: ruby
 authors: 
 - Jon Botelho
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-14 00:00:00 -04:00
+date: 2013-05-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency