v2gpti 0.2.0.5 → 0.2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96653de0af6eb4d4e0628e737d3c8168214b911b
-  data.tar.gz: 91098fcbb204c3800fced28249be0cb108007fa0
+  metadata.gz: 247e49b51d804014bf6e0f1c779a21ffc505197c
+  data.tar.gz: 7f2bdb3539b7a6a28098429df5322adbca41aa3e
 SHA512:
-  metadata.gz: 5886d17e06fc962fd0966a2bbed181ee8f7039ae89066ae469dd02898d94761571af54881edf4821be6e12a82d1b56cf2926548eea37196fdc952063d10a2d1e
-  data.tar.gz: 9e3e55b767b43ed87c808752c8b7d9bcb2ebe72d84f3efdd03585d6c8a4c66dc95c2cead134ae3125348d55ac7691ebb8b54a48bcbda6c1d00e1b4bcf2815fd9
+  metadata.gz: e7b6eec3f278b53223f0e76443abc07957c521bdff3865f20f0d26319f767eac420a8f9c4e119f09b1609c6d308a589019016a1d35abd9feb0e7a57ebd3eebb2
+  data.tar.gz: 0c281281e883c0f913053ef1fac341d86347136e5072951a6ab59581c2402b893763eddaa26931f916172f32058190eece3d84da31def3cc5c279f7e495e8b3f

data/lib/git-pivotal-tracker-integration/command/release.rb

@@ -41,15 +41,15 @@ class GitPivotalTrackerIntegration::Command::Release < GitPivotalTrackerIntegrat
 
     # checkout QA branch
     # Update QA from origin    
-    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout QA"
-    GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
-    GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs QA"
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout QA"
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs origin QA"
 
     # checkout master branch
     # Merge QA into master
-    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout master"
-       GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
-    if (GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs master")
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout master"
+       puts GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
+    if (GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs QA")
       puts "Merged 'QA' in to 'master'"
     else
       abort "FAILED to merge 'QA' in to 'master'"
@@ -75,7 +75,7 @@ class GitPivotalTrackerIntegration::Command::Release < GitPivotalTrackerIntegrat
     Dir.chdir(working_directory)
 
     # Create a new build commit, push to QA, checkout develop
-    GitPivotalTrackerIntegration::Util::Git.create_commit( "Update build number to #{version_number} for delivery to QA", story)
+    puts GitPivotalTrackerIntegration::Util::Git.create_commit( "Update version number to #{version_number} for delivery to QA", story)
     puts GitPivotalTrackerIntegration::Util::Shell.exec "git push" 
     puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout #{current_branch}"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: v2gpti
 version: !ruby/object:Gem::Version
-  version: 0.2.0.5
+  version: 0.2.0.6
 platform: ruby
 authors:
 - Ben Hale
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline