tutter-sppuppet 1.2.7 → 1.2.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWUyMDczZGM3ZmY3ZWNmMTk4YTA1MjM1MzE1YzUxMWZkZTlmN2FlNA==
+    YjRjNWM2NzU3ODE1ZjdiYmY5Y2ExZTMzOGYwZTI0MjVlMWQwMTk4Yg==
   data.tar.gz: !binary |-
-    MzdiMmRhY2I3MzMyZGU0MWJmNWRhM2NhZGE1ZDkzNDgzMTMwZTE4Mg==
+    MmFmNmE5ODgyY2EzZWUzNjY5MTJmZjgxMjk5MDNmMDM0OWYyMTEzNw==
 SHA512:
   metadata.gz: !binary |-
-    NWM3YmM4ZTBmNDViNDVjNjY3YjAwYzY2YTJhZDAyNTIyYTY4Yzg2ODBlOGE2
-    YTYwNmQ0MjdlNGI2NmU3ZDQ5MGFkODZlOTBkYWM2NjJkMmQzZjBmZDUzNWQ0
-    YWVjYzFjYWYyYzE0Y2FhNmM3NzY4ZmRjNTBjMWFlN2Q2NzU4Yzk=
+    OGM1YTE2OGFhNTczM2ExYTM3OWFiZWExZWMzYmM2Nzc4NTdhMzVlNjJlZjIx
+    NjQ5YTA4MTFmZTAzOWIwYmIwODc2Mzc5NzYwZmNlMDI5NzcyY2I0YmI4ODhl
+    ZDczYjc5ZTM5MTkxMzE4ZDlmNjFmZTNlZTNlNGM4NDNkNzk4NTU=
   data.tar.gz: !binary |-
-    YTMyZWQ2ZmU0NTZiZTUwZTZjODc3MTc0MDJiYjgxZDQzOTg3MGQwNzVkOTIw
-    ZTE0NGM5MDZlOTFlNmQ2OGNiOWZhOWUzY2U3Nzk5NDFmZGQ3MGVmNDdlOTQz
-    OTQ3YzJmZjg4MTE3ZjJhNTg0ZjQzYTA1OThlZjZhM2ZkMTM3MjE=
+    OTA3ZmE0OGY3MWQ0ZTE3NzNiODc5YTI4MDk0NjIwZjllZjgzMTUxMWUxMmYy
+    ZmQzY2E2Y2FiYjNhYmQzZDQzNjIzNjFmOTU3ZWMwZjY1MjA4MTNjMGVjMDQ1
+    ZDRhOThkMDAwYjM4ODhlNTk1ZTc0YTcyMTI3YWQ0Y2ViYWEzYjA=

data/lib/tutter/action/sppuppet.rb

@@ -4,6 +4,7 @@ require 'json'
 class Sppuppet
   # Match regexps
   MERGE_COMMENT = /(:shipit:|:ship:|!merge)/
+  DELETE_BRANCH_COMMENT = /(:scissors:)/
   PLUS_VOTE = /^(:?\+1:?|LGTM)/         # Match :+1:, +1, and LGTM
   MINUS_VOTE = /^(:?\-1:?)/             # Match :-1: and -1
   BLOCK_VOTE = /^(:poop:|:hankey:|-2)/ # Blocks merge
@@ -99,6 +100,10 @@ class Sppuppet
         end
       end
 
+      if DELETE_BRANCH_COMMENT.match(i.body)
+        @branch_to_delete = pr.head
+      end
+
       if PLUS_VOTE.match(i.body) && pr.user.login != commenter
         votes[commenter] = 1
         if @settings['owners'].include?(commenter)
@@ -165,6 +170,8 @@ MERGE_MSG
     end
     begin
       merge_commit = @client.merge_pull_request(@project, pull_request_id, merge_msg)
+      # If a owner posted a chop comment and was successfully merged delete the branch ref
+      @client.delete_branch(@project, @branch_to_delete) if @branch_to_delete
     rescue Octokit::MethodNotAllowed => e
       return post_comment(pull_request_id, "Pull request not mergeable: #{e.message}")
     end

data/tutter-sppuppet.gemspec

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