gitlab-triage 0.17.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50e7ccde3708d94fd7af8e08648c66c808efc29d65af9ef1daed5b2d93e8d186
-  data.tar.gz: 6d56190f6a55e5458a8a2a0dde2cd6d148c8cadc7b3171323c1f06c3165b38bf
+  metadata.gz: '068290d03b6eb617a306b0a5ea4ce9b255fa266a66cf97b7af06dca8395aae0a'
+  data.tar.gz: d73a8294b27be8fcec3fc465be95cf41109b8762abb1578a8c6b60da6d29c5ac
 SHA512:
-  metadata.gz: e3e8a45c76ec475486acfc23f555b3c71e90086fa0424efc36411de1caa32fee9471a2f2a751eac0a834a0a320e5293582e4b9011d39e09d0e40925ba1f64da1
-  data.tar.gz: ffc308fedc4e4d1f64ab028ef25ec46e4382990d601ff78137cbbc5d613bf3b8b5a299d8a2a31d32e09e9003ff6033eba6f464de0cd0b21d2df1db8b6cbf2a5d
+  metadata.gz: 24127793df3fcb08fe6ed9434ea4f0005617fb1e507df0a7e14bc065eb18bcd7a36bbf7d91501bf442484d21ea0dc1b4b02ad45dd625e6ca37c3fab234b8aec4
+  data.tar.gz: 1271a01b3bf03430265b068f98b9df87a53b8ca2026a71874fb64c5d1ceba3a950c6910a89045440f8e55eef0d64d46283a33e3459aeb1ddee337321e219fca8

data/lib/gitlab/triage/engine.rb

@@ -100,7 +100,12 @@ module Gitlab
         return if rules.blank?
 
         rules.each do |rule|
-          process_action(Policies::RulePolicy.new(resource_type, rule, resources_for_rule(resource_type, rule), network))
+          resources_for_rule(resource_type, rule) do |resources|
+            policy = Policies::RulePolicy.new(
+              resource_type, rule, resources, network)
+
+            process_action(policy)
+          end
         end
       end
 
@@ -108,20 +113,32 @@ module Gitlab
         puts Gitlab::Triage::UI.header("Processing summary: **#{summary[:name]}**", char: '~')
         puts
 
-        resources = resources_for_rules(resource_type, summary[:rules])
-        # { summary_rule => resources }
-        summary_parts = Hash[summary[:rules].zip(resources)]
+        summary_parts_for_rules(resource_type, summary[:rules]) do |parts|
+          policy = Policies::SummaryPolicy.new(
+            resource_type, summary, parts, network)
 
-        process_action(Policies::SummaryPolicy.new(resource_type, summary, summary_parts, network))
+          process_action(policy)
+        end
       end
 
-      def resources_for_rules(resource_type, rules)
-        rules.map { |rule| resources_for_rule(resource_type, rule) }
+      def summary_parts_for_rules(resource_type, rules)
+        # { summary_rule => resources }
+        parts = rules.inject({}) do |result, rule|
+          resources_and_conditions =
+            to_enum(:resources_for_rule, resource_type, rule)
+
+          resources_and_conditions
+            .inject(result) do |result, (resources, conditions)|
+              # { expanded_summary_rule => resources }
+              result.merge(rule.merge(conditions: conditions) => resources)
+            end
+        end
+
+        yield(parts)
       end
 
       def resources_for_rule(resource_type, rule)
         puts Gitlab::Triage::UI.header("Processing rule: **#{rule[:name]}**", char: '-')
-        resources = []
 
         ExpandCondition.perform(rule_conditions(rule)) do |conditions|
           # retrieving the resources for every rule is inefficient
@@ -138,9 +155,9 @@ module Gitlab
           resources = limit_resources(resources, rule_limits(rule))
           puts "\n* Total after limiting: #{resources.count} resources"
           puts
-        end
 
-        resources
+          yield(resources, conditions)
+        end
       end
 
       # We don't have to do this once the response will contain the type

data/lib/gitlab/triage/version.rb

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

data/support/.gitlab-ci.example.yml

@@ -8,7 +8,7 @@ dry-run:triage:
   script:
     - gem install gitlab-triage
     - gitlab-triage --help
-    - gitlab-triage --dry-run --token $API_TOKEN --project-id $CI_PROJECT_PATH
+    - gitlab-triage --dry-run --token $API_TOKEN --source projects --source-id $CI_PROJECT_PATH
   when: manual
   except:
     - schedules
@@ -17,6 +17,6 @@ run:triage:
   stage: triage
   script:
     - gem install gitlab-triage
-    - gitlab-triage --token $API_TOKEN --project-id $CI_PROJECT_PATH
+    - gitlab-triage --token $API_TOKEN --source projects --source-id $CI_PROJECT_PATH
   only:
     - schedules

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 1.0.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport