tutter-sppuppet 1.2.6 → 1.2.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDNiMjU2MTQ2NTU5MjA2MTQxZWQwNzZhYmRkOTY4YWY3NzllNWY3MA==
+    ZWUyMDczZGM3ZmY3ZWNmMTk4YTA1MjM1MzE1YzUxMWZkZTlmN2FlNA==
   data.tar.gz: !binary |-
-    NzE0NGM3YjdhMmVjMDYwZDgyN2I4ZTUxZDBhZWQ2ZWMwNjE3NDIzNA==
+    MzdiMmRhY2I3MzMyZGU0MWJmNWRhM2NhZGE1ZDkzNDgzMTMwZTE4Mg==
 SHA512:
   metadata.gz: !binary |-
-    YWM4ZTcyYWQ3MGMzNDEwMWE3ZWUxOTVjNjkxMTVlODJhMTJhNjk5NjAzNTRj
-    Yzc3OTBlZDg3OGRlY2VjOGVkNTM5MjU2ZDE4NmQ0ZWJlZWViYWQ0ZjAzN2Rh
-    NzZmMzkyYmVlNDZmMGE0ZGVmZjIwMzZmNTRhZTNhYTg4NGEwZTE=
+    NWM3YmM4ZTBmNDViNDVjNjY3YjAwYzY2YTJhZDAyNTIyYTY4Yzg2ODBlOGE2
+    YTYwNmQ0MjdlNGI2NmU3ZDQ5MGFkODZlOTBkYWM2NjJkMmQzZjBmZDUzNWQ0
+    YWVjYzFjYWYyYzE0Y2FhNmM3NzY4ZmRjNTBjMWFlN2Q2NzU4Yzk=
   data.tar.gz: !binary |-
-    YmNiYzJkZGI2OWQwNTU0ODI1NmQ3MDFiNGRjNjAzZGYyOTZmODU2YWNiZTQ4
-    NjAxNzA2NzU1YjIwYmMxOGY3YjQ3OThlMTQ1YzU2ZjE1ZDJhODVmNTA1NWM2
-    ODA4ZmM3OWIyMTNiN2ZmY2ZiZDczYWRhM2Q0NTBlMjMzMmYzOWI=
+    YTMyZWQ2ZmU0NTZiZTUwZTZjODc3MTc0MDJiYjgxZDQzOTg3MGQwNzVkOTIw
+    ZTE0NGM5MDZlOTFlNmQ2OGNiOWZhOWUzY2U3Nzk5NDFmZGQ3MGVmNDdlOTQz
+    OTQ3YzJmZjg4MTE3ZjJhNTg0ZjQzYTA1OThlZjZhM2ZkMTM3MjE=

data/lib/tutter/action/sppuppet.rb

@@ -12,6 +12,8 @@ class Sppuppet
   def initialize(settings, client, project, data, event)
     @settings = settings
     @settings['plus_ones_required'] ||= 1
+    @settings['owner_plus_ones_required'] ||= 0
+    @settings['owners'] ||= []
     @client = client
     @project = project
     @data = data
@@ -49,7 +51,12 @@ class Sppuppet
       # If a new pull request is opened, comment with instructions
       if @data['action'] == 'opened' && @settings['post_instructions']
         issue = @data['number']
-        comment = @settings['instructions'] || "To merge at least #{@settings['plus_ones_required']} person other than the submitter needs to write a comment containing only _+1_ or :+1:. Then write _!merge_ or :shipit: to trigger merging."
+        if @settings['owner_plus_ones_required'] > 0
+          owners_required_text = " and at least #{@settings['owner_plus_ones_required']} of the owners "
+        else
+          owners_required_text = ""
+        end
+        comment = @settings['instructions'] || "To merge at least #{@settings['plus_ones_required']} person other than the submitter #{owners_required_text}needs to write a comment containing only _+1_ or :+1:. Then write _!merge_ or :shipit: to trigger merging."
         return post_comment(issue, comment)
       else
         return 200, 'Not posting instructions'
@@ -60,6 +67,7 @@ class Sppuppet
   end
 
   def maybe_merge(pull_request_id, merge_command, merger = nil)
+    owner_votes = {}
     votes = {}
     incident_merge_override = false
     pr = @client.pull_request @project, pull_request_id
@@ -76,23 +84,33 @@ class Sppuppet
       # We only want to check newer comments
       next if last_commit_date > i.created_at
 
+      commenter = i.attrs[:user].attrs[:login]
       # Skip comments from tutter itself
-      next if i.attrs[:user].attrs[:login] == @client.user.login
+      next if commenter == @client.user.login
 
       if MERGE_COMMENT.match(i.body)
-        merger ||= i.attrs[:user].attrs[:login]
+        merger ||= commenter
         # Count as a +1 if it is not the author
-        unless pr.user.login == i.attrs[:user].attrs[:login]
-          votes[i.attrs[:user].attrs[:login]] = 1
+        unless pr.user.login == commenter
+          votes[commenter] = 1
+          if @settings['owners'].include?(commenter)
+            owner_votes[commenter] = 1
+          end
         end
       end
 
-      if PLUS_VOTE.match(i.body) && pr.user.login != i.attrs[:user].attrs[:login]
-        votes[i.attrs[:user].attrs[:login]] = 1
+      if PLUS_VOTE.match(i.body) && pr.user.login != commenter
+        votes[commenter] = 1
+        if @settings['owners'].include?(commenter)
+          owner_votes[commenter] = 1
+        end
       end
 
-      if MINUS_VOTE.match(i.body) && pr.user.login != i.attrs[:user].attrs[:login]
-        votes[i.attrs[:user].attrs[:login]] = -1
+      if MINUS_VOTE.match(i.body) && pr.user.login != commenter
+        votes[commenter] = -1
+        if @settings['owners'].include?(commenter)
+          owner_votes[commenter] = -1
+        end
       end
 
       if BLOCK_VOTE.match(i.body)
@@ -125,6 +143,12 @@ class Sppuppet
       return post_comment(pull_request_id, msg)
     end
 
+    num_owner_votes = owner_votes.values.reduce(0) { |a, e| a + e }
+    if num_owner_votes < @settings['owner_plus_ones_required'] && !incident_merge_override
+      msg = "Not enough plus ones from owners. #{@settings['owner_plus_ones_required']} required, and only have #{num_owner_votes}"
+      return post_comment(pull_request_id, msg)
+    end
+
     # TODO: Word wrap description
     merge_msg = <<MERGE_MSG
 Title: #{pr.title}

data/tutter-sppuppet.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'tutter-sppuppet'
-  s.version     = '1.2.6'
+  s.version     = '1.2.7'
   s.author      = ['Johan Haals', 'Erik Dalén', 'Alexey Lapitsky']
   s.email       = ['johan.haals@gmail.com', 'dalen@spotify.com', 'alexey@spotify.com']
   s.homepage    = 'https://github.com/jhaals/tutter-sppuppet'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tutter-sppuppet
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Johan Haals
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tutter