tutter-sppuppet 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTYyMWE5NWE0NGQyYzQ3ZTM4MTFkMDg5YTZhZGE2YjdhMjdjMDI1Mg==
+    YjMzYTk0ZTRlYjM1YjRiOTkwNDA3NzBlZDUwYmVhNDliOWVlOGZhYQ==
   data.tar.gz: !binary |-
-    NTk1NTVlYzA4NWRhNTUwZGUyZGVkMWZhNTAxOWY4YzQ0YjgwNjlhZA==
+    MmY1YmQ4OTcxZmQ3ZWJmYWMyZDAwZjllNTE5ODA3MDkzODU1Y2FhYw==
 SHA512:
   metadata.gz: !binary |-
-    NDlhN2IzYjI5MzIwODc3NDQ2N2FiMzcxNGRmOWExOGQ1MDU2MWVhOTNiYzYx
-    OWQ4NWFlMjhkNjQyMDRjZDBjYzcyMjA4YTQ1MmQyZTM1NWQyMmM3MWNjYzZk
-    ODQxY2I2NDE4MWNiNTk2ZGIzMzBiNDA0Zjk0N2E4MmJjZWE3MTU=
+    YmY5NjBlZWNkYzVhNmExYWEyM2I0NzZhMGNkZGU4ZmVlZjBiZGVlN2I5ZGU2
+    OTAwN2ExYTZjNDc3N2VhMTk0ZGMzZjk4YjQ1ZGM3MTFkNWQ5YjlmODQyNGM3
+    YmI4ZGNkMzc4MzM2MDAyMmQxNmZlZDRjMzI1Njk4YWMyMTNkYzg=
   data.tar.gz: !binary |-
-    MDhhYzNkZjY1NDA4N2Q3N2RmNGM4NGI0ZGFkZTBkZmQxN2FmZGM5MzU5ODQ5
-    OGYwZmZkOTY1ODEyNzdhNTEwM2JkNjk3YWRmZWE0MDU2M2Q1NDk2MGY1YzRk
-    YTQwNjI2ZjQ4ZWJiNTk4MTQyYmM0MTI2OWJhNGI5ZmE1MTIyNDg=
+    ODI4MzdiMjYwNzEyNWVjMDkzOWZhZmJlZDdmMjJjM2YyZTRlNzNhYWViNDkx
+    ZjFiYmU3ZjAwNWE3NDY4YmQ2MmY0MzlmOTQ5MmVlZWMwNDhiYTAxZGYwNmFh
+    NzI2NDllNDQwYjcxMmNmZWI0NDQ1NjlmYzRiZjI0YWM0ZjMzZjM=

data/lib/tutter/action/sppuppet.rb

@@ -17,7 +17,7 @@ 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 with saying _+1_ or _:+1:_. Then write _!merge_ to trigger the merging."
+      comment = @settings['instructions'] || "To merge at least #{@settings['plus_ones_required']} person other than the submitter needs to write a comment with saying _+1_ or :+1:. Then write _!merge_ or :shipit: to trigger the merging."
       begin
         @client.add_comment(@project, issue, comment)
         return 200, "Commented!"
@@ -78,7 +78,7 @@ class Sppuppet
       end
     end
 
-    merge = true if comments.last.body == '!merge'
+    merge = comments.last.body == '!merge' || comments.last.body == ':shipit:'
 
     if plus_one.count >= @settings['plus_ones_required'] and merge
       @client.merge_pull_request(@project, pull_request_id, 'SHIPPING!!')

data/tutter-sppuppet.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'tutter-sppuppet'
-  s.version     = '0.0.7'
+  s.version     = '0.0.8'
   s.author      = 'Johan Haals'
   s.email       = ['johan.haals@gmail.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: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Johan Haals