danger-findbugs 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4fd9cdf85075df5d0512d7b25458c312d5c09eaa
-  data.tar.gz: 4badc2cc6b36e3991cee9ddf416e2a3947ebfc9b
+SHA256:
+  metadata.gz: 9891d47f214dd933c5a60de3095fd3eafcb1a5fb0ebc2748d98f8a93869e6830
+  data.tar.gz: d35d97912c840bb79e986ee4a9032a27289004427a4d7f64caacd54cb5dbf7ad
 SHA512:
-  metadata.gz: e2975f853dd91f46a05871ae0a2359e3966a9098f9d0ce878842e0299ba8d9096ce4dfb4f3b47384fc2b59ce860c65bca1be34799517aa902b68e3b4d81a7aae
-  data.tar.gz: 1fb70c82cf6f3750e0f49f9c4e529bcf5807df271ec40a3ec91826ded22c7794b28e9da02bd9916b3cc11f9752ff3d968dd1d0109b8c62931b5b6e130fe9cf7c
+  metadata.gz: 212ddb9742a080d5948e83fdc54cbdc3f5f442f0ccf6928d7b6444ee4f6cdaa1486fd3e154ee70b39ff129a53c5ef62f6dded618702305b3f34179d0859e5e03
+  data.tar.gz: 7ca717bafe4b0b19cf4a4b4320674fcb213377d52003e82044a1c444209974d8372b0e572d44b9a0d7628ebde19eb1402ee4aeed543165842da0aa0de47add8f

data/Gemfile.lock

@@ -1,51 +1,53 @@
 PATH
   remote: .
   specs:
-    danger-findbugs (0.0.5)
+    danger-findbugs (0.0.8)
       danger-plugin-api (~> 1.0)
       oga (~> 2.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
-    ast (2.3.0)
-    claide (1.0.1)
+    ast (2.4.0)
+    claide (1.0.3)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    coderay (1.1.1)
+    coderay (1.1.2)
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.2.1)
+    danger (6.1.0)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
-      faraday-http-cache (~> 1.0)
-      git (~> 1)
-      kramdown (~> 1.5)
-      octokit (~> 4.2)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.5)
+      kramdown (~> 2.0)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (~> 4.7)
       terminal-table (~> 1)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
     diff-lcs (1.3)
-    faraday (0.12.1)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.3.1)
+    faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.9.18)
+    ffi (1.12.1)
     formatador (0.2.5)
-    git (1.3.0)
-    guard (2.14.1)
+    git (1.5.0)
+    guard (2.16.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -56,71 +58,74 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    kramdown (1.13.2)
+    jaro_winkler (1.5.4)
+    kramdown (2.1.0)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     listen (3.0.7)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
-    lumberjack (1.0.11)
-    method_source (0.8.2)
-    multipart-post (2.0.0)
+    lumberjack (1.1.1)
+    method_source (0.9.2)
+    multipart-post (2.1.1)
     nap (1.1.0)
     nenv (0.3.0)
-    notiffany (0.1.1)
+    no_proxy_fix (0.1.2)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.7.0)
+    octokit (4.15.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oga (2.10)
+    oga (2.15)
       ast
       ruby-ll (~> 2.1)
     open4 (1.3.4)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    pry (0.10.4)
+    parallel (1.19.1)
+    parser (2.7.0.2)
+      ast (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rainbow (2.2.2)
-      rake
+      method_source (~> 0.9.0)
+    public_suffix (4.0.3)
+    rainbow (3.0.0)
     rake (10.5.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.79.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 1.7)
     ruby-ll (2.1.2)
       ansi
       ast
-    ruby-progressbar (1.8.1)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    ruby-progressbar (1.10.1)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     shellany (0.0.1)
-    slop (3.6.0)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
-    thor (0.19.4)
-    unicode-display_width (1.1.3)
-    yard (0.9.9)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thor (1.0.1)
+    unicode-display_width (1.6.1)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
@@ -134,8 +139,8 @@ DEPENDENCIES
   pry
   rake (~> 10.0)
   rspec (~> 3.4)
-  rubocop (~> 0.41)
-  yard (~> 0.8)
+  rubocop (>= 0.49.0)
+  yard (>= 0.9.11)
 
 BUNDLED WITH
-   1.14.6
+   1.17.3

data/README.md

@@ -1,7 +1,13 @@
+# danger-findbugs
+[![Gem Version](https://badge.fury.io/rb/danger-findbugs.svg)](https://badge.fury.io/rb/danger-findbugs)
 
+Danger plugin for findbugs formatted xml file.
 
-### findbugs
+## Installation
 
+    $ gem install danger-findbugs
+
+## Usage
 Checks on your gradle project's Java source files.
 This is done using [finbugs](http://findbugs.sourceforge.net/)
 Results are passed out as tables in markdown.
@@ -18,25 +24,26 @@ findbugs.report_file = "app/build/reports/findbugs/findbugs.xml"
 findbugs.report</pre>
 </blockquote>
 
-
-
 #### Attributes
 
 `gradle_module` - Custom gradle module to run.
 This is useful when your project has different flavors.
 Defaults to "app".
 
+`gradle_modules` - Custom multiple gradle module to run.
+Defaults to "[`gradle_module`]".
+
 `gradle_task` - Custom gradle task to run.
 This is useful when your project has different flavors.
 Defaults to "findbugs".
 
+`gradle_project` - Custom gradle project directory.
+Defaults is repository's root directory.
+
 `report_file` - Location of report file
 If your findbugs task outputs to a different location, you can specify it here.
 Defaults to "build/reports/findbugs_report.xml".
 
-
-
-
 #### Methods
 
 `report` - Calls findbugs task of your gradle project.
@@ -56,7 +63,3 @@ It fails if `report_file` cannot be found inside current directory.
 `bug_issues` - A getter for `gradle_task`, returning "findbugs" if value is nil.
 
 `send_inline_comment` - Send inline comment with danger's warn or fail method
-
-
-
-

data/danger-findbugs.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.4'
 
   # Linting code and docs
-  spec.add_development_dependency "rubocop", "~> 0.41"
-  spec.add_development_dependency "yard", "~> 0.8"
+  spec.add_development_dependency "rubocop", ">= 0.49.0"
+  spec.add_development_dependency "yard", ">= 0.9.11"
 
   # Makes testing easy via `bundle exec guard`
   spec.add_development_dependency 'guard', '~> 2.14'

data/lib/findbugs/gem_version.rb

@@ -1,3 +1,3 @@
 module Findbugs
-  VERSION = "0.0.5".freeze
+  VERSION = "0.0.8".freeze
 end

data/lib/findbugs/plugin.rb

@@ -24,6 +24,10 @@ module Danger
     # Defaults to "app".
     # @return [String]
     attr_writer :gradle_module
+    # Custom multiple gradle module to run.
+    # Defaults to "[gradle_module]".
+    # @return [Array]
+    attr_writer :gradle_modules
     # Custom gradle task to run.
     # This is useful when your project has different flavors.
     # Defaults to "findbugs".
@@ -34,6 +38,15 @@ module Danger
     # Defaults to "build/reports/findbugs_report.xml".
     # @return [String]
     attr_writer :report_file
+    # Custom gradle project directory.
+    # Defaults is repository's root directory.
+    # @return [String]
+    attr_accessor :gradle_project
+    # Skip gradle task
+    # If you skip gradle task, for example project does not manage gradle.
+    # @return [Bool]
+    attr_writer :skip_gradle_task
+
 
     GRADLEW_NOT_FOUND = "Could not find `gradlew` inside current directory"
     REPORT_FILE_NOT_FOUND = "Findbugs report not found"
@@ -46,22 +59,60 @@ module Danger
 
     def report(inline_mode = true)
       return fail(GRADLEW_NOT_FOUND) unless gradlew_exists?
-      exec_gradle_task
+      if gradle_modules.empty?
+          execute_reporting(inline_mode)
+      end
+      unless skip_gradle_task
+        return fail(GRADLEW_NOT_FOUND) unless gradlew_exists?
+        exec_gradle_task
+      end
       return fail(REPORT_FILE_NOT_FOUND) unless report_file_exist?
 
       if inline_mode
         send_inline_comment
+
       else
-        # TODO not implemented
+          gradle_modules.each_with_index { |gradleModule, index|
+              task = gradle_task
+              file = report_file
+              @gradle_module = gradleModule
+              @gradle_task = gradleModule + ":" + task
+              @report_file = gradleModule + "/" + file
+
+              execute_reporting(inline_mode)
+
+              @gradle_task = task
+              @report_file = file
+              @bug_issues = nil
+              @findbugs_report = nil
+          }
       end
     end
 
+    # @return [void]
+    def execute_reporting(inline_mode)
+        exec_gradle_task
+        return fail(REPORT_FILE_NOT_FOUND) unless report_file_exist?
+
+        if inline_mode
+          send_inline_comment
+        else
+          # TODO not implemented
+        end
+    end
+
     # A getter for `gradle_module`, returning "app" if value is nil.
     # @return [String]
     def gradle_module
       @gradle_module ||= 'app'
     end
 
+    # A getter for `gradle_modules`, returning "[gradle_module]" if value is nil.
+    # @return [Array]
+    def gradle_modules
+      @gradle_modules ||= Array.new
+    end
+
     # A getter for `gradle_task`, returning "findbugs" if value is nil.
     # @return [String]
     def gradle_task
@@ -74,6 +125,11 @@ module Danger
       @report_file ||= 'build/reports/findbugs_report.xml'
     end
 
+    # A getter for `gradle_project`, returning "build/reports/findbugs_report.xml" if value is nil.
+    # @return [String]
+    def gradle_project
+      return @gradle_project ||= ''
+    end
     private
 
     # A getter for current updated files
@@ -82,29 +138,42 @@ module Danger
       @target_files ||= (git.modified_files - git.deleted_files) + git.added_files
     end
 
+    # A getter for `skip_gradle_task`, returning false if value is nil.
+    # @return [Bool]
+    def skip_gradle_task
+      @skip_gradle_task ||= false
+    end
+    
     # Run gradle task
     # @return [void]
     def exec_gradle_task
+      if gradle_project != ''
+        "export DANGER_TMP=$PWD"
+        "cd #{gradle_project}"
+      end
       system "./gradlew #{gradle_task}"
+      if gradle_project != ''
+        "cd DANGER_TMP"
+      end
     end
 
     # Check gradlew file exists in current directory
     # @return [Bool]
     def gradlew_exists?
-      `ls gradlew`.strip.empty? == false
+      `ls #{gradle_project}gradlew`.strip.empty? == false
     end
 
     # Check report_file exists in current directory
     # @return [Bool]
     def report_file_exist?
-      File.exists?(report_file)
+      File.exists?("#{gradle_project}#{report_file}")
     end
 
     # A getter for `gradle_task`, returning "findbugs" if value is nil.
     # @return [Oga::XML::Document]
     def findbugs_report
       require 'oga'
-      @findbugs_report ||= Oga.parse_xml(File.open(report_file))
+      @findbugs_report ||= Oga.parse_xml(File.open("#{gradle_project}#{report_file}"))
     end
 
     # A getter for `gradle_task`, returning "findbugs" if value is nil.
@@ -120,8 +189,9 @@ module Danger
     # @return [void]
     def send_inline_comment
       bug_issues.each do |issue|
-        next unless target_files.include? issue.absolute_path
-        send(issue.type, issue.description, file: issue.absolute_path, line: issue.line)
+        filename = "#{gradle_project}#{issue.absolute_path}"
+        next unless target_files.include? filename
+        send(issue.type, issue.description, file: filename, line: issue.line)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-findbugs
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - kazuki-yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2020-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -84,30 +84,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -213,8 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A longer description of danger-findbugs.