pronto 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a27da5811cbcfa71ddffc5842dc3295214206496
-  data.tar.gz: 233865c5cf619728fcd26dfbf3607feb0d5fed51
+  metadata.gz: a5a612afb137e615ee5e2ff77940bef61836f285
+  data.tar.gz: 0028f06bc680ba757b55872dadb633a38dae08e0
 SHA512:
-  metadata.gz: b9fb4cb872bca3c99d59ffe3a931dfac4911c617363a72f3307353792e514390fe5995382f11897da40694653e8029a8d181ed7a453aef27b0a79ba318a6423b
-  data.tar.gz: fa1ff35ec5743311ff86453f2487a14903e40c9ea00b6df04a507dc2949d696957c6067d7d4dfee9e0e6412d0fc3331394f1db247e399157d62d75fd2723c45a
+  metadata.gz: 8232ab1382ee1447884bf1061e58d28f8a62100c59743ac5a6a8264404c94b61966e8478b0b11b2da999eaab21a136233fc44cbc1354d4403dc6301094d88915
+  data.tar.gz: 8a4a1196d482efceedb8c64edced6b56fa8977fe07ce9511cd4cf6374863dd5fdfa2e4f5992d56cc93eeb6a03f669182c67de03418cffbe6774e914a773e62ad

data/CHANGELOG.md

@@ -1,14 +1,33 @@
 # Changelog
 
+## 0.8.0
+
+### New features
+
+* [#199](https://github.com/mmozuras/pronto/pull/199): add support for Ruby 2.4.0.
+
+### Changes
+
+* [#181](https://github.com/mmozuras/pronto/pull/181): add ENV variables for all configuration options.
+* [#184](https://github.com/mmozuras/pronto/pull/184): prefix all ENV variables with `PRONTO_`.
+* [#185](https://github.com/mmozuras/pronto/pull/185): allow excluding files to lint for single runner.
+
+### Bugs fixed
+
+* [#179](https://github.com/mmozuras/pronto/pull/179): correctly select branch name for fix Bitbucket pull request formatter.
+* [#187](https://github.com/mmozuras/pronto/pull/187): correctly handle nil/false with consolidate_comments config option.
+* [#189](https://github.com/mmozuras/pronto/pull/189): do not post anything when all consolidated comments already exist.
+* [#195](https://github.com/mmozuras/pronto/pull/195): fix warning for default formatters value.
+
 ## 0.7.1
 
 ### Changes
 
 * Remove support for Ruby 1.9.3.
 
-## Bugs fixed
+### Bugs fixed
 
-* [#149](https://github.com/mmozuras/pronto/issues/149): Use patches to correctly find line position for GitHub pull request formatter.
+* [#149](https://github.com/mmozuras/pronto/issues/149): use patches to correctly find line position for GitHub pull request formatter.
 
 ## 0.7.0
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2016 Mindaugas Mozūras
+Copyright (c) 2017 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

@@ -7,7 +7,7 @@
 [![Inline docs](http://inch-ci.org/github/mmozuras/pronto.svg)](http://inch-ci.org/github/mmozuras/pronto)
 
 **Pronto** runs analysis quickly by checking only the relevant changes. Created to
-be used on [pull requests](#github-integration), but also works [locally](#local-changes) and integrates with [GitLab](#gitlab-integration) and [Bitbucket](#bitbucket-integration).
+be used on [GitHub pull requests](#github-integration), but also works [locally](#local-changes) and integrates with [GitLab](#gitlab-integration) and [Bitbucket](#bitbucket-integration).
 Perfect if want to find out quickly if branch introduces changes that conform
 to your [styleguide](https://github.com/mmozuras/pronto-rubocop), [are DRY](https://github.com/mmozuras/pronto-flay), [don't introduce security holes](https://github.com/mmozuras/pronto-brakeman) and [more](#runners).
 
@@ -74,13 +74,13 @@ Just run `pronto` without any arguments to see what Pronto is capable of.
 
 Available Options
 
-Command flag     | Description
------------------|------------------------------------------------------------
-`--exit-code`    | Exits with non-zero code if there were any warnings/errors.
-`-c/--commit`    | Commit for the diff.
-`-i/--index`     | Analyze changes in git index (staging area).
-`-r/--runner`    | Run only the passed runners.
-`-f/--formatters`| Pick output formatters.
+| Command flag      | Description                                                 |
+|:------------------|:------------------------------------------------------------|
+| `--exit-code`     | Exits with non-zero code if there were any warnings/errors. |
+| `-c/--commit`     | Commit for the diff.                                        |
+| `-i/--index`      | Analyze changes in git index (staging area).                |
+| `-r/--runner`     | Run only the passed runners.                                |
+| `-f/--formatters` | Pick output formatters.                                     |
 
 ### GitHub Integration
 
@@ -89,32 +89,32 @@ on GitHub commits using `GithubFormatter` or `GithubPullRequestFormatter`.
 
 Add Pronto runners you want to use to your Gemfile:
 
-Set the GITHUB_ACCESS_TOKEN environment variable or value in `.pronto.yml` to
+Set the PRONTO_GITHUB_ACCESS_TOKEN environment variable or value in `.pronto.yml` to
 [OAuth token](https://help.github.com/articles/creating-an-access-token-for-command-line-use) that has access to the repository.
 
 Then just run it:
 
 ```sh
-$ GITHUB_ACCESS_TOKEN=token pronto run -f github -c origin/master
+$ PRONTO_GITHUB_ACCESS_TOKEN=token pronto run -f github -c origin/master
 ```
 
 or, if you want comments to appear on pull request diff, instead of commit:
 
 ```sh
-$ GITHUB_ACCESS_TOKEN=token pronto run -f github_pr -c origin/master
+$ PRONTO_GITHUB_ACCESS_TOKEN=token pronto run -f github_pr -c origin/master
 ```
 
 Use `GithubStatusFormatter` to submit [commit status](https://github.com/blog/1227-commit-status-api):
 
 ```sh
-$ GITHUB_ACCESS_TOKEN=token pronto run -f github_status -c origin/master
+$ PRONTO_GITHUB_ACCESS_TOKEN=token pronto run -f github_status -c origin/master
 ```
 
 It's possible to combine multiple formatters.
 To get both pull request comments and commit status summary use:
 
 ```sh
-$ GITHUB_ACCESS_TOKEN=token PULL_REQUEST_ID=id pronto run -f github_status github_pr -c origin/master
+$ PRONTO_GITHUB_ACCESS_TOKEN=token PULL_REQUEST_ID=id pronto run -f github_status github_pr -c origin/master
 ```
 
 As an alternative, you can also set up a rake task:
@@ -135,16 +135,16 @@ on GitLab commits using `GitlabFormatter`.
 
 **note: this requires at least GitLab v7.5.0**
 
-Set the `GITLAB_API_ENDPOINT` environment variable or value in `.pronto.yml` to
+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 `https://gitlab.com/api/v3`.
-Set the `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:
 
 ```sh
-$ GITLAB_API_ENDPOINT="https://gitlab.com/api/v3" GITLAB_API_PRIVATE_TOKEN=token pronto run -f gitlab -c origin/master
+$ PRONTO_GITLAB_API_ENDPOINT="https://gitlab.com/api/v3" PRONTO_GITLAB_API_PRIVATE_TOKEN=token pronto run -f gitlab -c origin/master
 ```
 
 ### Bitbucket Integration
@@ -154,19 +154,19 @@ on Bitbucket commits using `BitbucketFormatter` or `BitbucketPullRequestFormatte
 
 Add Pronto runners you want to use to your Gemfile:
 
-Set the BITBUCKET_USERNAME and BITBUCKET_PASSWORD environment variables or values in `.pronto.yml`.
+Set the PRONTO_BITBUCKET_USERNAME and PRONTO_BITBUCKET_PASSWORD environment variables or values in `.pronto.yml`.
 .
 
 Then just run it:
 
 ```sh
-$ BITBUCKET_USERNAME=user BITBUCKET_PASSWORD=pass pronto run -f bitbucket -c origin/master
+$ PRONTO_BITBUCKET_USERNAME=user PRONTO_BITBUCKET_PASSWORD=pass pronto run -f bitbucket -c origin/master
 ```
 
 or, if you want comments to appear on pull request diff, instead of commit:
 
 ```sh
-$ BITBUCKET_USERNAME=user BITBUCKET_PASSWORD=pass pronto run -f bitbucket_pr -c origin/master
+$ PRONTO_BITBUCKET_USERNAME=user PRONTO_BITBUCKET_PASSWORD=pass pronto run -f bitbucket_pr -c origin/master
 ```
 
 ## Configuration
@@ -180,13 +180,17 @@ The file has the following format:
 all:
   exclude:
     - 'spec/**/*'
+# exclude files for single runner
+eslint:
+  exclude:
+    - 'app/assets/**/*'
 github:
   slug: mmozuras/pronto
   access_token: B26354
   api_endpoint: https://api.github.com/
   web_endpoint: https://github.com/
 gitlab:
-  slug: mmozuras/42
+  slug: 1234567 # gitlab's project ID
   api_private_token: 46751
   api_endpoint: https://api.vinted.com/gitlab
 bitbucket:
@@ -200,7 +204,7 @@ verbose: false
 
 All properties that can be specified via `.pronto.yml`, can also be specified
 via environment variables. Their names will be the upcased path to the property.
-For example: `GITHUB_SLUG` or `GITLAB_API_PRIVATE_TOKEN`. Environment variables
+For example: `PRONTO_GITHUB_SLUG` or `PRONTO_GITLAB_API_PRIVATE_TOKEN`. Environment variables
 will always take precedence over values in configuration file.
 
 ## Runners
@@ -221,14 +225,18 @@ Currently available:
 * [pronto-jshint](https://github.com/mmozuras/pronto-jshint)
 * [pronto-json](https://github.com/deees/pronto-json)
 * [pronto-luacheck](https://github.com/seikichi/pronto-luacheck)
+* [pronto-phpcs](https://github.com/EllisV/pronto-phpcs)
+* [pronto-phpmd](https://github.com/EllisV/pronto-phpmd)
 * [pronto-poper](https://github.com/mmozuras/pronto-poper)
 * [pronto-rails_best_practices](https://github.com/mmozuras/pronto-rails_best_practices)
 * [pronto-rails_schema](https://github.com/raimondasv/pronto-rails_schema)
 * [pronto-reek](https://github.com/mmozuras/pronto-reek)
 * [pronto-rubocop](https://github.com/mmozuras/pronto-rubocop)
 * [pronto-scss](https://github.com/mmozuras/pronto-scss)
+* [pronto-shellcheck](https://github.com/pclalv/pronto-shellcheck)
 * [pronto-slim](https://github.com/nysthee/pronto-slim)
 * [pronto-spell](https://github.com/mmozuras/pronto-spell)
+* [pronto-stylelint](https://github.com/kevinjalbert/pronto-stylelint)
 * [pronto-swiftlint](https://github.com/ajanauskas/pronto-swiftlint)
 * [pronto-tailor](https://github.com/ajanauskas/pronto-tailor)
 
@@ -242,6 +250,8 @@ Articles to help you to get started:
 * [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)
+* [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/)
 
 Make a Pull Request to add something you wrote or found useful.
 

data/lib/pronto/bitbucket.rb

@@ -65,7 +65,9 @@ module Pronto
       @pull ||= if env_pull_id
                   pull_requests.find { |pr| pr.id.to_i == env_pull_id.to_i }
                 elsif @repo.branch
-                  pull_requests.find { |pr| pr.branch['name'] == @repo.branch }
+                  pull_requests.find do |pr|
+                    pr.source['branch']['name'] == @repo.branch
+                  end
                 end
     end
 

data/lib/pronto/cli.rb

@@ -37,7 +37,7 @@ module Pronto
 
     method_option :formatters,
                   type: :array,
-                  default: 'text',
+                  default: ['text'],
                   aliases: ['formatter', '-f'],
                   desc: "Pick output formatters. Available: #{::Pronto::Formatter.names.join(', ')}"
 

data/lib/pronto/config.rb

@@ -7,16 +7,26 @@ module Pronto
     %w(github gitlab bitbucket).each do |service|
       ConfigFile::EMPTY[service].each do |key, _|
         name = "#{service}_#{key}"
-        define_method(name) { ENV[name.upcase] || @config_hash[service][key] }
+        define_method(name) { ENV["PRONTO_#{name.upcase}"] || @config_hash[service][key] }
       end
     end
 
     def consolidate_comments?
-      !@config_hash['consolidate_comments'].nil?
+      consolidated =
+        ENV['PRONTO_CONSOLIDATE_COMMENTS'] ||
+        @config_hash.fetch('consolidate_comments', false)
+      consolidated
     end
 
-    def excluded_files
-      @excluded_files ||= Array(exclude)
+    def excluded_files(runner)
+      files =
+        if runner == 'all'
+          ENV['PRONTO_EXCLUDE'] || @config_hash['all']['exclude']
+        else
+          @config_hash.fetch(runner, {})['exclude']
+        end
+
+      Array(files)
         .flat_map { |path| Dir[path.to_s] }
         .map { |path| File.expand_path(path) }
     end
@@ -30,19 +40,14 @@ module Pronto
     end
 
     def max_warnings
-      @config_hash['max_warnings']
+      ENV['PRONTO_MAX_WARNINGS'] || @config_hash['max_warnings']
     end
 
     def logger
       @logger ||= begin
-        @config_hash['verbose'] ? Logger.new($stdout) : Logger.silent
+        verbose = ENV['PRONTO_VERBOSE'] || @config_hash['verbose']
+        verbose ? Logger.new($stdout) : Logger.silent
       end
     end
-
-    private
-
-    def exclude
-      @config_hash['all']['exclude']
-    end
   end
 end

data/lib/pronto/formatter/git_formatter.rb

@@ -83,7 +83,7 @@ module Pronto
           existing = old_comments[key]
           comments = dedupe_comments(existing, comments) if existing
 
-          if config.consolidate_comments?
+          if config.consolidate_comments? && !comments.empty?
             comment = consolidate_comments(comments)
             memo.push(comment)
           else

data/lib/pronto/formatter/github_status_formatter/status_builder.rb

@@ -1,5 +1,4 @@
 require_relative 'sentence'
-require_relative 'inflector'
 
 module Pronto
   module Formatter
@@ -20,7 +19,7 @@ module Pronto
         end
 
         def context
-          Inflector.underscore(@runner.name)
+          "pronto/#{@runner.title}"
         end
 
         private

data/lib/pronto/runner.rb

@@ -11,6 +11,14 @@ module Pronto
       repository
     end
 
+    def self.title
+      @runner_name ||= begin
+        source_path, _line = instance_method(:run).source_location
+        file_name, _extension = File.basename(source_path).split('.')
+        file_name
+      end
+    end
+
     def ruby_patches
       return [] unless @patches
 

data/lib/pronto/runners.rb

@@ -6,14 +6,18 @@ module Pronto
     end
 
     def run(patches)
-      patches = reject_excluded(patches)
-      return [] unless patches.any?
+      patches = reject_excluded(@config.excluded_files('all'), patches)
+      return [] if patches.none?
 
       result = []
       @runners.each do |runner|
         next if exceeds_max?(result)
         @config.logger.log("Running #{runner}")
-        result += runner.new(patches, patches.commit).run.flatten.compact
+        runner_patches = reject_excluded(
+          @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
@@ -21,14 +25,12 @@ module Pronto
 
     private
 
-    def reject_excluded(patches)
-      return patches unless @config.excluded_files.any?
-      patches.reject! { |patch| excluded?(patch) }
-      patches
-    end
+    def reject_excluded(excluded_files, patches)
+      return patches unless excluded_files.any?
 
-    def excluded?(patch)
-      @config.excluded_files.include?(patch.new_file_full_path.to_s)
+      patches.reject do |patch|
+        excluded_files.include?(patch.new_file_full_path.to_s)
+      end
     end
 
     def exceeds_max?(warnings)

data/lib/pronto/version.rb

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

data/pronto.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('thor', '~> 0.19.0')
   s.add_runtime_dependency('octokit', '~> 4.3', '>= 4.1.0')
   s.add_runtime_dependency('gitlab', '~> 3.6', '>= 3.4.0')
-  s.add_runtime_dependency('httparty', '~> 0.13.7')
+  s.add_runtime_dependency('httparty', '>= 0.13.7', '< 0.15')
   s.add_runtime_dependency('rainbow', '~> 2.1')
   s.add_development_dependency('rake', '~> 11.0')
   s.add_development_dependency('rspec', '~> 3.4')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pronto
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Mindaugas Mozūras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -88,16 +88,22 @@ dependencies:
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +265,6 @@ files:
 - lib/pronto/formatter/github_formatter.rb
 - lib/pronto/formatter/github_pull_request_formatter.rb
 - lib/pronto/formatter/github_status_formatter.rb
-- lib/pronto/formatter/github_status_formatter/inflector.rb
 - lib/pronto/formatter/github_status_formatter/sentence.rb
 - lib/pronto/formatter/github_status_formatter/status_builder.rb
 - lib/pronto/formatter/gitlab_formatter.rb
@@ -303,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Pronto runs analysis by checking only the introduced changes

data/lib/pronto/formatter/github_status_formatter/inflector.rb

@@ -1,17 +0,0 @@
-module Pronto
-  module Formatter
-    class GithubStatusFormatter
-      class Inflector
-        def self.underscore(camel_cased_word)
-          return camel_cased_word unless camel_cased_word =~ /[A-Z-]|::/
-          word = camel_cased_word.to_s.gsub(/::/, '/')
-          word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
-          word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
-          word.tr!('-', '_')
-          word.downcase!
-          word
-        end
-      end
-    end
-  end
-end