pronto 0.9.5 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 751d40e214f58802ae6f48a1c71a8bee1780dc81
-  data.tar.gz: ab5ffa282a02e967c825120dda4b19cb0cd66439
+SHA256:
+  metadata.gz: 46470dd7ac5341cc9bebbf13127f62c06d5d5a19cf55578a40439265761d59b3
+  data.tar.gz: a6a51d6593f9c4e521c8adf4a7fca559c3342931e7b207659e620d8d3585678a
 SHA512:
-  metadata.gz: 6160600de386512e3924bcc578b83995cccbf5ca44b4a57ae2476828fde3c796783eadb3edeb88923efddd28bbc8d395d09797626c0b7fccd5a8388ae18cf507
-  data.tar.gz: 180b4f95b5fa3407e3f04e6327327634b9bfe9b54a8feb52b95a2685918492512e0174770f5034c813bc225b43a3bc477e480a87161038604b94e02f7f038104
+  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,55 @@
 
 ## 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.
+* [#331](https://github.com/prontolabs/pronto/pull/331): allow to specify PATH in "run" command.
+
+### Bugs fixed
+
+* [#258](https://github.com/prontolabs/pronto/pull/258): fix blame returning nil when file does not exist in the git tree.
+* [#270](https://github.com/prontolabs/pronto/pull/270): fix ${line} in text format to mean line number.
+* [#282](https://github.com/prontolabs/pronto/issues/282): relax rainbow dependency.
+* [#329](https://github.com/prontolabs/pronto/pull/329): correctly handle renamed-only files.
+
+### Changes
+
+* Depend on thor `0.20.*`.
+* [#298](https://github.com/prontolabs/pronto/pull/298): change default GitLab API endpoint to v4.
+* [#332](https://github.com/prontolabs/pronto/pull/332): remove support for Ruby older than 2.3.0.
+
+## 0.9.5
+
 ### Bugs fixed
 
 * [#253](https://github.com/prontolabs/pronto/pull/253): fix an infinite loop when Bitbucket Server sends a paginated response.
@@ -51,7 +100,7 @@
 ### Changes
 
 * [#193](https://github.com/prontolabs/pronto/issues/193): rename `pronto run --index` option to `--unstaged`.
-* [#49](https://github.com/prontolabs/pronto/issues/49): handle non-existance of GitHub pull requests gracefully.
+* [#49](https://github.com/prontolabs/pronto/issues/49): handle nonexistence of GitHub pull requests gracefully.
 * [#217](https://github.com/prontolabs/pronto/issues/217): depend on `octokit >= 4.7.0`.
 * [#224](https://github.com/prontolabs/pronto/issues/224): depend on `gitlab >= 4.0.0`.
 * [#222](https://github.com/prontolabs/pronto/pull/184): prefix PULL_REQUEST_ID env variable with `PRONTO_`.

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2017 Mindaugas Mozūras
+Copyright (c) 2018 Mindaugas Mozūras
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,10 +1,9 @@
 # Pronto
 
 [![Build Status](https://secure.travis-ci.org/prontolabs/pronto.svg)](http://travis-ci.org/prontolabs/pronto)
-[![Coverage Status](https://img.shields.io/codeclimate/coverage/github/prontolabs/pronto.svg)](https://codeclimate.com/github/prontolabs/pronto)
+[![Coverage Status](https://img.shields.io/codeclimate/coverage/prontolabs/pronto.svg)](https://codeclimate.com/github/prontolabs/pronto)
 [![Code Climate](https://codeclimate.com/github/prontolabs/pronto.svg)](https://codeclimate.com/github/prontolabs/pronto)
 [![Gem Version](https://badge.fury.io/rb/pronto.svg)](http://badge.fury.io/rb/pronto)
-[![Dependency Status](https://gemnasium.com/prontolabs/pronto.svg)](https://gemnasium.com/prontolabs/pronto)
 [![Inline docs](http://inch-ci.org/github/prontolabs/pronto.svg)](http://inch-ci.org/github/prontolabs/pronto)
 
 **Pronto** runs analysis quickly by checking only the relevant changes. Created to
@@ -111,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:
 
@@ -141,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
@@ -151,7 +205,7 @@ on GitLab commits using `GitlabFormatter`.
 Set the `PRONTO_GITLAB_API_ENDPOINT` environment variable or value in `.pronto.yml` to
 your API endpoint URL. If you are using Gitlab.com's hosted service your
 endpoint will be set by default.
-Set the `PRONTO_GITLAB_API_PRIVATE_TOKEN` environment variable or value in `.pronto.yml
+Set the `PRONTO_GITLAB_API_PRIVATE_TOKEN` environment variable or value in `.pronto.yml`
 to your Gitlab private token which you can find in your account settings.
 
 Then just run it:
@@ -160,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
@@ -168,7 +245,6 @@ on Bitbucket commits using `BitbucketFormatter` or `BitbucketPullRequestFormatte
 Add Pronto runners you want to use to your Gemfile:
 
 Set the PRONTO_BITBUCKET_USERNAME and PRONTO_BITBUCKET_PASSWORD environment variables or values in `.pronto.yml`.
-.
 
 Then just run it:
 
@@ -212,6 +288,7 @@ bitbucket:
   password: pass
   web_endpoint: https://bitbucket.org/
 max_warnings: 150
+warnings_per_review: 30
 verbose: false
 ```
 
@@ -262,20 +339,34 @@ 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)
+* [pronto-erb_lint](https://github.com/tleish/pronto-erb_lint)
 * [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)
 * [pronto-json](https://github.com/deees/pronto-json)
@@ -283,8 +374,11 @@ Currently available:
 * [pronto-perl_lint](https://github.com/bells17/pronto-perl_lint)
 * [pronto-phpcs](https://github.com/EllisV/pronto-phpcs)
 * [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)
@@ -292,28 +386,36 @@ 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-undercover](https://github.com/grodowski/pronto-undercover)
+* [pronto-xmllint](https://github.com/pauliusm/pronto-xmllint)
 
 ## Articles
 
 Articles to help you to get started:
 
+* [Effortless Code Conventions Review for Pull Request Changes](https://jtway.co/effortless-code-review-for-pull-request-changes-241206b1cb04)
 * [Automating code review with Pronto (and friends)](http://everydayrails.com/2015/02/17/pronto-ruby-code-review.html)
 * [Setup Pronto with CircleCI](https://medium.com/@MaximAbramchuk/circleci-github-pr-commenting-ruby-scss-coffeescript-javascript-git-and-etc-fbcbe2a378a5#.gk5f14p3j)
 * [Continuous Static Analysis using Pronto](http://codingfearlessly.com/2014/11/06/continuous-static-analysis/)
 * [Pronto and git hooks](http://elliotthilaire.net/gem-pronto-and-git-hooks/)
 * [How to end fruitless dev discussions about your project’s code style?](https://medium.com/appaloosa-store-engineering/how-to-end-fruitless-dev-discussions-about-your-project-s-code-style-245070bff6d4)
-* [Free automated code reviews using Pronto](https://hovancik.net/blog/2016/04/11/free-automated-code-reviews-using-pronto.html)
+* [Free automated code reviews using Pronto](https://hovancik.net/blog/2016/04/11/free-automated-code-reviews-using-pronto/)
 * [Automated Elixir code review with Github, Credo and Travis CI](https://medium.com/fazibear/automated-elixir-code-review-with-github-credo-and-travis-ci-986cd56b8f02)
 * [Running Rubocop before git commit](https://christoph.luppri.ch/articles/2016/11/21/running-rubocop-before-git-commit/)
 * [Pronto, Codeship and GitHub for automatic code review](http://abinoam.tl1n.com/pronto-codeship-and-github-for-automatic-code-review/)
 * [How to automatically review your PRs for style violations with Pronto and RuboCop](https://christoph.luppri.ch/articles/2017/03/05/how-to-automatically-review-your-prs-for-style-violations-with-pronto-and-rubocop/)
 * [Create your own Pronto Runner](https://kevinjalbert.com/create-your-own-pronto-runner/)
+* [Make Code Reviews A Little Bit Better With Automation](https://medium.com/jimmy-farrell/make-codes-reviews-a-little-bit-better-with-automation-35640df08a62)
+* [Stop shipping untested Ruby code with undercover](https://medium.com/futuredev/stop-shipping-untested-ruby-code-with-undercover-1edc963be4a6)
 
 Make a Pull Request to add something you wrote or found useful.
 
@@ -323,4 +425,4 @@ Make a Pull Request to add something you wrote or found useful.
 
 ## Copyright
 
-Copyright (c) 2013-2017 Mindaugas Mozūras. See [LICENSE](LICENSE) for further details.
+Copyright (c) 2013-2018 Mindaugas Mozūras. See [LICENSE](LICENSE) for further details.

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)