tutter-sppuppet 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY3YmE5MDFlNjE5MDdkYzY2MjcxZjE3YmIyNDBkZmEzNmE2MjQ5OQ==
+    MWU4YTU4YzUxMTM0N2FkZTYyODc5MjdjYTY3N2RiYTFmMGExMjM4MQ==
   data.tar.gz: !binary |-
-    ZWZkODNmMjE4MTA0NTI3MmEwYzRlYzIyNjcxNzFmZjFkYWVhMzE0Zg==
+    ZDE3NmUzYzAyMDk0NGFhODJjYmEyYzNhYTVhZmMyY2JmNzkwY2U2ZA==
 SHA512:
   metadata.gz: !binary |-
-    OTRkYmViYWZhYzYxOTljYmY1NDg0NDVmOWYwYTFhMzM3ZmY0OTlmYjE5NWFh
-    YjcyZTU4NzBmYTYwYjFlM2UyYmIyNWU3MDBlOGQxNGYwYWY5YWVhM2I3ZmY2
-    NzNhYzI2MjBjNGQxOWViNWEyMWExZjg2ZWU4NTBkNzhlZmNkNjA=
+    OGVlMGIyYTQwYWNlNThmMWQ5ZGQyZjAxOWIzMDRkMzRmMjYxMzMyMjE3ZjI3
+    ZDMxNjUxODBlMDM5YzZiNmVhNjc4YTg3ZmI5YzI1NmFlZjMwMzA2N2EyNThh
+    ZjMxNTZjODdmNGY3YTAxYWVkYzVlZjQyNmE4MjdhYjk1NGQ4YmE=
   data.tar.gz: !binary |-
-    NDM2NThkZGNhMjdkMGYxZTdkYjgwODIwNDBhNDU3NjNiMWE5M2NkNTk5ODdk
-    NDg4N2Y2NGFkMzQ3NzFjMzYwODI3YTcwZDQ3OTBjOWU0Y2QxZDQ2M2RiOWI5
-    NWFlNDVmZDhhMTY0MzllYTM3YjI3YTNkYjVjZGQ4ZGYxZGQ4MTk=
+    ZjE4MGIwMjU1ODgxN2ZiOWM0MzUyY2QxNWZhYTY5Yzg1NDY2ZTc5ODllOWVj
+    ZDc0ZWJkOWJmZTU3ZGRiNjEyODE0NThhZDE1ODU2NDFmZmQ5YmJkNmJlYjk1
+    NDVmNzc1N2I2MDdhOGMzNTNiZmYyNTYxZDUzM2I4ZTVjYzYxMDY=

data/lib/tutter/action/sppuppet.rb

@@ -55,19 +55,9 @@ class Sppuppet
   def maybe_merge(pull_request_id, merge_command)
     votes = {}
     merger = nil
+    incident_merge_override = false
     pr = @client.pull_request @project, pull_request_id
 
-    unless pr.mergeable_state == 'clean'
-      msg = "Merge state for is not clean. Current state: #{pr.mergeable_state}\n"
-      reassure = "I will try to merge this for you when the builds turn green\n" +
-        'If your build fails or becomes stuck for some reason, just say \'rebuild\''
-      if merge_command
-        return post_comment(pull_request_id, msg + reassure)
-      else
-        return 200, msg
-      end
-    end
-
     # 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
@@ -88,7 +78,7 @@ class Sppuppet
         end
       end
 
-      match = /^:?([+-])1:?/.match(i.body)
+      match = /^(:?([+-])1:?|LGTM)/.match(i.body)
       if match
         score = match[1] == '+' ? 1 : -1
         # pull request submitter cant +1
@@ -102,12 +92,28 @@ class Sppuppet
         msg = "Commit cannot be merged so long as a -2 comment appears in the PR."
         return post_comment(pull_request_id, msg)
       end
+
+      if /jira.*INCIDENT/.match(i.body)
+        incident_merge_override = true
+      end
+    end
+
+    if pr.mergeable_state != 'clean' && !incident_merge_override
+      msg = "Merge state for is not clean. Current state: #{pr.mergeable_state}\n"
+      reassure = "I will try to merge this for you when the builds turn green\n" +
+        "If your build fails or becomes stuck for some reason, just say 'rebuild'\n" +
+        'If have an incident and want to skip the tests and the peer review, please post the link to the jira ticket.'
+      if merge_command
+        return post_comment(pull_request_id, msg + reassure)
+      else
+        return 200, msg
+      end
     end
 
     return 200, 'No merge comment found' unless merger
 
     num_votes = votes.values.reduce(0) { |a, e| a + e }
-    if num_votes < @settings['plus_ones_required']
+    if num_votes < @settings['plus_ones_required'] && !incident_merge_override
       msg = "Not enough plus ones. #{@settings['plus_ones_required']} required, and only have #{num_votes}"
       return post_comment(pull_request_id, msg)
     end

data/tutter-sppuppet.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'tutter-sppuppet'
-  s.version     = '1.1.1'
+  s.version     = '1.1.2'
   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.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Johan Haals
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tutter