pullermann 1.0.0 → 1.0.1

data/lib/pullermann/pullermann.rb

@@ -46,7 +46,7 @@ class Pullermann
       self.test_block.call
       # Unless already set, the success/failure is determined by the last
       # command's return code.
-      @result ||= $? == 0
+      @test_success ||= $? == 0
       # We need to switch back to the original branch in case we need to test
       # more pull requests.
       switch_branch_back
@@ -75,22 +75,28 @@ class Pullermann
     # Find environment (tasks, project, ...).
     @prepare_block ||= lambda {}
     @test_block ||= lambda { `rake test` }
-    connect_to_github
+    @github = connect_to_github
+    @github_fail = if self.username == self.username_fail
+      @github
+    else
+      connect_to_github self.username_fail, self.password_fail
+    end
   end
 
   def connect_to_github(user = self.username, pass = self.password)
-    @github = Octokit::Client.new(
+    github = Octokit::Client.new(
       :login => user,
       :password => pass
     )
     # Check user login to GitHub.
-    @github.login
-    @log.info "Successfully logged into GitHub (API v#{@github.api_version}) with user '#{user}'."
+    github.login
+    @log.info "Successfully logged into GitHub (API v#{github.api_version}) with user '#{user}'."
     # Ensure the user has access to desired project.
-    @project = /:(.*)\.git/.match(git_config['remote.origin.url'])[1]
+    @project ||= /:(.*)\.git/.match(git_config['remote.origin.url'])[1]
     begin
-      @github.repo @project
+      github.repo @project
       @log.info "Successfully accessed GitHub project '#{@project}'"
+      github
     rescue Octokit::Unauthorized => e
       @log.error "Unable to access GitHub project with user '#{user}':\n#{e.message}"
       abort
@@ -115,6 +121,9 @@ class Pullermann
       @log.info 'Pull request not auto-mergeable, skipping... '
       return false
     end
+    # 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
     if comments.empty?
@@ -122,14 +131,15 @@ class Pullermann
       @log.info 'New pull request detected, test run needed.'
       return true
     else
-      # 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
       # Initialize shas to ensure it will live on after the 'each' block.
       shas = nil
       comments.each do |comment|
         shas = /master sha# ([\w]+) ; pull sha# ([\w]+)/.match(comment.body)
-        break if shas && shas[1] && shas[2]
+        if shas && shas[1] && shas[2]
+          # Remember @comment to be able to update or delete it later.
+          @comment = comment
+          break
+        end
       end
       # We finally found the latest comment that includes the necessary information.
       if shas && shas[1] && shas[2]
@@ -171,19 +181,36 @@ class Pullermann
     `git co master &> /dev/null`
   end
 
+  # Analyze old comment to see whether it was a successful or a failing one.
+  def old_comment_success?
+    return unless @comment
+    # Determine boolean value.
+    @comment['body'].include? 'Well done!'
+  end
+
   # Output the result to a comment on the pull request on GitHub.
   def comment_on_github
-    sha_string = "\n( master sha# #{@target_head_sha} ; pull sha# #{@pull_head_sha} )"
-    if @result
-      message = 'Well done! All tests are still passing after merging this pull request. '
+    # Determine comment message.
+    message = if @test_success
+      'Well done! All tests are still passing after merging this pull request.'
     else
-      unless self.username == self.username_fail
-        # Re-connect with username_fail and password_fail.
-        connect_to_github(self.username, self.password)
-      end
-      message = 'Unfortunately your tests are failing after merging this pull request. '
+      'Unfortunately your tests are failing after merging this pull request.'
+    end
+    message += "\n( master sha# #{@target_head_sha} ; pull sha# #{@pull_head_sha} )"
+    if old_comment_success? == @test_success
+      # Replace existing @comment's body with the correct connection.
+      call_github(@test_success).update_comment(@project, @comment['id'], message)
+    else
+      # Delete old @comment with correct connection (if @comment exists).
+      call_github(!@test_success).delete_comment(@project, @comment['id']) if @comment
+      # Create new comment with correct connection.
+      call_github.add_comment(@project, @request_id, message)
     end
-    @github.add_comment(@project, @request_id, message + sha_string)
+  end
+
+  # Determine which connection to GitHub should be used for the call.
+  def call_github(use_default_user = true)
+    use_default_user ? @github : @github_fail
   end
 
   # Collect git config information in a Hash for easy access.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pullermann
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors: