pronto 0.10.0 → 0.11.1

data/lib/pronto/formatter/git_formatter.rb

@@ -10,7 +10,7 @@ module Pronto
         
         approve_pull_request(comments.count, additions.count, client) if defined?(self.approve_pull_request)
 
-        "#{additions.count} Pronto messages posted to #{pretty_name}"
+        "#{additions.count} Pronto messages posted to #{pretty_name} (#{existing.count} existing)"
       end
 
       def client_module

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/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

@@ -13,6 +13,18 @@ module Pronto
                             [head_commit_sha, @repo.index.diff(options)]
                           when :staged
                             [head_commit_sha, head.diff(@repo.index, options)]
+                          when :workdir
+                            [
+                              head_commit_sha,
+                              @repo.diff_workdir(
+                                head,
+                                {
+                                  include_untracked: true,
+                                  include_untracked_content: true,
+                                  recurse_untracked_dirs: true
+                                }.merge(options || {})
+                              )
+                            ]
                           else
                             merge_base = merge_base(commit)
                             patches = @repo.diff(merge_base, head, options)
@@ -38,7 +50,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
@@ -46,7 +58,7 @@ module Pronto
       end
 
       def path
-        Pathname.new(@repo.path).parent
+        Pathname.new(@repo.workdir).cleanpath
       end
 
       def blame(path, lineno)

data/lib/pronto/github.rb

@@ -45,17 +45,12 @@ module Pronto
       end
     end
 
-    def create_pull_request_review(comments)
-      return if comments.empty?
-
-      options = {
-        event: 'COMMENT',
-        accept: 'application/vnd.github.v3.diff+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)
@@ -68,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
@@ -103,5 +113,9 @@ module Pronto
                   @github_pull.pull_by_commit(@repo.head_commit_sha)
                 end
     end
+
+    def warnings_per_review
+      @warnings_per_review ||= @config.warnings_per_review
+    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,11 +73,24 @@ 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}
-      else
+      elsif url =~ /#{host}/
         %r{.*#{host}(:|\/)(?<slug>.*).git}
+      else
+        %r{\/\/.*?(\/)(?<slug>.*).git}
       end
     end
 

data/lib/pronto/runner.rb

@@ -28,7 +28,10 @@ module Pronto
     end
 
     def ruby_file?(path)
-      rb_file?(path) || rake_file?(path) || ruby_executable?(path)
+      rb_file?(path) ||
+        rake_file?(path) ||
+        gem_file?(path) ||
+        ruby_executable?(path)
     end
 
     def repo_path
@@ -45,6 +48,10 @@ module Pronto
       File.extname(path) == '.rake'
     end
 
+    def gem_file?(path)
+      File.basename(path) == 'Gemfile' || File.extname(path) == '.gemspec'
+    end
+
     def ruby_executable?(path)
       return false if File.directory?(path)
       line = File.open(path, &:readline)

data/lib/pronto/runners.rb

@@ -6,25 +6,42 @@ module Pronto
     end
 
     def run(patches)
-      patches = reject_excluded(@config.excluded_files('all'), patches)
+      patches = reject_excluded(config.excluded_files('all'), patches)
       return [] if patches.none?
 
       result = []
-      @runners.each do |runner|
+      active_runners.each do |runner|
         next if exceeds_max?(result)
-        @config.logger.log("Running #{runner}")
+        config.logger.log("Running #{runner}")
         runner_patches = reject_excluded(
-          @config.excluded_files(runner.title), patches
+          config.excluded_files(runner.title), patches
         )
         next if runner_patches.none?
         result += runner.new(runner_patches, patches.commit).run.flatten.compact
       end
-      result = result.take(@config.max_warnings) if @config.max_warnings
+      result = result.take(config.max_warnings) if config.max_warnings
       result
     end
 
     private
 
+    attr_reader :config, :runners
+
+    def active_runners
+      runners.select { |runner| active_runner?(runner) }
+    end
+
+    def active_runner?(runner)
+      return true if config.runners.empty? && config.skip_runners.empty?
+
+      if config.runners.empty?
+        !config.skip_runners.include?(runner.title)
+      else
+        active_runner_names = config.runners - config.skip_runners
+        active_runner_names.include?(runner.title)
+      end
+    end
+
     def reject_excluded(excluded_files, patches)
       return patches unless excluded_files.any?
 
@@ -34,7 +51,7 @@ module Pronto
     end
 
     def exceeds_max?(warnings)
-      @config.max_warnings && warnings.count >= @config.max_warnings
+      config.max_warnings && warnings.count >= config.max_warnings
     end
   end
 end

data/lib/pronto/version.rb

@@ -1,6 +1,6 @@
 module Pronto
   module Version
-    STRING = '0.10.0'.freeze
+    STRING = '0.11.1'.freeze
 
     MSG = '%s (running on %s %s %s)'.freeze
 

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'
@@ -53,9 +55,9 @@ require 'pronto/formatter/null_formatter'
 require 'pronto/formatter/formatter'
 
 module Pronto
-  def self.run(commit = 'master', repo_path = '.',
+  def self.run(commit = nil, repo_path = '.',
                formatters = [Formatter::TextFormatter.new], file = nil)
-    commit ||= 'master'
+    commit ||= default_commit
 
     repo = Git::Repository.new(repo_path)
     options = { paths: [file] } if file
@@ -70,4 +72,8 @@ module Pronto
 
     result
   end
+
+  def self.default_commit
+    Config.new.default_commit
+  end
 end

data/pronto.gemspec

@@ -40,18 +40,20 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
-  s.add_runtime_dependency('gitlab', '~> 4.0', '>= 4.0.0')
-  s.add_runtime_dependency('httparty', '>= 0.13.7')
-  s.add_runtime_dependency('octokit', '~> 4.7', '>= 4.7.0')
+  s.add_runtime_dependency('gitlab', '>= 4.4.0', '< 5.0')
+  s.add_runtime_dependency('httparty', '>= 0.13.7', '< 1.0')
+  s.add_runtime_dependency('octokit', '>= 4.7.0', '< 7.0')
   s.add_runtime_dependency('rainbow', '>= 2.2', '< 4.0')
-  s.add_runtime_dependency('rugged', '~> 0.24', '>= 0.23.0')
-  s.add_runtime_dependency('thor', '~> 0.20.0')
+  s.add_runtime_dependency('rexml', '>= 3.2.5', '< 4.0')
+  s.add_runtime_dependency('rugged', '>= 0.23.0', '< 2.0')
+  s.add_runtime_dependency('thor', '>= 0.20.3', '< 2.0')
   s.add_development_dependency('bundler', '>= 1.15')
-  s.add_development_dependency('pronto-rubocop', '~> 0.9.0')
+  s.add_development_dependency('pronto-rubocop', '~> 0.10.0')
   s.add_development_dependency('rake', '~> 12.0')
   s.add_development_dependency('rspec', '~> 3.4')
   s.add_development_dependency('rspec-its', '~> 1.2')
   s.add_development_dependency('rspec-expectations', '~> 3.4')
   s.add_development_dependency('rubocop', '~> 0.58')
-  s.add_development_dependency('simplecov', '~> 0.14')
+  s.add_development_dependency('simplecov', '~> 0.17', '!= 0.18.0', '!= 0.18.1', '!= 0.18.2', '!= 0.18.3', '!= 0.18.4',
+                               '!= 0.18.5', '!= 0.19.0', '!= 0.19.1') # see https://docs.codeclimate.com/docs/configuring-test-coverage
 end