danger-warnings_next_generation 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba6ffd3c7485975a270122fa89b748f08882d7616cc5cee693001789f298a99
-  data.tar.gz: 306a28d2ca2cf49b11c0e43d958380be89ac59bd359b00d4050e2ba3fe5a539e
+  metadata.gz: ca8908ac2dbb49d19073752e2f3080d18619db630da9458e4f3cf5754c0e5e10
+  data.tar.gz: 46682178b08d1c87e250bbe9a8910603efcea9f23abb5d3f6ca7ddb31fc66be4
 SHA512:
-  metadata.gz: 0d16ae24773329a9ece05fa147eaa68d1cd2cb23d220163a5e67c307d771d9b3db4ca33baef4aab556014222e7763a466204c83030eccbd264972b4ee5b861e7
-  data.tar.gz: f5bb67adfb5df821b6dcffd163a6664ce1ed7c1e63e752c0c45141a90049868556944285150d040c90c6e04c2fb80a1347c7fb6cf0b1f4aab94f1f98b443bb74
+  metadata.gz: 42b11cee07c972faacb608b1dac054dc2f7cec481b693179e74e139045cf5e8f8ae6d874c8b6fa55e0b49be6291856950bea4aaef714dd2142dcb414d75f891a
+  data.tar.gz: 48c2a489c9681d53ca4fe04c3382f955583ab26fc6dc144dc431f56056f3ab6bcf12868f577a709ea74db222f3f55dc7e76aa632db7f961c0cee05155309b137

data/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.2] - 2019-5-27
+### Fixed
+- Do not post empty tool report
+- Only include entries in tool report where basename of file is under changed files
+
 ## [0.1.1] - 2019-5-17
 ### Fixed
 - Remove line breaks from message to avoid broken tables.

data/README.md

@@ -94,7 +94,7 @@ This plugin is inspired and works only with the jenkins [warnings-ng-plugin](htt
 |Android Lint Warnings|10|0|3|
 |PMD Warnings|:star:|0|0|
 |Detekt Warnings|10|5|5|
-|Checkstyle|:star:|0|3|
+|Checkstyle Warnings|:star:|0|3|
 
 ### Java Warnings
 

data/lib/warnings_next_generation/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WarningsNextGeneration
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/warnings_next_generation/markdown_table.rb

@@ -22,6 +22,10 @@ module WarningsNextGeneration
       end
     end
 
+    def size
+      @lines.length
+    end
+
     def detail_header(*args)
       args.each do |item|
         @header << "#{item}#{COLUMN_SEPARATOR}"

data/lib/warnings_next_generation/plugin.rb

@@ -70,17 +70,15 @@ module Danger
         url = tool["latestUrl"]
         id = tool["id"]
 
-        if use_include_option?(options)
-          next unless tool_ids.include?(id)
-        end
+        next if use_include_option?(options) && !tool_ids.include?(id)
+
         overview = overview_result(url)
         entry_count += 1
         overview_entry(overview_table, name, overview)
       end
 
-      if use_include_option?(options)
-        return if entry_count.zero?
-      end
+      return if use_include_option?(options) && entry_count.zero?
+
       markdown("#{WNG_OVERVIEW_TITLE}\n\n#{overview_table.to_markdown}")
     end
 
@@ -99,9 +97,8 @@ module Danger
         url = tool["latestUrl"]
         id = tool["id"]
 
-        if use_include_option?(options)
-          next unless tool_ids.include?(id)
-        end
+        next if use_include_option?(options) && !tool_ids.include?(id)
+
         if inline?(options) && check_baseline(options)
           inline_report(url, baseline(options))
         else
@@ -168,11 +165,17 @@ module Danger
         file = File.basename(issue["fileName"])
         line = issue["lineStart"]
         message = issue["message"].gsub("\n", " ")
+
+        next unless basename_in_changeset?(file)
+
         table.line(severity, "#{file}:#{line}", "#{category_type(issue)} #{message}")
       end
-      content = +"### #{name}\n\n"
-      content << table.to_markdown
-      markdown(content)
+
+      unless table.size.zero?
+        content = +"### #{name}\n\n"
+        content << table.to_markdown
+        markdown(content)
+      end
     end
 
     def inline_report(url, baseline)
@@ -223,6 +226,16 @@ module Danger
       target_files.include?(file)
     end
 
+    def basename_in_changeset?(file)
+      result = false
+      target_files.each do |change|
+        break if result
+
+        result = change.include?(File.basename(file))
+      end
+      result
+    end
+
     def target_files
       @target_files ||= git.modified_files + git.added_files
     end

data/spec/assets/java_detail_one.json

@@ -0,0 +1,24 @@
+{
+  "_class": "io.jenkins.plugins.analysis.core.restapi.ReportApi",
+  "issues": [
+    {
+      "baseName": "ProductDetailPageFragment.kt",
+      "category": "Deprecation",
+      "columnEnd": 54,
+      "columnStart": 54,
+      "description": "",
+      "fileName": "/var/lib/jenkins/workspace/projectname/b2b-app-android-analyze/repository/app/src/main/java/com/projectname/b2bshop/fragment/ProductDetailPageFragment.kt",
+      "fingerprint": "07D91BE07253C0864B9B4F05F0308B28",
+      "lineEnd": 135,
+      "lineStart": 135,
+      "message": "'getColor(Int): Int' is deprecated. Deprecated in Java",
+      "moduleName": "",
+      "origin": "java",
+      "packageName": "-",
+      "reference": "5",
+      "severity": "NORMAL",
+      "type": "-"
+    }
+  ],
+  "size": 1
+}

data/spec/warnings_next_generation_spec.rb

@@ -14,6 +14,7 @@ module Danger
       before do
         @dangerfile = testing_dangerfile
         @my_plugin = @dangerfile.warnings_next_generation
+        target_files_return_java_all
       end
 
       describe "overview_report" do
@@ -129,7 +130,7 @@ module Danger
       describe "tools_report" do
         it "list all entries" do
           aggregation_return("/assets/aggregation_single.json")
-          details_return("/assets/java_all.json")
+          details_return("/assets/java_detail_all.json")
           @my_plugin.tools_report
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -141,7 +142,7 @@ module Danger
 
         it "no configuration list all warnings reports" do
           aggregation_return("/assets/aggregation.json")
-          details_return("/assets/java_all.json")
+          details_return("/assets/java_detail_all.json")
           @my_plugin.tools_report
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -150,7 +151,7 @@ module Danger
 
         it "single include adds table" do
           aggregation_return("/assets/aggregation.json")
-          details_return("/assets/java_all.json")
+          details_return("/assets/java_detail_all.json")
           @my_plugin.tools_report(include: ["java"])
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -160,7 +161,7 @@ module Danger
 
         it "multiple include adds table for each" do
           aggregation_return("/assets/aggregation.json")
-          details_return("/assets/java_all.json")
+          details_return("/assets/java_detail_all.json")
           @my_plugin.tools_report(include: %w(java pmd))
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -172,7 +173,7 @@ module Danger
 
         it "empty includes add no overview" do
           aggregation_return("/assets/aggregation.json")
-          details_return("/assets/java_all.json")
+          details_return("/assets/java_detail_all.json")
           @my_plugin.tools_report(include: [])
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -181,7 +182,7 @@ module Danger
 
         it "wrong includes add no overview" do
           aggregation_return("/assets/aggregation.json")
-          details_return("/assets/java_all.json")
+          details_return("/assets/java_detail_all.json")
           @my_plugin.tools_report(include: ["not_existing"])
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -190,14 +191,13 @@ module Danger
 
         it "inline missing baseline raises error" do
           aggregation_return("/assets/aggregation_single.json")
-          details_return("/assets/java_all.json")
+          details_return("/assets/java_detail_all.json")
           expect { @my_plugin.tools_report(inline: true) }.to raise_error(/set 'baseline'/)
         end
 
         it "creates inline comments" do
           aggregation_return("/assets/aggregation_single.json")
-          details_return("/assets/java_all.json")
-          target_files_return_java_all
+          details_return("/assets/java_detail_all.json")
           @my_plugin.tools_report(inline: true, baseline: JAVA_ALL_BASELINE)
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -209,8 +209,7 @@ module Danger
 
         it "inline comments remove baseline" do
           aggregation_return("/assets/aggregation_single.json")
-          details_return("/assets/java_all.json")
-          target_files_return_java_all
+          details_return("/assets/java_detail_all.json")
           @my_plugin.tools_report(inline: true, baseline: JAVA_ALL_BASELINE)
 
           message = @dangerfile.violation_report[:messages].first
@@ -224,6 +223,7 @@ module Danger
           issue = issues["issues"].first
           expect(issue["message"]).to include("\n")
           details_return_issue(issues)
+          target_files_return_manifest
           @my_plugin.tools_report
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -238,6 +238,7 @@ module Danger
           issue["category"] = "TEST_CATEGORY"
           issue["type"] = "TEST_TYPE"
           details_return_issue(issues)
+          target_files_return_manifest
           @my_plugin.tools_report
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -252,6 +253,7 @@ module Danger
           issue["category"] = "TEST_CATEGORY"
           issue["type"] = ""
           details_return_issue(issues)
+          target_files_return_manifest
           @my_plugin.tools_report
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -266,6 +268,7 @@ module Danger
           issue["category"] = "TEST_CATEGORY"
           issue["type"] = nil
           details_return_issue(issues)
+          target_files_return_manifest
           @my_plugin.tools_report
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -280,6 +283,7 @@ module Danger
           issue["category"] = ""
           issue["type"] = "TEST_TYPE"
           details_return_issue(issues)
+          target_files_return_manifest
           @my_plugin.tools_report
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -294,6 +298,7 @@ module Danger
           issue["category"] = nil
           issue["type"] = "TEST_TYPE"
           details_return_issue(issues)
+          target_files_return_manifest
           @my_plugin.tools_report
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -308,6 +313,7 @@ module Danger
           issue["category"] = ""
           issue["type"] = ""
           details_return_issue(issues)
+          target_files_return_manifest
           @my_plugin.tools_report
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -323,6 +329,7 @@ module Danger
           issue["category"] = nil
           issue["type"] = nil
           details_return_issue(issues)
+          target_files_return_manifest
           @my_plugin.tools_report
 
           markdowns = @dangerfile.status_report[:markdowns]
@@ -330,6 +337,16 @@ module Danger
           expect(markdowns.first.message).not_to include("[")
           expect(markdowns.first.message).not_to include("]")
         end
+
+        it "no changed files match does not add report" do
+          aggregation_return("/assets/aggregation_single.json")
+          details_return("/assets/java_detail_one.json")
+          target_files_return(["Unmatched.java"])
+          @my_plugin.tools_report
+
+          markdowns = @dangerfile.status_report[:markdowns]
+          expect(markdowns.length).to be(0)
+        end
       end
     end
   end
@@ -385,8 +402,16 @@ def android_lint_issues
 end
 
 def target_files_return_java_all
-  @my_plugin.stubs(:target_files).returns(["app/src/main/java/com/projectname/b2bshop/fragment/gallery/ImageGalleryFragment.kt",
-                                           "app/src/main/java/com/projectname/b2bshop/webservice/requestqueue/RequestQueue.java",
-                                           "app/src/main/java/com/projectname/b2bshop/webservice/requestqueue/RequestQueueImpl.java",
-                                           "app/src/main/java/com/projectname/b2bshop/fragment/ProductDetailPageFragment.kt"])
+  target_files_return(["app/src/main/java/com/projectname/b2bshop/fragment/gallery/ImageGalleryFragment.kt",
+                       "app/src/main/java/com/projectname/b2bshop/webservice/requestqueue/RequestQueue.java",
+                       "app/src/main/java/com/projectname/b2bshop/webservice/requestqueue/RequestQueueImpl.java",
+                       "app/src/main/java/com/projectname/b2bshop/fragment/ProductDetailPageFragment.kt"])
+end
+
+def target_files_return_manifest
+  target_files_return(["AndroidManifest.xml"])
+end
+
+def target_files_return(list)
+  @my_plugin.stubs(:target_files).returns(list)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-warnings_next_generation
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Martin Schwamberger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -182,7 +182,8 @@ files:
 - spec/assets/example/overview_detekt.json
 - spec/assets/example/overview_pmd.json
 - spec/assets/java.json
-- spec/assets/java_all.json
+- spec/assets/java_detail_all.json
+- spec/assets/java_detail_one.json
 - spec/assets/java_zero.json
 - spec/assets/java_zero_new.json
 - spec/spec_helper.rb
@@ -221,7 +222,8 @@ test_files:
 - spec/assets/example/overview_detekt.json
 - spec/assets/example/overview_pmd.json
 - spec/assets/java.json
-- spec/assets/java_all.json
+- spec/assets/java_detail_all.json
+- spec/assets/java_detail_one.json
 - spec/assets/java_zero.json
 - spec/assets/java_zero_new.json
 - spec/spec_helper.rb