face_control 0.8.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4f9e7ca404976809bcae27a991c816d13dc9aa99
-  data.tar.gz: 9331fd455ba8e164ba80e48be06626474dacf3bb
+SHA256:
+  metadata.gz: d122b35eb6eaff44afb9fa2cf73db3fc24c0ae4ee8641e0559ae51bf94f496ba
+  data.tar.gz: af390b2df7bc02946084829d41d76850e0b6beb2e981ae0986496b99272eb949
 SHA512:
-  metadata.gz: 7254bcdd2024704eb2718c1a714328c7746de59eaf8f56406fe17a46ab737350a3208af98c494d1e92409d6bba17cd0c0644b894cd075cf8244d25145e82ddcf
-  data.tar.gz: 1243c714fea6a8ea463b40d0ee17d2c51896588c50e51e345e1da0d67a58716af78a0f0df0e3f2d53ee41172219137b9e96cebe654bfe939f6bb0a18e7b08feb
+  metadata.gz: 7bdd454c0923cd2942f32341acfb29f6264d7f059366a32830d82b4baf1f3cb361c2d983a5b5196728102bfc81091867a69c9b1071874bb310339b1051f78f3f
+  data.tar.gz: 1073a7c288e5b336584c28b2e24f1abcefab827c472077d22b0845cbfb3fa49915153ca1f1b53d45cf3845b4eb3291d98441f67bd699e3a4120f45b55cd075d7

data/.coveralls.yml

@@ -0,0 +1 @@
+repo_token: 4sX7kIUmBKmdoAGw0PuaH9clgngz2zaGD

data/.gitignore

@@ -8,3 +8,4 @@ doc/
 pkg/
 spec/reports/
 tmp/
+.idea

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+
+rvm:
+- 2.7
+- 2.6
+- 2.5
+
+before_script:
+# https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
+- curl -sL https://deb.nodesource.com/setup_15.x | sudo -E bash -
+- sudo apt-get install -y nodejs
+- sudo npm install -g coffeelint

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Face Control
+
+## Significant changes
+
+### 1.0.0 (2020-10-26)
+
+* Initial release

data/README.md

@@ -1,11 +1,9 @@
-[![Gem Version](https://img.shields.io/gem/v/face_control.svg)](https://rubygems.org/gems/face_control)
-[![Code Climate](https://img.shields.io/codeclimate/github/vassilevsky/face_control.svg)](https://codeclimate.com/github/vassilevsky/face_control/code)
-[![Vexor](https://ci.vexor.io/projects/126da196-c8e6-46f0-8bc7-b5f8f4b49732/status.svg)](https://ci.vexor.io/ui/projects/126da196-c8e6-46f0-8bc7-b5f8f4b49732/builds)
-[![Coveralls](https://img.shields.io/coveralls/vassilevsky/face_control.svg)](https://coveralls.io/github/vassilevsky/face_control)
-[![VersionEye](https://img.shields.io/versioneye/d/ruby/face_control.svg)](https://www.versioneye.com/ruby/face_control)
-
 # Face Control
 
+[![Gem Version](https://img.shields.io/gem/v/face_control.svg)](https://rubygems.org/gems/face_control)
+[![Travis CI](https://img.shields.io/travis/com/funbox/face_control)](https://travis-ci.com/github/funbox/face_control)
+[![Coveralls](https://img.shields.io/coveralls/funbox/face_control.svg)](https://coveralls.io/github/funbox/face_control)
+
 Run static analysis of pull requests in [Bitbucket Server][] (formerly Stash)
 and comment on problems in added lines.
 
@@ -16,61 +14,75 @@ Inspired by [Hound][].
 
 ## Installation
 
-    gem install face_control
+```bash
+gem install face_control
+```
 
-You also need to have CoffeeLint installed and available in PATH.
+You also need to have CoffeeLint installed and available in `PATH`.
 
 ## Usage
 
-    face-control <project> <repository> <pull_request_id>
+```bash
+face-control <project> <repository> <pull_request_id>
+```
+
+It's natural to run this on a continuous integration server (see “[Example](#example)” below).
 
-It's natural to run this on a continuous integration server.
-For example, here's a [Jenkins][] project setup:
+If you don't want to receive RuboCop comments with certain severity level,
+pass the severity in the `--skip-severity` option like so:
+
+```bash
+face-control --skip-severity convention <project> <repository> <pull_request_id>
+```
 
-* Source Code Management
-  * Git
-    * Repositories
-      * Refspec:
+Instead of `--skip-severity` you can use just `-S`.
+
+You can also pass multiple severity levels as a comma-separated list:
 
-              +refs/pull-requests/*:refs/remotes/origin/pull-requests/*
+```bash
+face-control -S convention,refactor <project> <repository> <pull_request_id>
+```
 
-        (make Jenkins fetch otherwise ignored Stash-created branches)
+`face-control` uses the same configuration file (`~/.stashconfig.yml`)
+as the official [Bitbucket Server Command Line Tools][]
+to connect to your Stash instance.
 
-    * Branches to build
-      * Branch Specifier:
+## Example
 
-              origin/pull-requests/*/merge
+Here's a [Jenkins][] project setup as an example:
 
-        (merge results of open non-conflicting pull requests)
+_Source Code Management → Git → Repositories → Refspec:_
 
-* Build
-  * Execute shell
-    * Command
+```
++refs/pull-requests/*:refs/remotes/origin/pull-requests/*
+```
 
-            export PULL_REQUEST_ID=`echo $GIT_BRANCH | cut -d / -f 3`
+It makes Jenkins fetch otherwise ignored Stash-created branches.
 
-            gem install rubocop face_control
-            npm install -g coffeelint
+_Source Code Management → Git → Branches to build → Branch Specifier:_
 
-            face-control <project> <repository> $PULL_REQUEST_ID
+```
+origin/pull-requests/*/merge
+```
 
-If you don't want to receive RuboCop comments with certain severity level,
-pass the severity in the `--skip-severity` option like so:
+Merge results of open non-conflicting pull requests.
 
-    face-control --skip-severity convention <project> <repository> <pull_request_id>
+_Build → Execute shell → Command:_
 
-You can use just `-S`.
-You can also pass multiple severity levels as a comma-separated list:
+```bash
+export PULL_REQUEST_ID=`echo $GIT_BRANCH | cut -d / -f 3`
 
-    face-control -S convention,refactor <project> <repository> <pull_request_id>
+gem install rubocop face_control
+npm install -g coffeelint
 
-`face-control` uses the same configuration file (`~/.stashconfig.yml`)
-as the official [Bitbucket Server Command Line Tools][]
-to connect to your Stash instance.
+face-control <project> <repository> $PULL_REQUEST_ID
+```
 
 ## Etymology
 
-[Face control][] in Wikipedia
+[Face control][] in Wikipedia.
+
+[![Sponsored by FunBox](https://funbox.ru/badges/sponsored_by_funbox_centered.svg)](https://funbox.ru)
 
 [Hound]: https://houndci.com
 [Bitbucket Server]: https://www.atlassian.com/software/bitbucket/server

data/Rakefile

@@ -1,4 +1,3 @@
-require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|

data/face_control.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'face_control'
-  spec.version       = '0.8.4'
+  spec.version       = '1.0.0'
   spec.authors       = ['Ilya Vassilevsky']
   spec.email         = ['vassilevsky@gmail.com']
 
@@ -16,10 +16,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rubocop'
   spec.add_runtime_dependency 'httparty'
 
-  spec.add_development_dependency 'bundler', '~> 1.8'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'minitest', '~> 5.8'
-  spec.add_development_dependency 'minitest-reporters', '~> 1.0'
-  spec.add_development_dependency 'webmock', '~> 1.21'
-  spec.add_development_dependency 'coveralls', '~> 0.8'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest-reporters'
+  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'coveralls'
 end

data/lib/face_control/checkers/rubocop.rb

@@ -12,8 +12,10 @@ module FaceControl
       def relevant_globs
         %w(
           *.gemspec
-          *.rb
+          *.jbuilder
           *.rake
+          *.rb
+          *.ru
           Capfile
           Gemfile
           Rakefile
@@ -22,7 +24,7 @@ module FaceControl
       end
 
       def command(filenames)
-        "rubocop --format json #{filenames}"
+        "rubocop --parallel --format json #{filenames}"
       end
 
       def parse(command_output)
@@ -52,21 +54,13 @@ module FaceControl
           text << " — [Guide](#{link})"
         end
 
-        if can_be_autocorrected?(offense)
-          text << " (Run `rubocop -a #{file['path']}` to fix.)"
-        end
-
-        text
+        text << " — #{offense['cop_name']}"
       end
 
       def style_guide_url(offense)
         cop_name = offense['cop_name']
         config = ::RuboCop::ConfigLoader.default_configuration
-        ::RuboCop::Cop::MessageAnnotator.new(config, config.for_cop(cop_name), {}).urls.first
-      end
-
-      def can_be_autocorrected?(offense)
-        !offense['corrected'].nil?
+        ::RuboCop::Cop::MessageAnnotator.new(config, cop_name, config.for_cop(cop_name), {}).urls.first
       end
     end
   end

data/lib/face_control/cli.rb

@@ -9,7 +9,7 @@ module FaceControl
     def run
       logger = Logger.new(STDOUT)
       project, repository, pull_request_id, ignored_severities = arguments
-      pull_request = pull_request(project, repository, pull_request_id, logger)
+      pull_request = Stash::Config.new.server(logger).repository(project, repository).pull_request(pull_request_id)
 
       logger.info('Running checkers...')
       comments = check(pull_request, ignored_severities, logger)
@@ -60,14 +60,5 @@ module FaceControl
       puts e.message
       exit(1)
     end
-
-    def pull_request(project, repository, pull_request_id, logger)
-      @pull_request ||= begin
-        config = Stash::Config.new
-        server = Stash::Server.new(config.host, config.user, config.password, logger)
-        repository = server.repository(project, repository)
-        repository.pull_request(pull_request_id)
-      end
-    end
   end
 end

data/lib/stash/config.rb

@@ -8,6 +8,12 @@ module Stash
       fail "#{@config_file} does not exist" unless File.exist?(@config_file)
     end
 
+    def server(logger = nil)
+      Server.new(host, user, password, logger)
+    end
+
+    private
+
     def host
       config['stash_url']
     end
@@ -20,8 +26,6 @@ module Stash
       config['password']
     end
 
-    private
-
     def config
       @config ||= YAML.load_file(@config_file)
     end

data/lib/stash/pull_request/diff.rb

@@ -20,6 +20,7 @@ module Stash
       def diffs_with_added_lines
         @diff['diffs'].select do |diff|
           diff['destination'] &&
+          diff['hunks'] &&
           diff['hunks'].find do |hunk|
             hunk['segments'].find do |segment|
               segment['type'] == 'ADDED'

data/lib/stash/server.rb

@@ -3,6 +3,8 @@ require 'stash/repository'
 
 module Stash
   class Server
+    class CommunicationError < StandardError; end
+
     attr_accessor :root_uri, :user, :password, :logger
 
     def initialize(root_uri, user, password, logger = nil)
@@ -19,14 +21,18 @@ module Stash
     end
 
     def get(path)
-      logged('Response') do
-        HTTParty.get(endpoint + path, auth.merge(logging))
+      with_error_handling do
+        logged('Response') do
+          HTTParty.get(endpoint + path, auth.merge(logging))
+        end
       end
     end
 
     def post(path, data)
-      logged('Response') do
-        HTTParty.post(endpoint + path, auth.merge(content_type).merge(body: data.to_json).merge(logging))
+      with_error_handling do
+        logged('Response') do
+          HTTParty.post(endpoint + path, auth.merge(content_type).merge(body: data.to_json).merge(logging))
+        end
       end
     end
 
@@ -73,5 +79,13 @@ module Stash
         {}
       end
     end
+
+    def with_error_handling
+      yield.tap do |response|
+        unless response.success?
+          fail CommunicationError, 'Stash responded with an error'
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: face_control
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Ilya Vassilevsky
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -52,91 +52,77 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
-description: 
+        version: '0'
+description:
 email:
 - vassilevsky@gmail.com
 executables:
@@ -144,9 +130,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".vexor.yml"
+- ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -174,7 +162,7 @@ files:
 homepage: https://github.com/vassilevsky/face_control
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -189,9 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Checks Atlassian Stash pull requests and comments on issues in added code
 test_files: []

data/.vexor.yml

@@ -1,8 +0,0 @@
-rvm:
-- 2.0
-- 2.1
-- 2.2
-- 2.3
-
-before_script:
-- sudo npm install -g coffeelint