face_control 0.8.3 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0866df31cfd12c56023686b8a47d558c40f09bb9
-  data.tar.gz: eb123109eb9ef5745e26e518b4c0ba2c96a6af60
+SHA256:
+  metadata.gz: ba514fb93a1dfb2754c39133e292bf4465f14a91c740d23d1d41b578f7eb535e
+  data.tar.gz: b918ef667cef7b3f735990f278871c2f5150498c692ba3931d588234cf6bdf3e
 SHA512:
-  metadata.gz: f9b0053d8bf6d26a05c683b375c488bac18bebf31c901097dda691be5960f9588c8b16bc78176a91fafb7699ace29ab7c995b05d90a54b09998563a05719df50
-  data.tar.gz: 7b4d49bc82f187b8bd2d9a36690fc91b9b0965999b572a95ac39975ca7ffa4d814ee2c760cec5c02204ed77775c724366d503fc153c75665bb0a966b1becc9ce
+  metadata.gz: 90ff9a7e50d7b3adad8705b57ce83094567ed66832d8886e7299661b703e79a2ed1924d32ac7b3e8ae1dbfd22c279cba67cf8548ede752d4f17f55f8e4c5fdde
+  data.tar.gz: e9ccb42632591b28a0a50fb0d622d5fcb72c7dff13f20befe6d34051939a8dcc1a40f607260c5f840a1c2b4273d94f6c68713fe865f366178cbf37cd3ea29d4c

data/.gitignore

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

data/.vexor.yml

@@ -1,5 +1,4 @@
 rvm:
-- 1.9
 - 2.0
 - 2.1
 - 2.2

data/README.md

@@ -1,76 +1,94 @@
+# Face Control
+
 [![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
+Run static analysis of pull requests in [Bitbucket Server][] (formerly Stash)
+and comment on problems in added lines.
 
-Comment on added lines of pull requests in [Atlassian Stash][].
-Take comments from static checkers reports.
-(Currently supports [RuboCop][] and [CoffeeLint][].)
+Currently supports [RuboCop][] and [CoffeeLint][] and also checks for
+TODOs and FIXMEs.
 
 Inspired by [Hound][].
 
 ## Installation
 
-    gem install face_control
+```bash
+gem install face_control
+```
+
+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).
+
+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>
+```
 
-It's natural to run this on a continuous integration server.
-For example, here's a [Jenkins][] project setup:
+Instead of `--skip-severity` you can use just `-S`.
 
-* Source Code Management
-  * Git
-    * Repositories
-      * Refspec:
+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 [Atlassian Stash 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
-[Atlassian Stash]: https://www.atlassian.com/software/stash
-[Atlassian Stash Command Line Tools]: https://bitbucket.org/atlassian/stash-command-line-tools
+[Bitbucket Server]: https://www.atlassian.com/software/bitbucket/server
+[Bitbucket Server Command Line Tools]: https://bitbucket.org/atlassian/bitbucket-server-cli
 [RuboCop]: http://batsov.com/rubocop/
 [CoffeeLint]: http://www.coffeelint.org
 [Jenkins]: http://jenkins-ci.org

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.3'
+  spec.version       = '0.9.1'
   spec.authors       = ['Ilya Vassilevsky']
   spec.email         = ['vassilevsky@gmail.com']
 
@@ -16,7 +16,6 @@ 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'

data/lib/face_control/checkers/rubocop.rb

@@ -52,21 +52,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']
-        cop_config = ::RuboCop::ConfigLoader.default_configuration[cop_name] || {}
-        cop_config['StyleGuide']
-      end
-
-      def can_be_autocorrected?(offense)
-        !offense['corrected'].nil?
+        config = ::RuboCop::ConfigLoader.default_configuration
+        ::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.3
+  version: 0.9.1
 platform: ruby
 authors:
 - Ilya Vassilevsky
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -52,20 +52,6 @@ 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
@@ -136,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: 
+description:
 email:
 - vassilevsky@gmail.com
 executables:
@@ -174,7 +160,7 @@ files:
 homepage: https://github.com/vassilevsky/face_control
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -189,9 +175,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: []