pullermann 1.4.1 → 1.5.0

data/lib/pullermann/pullermann.rb

@@ -54,6 +54,7 @@ class Pullermann
     # Run code on all selected requests.
     selected_requests.each do |request|
       @request = request
+      @log.info "Running for request ##{@request.id}."
       # GitHub always creates a merge commit for its 'Merge Button'.
       # Pullermann reuses that commit to run the code on it.
       switch_branch_to_merged_state
@@ -166,20 +167,26 @@ class Pullermann
     end
     # If it's not mergeable, we need to delete all comments of former test runs.
     unless @request.content.mergeable
-      @log.info 'Pull request not auto-mergeable. Not running.'
-      if @request.comment
-        @log.info 'Deleting existing comment.'
-        call_github(old_comment_success?).delete_comment(@project, @request.comment.id)
+      # Sometimes GitHub doesn't have a proper boolean value stored.
+      if @request.content.mergeable.nil? && switch_branch_to_merged_state(false)
+        # Pull request is mergeable after all.
+        switch_branch_back
+      else
+        @log.info 'Pull request not auto-mergeable. Not running.'
+        if @request.comment
+          @log.info 'Deleting existing comment.'
+          call_github(old_comment_success?).delete_comment(@project, @request.comment.id)
+        end
+        return false
       end
-      return false
     end
     if @request.comment
       @log.info "Current target sha: '#{@request.target_head_sha}', pull sha: '#{@request.head_sha}'."
-      @log.info "Last test run target sha: '#{shas[1]}', pull sha: '#{shas[2]}'."
-      if self.rerun_on_source_change && (shas[2] != @request.head_sha)
+      @log.info "Last test run target sha: '#{shas[2]}', pull sha: '#{shas[1]}'."
+      if self.rerun_on_source_change && (shas[1] != @request.head_sha)
         @log.info 'Re-running due to new commit in pull request.'
         return true
-      elsif self.rerun_on_target_change && (shas[1] != @request.target_head_sha)
+      elsif self.rerun_on_target_change && (shas[2] != @request.target_head_sha)
         @log.info 'Re-running due to new commit in target branch.'
         return true
       end
@@ -192,7 +199,7 @@ class Pullermann
     false
   end
 
-  def switch_branch_to_merged_state
+  def switch_branch_to_merged_state(hard = true)
     # Fetch the merge-commit for the pull request.
     # NOTE: This commit is automatically created by 'GitHub Merge Button'.
     # FIXME: Use cheetah to pipe to @log.debug instead of that /dev/null hack.
@@ -200,8 +207,9 @@ class Pullermann
     `git checkout FETCH_HEAD &> /dev/null`
     unless $? == 0
       @log.error 'Unable to switch to merge branch.'
-      abort
+      hard ? abort : false
     end
+    true
   end
 
   def switch_branch_back

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pullermann
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit