tutter-sppuppet 0.0.18 → 0.0.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjk0NzA4MTRlYzkxMzQwOWZkMTI3YmMwZTFlYjI1OTMyNmYxMmI4MA==
+    MjA4YjAxMWIwYjI2ZmJkZmE2YjljMTVjMzgxMDBiMDQxYzYyZTVjZQ==
   data.tar.gz: !binary |-
-    NTU5NWY0NzRkNzkzYzc3MDQ1MDM5MzhmOTUxNzFhOGJjOWJlYzk5OA==
+    Y2M5NGY1YzFlYjI0ZjA4MTM2OTFiYjdjN2M4Yjk1NTBkMzI1MmZkZg==
 SHA512:
   metadata.gz: !binary |-
-    YTljMTE1OGZhYTRkNzJlN2I4MmVhZTkyYjA2ZTI0NTJmODlkMWZlNDgzMTNj
-    MTBiMDg1MmI2NzA5NzZjMzM5NjY2ZTIxYzE1MTI5NTVkN2UzYzMwYzA0MDMx
-    YTAzZWI4ZDYyZjVjYzFjN2ExNGM4NDViNWViNWJkMTE1YjZkM2Y=
+    ZmU2YmJlOGExNmFjZjVlMGE4ZWMzYzRmY2EwOTg1MmZmZGY5MjhjMzVhMTBk
+    YjBlYzkyZmZiZDZjYTYwNWE0ZTczYzIxODkyYzI4NDdmMmRkNmU5MmQ4NjVm
+    M2JiNmJlYTk5ZTE0ODdjNWRiZjZkNDMzN2Q1ZTRiZjVjNGMxMDA=
   data.tar.gz: !binary |-
-    NzdkY2RkNjY1MGFkMzNiMWNiZmEzOGVkZTQ2ZmQ5ZDhmOGJjNjUyOTQwNDcy
-    ZTM2MDAzMzJlNjZlNDA0ZDg4MDlkNjQ1NTEyNzUyZjI1MGY1NjAxNjBiOGE4
-    YzRiZDI5NGNiODBmMTllMDBlM2FkNmQ2MDQ2ODk1ZmNlZGE4NTY=
+    NjJmY2Q1OWM5ZDU5NGU0YWM3ZTJiNTljYjVmMzUzODZkMjA2MmIwNDc0OWI0
+    NGVmZGNhNzhmZmFmZjJlMWUxMzk5OGJjNzBhNmJlOTNiZGE4MzZiMDhkOTU4
+    Y2ZlOWY5ZTQwNDBjNWNkZWI1MDBkMTZkMWE1YWMxMGYxYjg0ODU=

data/lib/tutter/action/sppuppet.rb

@@ -23,14 +23,18 @@ class Sppuppet
 
       pull_request_id = @data['issue']['number']
       pr = @client.pull_request @project, pull_request_id
-      plus_one = {}
+      votes = {}
 
-      unless pr.mergeable
-        return 200, "merge state for #{@project} #{pull_request_id} is not clean. Current state: #{pr.mergeable_state}"
-      end
+      merge = (@data['comment']['body'] == '!merge' ||
+        @data['comment']['body'].start_with?(':shipit:'))
+
+      return 200, 'Not a merge comment' unless merge
 
-      # No comments, no need to go further.
-      return 200, 'no comments, skipping' if pr.comments == 0
+      unless pr.mergeable_state == 'clean'
+        msg = "Merge state for #{@project} #{pull_request_id} is not clean. Current state: #{pr.mergeable_state}"
+        @client.add_comment(@project, pull_request_id, msg)
+        return 200, msg
+      end
 
       # We fetch the latest commit and it's date.
       last_commit = @client.pull_request_commits(@project, pull_request_id).last
@@ -40,39 +44,38 @@ class Sppuppet
 
       # Check each comment for +1 and merge comments
       comments.each do |i|
-
-        # Comment is older than last commit. We only want to check for +1 in newer comments
+        # Comment is older than last commit.
+        # We only want to check for +1 in newer comments
         next if last_commit_date > i.created_at
 
-        if /^(\+1|:\+1)/.match i.body
+        match = /^:?([+-])1:?/.match(i.body)
+        if match
+          score = match[1] == '+' ? 1 : -1
           # pull request submitter cant +1
           unless pr.user.login == i.attrs[:user].attrs[:login]
-            plus_one[i.attrs[:user].attrs[:login]] = 1
+            votes[i.attrs[:user].attrs[:login]] = score
           end
         end
-
-        # TODO it should calculate the +1's - the -1's
-        # Never merge if someone says -1
-        if /^(\-1|:\-1:)/.match i.body
-          return 200, "#{@project} #{pull_request_id} has a -1. I will not take the blame"
-        end
       end
 
-      merge = (@data['comment']['body'] == '!merge' ||
-        @data['comment']['body'].start_with?(':shipit:'))
+      num_votes = votes.values.reduce(0) { |a, e| a + e }
+      if num_votes < @settings['plus_ones_required']
+        msg = "Not enough plus ones. #{@settings['plus_ones_required']} required, and only have #{num_votes}"
+        @client.add_comment(@project, pull_request_id, msg)
+        return 200, msg
+      end
 
-      if plus_one.count >= @settings['plus_ones_required'] && merge
-        json = { url: pr.url,
-                 title: pr.title,
-                 author: 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: plus_one.keys,
-                 deployer: comments.last.user.login }
-        # TODO: Word wrap description
-        merge_msg = <<MERGE_MSG
+      json = { url: pr.url,
+               title: pr.title,
+               author: 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: plus_one.keys,
+               deployer: comments.last.user.login }
+      # TODO: Word wrap description
+      merge_msg = <<MERGE_MSG
 Title: #{pr.title}
 Description: #{pr.body}
 Author: #{pr.user.login}
@@ -80,25 +83,20 @@ Reviewers: #{plus_one.keys.join ', '}
 Deployer: #{comments.last.user.login}
 URL: #{pr.url}
 MERGE_MSG
-        begin
-          merge_commit = @client.merge_pull_request(@project, pull_request_id, merge_msg)
-        rescue Octokit::MethodNotAllowed => e
-          return 200, "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}"
-      elsif plus_one.count >= @settings['plus_ones_required']
-        return 200, "have enough +1, but no merge command"
-      else
-        return 200, "not enough +1, have #{plus_one.count} but need #{@settings['plus_ones_required']}"
+      begin
+        merge_commit = @client.merge_pull_request(@project, pull_request_id, merge_msg)
+      rescue Octokit::MethodNotAllowed => e
+        return 200, "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}"
     when 'pull_request'
       # If a new pull request is opened, comment with instructions
       if @data['action'] == 'opened' && @settings['post_instructions']
@@ -106,9 +104,9 @@ MERGE_MSG
         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!"
+          return 200, 'Commented!'
         rescue Octokit::NotFound
-          return 404, "Octokit returned 404, this could be an issue with your access token"
+          return 404, 'Octokit returned 404, this could be an issue with your access token'
         rescue Octokit::Unauthorized
           return 401, "Authorization to #{@project} failed, please verify your access token"
         rescue Octokit::TooManyLoginAttempts

data/tutter-sppuppet.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'tutter-sppuppet'
-  s.version     = '0.0.18'
+  s.version     = '0.0.19'
   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: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Johan Haals