gitlab-triage 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd48e4232bda87bda7044a5453a42c0a39b29ebe69cd5953048df8dd577c872f
-  data.tar.gz: d14d0e432023d50f6a11fcf3ff8ec223c3235ac5c53191cf2dd5babfbaeaa10b
+  metadata.gz: 3ce7441fc645df64325c4061299790c590bfbdcdb979dd53369f55231479f346
+  data.tar.gz: 3ca3d8cb0d811e5d3e32e2870c0aaf0d671ba5b51fd819341eae831894b131e4
 SHA512:
-  metadata.gz: 9aa0e6f1062e6c39785b020c23c0c382a2387446fe77e29dd154cbe6530ee4cd6f873da842ab1abae04e2516cd4a7a2c070019ef8ebdce63b16eeb9becb5b5cb
-  data.tar.gz: 67fbbe46988133f88de13d8e066eb61da9cfbf025d1c4cd622a97e4c41420838a4d27ce1300fc88cacbb70a2447c46b3af84d342405206cd578c40b59d250dd0
+  metadata.gz: 92e7edefb97e7849ff2228ab4d842a04583b11a4d24a1f64f553e58b8a850bfc17f1f5fd00e18b436bb2ad6e0b0558cff6e1ff5f98c7fea6cee398b6ced715bc
+  data.tar.gz: 13bc2c8ac796534550dcef8164cd3ace9e5e99757f2f007e5c87c63b67943545ca4800a214798bd4387374b7fa3c3e49cd85682bc5db80665ce52ca1e22d61a8

data/bin/gitlab-triage

@@ -5,9 +5,13 @@ require_relative '../lib/gitlab/triage/option_parser'
 require_relative '../lib/gitlab/triage/engine'
 
 options = Gitlab::Triage::OptionParser.parse(ARGV)
-policies_file = options.policies_file || '.triage-policies.yml'
-policies = HashWithIndifferentAccess.new(YAML.load_file(policies_file))
 
-Gitlab::Triage::Engine
-  .new(policies: policies, options: options)
-  .perform
+policies_files = options.policies_files || ['.triage-policies.yml']
+
+policies_files.each do |policies_file|
+  policies = HashWithIndifferentAccess.new(YAML.load_file(policies_file))
+
+  Gitlab::Triage::Engine
+    .new(policies: policies, options: options)
+    .perform
+end

data/lib/gitlab/triage/option_parser.rb

@@ -21,7 +21,7 @@ module Gitlab
             end
 
             opts.on('-f', '--policies-file [string]', String, 'A valid policies YML file') do |value|
-              options.policies_file = value
+              options.policies_files << value
             end
 
             opts.on('-s', '--source [type]', [:projects, :groups], 'The source type between [ projects or groups ], default value: projects') do |value|

data/lib/gitlab/triage/options.rb

@@ -2,7 +2,7 @@ module Gitlab
   module Triage
     Options = Struct.new(
       :dry_run,
-      :policies_file,
+      :policies_files,
       :source,
       :source_id,
       :token,
@@ -19,6 +19,7 @@ module Gitlab
         self.api_version ||= 'v4'
         self.source ||= 'projects'
         self.require_files ||= []
+        self.policies_files ||= Set.new
       end
     end
   end

data/lib/gitlab/triage/resource/base.rb

@@ -41,6 +41,14 @@ module Gitlab
 
         private
 
+        def source_resource
+          @source_resource ||= network.query_api_cached(source_url).first
+        end
+
+        def source_url
+          build_url(options: { resource_type: nil })
+        end
+
         def url(params = {})
           build_url(params: params)
         end

data/lib/gitlab/triage/resource/shared/issuable.rb

@@ -9,6 +9,9 @@ module Gitlab
     module Resource
       module Shared
         module Issuable
+          SourceTooDeep = Class.new(RuntimeError)
+          MAX_PARENT_LOOKUP = 10
+
           def milestone
             @milestone ||=
               resource[:milestone] &&
@@ -42,12 +45,40 @@ module Gitlab
             @labels_chronologically ||= labels_with_details.sort_by(&:added_at)
           end
 
+          def root_id(
+            namespace: source_resource[:namespace],
+            max_levels: MAX_PARENT_LOOKUP)
+            raise SourceTooDeep if max_levels <= 0
+
+            parent_id = namespace[:parent_id]
+
+            if parent_id
+              root_id(
+                namespace: request_group(parent_id)[:namespace],
+                max_levels: max_levels - 1)
+            else
+              namespace[:id]
+            end
+          end
+
           private
 
           def query_label_events
             network.query_api_cached(
               resource_url(sub_resource_type: 'resource_label_events'))
           end
+
+          def request_group(group_id)
+            network.query_api_cached(group_url(group_id)).first
+          end
+
+          def group_url(group_id)
+            Gitlab::Triage::UrlBuilders::UrlBuilder.new(
+              network_options: network.options,
+              source: 'groups',
+              source_id: group_id
+            ).build
+          end
         end
       end
     end

data/lib/gitlab/triage/url_builders/url_builder.rb

@@ -8,7 +8,7 @@ module Gitlab
           @api_version = @network_options.api_version
           @source = options.fetch(:source, 'projects')
           @source_id = options.fetch(:source_id)
-          @resource_type = options.fetch(:resource_type)
+          @resource_type = options.fetch(:resource_type, nil)
           @sub_resource_type = options.fetch(:sub_resource_type, nil)
           @resource_id = options.fetch(:resource_id, nil)
           @params = options.fetch(:params, [])
@@ -29,7 +29,10 @@ module Gitlab
         end
 
         def base_url
-          "#{host_with_api_url}/#{@source}/#{CGI.escape(@source_id.to_s)}/#{@resource_type}"
+          "#{host_with_api_url}/#{@source}/#{CGI.escape(@source_id.to_s)}"
+            .tap do |url|
+              url << "/#{@resource_type}" if @resource_type
+            end
         end
 
         def params_string

data/lib/gitlab/triage/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Triage
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport