pronto 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46191096dc80dd16c7d74cb071776e3d527c58030b205f13ef7cdd814bc2a75
-  data.tar.gz: c0e30815ad2b8e4cc4dc5b0e3f020347346a2e27463855951399b270b136015b
+  metadata.gz: 46470dd7ac5341cc9bebbf13127f62c06d5d5a19cf55578a40439265761d59b3
+  data.tar.gz: a6a51d6593f9c4e521c8adf4a7fca559c3342931e7b207659e620d8d3585678a
 SHA512:
-  metadata.gz: 005ccdcd8d549c490828c473658708c273f982fca0923897444cb84d02e2757b539d1acdf2accbe87220e08a55d5d2b3168780090c996e0449416cde798eaf92
-  data.tar.gz: 4b3b8aefc717056f27840f5ad1693f6d053e4988c4d892b281dadb55ac6dbbe9824dd97bccc609caab3d2e772e60802bb45c0021772ef64fb19883219bd4f62e
+  metadata.gz: e500bc433123227725e318c285995986ba6cf4a5281cbcb2be92aaac130515a788be5fabdd957d9d95e2f58fb95708bed6db193ab340c123760d8210471f4995
+  data.tar.gz: 1342570798515c8efdfcc17eaf383c308c8875031dd61cb4eef5821513c8e3a748b411b7112d5c210dabda11afc0831fc5767f08729dcad8d452e9c1215c60c1

data/.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# Order is important. The last matching pattern takes the most precedence.
+# Default owners for everything in the repo.
+* @prontolabs/core

data/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 ## Unreleased
 
+## 0.11.0
+
+### New features
+
+* [#304](https://github.com/prontolabs/pronto/pull/304) add option to limit comments per PR review
+* [#333](https://github.com/prontolabs/pronto/pull/333) add github_combined_status formatter
+* [#334](https://github.com/prontolabs/pronto/pull/334) add configurable review_type for GitHub (with REQUEST_CHANGES as default)
+* [#351](https://github.com/prontolabs/pronto/pull/351) add gitLab_mr formatter
+* [#369](https://github.com/prontolabs/pronto/pull/369) make Pronto::Git::Patch#new_file_path public
+* update to the BitBucket 2.0 API (_as the 1.0 API was deprecated_) via [#347](https://github.com/prontolabs/pronto/pull/347), [#348](https://github.com/prontolabs/pronto/pull/348), [#352](https://github.com/prontolabs/pronto/pull/352) and [#354](https://github.com/prontolabs/pronto/pull/354)
+
+### Bugs fixed
+
+* [#344](https://github.com/prontolabs/pronto/pull/344) treat Gemfile and .gemspecs as Ruby
+* [#380](https://github.com/prontolabs/pronto/pull/380) fix compatibility with rugged >= 0.99
+* [#387](https://github.com/prontolabs/pronto/pull/387) fix running pronto inside git submodules
+
+### Changes
+
+* [#370](https://github.com/prontolabs/pronto/pull/370) allow thor 1.x gem versions
+* [#379](https://github.com/prontolabs/pronto/pull/379) allow rugged 1.0.x gem versions
+* [#386](https://github.com/prontolabs/pronto/pull/386) add ruby 2.7 to CI
+* [#390](https://github.com/prontolabs/pronto/pull/390) fix issue with generating Sorbet RBI
+* [#396](https://github.com/prontolabs/pronto/pull/396) add support for Ruby 3.0
+* document/improve GitHub Actions integration in README.md via [#360](https://github.com/prontolabs/pronto/pull/360), [#378](https://github.com/prontolabs/pronto/pull/378) and [#389](https://github.com/prontolabs/pronto/pull/389)
+* add links to additional pronto runners in README.md
+
+## 0.10.0
+
 ### New features
 
 * [#301](https://github.com/prontolabs/pronto/pull/301): add ability to auto approve Bitbucket pull requests.

data/README.md

@@ -110,18 +110,40 @@ If you want comments to appear on pull request diff, instead of commit:
 $ PRONTO_GITHUB_ACCESS_TOKEN=token pronto run -f github_pr -c origin/master
 ```
 
-If you want review to appear on pull request diff, instead of comments:
+If you want review to appear on pull request diff, instead of separate comments:
 
 ```sh
 $ PRONTO_GITHUB_ACCESS_TOKEN=token pronto run -f github_pr_review -c origin/master
 ```
 
+All the **N** pending comments will be now separated into **X** number of PR reviews.
+The number of the PR reviews will be controlled by an additional environment variable or with the help of a config setting.
+This way, by a single pronto run, all the comments will be published to the PR, but divided into small reviews
+in order to avoid the rate limit of the providers.
+
+```
+X = N / {PRONTO_WARNINGS_PER_REVIEW || warnings_per_review || 30})
+```
+
+Note: In case no environment variable or config setting is specified in `.pronto.yml`, 
+      a default value of `30` will be used.
+
+```sh
+$ PRONTO_WARNINGS_PER_REVIEW=30 PRONTO_GITHUB_ACCESS_TOKEN=token pronto run -f github_pr_review -c origin/master
+```
+
 Use `GithubStatusFormatter` to submit [commit status](https://github.com/blog/1227-commit-status-api):
 
 ```sh
 $ PRONTO_GITHUB_ACCESS_TOKEN=token pronto run -f github_status -c origin/master
 ```
 
+If you want to show a one single status for all runners, instead of status per runner:
+
+```sh
+$ PRONTO_GITHUB_ACCESS_TOKEN=token pronto run -f github_combined_status -c origin/master
+```
+
 It's possible to combine multiple formatters.
 To get both pull request comments and commit status summary use:
 
@@ -140,6 +162,39 @@ formatters = [formatter, status_formatter]
 Pronto.run('origin/master', '.', formatters)
 ```
 
+#### GitHub Actions Integration
+
+You can also run Pronto as a GitHub action. 
+
+Here's an example `.github/workflows/pronto.yml` workflow file using the `github_status` and `github_pr` formatters and running on each GitHub PR, with `pronto-rubocop` as the runner:
+
+
+```yml
+name: Pronto
+on: [pull_request]
+
+jobs:
+  pronto:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - run: |
+          git fetch --no-tags --prune --depth=10 origin +refs/heads/*:refs/remotes/origin/*
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+      - name: Setup pronto
+        run: gem install pronto pronto-rubocop
+      - name: Run Pronto
+        run: pronto run -f github_status github_pr -c origin/${{ github.base_ref }}
+        env:
+          PRONTO_PULL_REQUEST_ID: ${{ github.event.pull_request.number }}
+          PRONTO_GITHUB_ACCESS_TOKEN: "${{ github.token }}"
+```
+check Wiki on [GitHub Actions Integration](https://github.com/prontolabs/pronto/wiki/GitHub-Actions-Integration) for more info.
+
 ### GitLab Integration
 
 You can run Pronto as a step of your CI builds and get the results as comments
@@ -159,6 +214,29 @@ Then just run it:
 $ PRONTO_GITLAB_API_PRIVATE_TOKEN=token pronto run -f gitlab -c origin/master
 ```
 
+**note: this requires at least Gitlab 11.6+**
+
+Merge request integration:
+
+```sh
+$ PRONTO_GITLAB_API_PRIVATE_TOKEN=token PRONTO_PULL_REQUEST_ID=id pronto run -f gitlab_mr -c origin/master
+```
+
+On GitLabCI make make sure to run Pronto in a [merge request pipeline](https://docs.gitlab.com/ce/ci/merge_request_pipelines/):
+
+```yml
+lint:
+  image: ruby
+  variables:
+    PRONTO_GITLAB_API_ENDPOINT: "https://gitlab.com/api/v4"
+    PRONTO_GITLAB_API_PRIVATE_TOKEN: token
+  only:
+    - merge_requests
+  script:
+    - bundle install
+    - bundle exec pronto run -f gitlab_mr -c origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+```
+
 ### Bitbucket Integration
 
 You can run Pronto as a step of your CI builds and get the results as comments
@@ -210,6 +288,7 @@ bitbucket:
   password: pass
   web_endpoint: https://bitbucket.org/
 max_warnings: 150
+warnings_per_review: 30
 verbose: false
 ```
 
@@ -260,13 +339,17 @@ The following values are available only to the text formatter:
 Pronto can run various tools and libraries, as long as there's a runner for it.
 Currently available:
 
+* [pronto-bigfiles](https://github.com/apiology/pronto-bigfiles)
 * [pronto-blacklist](https://github.com/pbstriker38/pronto-blacklist)
 * [pronto-brakeman](https://github.com/prontolabs/pronto-brakeman)
+* [pronto-bundler_audit](https://github.com/pdobb/pronto-bundler_audit)
+* [pronto-checkstyle](https://github.com/seikichi/pronto-checkstyle)
 * [pronto-coffeelint](https://github.com/siebertm/pronto-coffeelint)
 * [pronto-clang_format](https://github.com/micjabbour/pronto-clang_format)
 * [pronto-clang_tidy](https://github.com/micjabbour/pronto-clang_tidy)
 * [pronto-clippy](https://github.com/hauleth/pronto-clippy)
 * [pronto-credo](https://github.com/carakan/pronto-credo)
+* [pronto-dialyxir](https://github.com/Apelsinka223/pronto-dialyxir)
 * [pronto-dialyzer](https://github.com/iurifq/pronto-dialyzer)
 * [pronto-dirty_words](https://github.com/kevinjalbert/pronto-dirty_words)
 * [pronto-dogma](https://github.com/iurifq/pronto-dogma)
@@ -274,11 +357,15 @@ Currently available:
 * [pronto-eslint](https://github.com/prontolabs/pronto-eslint) (uses [eslintrb](https://github.com/zendesk/eslintrb))
 * [pronto-eslint_npm](https://github.com/doits/pronto-eslint_npm) (uses eslint installed from npm)
 * [pronto-fasterer](https://github.com/prontolabs/pronto-fasterer)
+* [pronto-findbugs](https://github.com/seikichi/pronto-findbugs)
 * [pronto-flake8](https://github.com/scoremedia/pronto-flake8)
 * [pronto-flay](https://github.com/prontolabs/pronto-flay)
 * [pronto-flow](https://github.com/kevinjalbert/pronto-flow)
 * [pronto-foodcritic](https://github.com/prontolabs/pronto-foodcritic)
+* [pronto-goodcheck](https://github.com/aergonaut/pronto-goodcheck)
 * [pronto-haml](https://github.com/prontolabs/pronto-haml)
+* [pronto-hlint](https://github.com/fretlink/pronto-hlint/) (uses Haskell code suggestions [hlint](https://github.com/ndmitchell/hlint))
+* [pronto-infer](https://github.com/seikichi/pronto-infer)
 * [pronto-inspec](https://github.com/stiller-leser/pronto-inspec)
 * [pronto-jscs](https://github.com/spajus/pronto-jscs)
 * [pronto-jshint](https://github.com/prontolabs/pronto-jshint)
@@ -289,7 +376,9 @@ Currently available:
 * [pronto-phpmd](https://github.com/EllisV/pronto-phpmd)
 * [pronto-phpstan](https://github.com/Powerhamster/pronto-phpstan)
 * [pronto-poper](https://github.com/prontolabs/pronto-poper)
+* [pronto-punchlist](https://github.com/apiology/pronto-punchlist)
 * [pronto-rails_best_practices](https://github.com/prontolabs/pronto-rails_best_practices)
+* [pronto-rails_data_schema](https://github.com/mbajur/pronto-rails_data_schema)
 * [pronto-rails_schema](https://github.com/raimondasv/pronto-rails_schema)
 * [pronto-reek](https://github.com/prontolabs/pronto-reek)
 * [pronto-rubocop](https://github.com/prontolabs/pronto-rubocop)
@@ -297,15 +386,17 @@ Currently available:
 * [pronto-shellcheck](https://github.com/pclalv/pronto-shellcheck)
 * [pronto-slim](https://github.com/nysthee/pronto-slim)
 * [pronto-slim_lint](https://github.com/ibrahima/pronto-slim_lint)
+* [pronto-sorbet](https://github.com/teamsimplepay/pronto-sorbet)
 * [pronto-spell](https://github.com/prontolabs/pronto-spell)
+* [pronto-standardrb](https://github.com/julianrubisch/pronto-standardrb)
 * [pronto-stylelint](https://github.com/kevinjalbert/pronto-stylelint)
 * [pronto-swiftlint](https://github.com/ajanauskas/pronto-swiftlint)
 * [pronto-tailor](https://github.com/ajanauskas/pronto-tailor)
 * [pronto-textlint](https://github.com/seikichi/pronto-textlint)
 * [pronto-tslint_npm](https://github.com/eprislac/pronto-tslint_npm)
 * [pronto-yamllint](https://github.com/pauliusm/pronto-yamllint)
-* [pronto-goodcheck](https://github.com/aergonaut/pronto-goodcheck)
 * [pronto-undercover](https://github.com/grodowski/pronto-undercover)
+* [pronto-xmllint](https://github.com/pauliusm/pronto-xmllint)
 
 ## Articles
 

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/clients/bitbucket_client.rb

@@ -1,28 +1,39 @@
 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)
-    response = get("#{pull_request_api(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)
@@ -30,29 +41,46 @@ class BitbucketClient
   end
 
   def approve_pull_request(slug, pull_id)
-    self.class.post("#{pull_request_api(slug)}/pullrequests/#{pull_id}/approve")
+    self.class.post("/#{slug}/pullrequests/#{pull_id}/approve")
   end
 
   def unapprove_pull_request(slug, pull_id)
-    self.class.delete("#{pull_request_api(slug)}/pullrequests/#{pull_id}/approve")
+    self.class.delete("/#{slug}/pullrequests/#{pull_id}/approve")
   end
 
   private
 
-  def pull_request_api(slug)
-    "https://api.bitbucket.org/2.0/repositories/#{slug}"
-  end
-
   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/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,6 +51,10 @@ 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'] && Integer(ENV['PRONTO_MAX_WARNINGS']) || @config_hash['max_warnings']
     end

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,7 +12,8 @@ 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,
@@ -32,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/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/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

@@ -38,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
@@ -46,7 +46,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,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}

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/version.rb

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

data/pronto.gemspec

@@ -40,14 +40,15 @@ 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('gitlab', '~> 4.4', '>= 4.4.0')
   s.add_runtime_dependency('httparty', '>= 0.13.7')
   s.add_runtime_dependency('octokit', '~> 4.7', '>= 4.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')
+  s.add_runtime_dependency('rugged', '>= 0.23.0', '< 1.1.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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pronto
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Mindaugas Mozūras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-03 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +84,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -91,9 +105,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.23.0
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -101,23 +115,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.23.0
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.20.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.20.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -138,14 +158,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +263,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".github/CODEOWNERS"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - LICENSE
@@ -268,6 +289,7 @@ files:
 - lib/pronto/formatter/commit_formatter.rb
 - lib/pronto/formatter/formatter.rb
 - lib/pronto/formatter/git_formatter.rb
+- lib/pronto/formatter/github_combined_status_formatter.rb
 - lib/pronto/formatter/github_formatter.rb
 - lib/pronto/formatter/github_pull_request_formatter.rb
 - lib/pronto/formatter/github_pull_request_review_formatter.rb
@@ -275,6 +297,7 @@ files:
 - lib/pronto/formatter/github_status_formatter/sentence.rb
 - lib/pronto/formatter/github_status_formatter/status_builder.rb
 - lib/pronto/formatter/gitlab_formatter.rb
+- lib/pronto/formatter/gitlab_merge_request_review_formatter.rb
 - lib/pronto/formatter/json_formatter.rb
 - lib/pronto/formatter/null_formatter.rb
 - lib/pronto/formatter/pull_request_formatter.rb
@@ -316,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Pronto runs analysis by checking only the introduced changes