pronto 0.9.0 → 0.11.0

data/lib/pronto.rb

@@ -42,9 +42,11 @@ require 'pronto/formatter/commit_formatter'
 require 'pronto/formatter/pull_request_formatter'
 require 'pronto/formatter/github_formatter'
 require 'pronto/formatter/github_status_formatter'
+require 'pronto/formatter/github_combined_status_formatter'
 require 'pronto/formatter/github_pull_request_formatter'
 require 'pronto/formatter/github_pull_request_review_formatter'
 require 'pronto/formatter/gitlab_formatter'
+require 'pronto/formatter/gitlab_merge_request_review_formatter'
 require 'pronto/formatter/bitbucket_formatter'
 require 'pronto/formatter/bitbucket_pull_request_formatter'
 require 'pronto/formatter/bitbucket_server_pull_request_formatter'

data/lib/pronto/bitbucket.rb

@@ -32,6 +32,13 @@ module Pronto
       end
     end
 
+    def approve_pull_request
+      client.approve_pull_request(slug, pull_id)
+    end
+
+    def unapprove_pull_request
+      client.unapprove_pull_request(slug, pull_id)
+    end
     private
 
     def slug

data/lib/pronto/cli.rb

@@ -12,7 +12,7 @@ module Pronto
       end
     end
 
-    desc 'run', 'Run Pronto'
+    desc 'run [PATH]', 'Run Pronto'
 
     method_option :'exit-code',
                   type: :boolean,
@@ -45,7 +45,9 @@ module Pronto
                   aliases: ['formatter', '-f'],
                   desc: "Pick output formatters. Available: #{::Pronto::Formatter.names.join(', ')}"
 
-    def run(path = nil)
+    def run(path = '.')
+      path = File.expand_path(path)
+
       gem_names = options[:runner].any? ? options[:runner] : ::Pronto::GemNames.new.to_a
       gem_names.each do |gem_name|
         require "pronto/#{gem_name}"
@@ -56,16 +58,19 @@ module Pronto
       commit_options = %i[staged unstaged index]
       commit = commit_options.find { |o| options[o] } || options[:commit]
 
-      repo_workdir = ::Rugged::Repository.discover('.').workdir
+      repo_workdir = ::Rugged::Repository.discover(path).workdir
+      relative     = path.sub(repo_workdir, '')
+
       messages = Dir.chdir(repo_workdir) do
-        ::Pronto.run(commit, '.', formatters, path)
+        file = relative.length != path.length ? relative : nil
+        ::Pronto.run(commit, '.', formatters, file)
       end
       if options[:'exit-code']
         error_messages_count = messages.count { |m| m.level != :info }
         exit(error_messages_count)
       end
     rescue Rugged::RepositoryError
-      puts '"pronto" should be run from a git repository'
+      puts '"pronto" must be run from within a git repository or must be supplied the path to a git repository'
     rescue Pronto::Error => e
       $stderr.puts "Pronto errored: #{e.message}"
     end

data/lib/pronto/clients/bitbucket_client.rb

@@ -1,47 +1,86 @@
 class BitbucketClient
   include HTTParty
-  base_uri 'https://api.bitbucket.org/1.0/repositories'
+  base_uri 'https://api.bitbucket.org/2.0/repositories'
 
   def initialize(username, password)
     self.class.basic_auth(username, password)
   end
 
   def commit_comments(slug, sha)
-    response = get("/#{slug}/changesets/#{sha}/comments")
-    openstruct(response)
+    response = get("/#{slug}/commit/#{sha}/comments?pagelen=100")
+    result = parse_comments(openstruct(response))
+    while (response['next'])
+      response = get response['next']
+      result.concat(parse_comments(openstruct(response)))
+    end
+    result
   end
 
   def create_commit_comment(slug, sha, body, path, position)
-    post("/#{slug}/changesets/#{sha}/comments", body, path, position)
+    post("/#{slug}/commit/#{sha}/comments", body, path, position)
   end
 
   def pull_comments(slug, pull_id)
-    response = get("/#{slug}/pullrequests/#{pull_id}/comments")
-    openstruct(response)
+    response = get("/#{slug}/pullrequests/#{pull_id}/comments?pagelen=100")
+    parse_comments(openstruct(response))
+    result = parse_comments(openstruct(response))
+    while (response['next'])
+      response = get response['next']
+      result.concat(parse_comments(openstruct(response)))
+    end
+    result
   end
 
   def pull_requests(slug)
-    base = 'https://api.bitbucket.org/2.0/repositories'
-    response = get("#{base}/#{slug}/pullrequests?state=OPEN")
-    openstruct(response['values'])
+    response = get("/#{slug}/pullrequests?state=OPEN")
+    openstruct(response)
   end
 
   def create_pull_comment(slug, pull_id, body, path, position)
     post("/#{slug}/pullrequests/#{pull_id}/comments", body, path, position)
   end
 
+  def approve_pull_request(slug, pull_id)
+    self.class.post("/#{slug}/pullrequests/#{pull_id}/approve")
+  end
+
+  def unapprove_pull_request(slug, pull_id)
+    self.class.delete("/#{slug}/pullrequests/#{pull_id}/approve")
+  end
+
   private
 
   def openstruct(response)
-    response.map { |r| OpenStruct.new(r) }
+    if response['values']
+      response['values'].map { |r| OpenStruct.new(r) }
+    else
+      p response
+      raise 'BitBucket response invalid'
+    end
   end
 
+  def parse_comments(values)
+    values.each do |value|
+      value.content = value.content['raw']
+      value.line_to = value.inline ? value.inline['to'] : 0
+      value.filename = value.inline ? value.inline['path'] : ''
+    end
+    values
+  end
+  
   def post(url, body, path, position)
     options = {
       body: {
-        content: body,
-        line_to: position,
-        filename: path
+        content: {
+          raw: body
+        },
+        inline: {
+          to: position,
+          path: path
+        }
+      }.to_json,
+      headers: {
+        'Content-Type': 'application/json'
       }
     }
     self.class.post(url, options)

data/lib/pronto/clients/bitbucket_server_client.rb

@@ -62,6 +62,6 @@ class BitbucketServerClient
   end
 
   def get(url, query)
-    self.class.get(url, query).parsed_response
+    self.class.get(url, query: query).parsed_response
   end
 end

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
@@ -51,7 +55,7 @@ module Pronto
         if oldval.is_a?(Hash) && newval.is_a?(Hash)
           oldval.merge(newval, &merger)
         else
-          oldval || newval
+          oldval.nil? ? newval : oldval
         end
       end
 

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

@@ -1,3 +1,5 @@
+require 'delegate'
+
 module Pronto
   module Formatter
     class TextMessageDecorator < SimpleDelegator
@@ -14,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

@@ -10,15 +10,16 @@ module Pronto
       def diff(commit, options = nil)
         target, patches = case commit
                           when :unstaged, :index
-                            [head, @repo.index.diff(options)]
+                            [head_commit_sha, @repo.index.diff(options)]
                           when :staged
-                            [head, @repo.head.target.diff(@repo.index, options)]
+                            [head_commit_sha, head.diff(@repo.index, options)]
                           else
                             merge_base = merge_base(commit)
                             patches = @repo.diff(merge_base, head, options)
                             [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]
@@ -66,8 +69,16 @@ module Pronto
         head.oid
       end
 
+      def head_detached?
+        @repo.head_detached?
+      end
+
       private
 
+      def new_file?(path)
+        @repo.status(path).include?(:index_new)
+      end
+
       def empty_patches(sha)
         Patches.new(self, sha, [])
       end