tutter-sppuppet 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb3374056a2601ef388af3b3119d6fc236e00030
-  data.tar.gz: acc0ca1594ca46c7ef6bb4e701311f1d41a4d616
+  metadata.gz: 9c82c8f1b531c0e1577d3d18c117f8ebda785b4c
+  data.tar.gz: c8995bccc8a4f0d9a4a27477ca13bfb7243ddd66
 SHA512:
-  metadata.gz: df26292e971f810911aec4f64885f177d59057374ec707afae0f299c272f2e57fbda41d2f0b3d08b7a252d92681fcd0062534ec898562f302aa2b733d53d88e3
-  data.tar.gz: ed4f4058f138b80b8fb86d9946450ad21fd4b03b65f67631858271043c7d7b8931308fe38d4352dfd59bc3b4070b0bcbd2bb752b07381b0bbe2cff5e6c073939
+  metadata.gz: 3a416fb995a3bebf146e3dc6b174e644d38830d664be2f41aa75eb740829dfd62583cd2cf386bd0c2788773f3e2e7cfe8efa7c6508ff0fd47c16a680c7544fbd
+  data.tar.gz: 2575109d71bbc07c5f82a85f44a60e3a9a04c8c4617fcfe4416fb4aaa68c90b717119c50283b1ab4aaa6cf771d467c2f861fc5823afd9cf22c6ff55c12eef177

data/.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'tutter-sppuppet'
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.author      = 'Johan Haals'
   s.email       = ['johan.haals@gmail.com']
   s.homepage    = 'https://github.com/jhaals/tutter-sppuppet'

data/README.md

@@ -11,13 +11,18 @@ desired amount of +1's(configurable)
 
 A pull request will be blocked if it has a _-1_ comment
 
+## Installation
 
-### tutter.yaml sppuppet specific settings
+    gem install tutter-sppuppet
+
+sppuppet specific settings (goes into tutter.yaml)
 
     action: 'sppuppet'
     action_settings:
-    plus_ones_required: 3
+      plus_ones_required: 3
+      debug: false
 
 ### TODO
 * whitelist
-* blacklist
+* blacklist
+* tests

data/lib/tutter/action/sppuppet.rb

@@ -5,30 +5,48 @@ class Sppuppet
     @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
@@ -37,7 +55,7 @@ class Sppuppet
       # 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
@@ -45,7 +63,7 @@ class Sppuppet
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tutter-sppuppet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Johan Haals
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies: []
 description: This tutter action let non collaborators review and merge code without
   having more then read access to the project
@@ -46,3 +46,4 @@ signing_key:
 specification_version: 4
 summary: Github code review without collaborator access
 test_files: []
+has_rdoc: