tutter-sppuppet 1.1.5 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmUyNzAyYWM5NTYxOTZiYzgyYjY5ZWM2Zjk4MzNkOGRiY2FhZjczMw==
+    NzJiZTJkNjNlYjc3NzJkYWY1ZDNlNTdmMTA3ZGUwODRkNTI4ZGIzYw==
   data.tar.gz: !binary |-
-    Mzk1ODNkODJjNTBkMjZhYTgxOGY2MTgyM2E5YzliZTZjN2M3Zjg0YQ==
+    Y2U5ODIzZmRmNGQ2YzZhNThmOGY0ZTNjODEyN2NmYTExY2ZiODYxMg==
 SHA512:
   metadata.gz: !binary |-
-    MzIxNzQyMzQ4OWUxMjJhOTVhYzUzZTc3ZGFkYTY3ZDc4ZTEwMmEyZGFhMjk5
-    ODlmMGRhZjMwNGU2MWFlMzA0MDZiZTA4ZGIzN2U4OGJjYjhmMzMyOTQ3OTA3
-    OGRmZWNiM2Q2ZDRkZWEwNTQwYjIwZGE3YzkzMjMyNGE2NGNiODE=
+    OGIxMDM2NDAyN2NmNWFiM2MzYmU1N2UyODhkZGZjMWNiZDFkMzNlZDhiY2Vj
+    MTk5NzRkOGM0YjhhOGEyMzM2ZTQ4MzIyN2YwZDA4MTc5YTMxOWJhZWI2NGI4
+    ZWVlODVlNmM0YTUyNzlkZWUxODA0N2I2NGI4YWU5NzY5OWE4MmE=
   data.tar.gz: !binary |-
-    NjkxODI5MmU5MDYyYmU5ZmIyMWMxYTRjNDgzZTgyYmVmOTMyZTQxMTJiN2E5
-    MGIxMjZlYWI4NDUzMjdiZTFkZDJmMDZkMTQ2YmM3MTRhYmQ1ODRhMDcwZmNl
-    ZDhiMDU2NjEzM2EzMTg5NTQ5OWI5ZTU0YjIxYjVlZWFmOWU4NjU=
+    MDYwMjYzMzhkYTdhZjc3ZTIxODYxNjc4MWUwNjE3Y2RmOTIyNTU2N2YxNTcy
+    YzBhMGU4NWRiZjZhMDFlMzk1YjYwMzE1ZjdhNjlkNDE0ODk5OGI4MDA0ZmE1
+    YTRmY2I2ODNlMGMyM2FjY2U4YWJmZGExMzFiMWE2NmRhZjI3YzM=

data/README.md

@@ -23,8 +23,6 @@ sppuppet specific settings (goes into tutter.yaml)
       plus_ones_required: 3
       post_instructions: true
       instructions: 'To merge, post 3 +1s and then !merge'
-      generate_reports: true
-      reports_dir: '/var/lib/tutter/reports'
 
 ### TODO
 * whitelist

data/lib/tutter/action/sppuppet.rb

@@ -2,11 +2,16 @@ require 'fileutils'
 require 'json'
 
 class Sppuppet
+  # Match regexps
+  MERGE_COMMENT = /(:shipit:|:ship:|!merge)/
+  PLUS_VOTE = /(:+1:|^\+1|^LGTM)/
+  MINUS_VOTE = /(:-1:|^-1)/
+  BLOCK_VOTE = /^(:poop:|:hankey:|-2)/ # Blocks merge
+  INCIDENT = /jira.*INCIDENT/
 
   def initialize(settings, client, project, data, event)
     @settings = settings
     @settings['plus_ones_required'] ||= 1
-    @settings['reports_dir'] ||= '/var/lib/tutter/reports'
     @client = client
     @project = project
     @data = data
@@ -23,12 +28,11 @@ class Sppuppet
 
       pull_request_id = @data['issue']['number']
 
-      merge_command = (@data['comment']['body'] == '!merge' ||
-        @data['comment']['body'].start_with?(':shipit:'))
+      merge_command = MERGE_COMMENT.match @data['comment']['body']
 
       return 200, 'Not a merge comment' unless merge_command
 
-      return maybe_merge(pull_request_id, true)
+      return maybe_merge(pull_request_id, true, @data['sender']['login'])
 
     when 'status'
       return 200, 'Merge state not clean' unless @data['state'] == 'success'
@@ -52,9 +56,8 @@ class Sppuppet
     end
   end
 
-  def maybe_merge(pull_request_id, merge_command)
+  def maybe_merge(pull_request_id, merge_command, merger = nil)
     votes = {}
-    merger = nil
     incident_merge_override = false
     pr = @client.pull_request @project, pull_request_id
 
@@ -70,7 +73,7 @@ class Sppuppet
       # We only want to check newer comments
       next if last_commit_date > i.created_at
 
-      if i.body == '!merge' || i.body.start_with?(':shipit:') || i.body.start_with?(':ship:')
+      if MERGE_COMMENT.match i.body
         merger ||= i.attrs[:user].attrs[:login]
         # Count as a +1 if it is not the author
         unless pr.user.login == i.attrs[:user].attrs[:login]
@@ -78,22 +81,20 @@ class Sppuppet
         end
       end
 
-      match = /^(:?([+-])1:?|LGTM)/.match(i.body)
-      if match
-        score = match[2] == '-' ? -1 : 1
-        # pull request submitter cant +1
-        unless pr.user.login == i.attrs[:user].attrs[:login]
-          votes[i.attrs[:user].attrs[:login]] = score
-        end
+      if PLUS_VOTE.match i.body && pr.user.login != i.attrs[:user].attrs[:login]
+        votes[i.attrs[:user].attrs[:login]] = 1
       end
 
-      match = /^(:poop:|:hankey:|-2)/.match(i.body)
-      if match
-        msg = "Commit cannot be merged so long as a -2 comment appears in the PR."
+      if MINUS_VOTE.match i.body && pr.user.login != i.attrs[:user].attrs[:login]
+        votes[i.attrs[:user].attrs[:login]] = -1
+      end
+
+      if BLOCK_VOTE.match i.body
+        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)
+      if INCIDENT.match(i.body)
         incident_merge_override = true
       end
     end
@@ -118,15 +119,6 @@ class Sppuppet
       return post_comment(pull_request_id, msg)
     end
 
-    json = { url: pr.url,
-             title: pr.title,
-             opened_by: pr.user.login,
-             description: pr.body,
-             commits: @client.pull_request_commits(@project, pr.number).map { |c| { author: c.author, message: c.commit.message, sha: c.commit.tree.sha } },
-             head_sha: pr.head.sha,
-             tests: @client.combined_status(@project, pr.head.sha).statuses.map { |s| {state: s.state, url: s.target_url, description: s.description } },
-             reviewers: votes.keys,
-             deployer: merger }
     # TODO: Word wrap description
     merge_msg = <<MERGE_MSG
 Title: #{pr.title}
@@ -146,14 +138,6 @@ MERGE_MSG
     rescue Octokit::MethodNotAllowed => e
       return post_comment(pull_request_id, "Pull request not mergeable: #{e.message}")
     end
-    puts merge_commit.inspect
-    json[:merge_sha] = merge_commit.sha
-    report_directory = "#{@settings['reports_dir']}/#{merge_commit.sha[0..1]}/#{merge_commit.sha[2..3]}"
-    report_path = "#{report_directory}/#{merge_commit.sha}.json"
-    if @settings['generate_reports']
-      FileUtils.mkdir_p report_directory
-      File.open(report_path, 'w') { |f| f.write(JSON.pretty_generate(json)) }
-    end
     return 200, "merging #{pull_request_id} #{@project}"
   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.5'
+  s.version     = '1.2.0'
   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.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Johan Haals
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tutter