pronto-github_resolver 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 152e4319e389105c14b8c208f8b668c17a25eafbab0f1270b00c071994f9320c
-  data.tar.gz: b7a1b40e35543a93e7924e82a7b3596e35ac9e416df34855939112e5222db953
+  metadata.gz: 6724a96a446afe92679d71a695c66caef7ee8bfb0fc67569aa7d11541a3d2682
+  data.tar.gz: c9d3681104e1990b423d73e4d3989853f718ae584ce733840665672ee29266b6
 SHA512:
-  metadata.gz: 46e7f768e794754c2e2d1159779332f980408d77f5fe4c88f825ed63c27c85dad49318c66da9236ca05d133532de5c6d20a3d39df9c8bd68eef7141bf1763368
-  data.tar.gz: '0758a279f57ba8c0a153528f0b2b06ab3baee909e396e92c86845b86672f18d312ec41f9efbc574f45cf5aa1ec093f988ae728fd987a72e3d571b31f074d5201'
+  metadata.gz: ef745534dd513e7d1ac9161740f805b7589e8918477e7f01623932717bd0519e7440454920fef6ecca5133244a4bae4dbc9236f801a65928a3b68ab7bb5da717
+  data.tar.gz: ad719deed8a69fb7ee362162715b5fee13703d8a9aaa5708379e0828a37d0d08d66049609956e8c4caaff38b5a4dc98cddbae55965e1bea29dcfdad63ac88621

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pronto-github_resolver (0.0.2)
+    pronto-github_resolver (0.0.3)
       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.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/pronto/github_resolver.rb

@@ -53,14 +53,6 @@ module Pronto
       client.pull_request_reviews(slug, pull_id)
     end
 
-    def bot_user_id
-      bot_user.id
-    end
-
-    def bot_user
-      @bot_user ||= client.user
-    end
-
     def get_review_threads
       owner, repo_name = (slug || "").split('/')
       res = client.post :graphql, { query: <<~GQL }.to_json
@@ -74,7 +66,6 @@ module Pronto
                         id
                         comments(last: 10) {
                             nodes {
-                                author { ... on Node { id } }
                                 viewerDidAuthor
                                 path position body
                             }
@@ -98,7 +89,7 @@ module Pronto
           node.id,
           node.comments.nodes.map{ |comment|
             {
-              author_id: comment.author.id,
+              authored: comment.viewerDidAuthor,
               path: comment.path, position: comment.position, body: comment.body
             }
           }
@@ -137,9 +128,8 @@ module Pronto
         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
@@ -161,6 +151,10 @@ 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
@@ -169,10 +163,9 @@ module Pronto
 
       def resolve_old_messages(client, repo, actual_comments)
         thread_ids_to_resolve = []
-        bot_node_id = client.bot_user.node_id
         client.get_review_threads.each_pair do |thread_id, thread_comments|
           next unless thread_comments.all? do |comment|
-            comment[:author_id] == bot_node_id &&
+            comment[:authored] &&
               (actual_comments[[repo.path.join(comment[:path]), comment[:position]]] || []).none? { |actual_comment|
                 comment[:body].include?(actual_comment.body)
               }

metadata

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