lib/tutter/action/sppuppet.rb in tutter-sppuppet-0.0.1 vs lib/tutter/action/sppuppet.rb in tutter-sppuppet-0.0.2

@@ -3,50 +3,68 @@
   def initialize(settings, client, project, data)
     @settings = settings
     @client = client
     @project = project
     @data = data
+    @debug = settings['debug'] unless settings['debug'].nil?
   end
 
+  def debug(message)
+    puts message if @debug
+  end
+
   def run
     pull_request_id = @data['issue']['number']
+    debug "pull request id: #{pull_request_id}"
     pr = @client.pull_request @project, pull_request_id
     plus_one = {}
     merge = false
 
     if pr.mergeable_state != 'clean'
-      puts "merge state for #{@project} #{pull_request_id} is not clean. Current state: #{pr.mergeable_state}"
+      debug "merge state for #{@project} #{pull_request_id} is not clean. Current state: #{pr.mergeable_state}"
       return false
     end
 
+    # No comments, no need to go further.
+    if pr.comments == 0
+      debug 'no comments, skipping'
+      return false
+    end
+
     # Don't care about code we can't merge
     return false unless pr.mergeable
 
+    # We fetch the latest commit and it's date.
+    last_commit = @client.pull_request_commits(@project, pull_request_id).last
+    last_commit_date = last_commit.commit.committer.date
+
     comments = @client.issue_comments(@project, pull_request_id)
 
     # Check each comment for +1 and merge comments
     comments.each do |i|
 
+      # Comment is older than last commit. We only want to check for +1 in newer comments
+      next if last_commit_date > i.created_at
+
       if /^(\+1|:\+1)/.match i.body
         # pull request submitter cant +1
-
         unless pr.user.login == i.attrs[:user].attrs[:login]
           plus_one[i.attrs[:user].attrs[:login]] = 1
         end
       end
 
       # TODO it should calculate the +1's - the -1's
       # Never merge if someone says -1
       if /^(\-1|:\-1:)/.match i.body
-        puts "#{@project} #{pull_request_id} has a -1. I will not take the blame"
+        debug "#{@project} #{pull_request_id} has a -1. I will not take the blame"
         return false
       end
     end
 
     merge = true if comments.last.body == '!merge'
 
     if plus_one.count >= @settings['plus_ones_required'] and merge
-      puts "merging #{pull_request_id} #{@project}"
+      debug "merging #{pull_request_id} #{@project}"
       @client.merge_pull_request(@project, pull_request_id, 'SHIPPING!!')
     end
   end
 end