gitlab-triage 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 151d7ca8651d7f913171ef8fe50a1128d2101df9286d88cffe57cbc20d50f254
-  data.tar.gz: 81a9fab0da6480444ad0498a361c364efac00c63c3db56b3d26b433a6f83f388
+  metadata.gz: 50e7ccde3708d94fd7af8e08648c66c808efc29d65af9ef1daed5b2d93e8d186
+  data.tar.gz: 6d56190f6a55e5458a8a2a0dde2cd6d148c8cadc7b3171323c1f06c3165b38bf
 SHA512:
-  metadata.gz: fa57bcfddb6a36c963cd1bd80903deef7c03d82bc77e259d5d71d9edc01dcf9b7786d0b88b79110273c7167fc6b74339da904470c79d648b8ed50ebd1b2ceb88
-  data.tar.gz: 92929ba6651a46241581dac4d3a3ec902e959ecea660b51cb7a861dba32f9418a760d9bcaaedf645439e39e6bdd5462880d9b1c635a90d3a9cf6499d372d43e8
+  metadata.gz: e3e8a45c76ec475486acfc23f555b3c71e90086fa0424efc36411de1caa32fee9471a2f2a751eac0a834a0a320e5293582e4b9011d39e09d0e40925ba1f64da1
+  data.tar.gz: ffc308fedc4e4d1f64ab028ef25ec46e4382990d601ff78137cbbc5d613bf3b8b5a299d8a2a31d32e09e9003ff6033eba6f464de0cd0b21d2df1db8b6cbf2a5d

data/README.md

@@ -636,6 +636,9 @@ Placeholders work regularly for `item`, but for `summary` only
 `{{title}}`, `{{items}}`, `{{type}}` are supported because it's not tied to a
 particular resource like the comment action.
 
+**Note:**: No issues will be created if the specific policy doesn't yield
+any resources.
+
 **Note:**: `redact_confidential_resources` defaults to `true`, so fields on
 confidential resources will be converted to `(confidential)` except for
 `{{web_url}}`. Setting it to `false` will reveal the confidential fields.
@@ -774,6 +777,10 @@ Which could generate an issue like:
   /label ~"needs attention"
   ```
 
+**Note:**: If a specific policy doesn't yield any resources, it will not generate
+the corresponding description. If all policies yield no resources, then
+no issues will be created.
+
 ### Ruby expression API
 
 Here's a list of currently available Ruby expression API:

data/lib/gitlab/triage/action/summarize.rb

@@ -19,7 +19,7 @@ module Gitlab
         end
 
         def act
-          perform if policy.resources.any? && issue.valid?
+          perform if issue.valid?
         end
 
         private

data/lib/gitlab/triage/entity_builders/issue_builder.rb

@@ -6,9 +6,7 @@ module Gitlab
   module Triage
     module EntityBuilders
       class IssueBuilder
-        attr_writer :description, :items
-
-        def initialize(type:, action:, resources:, network:)
+        def initialize(type:, action:, resources:, network:, separator: "\n")
           @type = type
           @item_template = action[:item]
           @title_template = action[:title]
@@ -17,6 +15,7 @@ module Gitlab
             action[:redact_confidential_resources] != false
           @resources = resources
           @network = network
+          @separator = separator
         end
 
         def title
@@ -28,7 +27,11 @@ module Gitlab
         end
 
         def valid?
-          title =~ /\S+/
+          title =~ /\S+/ && any_resources?
+        end
+
+        def any_resources?
+          @resources.any?
         end
 
         private
@@ -42,11 +45,16 @@ module Gitlab
         end
 
         def items
-          @items ||= @resources.map(&method(:build_item)).join("\n")
+          @items ||= @resources.map(&method(:build_item)).join(@separator)
         end
 
         def build_item(resource)
-          build_text(resource, @item_template)
+          case resource
+          when IssueBuilder
+            resource.description
+          else
+            build_text(resource, @item_template)
+          end
         end
 
         def build_text(resource, template)

data/lib/gitlab/triage/policies/summary_policy.rb

@@ -12,19 +12,19 @@ module Gitlab
         def build_issue
           action = actions[:summarize]
 
+          issues =
+            resources.map do |inner_policy_spec, inner_resources|
+              Policies::RulePolicy.new(
+                type, inner_policy_spec, inner_resources, network)
+                .build_issue
+            end
+
           EntityBuilders::IssueBuilder.new(
             type: type,
             action: action,
-            resources: [],
-            network: network).tap do |issue|
-            issue.items =
-              resources.map do |inner_policy_spec, inner_resources|
-                Policies::RulePolicy.new(
-                  type, inner_policy_spec, inner_resources, network)
-                  .build_issue
-                  .description
-              end.join("\n\n")
-          end
+            resources: issues.select(&:any_resources?),
+            network: network,
+            separator: "\n\n")
         end
 
         # Due to resources is a different type, this will never work

data/lib/gitlab/triage/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Triage
-    VERSION = '0.16.0'.freeze
+    VERSION = '0.17.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: GitLab triage automation project.