danger-ktlint 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9214f9181e86cf209334e8b1f571ba7feb327b6b155aab65cabfb10897c05b82
-  data.tar.gz: fe8ee017fd08f7571245f150a8b41c79961dd132d38ce05058972dab8ca484c0
+  metadata.gz: 99b078a476493453fd609f033e65c6cd20d695617fc8a8a3e6a9c8b0b7745f3f
+  data.tar.gz: bf60ceecd5cf172c879f80183933b55274a5f1261f00fa241ae56fa95e9f44ae
 SHA512:
-  metadata.gz: 358a13a92ee3b69c3ec2202a1eac4a830b38beedd225cf2669ec4a2893cd551176a7e8e08b02e45a5010f30ad8ed294e001f763501b4218969376174c69caacc
-  data.tar.gz: 77e4e6084228c7cf2f08bc4c44f9475188125e29af700798b665ef8ed7c8050674507d68b028894a346db5b09117ad0ac34ddd3116136cbc095dd36bc81a4878
+  metadata.gz: 255316fb1e4627d772601a0fc40ab3d8faf67e35696f4433477ed431a3de010a203e5f9201902c9c98f046450546d2829a457d980ce9d887a65db6dd4dc6b7ef
+  data.tar.gz: 325c2fb3d73b05a9a4e8256c94accab75a8bdec4978d46d8b8ef1db6adea6947b776dcb1316be2271d6079f8f12347dcb02b13e4a600a546d4e6f67ce3dd98f3

data/.github/workflows/test.yml

@@ -0,0 +1,19 @@
+name: test
+
+on: [push]
+
+jobs:
+  test:
+    name: Run spec
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.0.1
+        bundler-cache: true
+    - name: Run spec
+      run: |
+        bundle exec rspec spec
+

data/CHANGELOG.md

@@ -0,0 +1,28 @@
+## Unreleased
+
+## 0.0.6
+
+- Support GitLab and BitBucket server even if `inline_mode: false` is specified.
+
+## 0.0.5
+
+### Fixed
+
+- Fixed to not check ktlint binary even when skip_task is specified.
+
+## 0.0.4
+
+### Added
+- ktlint task can be skipped by specifing `ktlint.skip_lint = true` and `ktlint.report_file = '...'`
+
+## 0.0.3
+### Added
+- `limit` parameter to set the maximum number of comments of ktlint results.
+
+## 0.0.2
+### Added
+- Inline comment feature (`inline_mode: true` with ktlint.lint)
+
+## 0.0.1
+### Added
+- Run ktlint by ktlint.lint

data/README.md

@@ -5,16 +5,18 @@ Lint kotlin files only changed files in a pull request using ktlint command lint
 ## Installation
 
 ```ruby
-$ gem install danger-ktlint
+gem install danger-ktlint
 ```
 
 ## Usage
 
 You need to install `ktlint` command and set as executable first, see: https://ktlint.github.io/#getting-started.
 
+If you want to skip ktlint task, for example to only comment on the results of ktlint, no need to install ktlint. See https://github.com/mataku/danger-ktlint#skip-ktlint-task.
+
 ```bash
 # Example
-$ curl --output /usr/local/bin/ktlint -sL https://github.com/shyiko/ktlint/releases/download/$KTLINT_VERSION/ktlint && chmod a+x /usr/loca/bin/ktlint
+curl --output /usr/local/bin/ktlint -sL https://github.com/pinterest/ktlint/releases/download/$KTLINT_VERSION/ktlint && chmod a+x /usr/local/bin/ktlint
 ```
 
 Add this to Dangerfile.
@@ -23,12 +25,40 @@ Add this to Dangerfile.
 ktlint.lint
 
 # If you want inline comments, specify `ktlint.lint` with `inline_mode: true`
-ktlint.lint(inline_mode: true)
+# ktlint.lint(inline_mode: true)
 ```
 
+### Options
+#### Set maximum number of comments of ktlint results
+
+Default is `nil`, all comments are sent.
+
+```shell
+ktlint.limit = 3
+ktlint.lint
+```
+
+#### Skip ktlint task
+
+Default is false.
+
+```shell
+ktlint.skip_lint = true
+# If skip_lint is specified, report_file must also be specified.
+ktlint.report_file = 'result.json'
+ktlint.lint
+```
+
+## CHANGELOG
+
+See [CHANGELOG.md](https://github.com/mataku/danger-ktlint/blob/master/CHANGELOG.md).
+
 ## TODO
 
 - filtering: false (default: filtering: true behavior)
+- Allow plain or html report_file (Currently only JSON is supported.)
+- Install ktlint and use it if ktlint binary does not exist
+- Support for services other than GitHub
 
 ## Development
 

data/danger-ktlint.gemspec

@@ -21,29 +21,18 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
 
   # General ruby development
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake'
 
   # Testing support
   spec.add_development_dependency 'rspec', '~> 3.4'
 
   # Linting code and docs
   spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "yard"
 
   # Makes testing easy via `bundle exec guard`
   spec.add_development_dependency 'guard', '~> 2.14'
   spec.add_development_dependency 'guard-rspec', '~> 4.7'
 
-  # If you want to work on older builds of ruby
-  spec.add_development_dependency 'listen', '3.0.7'
-
-  # This gives you the chance to run a REPL inside your tests
-  # via:
-  #
-  #    require 'pry'
-  #    binding.pry
-  #
-  # This will stop test execution and let you inspect the results
   spec.add_development_dependency 'pry'
 end

data/lib/ktlint/gem_version.rb

@@ -1,3 +1,3 @@
 module Ktlint
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.6".freeze
 end

data/lib/ktlint/plugin.rb

@@ -1,31 +1,57 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Danger
   class DangerKtlint < Plugin
+    class UnexpectedLimitTypeError < StandardError; end
+
+    class UnsupportedServiceError < StandardError
+      def initialize(message = 'Unsupported service! Currently supported services are GitHub, GitLab and BitBucket server.')
+        super(message)
+      end
+    end
+
+    AVAILABLE_SERVICES = [:github, :gitlab, :bitbucket_server]
+
     # TODO: Lint all files if `filtering: false`
     attr_accessor :filtering
 
+    attr_accessor :skip_lint, :report_file
+
+    def limit
+      @limit ||= nil
+    end
+
+    def limit=(limit)
+      if limit != nil && limit.integer?
+        @limit = limit
+      else
+        raise UnexpectedLimitTypeError
+      end
+    end
+
     # Run ktlint task using command line interface
     # Will fail if `ktlint` is not installed
     # Skip lint task if files changed are empty
     # @return [void]
     # def lint(inline_mode: false)
     def lint(inline_mode: false)
-      unless ktlint_exists?
-        fail("Couldn't find ktlint command. Install first.")
-        return
+      unless supported_service?
+        raise UnsupportedServiceError.new
       end
 
       targets = target_files(git.added_files + git.modified_files)
-      return if targets.empty?
 
-      results = JSON.parse(`ktlint #{targets.join(' ')} --reporter=json --relative`)
-      return if results.empty?
+      results = ktlint_results(targets)
+      if results.nil? || results.empty?
+        return
+      end
 
       if inline_mode
-        send_inline_comments(results)
+        send_inline_comments(results, targets)
       else
-        send_markdown_comment(results)
+        send_markdown_comment(results, targets)
       end
     end
 
@@ -45,23 +71,44 @@ module Danger
     # 		]
     # 	}
     # ]
-    def send_markdown_comment(results)
-      results.each {|result|
-        result['errors'].each {|error|
-          file = "#{result['file']}#L#{error['line']}"
-          message = "#{github.html_link(file)} has linter issue: #{error['message']}"
-          fail(message)
-        }
-      }
+    def send_markdown_comment(results, targets)
+      catch(:loop_break) do
+        count = 0
+        results.each do |result|
+          result['errors'].each do |error|
+            file_path = relative_file_path(result['file'])
+            next unless targets.include?(file_path)
+
+            message = "#{file_html_link(file_path, error['line'])}: #{error['message']}"
+            fail(message)
+            unless limit.nil?
+              count += 1
+              if count >= limit
+                throw(:loop_break)
+              end
+            end
+          end
+        end
+      end
     end
 
-    def send_inline_comments(results)
-      results.each do |result|
-        result['errors'].each do |error|
-          file = result['file']
-          message = error['message']
-          line = error['line']
-          fail(message, file: result['file'], line: line)
+    def send_inline_comments(results, targets)
+      catch(:loop_break) do
+        count = 0
+        results.each do |result|
+          result['errors'].each do |error|
+            file_path = relative_file_path(result['file'])
+            next unless targets.include?(file_path)
+            message = error['message']
+            line = error['line']
+            fail(message, file: result['file'], line: line)
+            unless limit.nil?
+              count += 1
+              if count >= limit
+                throw(:loop_break)
+              end
+            end
+          end
         end
       end
     end
@@ -72,10 +119,65 @@ module Danger
       end
     end
 
+    # Make it a relative path so it can compare it to git.added_files
+    def relative_file_path(file_path)
+      file_path.gsub(/#{pwd}\//, '')
+    end
+
     private
 
+    def file_html_link(file_path, line_number)
+      file = if danger.scm_provider == :github
+               "#{file_path}#L#{line_number}"
+             else
+               file_path
+             end
+      scm_provider_klass.html_link(file)
+    end
+
+    # `eval` may be dangerous, but it does not accept any input because it accepts only defined as danger.scm_provider
+    def scm_provider_klass
+      @scm_provider_klass ||= eval(danger.scm_provider.to_s)
+    end
+
+    def pwd
+      @pwd ||= `pwd`.chomp
+    end
+
     def ktlint_exists?
       system 'which ktlint > /dev/null 2>&1' 
     end
+
+    def ktlint_results(targets)
+      if skip_lint
+        # TODO: Allow XML
+        if report_file.nil? || report_file.empty?
+          fail("If skip_lint is specified, You must specify ktlint report json file with `ktlint.report_file=...` in your Dangerfile.")
+          return
+        end
+
+        unless File.exists?(report_file)
+          fail("Couldn't find ktlint result json file.\nYou must specify it with `ktlint.report_file=...` in your Dangerfile.")
+          return
+        end
+
+        File.open(report_file) do |f|
+          JSON.load(f)
+        end
+      else
+        unless ktlint_exists?
+          fail("Couldn't find ktlint command. Install first.")
+          return
+        end
+
+        return if targets.empty?
+
+        JSON.parse(`ktlint #{targets.join(' ')} --reporter=json --relative`)
+      end
+    end
+
+    def supported_service?
+      AVAILABLE_SERVICES.include?(danger.scm_provider.to_sym)
+    end
   end
 end

data/spec/fixtures/ktlint_result.txt

@@ -7,6 +7,12 @@
 				"column": 1,
 				"message": "Unexpected blank line(s) before \"}\"",
 				"rule": "no-blank-line-before-rbrace"
+			},
+		  {
+				"line": 47,
+				"column": 1,
+				"message": "Unexpected blank line(s) before \"}\"",
+				"rule": "no-blank-line-before-rbrace"
 			}
 		]
 	}

data/spec/ktlint_spec.rb

@@ -9,6 +9,11 @@ module Danger
       expect(Danger::DangerKtlint.new(nil)).to be_a Danger::Plugin
     end
 
+    before do
+      allow_any_instance_of(Kernel).to receive(:`).with('pwd').and_return('/home/mataku')
+      allow_any_instance_of(Kernel).to receive(:`).with('which less').and_return(0)
+    end
+
     describe '#lint' do
       before do
         allow_any_instance_of(Danger::DangerfileGitPlugin).to receive(:added_files).and_return(['app/src/main/java/com/mataku/Model.kt'])
@@ -31,11 +36,12 @@ module Danger
           allow_any_instance_of(Kernel).to receive(:system).with('which ktlint > /dev/null 2>&1').and_return(true)
           allow_any_instance_of(Kernel).to receive(:`).with('ktlint app/src/main/java/com/mataku/Model.kt --reporter=json --relative').and_return(dummy_ktlint_result)
           allow_any_instance_of(Danger::DangerfileGitHubPlugin).to receive(:html_link).with('app/src/main/java/com/mataku/Model.kt#L46').and_return("<a href='https://github.com/mataku/android/blob/561827e46167077b5e53515b4b7349b8ae04610b/Model.kt'>Model.kt</a>")
+          allow_any_instance_of(Danger::DangerfileGitHubPlugin).to receive(:html_link).with('app/src/main/java/com/mataku/Model.kt#L47').and_return("<a href='https://github.com/mataku/android/blob/561827e46167077b5e53515b4b7349b8ae04610b/Model.kt'>Model.kt</a>")
         end
 
         it 'Sends markdown comment' do
           plugin.lint
-          expect(dangerfile.status_report[:errors].size).to eq(1)
+          expect(dangerfile.status_report[:errors].size).to eq(2)
         end
       end
 
@@ -47,7 +53,57 @@ module Danger
 
         it 'Sends inline comment' do
           plugin.lint(inline_mode: true)
-          expect(dangerfile.status_report[:errors].size).to eq(1)
+          expect(dangerfile.status_report[:errors].size).to eq(2)
+        end
+      end
+
+      context 'GitLab' do
+        let(:dangerfile) { testing_dangerfile_for_gitlab }
+
+        before do
+          allow_any_instance_of(Kernel).to receive(:system).with('which ktlint > /dev/null 2>&1').and_return(true)
+          allow_any_instance_of(Kernel).to receive(:`).with('ktlint app/src/main/java/com/mataku/Model.kt --reporter=json --relative').and_return(dummy_ktlint_result)
+          allow_any_instance_of(Danger::DangerfileGitLabPlugin).to receive(:html_link).with('app/src/main/java/com/mataku/Model.kt').and_return("<a href='https://gitlab.com/mataku/android/blob/561827e46167077b5e53515b4b7349b8ae04610b/Model.kt'>Model.kt</a>")
+          allow_any_instance_of(Danger::DangerfileGitLabPlugin).to receive(:html_link).with('app/src/main/java/com/mataku/Model.kt').and_return("<a href='https://gitlab.com/mataku/android/blob/561827e46167077b5e53515b4b7349b8ae04610b/Model.kt'>Model.kt</a>")
+        end
+
+        it do
+          plugin.lint
+          expect(dangerfile.status_report[:errors].size).to eq(2)
+        end
+      end
+    end
+
+    describe '#limit' do
+      context 'expected limit value is set' do
+        it 'raises UnexpectedLimitTypeError' do
+          expect { plugin.limit = nil }.to raise_error(DangerKtlint::UnexpectedLimitTypeError)
+        end
+      end
+
+      context 'integer value is set to limit' do
+        it 'raises no errors' do
+          expect { plugin.limit = 1 }.not_to raise_error
+        end
+      end
+    end
+
+    describe '#send_markdown_comment' do
+      let(:limit) { 1 } 
+
+      before do
+        allow_any_instance_of(Danger::DangerfileGitPlugin).to receive(:added_files).and_return(['app/src/main/java/com/mataku/Model.kt'])
+        allow_any_instance_of(Danger::DangerfileGitPlugin).to receive(:modified_files).and_return([])
+ 
+        allow_any_instance_of(Kernel).to receive(:system).with('which ktlint > /dev/null 2>&1').and_return(true)
+        allow_any_instance_of(Kernel).to receive(:`).with('ktlint app/src/main/java/com/mataku/Model.kt --reporter=json --relative').and_return(dummy_ktlint_result)
+        plugin.limit = limit
+      end
+
+      context 'limit is set' do
+        it 'equals number of ktlint results to limit' do
+          plugin.lint(inline_mode: true)
+          expect(dangerfile.status_report[:errors].size).to eq(limit)
         end
       end
     end

data/spec/spec_helper.rb

@@ -46,24 +46,35 @@ def testing_ui
 end
 # rubocop:enable Lint/NestedMethodDefinition
 
-# Example environment (ENV) that would come from
-# running a PR on TravisCI
 def testing_env
   {
-    "HAS_JOSH_K_SEAL_OF_APPROVAL" => "true",
-    "TRAVIS_PULL_REQUEST" => "800",
-    "TRAVIS_REPO_SLUG" => "artsy/eigen",
-    "TRAVIS_COMMIT_RANGE" => "759adcbd0d8f...13c4dc8bb61d",
+    "BITRISE_PULL_REQUEST" => "4",
+    "BITRISE_IO" => "true",
+    "GIT_REPOSITORY_URL" => "git@github.com:artsy/eigen",
     "DANGER_GITHUB_API_TOKEN" => "123sbdq54erfsd3422gdfio"
   }
 end
 
+def testing_env_for_gitlab
+  {
+    "BITRISE_PULL_REQUEST" => "4",
+    "BITRISE_IO" => "true",
+    "GIT_REPOSITORY_URL" => "git@gitlab.com:artsy/eigen",
+    "DANGER_GITLAB_API_TOKEN" => "123sbdq54erfsd3422gdfio"
+  }
+end
+
 # A stubbed out Dangerfile for use in tests
 def testing_dangerfile
   env = Danger::EnvironmentManager.new(testing_env)
   Danger::Dangerfile.new(env, testing_ui)
 end
 
+def testing_dangerfile_for_gitlab
+  env = Danger::EnvironmentManager.new(testing_env_for_gitlab)
+  Danger::Dangerfile.new(env, testing_ui)
+end
+
 def dummy_ktlint_result
   File.read(File.expand_path('../fixtures/ktlint_result.txt', __FILE__)).chomp
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-ktlint
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - mataku
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -157,9 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -177,7 +150,7 @@ homepage: https://github.com/mataku/danger-ktlint
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,9 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Lint kotlin files using ktlint command line interface.
 test_files:

data/.circleci/config.yml

@@ -1,27 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: ruby:2.5.3
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "Gemfile.lock" }}
-              # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-      
-      - run:
-          name: Install Dependencies
-          command: |
-            bundle install --jobs=4 --path vendor/bundle
-      
-      - save_cache:
-          paths: 
-          - vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-
-      - run:
-          name: Run RSpec
-          command: |
-            bundle exec rspec