pullermann 1.2.2 → 1.4.1

data/lib/pullermann/pull_request.rb

@@ -0,0 +1,15 @@
+class PullRequest
+
+  attr_accessor :id,
+                :content,
+                :comment,
+                :head_sha,
+                :target_head_sha
+
+  def initialize(content)
+    @content = content
+    @id = content.number
+    @head_sha = content.head.sha
+  end
+
+end

data/lib/pullermann/pullermann.rb

@@ -9,7 +9,12 @@ class Pullermann
                 :prepare_block,
                 :exec_block,
                 :logger,
-                :success
+                :success,
+                :status_pending,
+                :status_failure,
+                :status_success,
+                :comment_failure,
+                :comment_success
 
   # Allow configuration blocks being passed to Pullermann.
   # See the README.md for examples on how to call this method.
@@ -33,24 +38,39 @@ class Pullermann
   def run
     # Populate variables and setup environment.
     configure
-    self.prepare_block.call
+    begin
+      self.prepare_block.call
+    rescue Exception => e
+      @log.error "Preparation block raised an exception: #{e}"
+    end
     # Loop through all 'open' pull requests.
-    pull_requests.each do |request|
-      @request_id = request['number']
-      # Jump to next iteration if source and/or target haven't change since last run.
+    selected_requests = pull_requests.select do |request|
+      @request = request
+      # Jump to next iteration if source and/or target didn't change since last run.
       next unless run_necessary?
       set_status_on_github
+      true
+    end
+    # Run code on all selected requests.
+    selected_requests.each do |request|
+      @request = request
       # 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
       # Run specified code (i.e. tests) for the project.
-      self.exec_block.call
-      # Unless self.success has already been set manually,
-      # the success/failure is determined by the last command's return code.
-      self.success ||= ($? == 0)
+      begin
+        self.exec_block.call
+        # Unless self.success has already been set manually,
+        # the success/failure is determined by the last command's return code.
+        self.success ||= ($? == 0)
+      rescue Exception => e
+        @log.error "Execution block raised an exception: #{e}"
+        self.success = false
+      end
       switch_branch_back
       comment_on_github
       set_status_on_github
+      self.success = nil
     end
   end
 
@@ -75,8 +95,14 @@ class Pullermann
     self.password ||= git_config['github.password']
     self.username_fail ||= self.username
     self.password_fail ||= self.password
-    self.rerun_on_source_change = true unless self.rerun_on_source_change == false
-    self.rerun_on_target_change = true unless self.rerun_on_target_change == false
+    self.rerun_on_source_change ||= true
+    self.rerun_on_target_change ||= true
+    # Allow for custom messages.
+    self.status_pending ||= 'Pullermann is still running.'
+    self.status_failure ||= 'Pullermann reports failure.'
+    self.status_success ||= 'Pullermann reports success.'
+    self.comment_failure ||= 'Pullermann reports failure.'
+    self.comment_success ||= 'Pullermann reports success.'
     # Find environment (tasks, project, ...).
     self.prepare_block ||= lambda {}
     self.exec_block ||= lambda { `rake` }
@@ -109,9 +135,12 @@ class Pullermann
   end
 
   def pull_requests
-    pulls = @github.pulls @project, 'open'
-    @log.info "Found #{pulls.size > 0 ? pulls.size : 'no'} open pull requests in '#{@project}'."
-    pulls
+    request_list = @github.pulls @project, 'open'
+    requests = request_list.collect do |request|
+      PullRequest.new(@github.pull_request @project, request.number)
+    end
+    @log.info "Found #{requests.size > 0 ? requests.size : 'no'} open pull requests in '#{@project}'."
+    requests
   end
 
   # (Re-)runs are necessary if:
@@ -119,40 +148,38 @@ class Pullermann
   # - the pull request has been updated since the last run.
   # - the target (i.e. master) has been updated since the last run.
   def run_necessary?
-    pull_request = @github.pull_request @project, @request_id
-    @log.info "Checking pull request ##{@request_id}: #{pull_request.title}"
+    @log.info "Checking pull request ##{@request.id}: #{@request.content.title}"
     # Compare current sha ids of target and source branch with those from the last test run.
-    @target_head_sha = @github.commits(@project).first.sha
-    @pull_head_sha = pull_request.head.sha
-    comments = @github.issue_comments(@project, @request_id)
-    comments = comments.select{ |c| [username, username_fail].include?(c.user.login) }.reverse
+    @request.target_head_sha = @github.commits(@project).first.sha
+    comments = @github.issue_comments(@project, @request.id)
+    comments = comments.select { |c| [username, username_fail].include?(c.user.login) }.reverse
     # Initialize shas to ensure it will live on after the 'each' block.
     shas = nil
-    @comment = nil
+    @request.comment = nil
     comments.each do |comment|
-      shas = /master sha# ([\w]+) ; pull sha# ([\w]+)/.match(comment.body)
+      shas = /Merged ([\w]+) into ([\w]+)/.match(comment.body)
       if shas && shas[1] && shas[2]
-        # Remember @comment to be able to update or delete it later.
-        @comment = comment
+        # Remember comment to be able to update or delete it later.
+        @request.comment = comment
         break
       end
     end
     # If it's not mergeable, we need to delete all comments of former test runs.
-    unless pull_request.mergeable
+    unless @request.content.mergeable
       @log.info 'Pull request not auto-mergeable. Not running.'
-      if @comment
+      if @request.comment
         @log.info 'Deleting existing comment.'
-        call_github(old_comment_success?).delete_comment(@project, @comment.id)
+        call_github(old_comment_success?).delete_comment(@project, @request.comment.id)
       end
       return false
     end
-    if @comment
-      @log.info "Current target sha: '#{@target_head_sha}', pull sha: '#{@pull_head_sha}'."
+    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] != @pull_head_sha)
+      if self.rerun_on_source_change && (shas[2] != @request.head_sha)
         @log.info 'Re-running due to new commit in pull request.'
         return true
-      elsif self.rerun_on_target_change && (shas[1] != @target_head_sha)
+      elsif self.rerun_on_target_change && (shas[1] != @request.target_head_sha)
         @log.info 'Re-running due to new commit in target branch.'
         return true
       end
@@ -161,7 +188,7 @@ class Pullermann
       @log.info 'New pull request detected, run needed.'
       return true
     end
-    @log.info "Not running for request ##{@request_id}."
+    @log.info "Not running for request ##{@request.id}."
     false
   end
 
@@ -169,7 +196,7 @@ class Pullermann
     # 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.
-    `git fetch origin refs/pull/#{@request_id}/merge: &> /dev/null`
+    `git fetch origin refs/pull/#{@request.id}/merge: &> /dev/null`
     `git checkout FETCH_HEAD &> /dev/null`
     unless $? == 0
       @log.error 'Unable to switch to merge branch.'
@@ -185,35 +212,34 @@ class Pullermann
   end
 
   def old_comment_success?
-    return unless @comment
+    return unless @request.comment
     # Analyze old comment to see whether it was a successful or a failing one.
-    @comment.body.include? 'Well done!'
+    @request.comment.body.include? '( Success: '
   end
 
   def comment_on_github
     # Determine comment message.
-    # TODO: Allow for custom messages.
     message = if self.success
       @log.info 'Successful run.'
-      'Well done! Your code is still running successfully after merging this pull request.'
+      self.comment_success + "\n( Success: "
     else
       @log.info 'Failing run.'
-      'Unfortunately your code is failing after merging this pull request.'
+      self.comment_failure + "\n( Failure: "
     end
-    message += "\n( master sha# #{@target_head_sha} ; pull sha# #{@pull_head_sha} )"
+    message += "Merged #{@request.head_sha} into #{@request.target_head_sha} )"
     if old_comment_success? == self.success
-      # Replace existing @comment's body with the correct connection.
+      # Replace existing comment's body with the correct connection.
       @log.info "Updating existing #{notion(self.success)} comment."
-      call_github(self.success).update_comment(@project, @comment['id'], message)
+      call_github(self.success).update_comment(@project, @request.comment.id, message)
     else
-      if @comment
+      if @request.comment
         @log.info "Deleting existing #{notion(!self.success)} comment."
-        # Delete old @comment with correct connection (if @comment exists).
-        call_github(!self.success).delete_comment(@project, @comment['id'])
+        # Delete old comment with correct connection (if @request.comment exists).
+        call_github(!self.success).delete_comment(@project, @request.comment.id)
       end
       # Create new comment with correct connection.
       @log.info "Adding new #{notion(self.success)} comment."
-      call_github(self.success).add_comment(@project, @request_id, message)
+      call_github(self.success).add_comment(@project, @request.id, message)
     end
   end
 
@@ -222,18 +248,18 @@ class Pullermann
     case self.success
     when true
       state_symbol = :success
-      state_message = 'passing after merging'
+      state_message = self.status_success
     when false
       state_symbol = :failure
-      state_message = 'failing after merging'
+      state_message = self.status_failure
     else
       state_symbol = :pending
-      state_message = 'still running for'
+      state_message = self.status_pending
     end
     @github.post(
-      "repos/#{@project}/statuses/#{@pull_head_sha}", {
+      "repos/#{@project}/statuses/#{@request.head_sha}", {
         :state => state_symbol,
-        :description => "Tests are #{state_message} this pull request."
+        :description => state_message
       }
     )
   end

data/lib/pullermann.rb

@@ -1,4 +1,5 @@
 require 'octokit'
 require 'logger'
 require 'pullermann/railtie' if defined?(Rails)
+require 'pullermann/pull_request'
 require 'pullermann/pullermann'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pullermann
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -59,6 +59,7 @@ files:
 - lib/tasks/pullermann.rake
 - lib/pullermann/pullermann.rb
 - lib/pullermann/railtie.rb
+- lib/pullermann/pull_request.rb
 homepage: http://github.com/b4mboo/pullermann
 licenses: []
 post_install_message: