pronto 0.9.5 → 0.11.0

data/lib/pronto/config.rb

@@ -18,6 +18,18 @@ module Pronto
       consolidated
     end
 
+    def github_review_type
+      review_type =
+        ENV['PRONTO_GITHUB_REVIEW_TYPE'] ||
+        @config_hash.fetch('github_review_type', false)
+
+      if review_type == 'request_changes'
+        'REQUEST_CHANGES'
+      else
+        'COMMENT'
+      end
+    end
+
     def excluded_files(runner)
       files =
         if runner == 'all'
@@ -39,8 +51,12 @@ module Pronto
       URI.parse(bitbucket_web_endpoint).host
     end
 
+    def warnings_per_review
+      ENV['PRONTO_WARNINGS_PER_REVIEW'] && Integer(ENV['PRONTO_WARNINGS_PER_REVIEW']) || @config_hash['warnings_per_review']
+    end
+
     def max_warnings
-      ENV['PRONTO_MAX_WARNINGS'] || @config_hash['max_warnings']
+      ENV['PRONTO_MAX_WARNINGS'] && Integer(ENV['PRONTO_MAX_WARNINGS']) || @config_hash['max_warnings']
     end
 
     def message_format(formatter)

data/lib/pronto/config_file.rb

@@ -1,6 +1,7 @@
 module Pronto
   class ConfigFile
     DEFAULT_MESSAGE_FORMAT = '%{msg}'.freeze
+    DEFAULT_WARNINGS_PER_REVIEW = 30
 
     EMPTY = {
       'all' => {
@@ -11,18 +12,20 @@ module Pronto
         'slug' => nil,
         'access_token' => nil,
         'api_endpoint' => 'https://api.github.com/',
-        'web_endpoint' => 'https://github.com/'
+        'web_endpoint' => 'https://github.com/',
+        'review_type' => 'request_changes'
       },
       'gitlab' => {
         'slug' => nil,
         'api_private_token' => nil,
-        'api_endpoint' => 'https://gitlab.com/api/v3'
+        'api_endpoint' => 'https://gitlab.com/api/v4'
       },
       'bitbucket' => {
         'slug' => nil,
         'username' => nil,
         'password' => nil,
         'api_endpoint' => nil,
+        'auto_approve' => false,
         'web_endpoint' => 'https://bitbucket.org/'
       },
       'text' => {
@@ -31,6 +34,7 @@ module Pronto
       'runners' => [],
       'formatters' => [],
       'max_warnings' => nil,
+      'warnings_per_review' => DEFAULT_WARNINGS_PER_REVIEW,
       'verbose' => false,
       'format' => DEFAULT_MESSAGE_FORMAT
     }.freeze

data/lib/pronto/formatter/bitbucket_pull_request_formatter.rb

@@ -12,6 +12,16 @@ module Pronto
       def line_number(message, _)
         message.line.line.new_lineno if message.line
       end
+
+      def approve_pull_request(comments_count, additions_count, client)
+        return if config.bitbucket_auto_approve == false
+
+        if comments_count > 0 && additions_count > 0
+          client.unapprove_pull_request  
+        elsif comments_count == 0
+          client.approve_pull_request
+        end
+      end
     end
   end
 end

data/lib/pronto/formatter/checkstyle_formatter.rb

@@ -7,7 +7,7 @@ module Pronto
         @output = ''
       end
 
-      def format(messages, _, _)
+      def format(messages, _repo, _patches)
         open_xml
         process_messages(messages)
         close_xml

data/lib/pronto/formatter/formatter.rb

@@ -13,9 +13,11 @@ module Pronto
     FORMATTERS = {
       'github' => GithubFormatter,
       'github_status' => GithubStatusFormatter,
+      'github_combined_status' => GithubCombinedStatusFormatter,
       'github_pr' => GithubPullRequestFormatter,
       'github_pr_review' => GithubPullRequestReviewFormatter,
       'gitlab' => GitlabFormatter,
+      'gitlab_mr' => GitlabMergeRequestReviewFormatter,
       'bitbucket' => BitbucketFormatter,
       'bitbucket_pr' => BitbucketPullRequestFormatter,
       'bitbucket_server_pr' => BitbucketServerPullRequestFormatter,

data/lib/pronto/formatter/git_formatter.rb

@@ -7,6 +7,8 @@ module Pronto
         comments = new_comments(messages, patches)
         additions = remove_duplicate_comments(existing, comments)
         submit_comments(client, additions)
+        
+        approve_pull_request(comments.count, additions.count, client) if defined?(self.approve_pull_request)
 
         "#{additions.count} Pronto messages posted to #{pretty_name}"
       end

data/lib/pronto/formatter/github_combined_status_formatter.rb

@@ -0,0 +1,24 @@
+require_relative 'github_status_formatter/status_builder'
+
+module Pronto
+  module Formatter
+    class GithubCombinedStatusFormatter
+      def format(messages, repo, _)
+        client = Github.new(repo)
+        head = repo.head_commit_sha
+
+        create_status(client, head, messages.uniq || [])
+      end
+
+      private
+
+      def create_status(client, sha, messages)
+        builder = GithubStatusFormatter::StatusBuilder.new(nil, messages)
+        status = Status.new(sha, builder.state,
+                            'pronto', builder.description)
+
+        client.create_commit_status(status)
+      end
+    end
+  end
+end

data/lib/pronto/formatter/github_pull_request_review_formatter.rb

@@ -10,7 +10,7 @@ module Pronto
       end
 
       def submit_comments(client, comments)
-        client.create_pull_request_review(comments)
+        client.publish_pull_request_comments(comments)
       rescue Octokit::UnprocessableEntity, HTTParty::Error => e
         $stderr.puts "Failed to post: #{e.message}"
       end

data/lib/pronto/formatter/gitlab_merge_request_review_formatter.rb

@@ -0,0 +1,29 @@
+module Pronto
+  module Formatter
+    class GitlabMergeRequestReviewFormatter < PullRequestFormatter
+      def client_module
+        Gitlab
+      end
+
+      def pretty_name
+        'Gitlab'
+      end
+
+      def existing_comments(_, client, repo)
+        sha = repo.head_commit_sha
+        comments = client.pull_comments(sha)
+        grouped_comments(comments)
+      end
+
+      def submit_comments(client, comments)
+        client.create_pull_request_review(comments)
+      rescue => e
+        $stderr.puts "Failed to post: #{e.message}"
+      end
+
+      def line_number(message, _)
+        message.line.line.new_lineno if message.line
+      end
+    end
+  end
+end

data/lib/pronto/formatter/json_formatter.rb

@@ -3,7 +3,7 @@ require 'json'
 module Pronto
   module Formatter
     class JsonFormatter < Base
-      def format(messages, _, _)
+      def format(messages, _repo, _patches)
         messages.map do |message|
           lineno = message.line.new_lineno if message.line
 

data/lib/pronto/formatter/null_formatter.rb

@@ -1,7 +1,7 @@
 module Pronto
   module Formatter
     class NullFormatter < Base
-      def format(_, _, _); end
+      def format(_messages, _repo, _patches); end
     end
   end
 end

data/lib/pronto/formatter/text_formatter.rb

@@ -3,7 +3,7 @@ require 'pronto/formatter/text_message_decorator'
 module Pronto
   module Formatter
     class TextFormatter < Base
-      def format(messages, _, _)
+      def format(messages, _repo, _patches)
         messages.map do |message|
           message_format = config.message_format(self.class.name)
           message_data = TextMessageDecorator.new(message).to_h

data/lib/pronto/formatter/text_message_decorator.rb

@@ -16,6 +16,7 @@ module Pronto
 
       def to_h
         original = __getobj__.to_h
+        original[:line] = __getobj__.line.new_lineno if __getobj__.line
         original[:color_level] = format_level(__getobj__)
         original[:color_location] = format_location(__getobj__)
         original

data/lib/pronto/git/patch.rb

@@ -37,8 +37,6 @@ module Pronto
         repo.path.join(new_file_path)
       end
 
-      private
-
       def new_file_path
         delta.new_file[:path]
       end

data/lib/pronto/git/repository.rb

@@ -19,6 +19,7 @@ module Pronto
                             [merge_base, patches]
                           end
 
+        patches.find_similar!(renames: true)
         Patches.new(self, target, patches)
       end
 
@@ -37,7 +38,7 @@ module Pronto
 
       def commits_until(sha)
         result = []
-        @repo.walk(head, Rugged::SORT_TOPO).take_while do |commit|
+        @repo.walk(head_commit_sha, Rugged::SORT_TOPO).take_while do |commit|
           result << commit.oid
           !commit.oid.start_with?(sha)
         end
@@ -45,10 +46,12 @@ module Pronto
       end
 
       def path
-        Pathname.new(@repo.path).parent
+        Pathname.new(@repo.workdir).cleanpath
       end
 
       def blame(path, lineno)
+        return if new_file?(path)
+
         Rugged::Blame.new(@repo, path, min_line: lineno, max_line: lineno,
                                        track_copies_same_file: true,
                                        track_copies_any_commit_copies: true)[0]
@@ -72,6 +75,10 @@ module Pronto
 
       private
 
+      def new_file?(path)
+        @repo.status(path).include?(:index_new)
+      end
+
       def empty_patches(sha)
         Patches.new(self, sha, [])
       end

data/lib/pronto/github.rb

@@ -1,5 +1,12 @@
+require 'pronto/github_pull'
+
 module Pronto
   class Github < Client
+    def initialize(repo)
+      super(repo)
+      @github_pull = Pronto::GithubPull.new(client, slug)
+    end
+
     def pull_comments(sha)
       @comment_cache["#{pull_id}/#{sha}"] ||= begin
         client.pull_comments(slug, pull_id).map do |comment|
@@ -38,17 +45,12 @@ module Pronto
       end
     end
 
-    def create_pull_request_review(comments)
-      return if comments.empty?
-
-      options = {
-        event: 'COMMENT',
-        accept: 'application/vnd.github.black-cat-preview+json', # https://developer.github.com/v3/pulls/reviews/#create-a-pull-request-review
-        comments: comments.map do |c|
-          { path: c.path, position: c.position, body: c.body }
-        end
-      }
-      client.create_pull_request_review(slug, pull_id, options)
+    def publish_pull_request_comments(comments)
+      comments_left = comments.clone
+      while comments_left.any?
+        comments_to_publish = comments_left.slice!(0, warnings_per_review)
+        create_pull_request_review(comments_to_publish)
+      end
     end
 
     def create_commit_status(status)
@@ -61,6 +63,21 @@ module Pronto
 
     private
 
+    def create_pull_request_review(comments)
+      options = {
+        event: @config.github_review_type,
+        accept: 'application/vnd.github.v3.diff+json', # https://developer.github.com/v3/pulls/reviews/#create-a-pull-request-review
+        comments: comments.map do |comment|
+          {
+            path:     comment.path,
+            position: comment.position,
+            body:     comment.body
+          }
+        end
+      }
+      client.create_pull_request_review(slug, pull_id, options)
+    end
+
     def slug
       return @config.github_slug if @config.github_slug
       @slug ||= begin
@@ -80,7 +97,7 @@ module Pronto
     end
 
     def pull_id
-      pull ? pull[:number].to_i : env_pull_id
+      env_pull_id || pull[:number].to_i
     end
 
     def pull_sha
@@ -89,18 +106,16 @@ module Pronto
 
     def pull
       @pull ||= if env_pull_id
-                  pull_requests.find { |pr| pr[:number].to_i == env_pull_id }
+                  @github_pull.pull_by_id(env_pull_id)
                 elsif @repo.branch
-                  pull_requests.find { |pr| pr[:head][:ref] == @repo.branch }
+                  @github_pull.pull_by_branch(@repo.branch)
                 elsif @repo.head_detached?
-                  pull_requests.find do |pr|
-                    pr[:head][:sha] == @repo.head_commit_sha
-                  end
+                  @github_pull.pull_by_commit(@repo.head_commit_sha)
                 end
     end
 
-    def pull_requests
-      @pull_requests ||= client.pull_requests(slug)
+    def warnings_per_review
+      @warnings_per_review ||= @config.warnings_per_review
     end
   end
 end

data/lib/pronto/github_pull.rb

@@ -0,0 +1,43 @@
+module Pronto
+  # Provides strategies for finding corresponding PR on GitHub
+  class GithubPull
+    def initialize(client, slug)
+      @client = client
+      @slug = slug
+    end
+
+    def pull_requests
+      @pull_requests ||= @client.pull_requests(@slug)
+    end
+
+    def pull_by_id(pull_id)
+      result = pull_requests.find { |pr| pr[:number].to_i == pull_id }
+      unless result
+        message = "Pull request ##{pull_id} was not found in #{@slug}."
+        raise Pronto::Error, message
+      end
+      result
+    end
+
+    def pull_by_branch(branch)
+      result = pull_requests.find { |pr| pr[:head][:ref] == branch }
+      unless result
+        raise Pronto::Error, "Pull request for branch #{branch} " \
+                             "was not found in #{@slug}."
+      end
+      result
+    end
+
+    def pull_by_commit(sha)
+      result = pull_requests.find do |pr|
+        pr[:head][:sha] == sha
+      end
+      unless result
+        message = "Pull request with head #{sha} " \
+                  "was not found in #{@slug}."
+        raise Pronto::Error, message
+      end
+      result
+    end
+  end
+end

data/lib/pronto/gitlab.rb

@@ -2,12 +2,49 @@ module Pronto
   class Gitlab < Client
     def commit_comments(sha)
       @comment_cache[sha.to_s] ||= begin
-        client.commit_comments(slug, sha, per_page: 500).map do |comment|
+        client.commit_comments(slug, sha).auto_paginate.map do |comment|
           Comment.new(sha, comment.note, comment.path, comment.line)
         end
       end
     end
 
+    def pull_comments(sha)
+      @comment_cache["#{slug}/#{pull_id}"] ||= begin
+        arr = []
+        client.merge_request_discussions(slug, pull_id).auto_paginate.each do |comment|
+          comment.notes.each do |note|
+            next unless note['position']
+
+            arr << Comment.new(
+              sha,
+              note['body'],
+              note['position']['new_path'],
+              note['position']['new_line']
+            )
+          end
+        end
+        arr
+      end
+    end
+
+    def create_pull_request_review(comments)
+      return if comments.empty?
+
+      comments.each do |comment|
+        options = {
+          body: comment.body,
+          position: position_sha.dup.merge(
+            new_path: comment.path,
+            position_type: 'text',
+            new_line: comment.position,
+            old_line: nil,
+          )
+        }
+
+        client.create_merge_request_discussion(slug, pull_id, options)
+      end
+    end
+
     def create_commit_comment(comment)
       @config.logger.log("Creating commit comment on #{comment.sha}")
       client.create_commit_comment(slug, comment.sha, comment.body,
@@ -17,6 +54,15 @@ module Pronto
 
     private
 
+    def position_sha
+      # Better to get those informations from Gitlab API directly than trying to look for them here.
+      # (FYI you can't use `pull` method because index api does not contains those informations)
+      @position_sha ||= begin
+                          data = client.merge_request(slug, pull_id)
+                          data.diff_refs.to_h
+                        end
+    end
+
     def slug
       return @config.gitlab_slug if @config.gitlab_slug
       @slug ||= begin
@@ -27,6 +73,17 @@ module Pronto
       end
     end
 
+    def pull_id
+      env_pull_id || raise(Pronto::Error, "Unable to determine merge request id. Specify either `PRONTO_PULL_REQUEST_ID` or `CI_MERGE_REQUEST_IID`.")
+    end
+
+    def env_pull_id
+      pull_request = super
+
+      pull_request ||= ENV['CI_MERGE_REQUEST_IID']
+      pull_request.to_i if pull_request
+    end
+
     def slug_regex(url)
       if url =~ %r{^ssh:\/\/}
         %r{.*#{host}(:[0-9]+)?(:|\/)(?<slug>.*).git}