pronto-github_resolver 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8853fcc6e38eef6f5fbaac5dc815cabd7e3e81e18136675a9cddfbc203f538d7
-  data.tar.gz: ab3620bd675754fc045ff7619f3053f27829786f4076a19f0cbd317ed3f84d56
+  metadata.gz: 96e8c0465386136dab740a7e36d4804a1a84fe6e2cb9bfab2ff2d567494c80e7
+  data.tar.gz: 817f09eb49a66f716d384f301334bab472f5e939b03c71ba962780c02ce27002
 SHA512:
-  metadata.gz: f7097355369c367d5d6232204fcc623cfb6755a494e4b81467904d97d671b46aa70c7d9339ebb92bc5a8a8e9ed4d56642cba344a73a31ecc56904959132d456a
-  data.tar.gz: cf0f065244dea041390ceabafb2cb76dcf71e46ea4d512666106b5ff9f1cc62f071bb5eb87945cb642cb08298d5873d9559db404ccd8f3cc5f64791248fa70db
+  metadata.gz: e06e67a83cf9c1cfec2d4152812c2948fd802f785f3565202dccfa8ca7ccf3af04f4a1ceee1fa2f8485f8f5ac2fb99cc183949c792088d7785381612e7fb8d59
+  data.tar.gz: bb93f3ea985b455ad96897e05a2724dc0e63f4ecfd6b90c87e630a15b989aa2f4b06d0c56d2d4419ceb5ee255730ce6a265576ef0ea5fc37cfcd226be5709568

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pronto-github_resolver (0.0.1)
+    pronto-github_resolver (0.0.5)
       pronto (~> 0.11)
 
 GEM

data/README.md

@@ -22,7 +22,9 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+- When any of pronto runners emits message with level `:error` or `:fatal` - generated PR review will have resolution 'REQUEST_CHANGES', and default in other cases.
+- On each run comment threads where message is no longer generated will be marked as resolved.
+- Set ENV['PRONTO_GITHUB_BOT_ID'] to github id of your bot user. This enables posting PR 'APPROVE' review by bot after all messages are resolved.
 
 ## Development
 

data/lib/pronto/github_resolver/version.rb

@@ -2,6 +2,6 @@
 
 module Pronto
   module GithubResolver
-    VERSION = "0.0.1"
+    VERSION = "0.0.5"
   end
 end

data/lib/pronto/github_resolver.rb

@@ -29,7 +29,7 @@ module Pronto
       client.create_pull_request_review(slug, pull_id, options)
     end
 
-    def approve_pull_request(message=nil)
+    def approve_pull_request(message="")
       client.create_pull_request_review(slug, pull_id, {
         event: 'APPROVE', body: message, accept: 'application/vnd.github.v3.diff+json'
       })
@@ -39,8 +39,64 @@ module Pronto
       client.pull_request_reviews(slug, pull_id)
     end
 
-    def bot_user_id
-      client.user.id
+    def get_review_threads
+      owner, repo_name = (slug || "").split('/')
+      res = client.post :graphql, { query: <<~GQL }.to_json
+        query getUserId {
+          repository(owner: "#{owner}", name: "#{repo_name}") {
+            pullRequest: issueOrPullRequest(number: #{pull_id}) {
+              ... on PullRequest {
+                reviewThreads(last:100) {
+                    totalCount
+                    nodes {
+                        id
+                        comments(last: 10) {
+                            nodes {
+                                viewerDidAuthor
+                                path position body
+                            }
+                        }
+                    }
+                }
+              }
+            }
+          }
+        }
+      GQL
+
+      if res.errors || !res.data
+        # ex: [{:message=>"Parse error on \"11\" (INT) at [1, 22]", :locations=>[{:line=>1, :column=>22}]}]
+        # TODO: handle errors
+        return []
+      end
+
+      res.data.repository.pullRequest.reviewThreads.nodes.to_h { |node|
+        [
+          node.id,
+          node.comments.nodes.map{ |comment|
+            {
+              authored: comment.viewerDidAuthor,
+              path: comment.path, position: comment.position, body: comment.body
+            }
+          }
+        ]
+      }
+    end
+
+    def resolve_review_threads(node_ids)
+      return unless node_ids.any?
+
+      owner, repo_name = (slug || "").split('/')
+      query = <<~GQL
+        mutation {
+          #{
+            node_ids.each_with_index.map {|id, index|
+              "q#{index}: resolveReviewThread(input: { threadId: \"#{id}\" }){ thread { id } } "
+            }.join("\n")
+          }
+        }
+      GQL
+      client.post :graphql, { query: query }.to_json
     end
   end
 
@@ -52,12 +108,14 @@ module Pronto
         comments = new_comments(messages, patches)
         additions = remove_duplicate_comments(existing, comments)
 
+        # TODO: we can reuse some threads from graphql for existing messages detection (but there's no pagination)
+        resolve_old_messages(client, repo, comments)
+
         if comments.none?
           bot_reviews = client.existing_pull_request_reviews.select { |review| review.user.type == 'Bot' }
           if bot_reviews.any?
-            bot_id = client.bot_user_id
             current_bot_review_status = bot_reviews.inject(nil) do |prev_status, review|
-              next prev_status unless review.user.id == bot_id
+              next prev_status unless review_by_this_bot?(review)
 
               case review.state
               when 'CHANGES_REQUESTED' then review.state
@@ -79,11 +137,29 @@ module Pronto
         "#{additions.count} Pronto messages posted to #{pretty_name}"
       end
 
+      def review_by_this_bot?(review)
+        ENV['PRONTO_GITHUB_BOT_ID'] && review.user.id == ENV['PRONTO_GITHUB_BOT_ID'].to_i
+      end
+
       def submit_comments(client, comments, event: nil)
         client.publish_pull_request_comments(comments, event: event)
       rescue Octokit::UnprocessableEntity, HTTParty::Error => e
         $stderr.puts "Failed to post: #{e.message}"
       end
+
+      def resolve_old_messages(client, repo, actual_comments)
+        thread_ids_to_resolve = []
+        client.get_review_threads.each_pair do |thread_id, thread_comments|
+          next unless thread_comments.all? do |comment|
+            comment[:authored] &&
+              (actual_comments[[comment[:path], comment[:position]]] || []).none? { |actual_comment|
+                comment[:body].include?(actual_comment.body)
+              }
+          end
+          thread_ids_to_resolve << thread_id
+        end
+        client.resolve_review_threads(thread_ids_to_resolve)
+      end
     end
 
     class GithubPullRequestResolvingReviewFormatter < PullRequestFormatter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pronto-github_resolver
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - Vasily Fedoseyev