gitcycle 0.2.27 → 0.2.28

data/gitcycle.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "gitcycle"
-  s.version     = '0.2.27'
+  s.version     = '0.2.28'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -316,9 +316,13 @@ class Gitcycle
     if branch['collab']
       puts "\nPushing branch '#{branch['home']}/#{branch['name']}'.\n".green
       run("git push #{branch['home']} #{branch['name']} -q")
-    else
+    elsif branch
       puts "\nPushing branch 'origin/#{branch['name']}'.\n".green
       run("git push origin #{branch['name']} -q")
+    else
+      current_branch = branches(:current => true)
+      puts "\nPushing branch 'origin/#{current_branch}'.\n".green
+      run("git push origin #{current_branch} -q")
     end
   end
 
@@ -360,6 +364,7 @@ class Gitcycle
       elsif branch =~ /^qa_/
         puts "\nRetrieving branch information from gitcycle.\n".green
         qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
+        qa_branch_name = "qa_#{qa_branch['source']}_#{qa_branch['user']}"
 
         if pass_fail == 'pass'
           checkout_or_track(:name => qa_branch['source'], :remote => 'origin')
@@ -375,10 +380,28 @@ class Gitcycle
 
         if pass_fail == 'pass' && issues.empty?
           owner, repo = qa_branch['repo'].split(':')
+
+          qa_branch['branches'].each do |b|
+            repo = b['repo'].split(':')[1]
+
+            add_remote_and_fetch(
+              :owner => b['home'],
+              :repo => repo
+            )
+
+            output = run("git log #{qa_branch_name}..#{b['home']}/#{repo}")
+
+            unless output.strip.empty?
+              puts "\nUn-merged changes detected in '#{repo}/#{b['home']}':".red
+              puts "\n#{output}"
+              puts "\nTo merge the change: git merge #{repo}/#{b['home']}".yellow
+            end
+          end
+          
           merge_remote_branch(
             :owner => owner,
             :repo => repo,
-            :branch => "qa_#{qa_branch['source']}_#{qa_branch['user']}",
+            :branch => qa_branch_name,
             :type => :from_qa
           )
         end
@@ -448,8 +471,11 @@ class Gitcycle
     branch = pull
 
     if branch && !branch['collab']
-      force = branch['labels'] && branch['labels'].include?('Pass')
-      branch = create_pull_request(branch, force)
+      # Recreate pull request if force == true
+      force   = branch['labels'] && branch['labels'].include?('Pass')
+      force ||= branch['state']  && branch['state'] == 'closed'
+
+      branch  = create_pull_request(branch, force)
     end
 
     if branch == false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitcycle
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.2.28
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber