gitlab-triage 1.6.1 → 1.10.0

data/lib/gitlab/triage/policies_resources/summary_resources.rb

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module Gitlab
   module Triage
     module PoliciesResources
       class SummaryResources
-        attr_reader :rule_to_resources
+        include Enumerable
+        extend Forwardable
 
         def initialize(new_rule_to_resources)
           @rule_to_resources = new_rule_to_resources
         end
 
-        def build_issues
-          rule_to_resources.map do |inner_policy_spec, inner_resources|
-            yield(inner_policy_spec, inner_resources)
-          end
-        end
+        def_delegator :@rule_to_resources, :each
       end
     end
   end

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

@@ -41,6 +41,11 @@ module Gitlab
 
         private
 
+        def expand_resource!(params: {})
+          resource.merge!(
+            network.query_api_cached(resource_url(params: params)).first)
+        end
+
         def source_resource
           @source_resource ||= network.query_api_cached(source_url).first
         end

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

@@ -8,6 +8,10 @@ module Gitlab
     module Resource
       class Issue < Base
         include Shared::Issuable
+
+        def reference
+          '#'
+        end
       end
     end
   end

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

@@ -8,6 +8,19 @@ module Gitlab
     module Resource
       class MergeRequest < Base
         include Shared::Issuable
+
+        def reference
+          '!'
+        end
+
+        def first_contribution?
+          if resource.key?(:first_contribution)
+            resource[:first_contribution]
+          else
+            expanded = expand_resource!
+            expanded[:first_contribution]
+          end
+        end
       end
     end
   end

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

@@ -49,6 +49,20 @@ module Gitlab
             @author ||= resource.dig(:author, :username)
           end
 
+          def project_path
+            @project_path ||=
+              request_project(resource[:project_id])[:path_with_namespace]
+          end
+
+          def full_resource_reference
+            @full_resource_reference ||=
+              "#{project_path}#{reference}#{resource[:iid]}"
+          end
+
+          def reference
+            raise NotImplementedError
+          end
+
           def root_id(
             resource: source_resource,
             max_levels: MAX_PARENT_LOOKUP)
@@ -72,6 +86,10 @@ module Gitlab
               resource_url(sub_resource_type: 'resource_label_events'))
           end
 
+          def request_project(project_id)
+            network.query_api_cached(project_url(project_id)).first
+          end
+
           def request_group(group_id)
             network.query_api_cached(group_url(group_id)).first
           end
@@ -83,6 +101,14 @@ module Gitlab
               source_id: group_id
             ).build
           end
+
+          def project_url(project_id)
+            Gitlab::Triage::UrlBuilders::UrlBuilder.new(
+              network_options: network.options,
+              source: 'projects',
+              source_id: project_id
+            ).build
+          end
         end
       end
     end

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

@@ -6,6 +6,7 @@ module Gitlab
           @network_options = options.fetch(:network_options)
           @host_url = @network_options.host_url
           @api_version = @network_options.api_version
+          @all = options.fetch(:all, false)
           @source = options.fetch(:source, 'projects')
           @source_id = options.fetch(:source_id)
           @resource_type = options.fetch(:resource_type, nil)
@@ -15,11 +16,11 @@ module Gitlab
         end
 
         def build
-          base_url.tap do |url|
-            url << "/#{@resource_id}" if @resource_id
-            url << "/#{@sub_resource_type}" if @sub_resource_type
-            url << params_string if @params
-          end
+          url = base_url
+          url << "/#{@resource_id}" if @resource_id
+          url << "/#{@sub_resource_type}" if @sub_resource_type
+          url << params_string if @params
+          url
         end
 
         private
@@ -29,10 +30,10 @@ module Gitlab
         end
 
         def base_url
-          "#{host_with_api_url}/#{@source}/#{CGI.escape(@source_id.to_s)}"
-            .tap do |url|
-              url << "/#{@resource_type}" if @resource_type
-            end
+          url = host_with_api_url
+          url << "/#{@source}/#{CGI.escape(@source_id.to_s)}" unless @all
+          url << "/#{@resource_type}" if @resource_type
+          url
         end
 
         def params_string

data/lib/gitlab/triage/validators/limiter_validator.rb

@@ -12,7 +12,9 @@ module Gitlab
       end
 
       def validate_required_parameters(value)
-        raise ArgumentError, "For the limits field, please specify one of: `#{params_limiter_names.join('`, `')}`" unless value.keys.map(&:to_sym).one? { |key| params_limiter_names.include?(key) }
+        return if value.keys.one? { |key| params_limiter_names.include?(key.to_sym) }
+
+        raise ArgumentError, "For the limits field, please specify one of: `#{params_limiter_names.join('`, `')}`"
       end
     end
   end

data/lib/gitlab/triage/validators/params_validator.rb

@@ -1,6 +1,8 @@
 module Gitlab
   module Triage
     class ParamsValidator
+      InvalidParameter = Class.new(ArgumentError)
+
       def initialize(parameter_definitions, value)
         @parameter_definitions = parameter_definitions
         @value = value
@@ -16,7 +18,7 @@ module Gitlab
 
       def validate_required_parameters(value)
         @parameter_definitions.each do |param|
-          raise ArgumentError, "#{param[:name]} is a required parameter" unless value[param[:name]]
+          raise InvalidParameter, "#{param[:name]} is a required parameter" unless value[param[:name]]
         end
       end
 
@@ -24,7 +26,7 @@ module Gitlab
         @parameter_definitions.each do |param|
           if value.has_key?(param[:name])
             param_types = Array(param[:type]).flatten
-            raise ArgumentError, "#{param[:name]} must be of type #{param[:type]}" unless param_types.any? { |type| value[param[:name]].is_a?(type) }
+            raise InvalidParameter, "#{param[:name]} must be of type #{param[:type]}" unless param_types.any? { |type| value[param[:name]].is_a?(type) }
           end
         end
       end
@@ -32,7 +34,7 @@ module Gitlab
       def validate_parameter_content(value)
         @parameter_definitions.each do |param|
           if param[:values]
-            raise ArgumentError, "#{param[:name]} must be of one of #{param[:values].join(',')}" unless param[:values].include?(value[param[:name]])
+            raise InvalidParameter, "#{param[:name]} must be of one of #{param[:values].join(',')}" unless param[:values].include?(value[param[:name]])
           end
         end
       end

data/lib/gitlab/triage/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Gitlab
   module Triage
-    VERSION = '1.6.1'.freeze
+    VERSION = '1.10.0'
   end
 end

data/support/.triage-policies.example.yml

@@ -6,10 +6,10 @@ resource_rules:
           date:
             attribute: created_at
             condition: older_than
-            interval_type: week
+            interval_type: weeks
             interval: 1
           labels:
-            - No label
+            - None
           state: opened
         actions:
           comment: |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.10.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,6 +120,7 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".gitlab/CODEOWNERS"
+- ".gitlab/merge_request_templates/Release.md"
 - ".rubocop.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -135,12 +136,14 @@ files:
 - lib/gitlab/triage/action/comment.rb
 - lib/gitlab/triage/action/summarize.rb
 - lib/gitlab/triage/api_query_builders/base_query_param_builder.rb
+- lib/gitlab/triage/api_query_builders/date_query_param_builder.rb
 - lib/gitlab/triage/api_query_builders/multi_query_param_builder.rb
 - lib/gitlab/triage/api_query_builders/single_query_param_builder.rb
 - lib/gitlab/triage/command_builders/base_command_builder.rb
 - lib/gitlab/triage/command_builders/cc_command_builder.rb
 - lib/gitlab/triage/command_builders/comment_command_builder.rb
 - lib/gitlab/triage/command_builders/label_command_builder.rb
+- lib/gitlab/triage/command_builders/move_command_builder.rb
 - lib/gitlab/triage/command_builders/remove_label_command_builder.rb
 - lib/gitlab/triage/command_builders/status_command_builder.rb
 - lib/gitlab/triage/command_builders/text_content_builder.rb
@@ -156,7 +159,6 @@ files:
 - lib/gitlab/triage/filters/author_member_conditions_filter.rb
 - lib/gitlab/triage/filters/base_conditions_filter.rb
 - lib/gitlab/triage/filters/forbidden_labels_conditions_filter.rb
-- lib/gitlab/triage/filters/issuable_date_conditions_filter.rb
 - lib/gitlab/triage/filters/member_conditions_filter.rb
 - lib/gitlab/triage/filters/merge_request_date_conditions_filter.rb
 - lib/gitlab/triage/filters/name_conditions_filter.rb
@@ -212,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: GitLab triage automation project.

data/lib/gitlab/triage/filters/issuable_date_conditions_filter.rb

@@ -1,65 +0,0 @@
-require_relative 'base_conditions_filter'
-
-module Gitlab
-  module Triage
-    module Filters
-      class IssuableDateConditionsFilter < BaseConditionsFilter
-        ATTRIBUTES = %w[updated_at created_at].freeze
-        CONDITIONS = %w[older_than newer_than].freeze
-        INTERVAL_TYPES = %w[days weeks months years].freeze
-
-        def self.allowed_attributes
-          self::ATTRIBUTES
-        end
-
-        def self.filter_parameters
-          [
-            {
-              name: :attribute,
-              type: String,
-              values: allowed_attributes
-            },
-            {
-              name: :condition,
-              type: String,
-              values: CONDITIONS
-            },
-            {
-              name: :interval_type,
-              type: String,
-              values: INTERVAL_TYPES
-            },
-            {
-              name: :interval,
-              type: Numeric
-            }
-          ]
-        end
-
-        def initialize_variables(condition)
-          @attribute = condition[:attribute].to_sym
-          @condition = condition[:condition].to_sym
-          @interval_type = condition[:interval_type].to_sym
-          @interval = condition[:interval]
-        end
-
-        def resource_value
-          @resource[@attribute].to_date
-        end
-
-        def condition_value
-          @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
-        end
-
-        def calculate
-          case @condition
-          when :older_than
-            resource_value < condition_value
-          when :newer_than
-            resource_value > condition_value
-          end
-        end
-      end
-    end
-  end
-end