gitlab-triage 1.7.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 115d63f58149d8ed49f22fcafc929b06ebcf7ba180cb1047121f61a7c67d890b
-  data.tar.gz: 13f5bfcfd2bcb8325a40566fe86e30e13f03eb2aa0e3935c0f91c53446867ae2
+  metadata.gz: 1242b945b940e1378f6bb8f66eb5f08f3adb387245c0425954aa7a6cc3e98f25
+  data.tar.gz: 925cbb79cd61b2c5f4eeb87eed0596c674902aa6fd44bfe679b9740d660aede6
 SHA512:
-  metadata.gz: ac6caff9332e7cc266ea22abb7beed863c577e4d4d4a2fb4c63171cf1834b14b1d4f0abaf616408d7a3ae9261a1668ce5e54ff6de971e14fd5136f584d7e7cd3
-  data.tar.gz: 24e71190417f5e36deca4d1b6b1ee1991eecdf7930b5af852c7b861b75dd8e50071e7c0c051c04a84f9247a9a89e4887ec016f7896823b333c5350cc1643b7ba
+  metadata.gz: 1caedc0d489bc0e45e66399aa9529cf3eaf9812a78cb99fddba5cc5a078b10ab748e763d2407e6911da9ba2cadbc56453040366c8bad1757a0ae07fbcbf25b1d
+  data.tar.gz: 12de27a31f013916beee14fe3da467e1ee316774e8fea019c0735c68c81f0e5694a79cdcb5d4bc94522b620a94c4c4989c4367f51fd28d400f19a1dca63d48dc

data/.gitignore

@@ -6,7 +6,6 @@
 /Gemfile.lock
 /_yardoc/
 /coverage/
-/doc/
 /pkg/
 /spec/reports/
 /tmp/

data/.gitlab-ci.yml

@@ -1,49 +1,67 @@
-image: ruby:2.6
-
 stages:
   - prepare
   - test
   - triage
+  - release
 
-.default-only:
-  only:
-    refs:
-      - master
-      - merge_requests
-      - tags
-
-.default-before_script:
+default:
+  image: ruby:2.7
+  tags:
+    - gitlab-org
+  cache:
+    key:
+      files:
+        - Gemfile
+        - gitlab-triage.gemspec
+    paths:
+      - vendor/ruby
+      - Gemfile.lock
+    policy: pull
   before_script:
+    - ruby --version
     - gem install bundler --no-document --version 2.0.2
-    - bundle install --jobs $(nproc) --retry 3 --quiet
+    - bundle --version
+    - bundle install --jobs $(nproc) --path=vendor --retry 3 --quiet
+    - bundle check
+
+workflow:
+  rules:
+    # For merge requests, create a pipeline.
+    - if: '$CI_MERGE_REQUEST_IID'
+    # For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    # For tags, create a pipeline.
+    - if: '$CI_COMMIT_TAG'
+
+.use-docker-in-docker:
+  image: docker:${DOCKER_VERSION}
+  services:
+    - docker:${DOCKER_VERSION}-dind
+  variables:
+    DOCKER_DRIVER: overlay2
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_TLS_CERTDIR: ""
+  tags:
+    # See https://gitlab.com/gitlab-com/www-gitlab-com/-/issues/7019 for tag descriptions
+    - gitlab-org-docker
 
 ###################
 ## Prepare stage ##
 ###################
 setup-test-env:
-  extends: .default-only
   stage: prepare
   script:
-    - ruby --version
-    - gem install bundler --no-document
-    - bundle --version
-    - bundle install --clean --jobs $(nproc) --path=vendor --retry=3 --quiet
-    - bundle check
+    - echo "Setup done!"
   cache:
-    key: "$CI_JOB_NAME-ruby-2.6"
-    paths:
-      - vendor/ruby
-      - Gemfile.lock
+    policy: pull-push
   artifacts:
     paths:
-      - vendor/ruby
       - Gemfile.lock
 
 ################
 ## Test stage ##
 ################
 rubocop:
-  extends: [".default-only", ".default-before_script"]
   stage: test
   needs: ["setup-test-env"]
   dependencies: ["setup-test-env"]
@@ -55,20 +73,15 @@ rubocop:
       - .cache/rubocop_cache/
 
 # We need to copy this job's definition from the Code-Quality.gitlab-ci.yml
-# template because `only` is set without `refs`, so it takes precedence over `.default-only`.
+# template because `only` is set without `refs`, so it takes precedence over default workflow rules.
 # See https://gitlab.com/gitlab-org/gitlab-ce/issues/66767.
 code_quality:
-  extends: .default-only
-  needs: ["setup-test-env"]
-  dependencies: ["setup-test-env"]
+  extends: .use-docker-in-docker
   stage: test
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   variables:
-    DOCKER_DRIVER: overlay2
     DOCKER_TLS_CERTDIR: ""
+  before_script: []
   script:
     - |
       if ! docker info &>/dev/null; then
@@ -85,14 +98,9 @@ code_quality:
     reports:
       codequality: gl-code-quality-report.json
     expire_in: 1 week
-  except:
-    variables:
-      - $CODE_QUALITY_DISABLED
 
 specs:
-  extends: [".default-only", ".default-before_script"]
   needs: ["setup-test-env"]
-  dependencies: ["setup-test-env"]
   stage: test
   script:
     - bundle exec rake spec
@@ -101,12 +109,13 @@ specs:
 ## Triage stage ##
 ##################
 dry-run:gitlab-triage:
-  extends: [".default-only", ".default-before_script"]
   needs: ["setup-test-env"]
-  dependencies: ["setup-test-env"]
   stage: triage
   script:
-    - bundle exec rake install:local
+    - bundle exec rake build
+    - gem install pkg/*.gem
+    - which gitlab-triage
+    - gitlab-triage --version
     - gitlab-triage --help
     - gitlab-triage --init
     - gitlab-triage --dry-run --debug --token $API_TOKEN --source-id $CI_PROJECT_PATH
@@ -114,4 +123,30 @@ dry-run:gitlab-triage:
 # This job requires allows to override the `CI_PROJECT_PATH` variable when triggered.
 dry-run:custom:
   extends: dry-run:gitlab-triage
-  when: manual
+  rules:
+    - when: manual
+      allow_failure: true
+
+###################
+## Release stage ##
+###################
+release:
+  stage: release
+  rules:
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
+      changes: ["lib/gitlab/triage/version.rb"]
+    - if: '$CI_MERGE_REQUEST_TITLE =~ /RELEASE/'
+      when: manual
+  before_script: []
+  script:
+    - version=$(ruby -r ./lib/gitlab/triage/version -e 'puts Gitlab::Triage::VERSION' | tr -d "\n")
+    - tag="v${version}"
+    - message="Version ${version}."
+    # TODO: Add release notes from the Release MR?
+    - 'curl --request POST --header "PRIVATE-TOKEN: ${API_TOKEN}" -d "tag_name=${tag}" -d "ref=${CI_COMMIT_SHA}" -d "message=${message}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/repository/tags"'
+    - gem build gitlab-triage.gemspec
+    - gem push "gitlab-triage-${version}.gem"
+  artifacts:
+    paths:
+      - gitlab-triage*.gem
+    expire_in: 30 days

data/.gitlab/merge_request_templates/Release.md

@@ -0,0 +1,35 @@
+<!-- Replace `v4.5.0` with the previous release here, and `e18d76b309e42888759c1effe96767f13e34ae55`
+with the latest commit from https://gitlab.com/gitlab-org/gitlab-triage/commits/master that will be included in the release. -->
+- Diff: https://gitlab.com/gitlab-org/gitlab-triage/compare/v4.5.0...e18d76b309e42888759c1effe96767f13e34ae55
+
+- Release notes:
+
+<!-- Keep the sections order but remove the empty sections -->
+
+```markdown
+### New features and features updates
+
+- !aaa <Title of the aaa MR>.
+
+### Fixes
+
+- !bbb <Title of the bbb MR>.
+
+### Doc changes
+
+- !ccc <Title of the ccc MR>.
+
+### Other changes (tooling, technical debt)
+
+- !ddd <Title of the ddd MR>.
+```
+
+- Checklist before merging:
+  - [ ] Diff link is up-to-date.
+  - [ ] Based on the diff, `lib/gitlab/triage/version.rb` is updated, according to [SemVer](https://semver.org).
+  - [ ] Release notes are accurate.
+
+- Checklist after merging:
+  - [ ] [Update the release notes for the newly created tag](docs/release_process.md#how-to).
+
+/label ~"Engineering Productivity" ~"ep::triage" ~"tooling::workflow"

data/.rubocop.yml

@@ -11,3 +11,6 @@ AllCops:
 
 Rails/Output:
   Enabled: false
+
+Metrics/LineLength:
+  Max: 152

data/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'gitlab-styles', '~> 3.0'
+  gem 'gitlab-styles', '~> 3.3.0'
 end

data/README.md

@@ -58,7 +58,7 @@ resource_rules:
             interval: 5
           state: opened
           labels:
-            - No Label
+            - None
         limits:
           most_recent: 50
         actions:
@@ -66,6 +66,7 @@ resource_rules:
             - needs attention
           mention:
             - markglenfletcher
+          move: gitlab-org/backlog
           comment: |
             {{author}} This issue is unlabelled after 5 days. It needs attention. Please take care of this before the end of #{2.days.from_now.strftime('%Y-%m-%d')}
           summarize:
@@ -85,9 +86,27 @@ resource_rules:
               /label ~"needs attention"
   merge_requests:
     rules:
-      []
+      - name: My policy
+        conditions:
+          state: opened
+          labels:
+            - None
+        limits:
+          most_recent: 50
+        actions:
+          labels:
+            - needs attention
+          comment_type: thread
+          comment: |
+            {{author}} This issue is unlabelled. Please add one or more labels.
 ```
 
+### Real world example
+
+We're enforcing multiple polices with pipeline schedules at [triage-ops](
+https://gitlab.com/gitlab-org/quality/triage-ops), where we're also
+extensively utilizing the [plugins system](#can-i-customize).
+
 ### Fields
 
 A policy consists of the following fields:
@@ -210,6 +229,22 @@ conditions:
     - feature proposal
 ```
 
+###### Predefined special label names
+
+Basing on the [issues API](https://docs.gitlab.com/ee/api/issues.html), there
+are two special predefined label names we can use here:
+
+* `None`: This indicates that no labels were present
+* `Any`: This indicates that any labels were presented
+
+Example:
+
+```yml
+conditions:
+  labels:
+    - None
+```
+
 ###### Labels brace expansion
 
 We could expand the labels by using brace expansion, which is a pattern
@@ -506,7 +541,9 @@ Available action types:
 - [`remove_labels` action](#remove-labels-action)
 - [`status` action](#status-action)
 - [`mention` action](#mention-action)
+- [`move` action](#move-action)
 - [`comment` action](#comment-action)
+- [`comment_type` action option](#comment-type-action-option)
 - [`summarize` action](#summarize-action)
 
 ##### Labels action
@@ -572,6 +609,19 @@ actions:
     - markglenfletcher
 ```
 
+##### Move action
+
+Moves an issue (merge request is not supported yet) to the specified project.
+
+Accepts a string containing the target project path.
+
+Example:
+
+```yml
+actions:
+  move: target/project_path
+```
+
 ##### Comment action
 
 Adds a comment to the resource.
@@ -619,6 +669,26 @@ actions:
     {{author}} Are you still interested in finishing this merge request?
 ```
 
+##### Comment type action option
+
+Determines the type of comment to be added to the resource.
+
+The following comment types are supported:
+
+- `comment` (default): creates a regular comment on the resource
+- `thread`: starts a resolvable thread (discussion) on the resource
+
+For merge requests, if `comment_type` is set to `thread`, we can also configure that [all threads should be resolved before merging](https://docs.gitlab.com/ee/user/discussions/#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved), therefore this comment can prevent it from merging.
+
+Example:
+
+```yml
+actions:
+  comment_type: thread
+  comment: |
+    {{author}} Are you still interested in finishing this merge request?
+```
+
 ###### Harnessing Quick Actions
 
 [GitLab's quick actions feature](https://docs.gitlab.com/ce/user/project/quick_actions.html) is available in Core.
@@ -839,7 +909,7 @@ Which could generate an issue like:
 
 Here's a list of currently available Ruby expression API:
 
-##### API
+##### Methods for `Issue` and `MergeRequest` (the context)
 
 | Name                    | Return type     | Description |
 | ----                    | ----            | ----        |
@@ -854,6 +924,12 @@ Here's a list of currently available Ruby expression API:
 | project_path            | String          | The path with namespace to the issues or merge requests project |
 | full_resource_reference | String          | A full reference incuding project path to the issue or merge request |
 
+##### Methods for `MergeRequest` (merge request context)
+
+| Method              | Return type | Description |
+| ----                | ----        | ----        |
+| first_contribution? | Boolean     | `true` if it's the author's first contribution to the project; `false` otherwise. This API requires an additional API request for the merge request, thus would be slower. |
+
 ##### Methods for `Milestone`
 
 | Method      | Return type | Description |
@@ -930,6 +1006,7 @@ Usage: gitlab-triage [options]
     -r, --require [string]           Require a file before performing
     -d, --debug                      Print debug information
     -h, --help                       Print help message
+        --all-projects               Process all projects visible to `--token`
         --init                       Initialize the project with a policy file
         --init-ci                    Initialize the project with a .gitlab-ci.yml file
 ```
@@ -948,6 +1025,14 @@ Triaging against a whole group:
 gitlab-triage --dry-run --token $API_TOKEN --source-id gitlab-org --source groups
 ```
 
+Triaging against an entire instance:
+
+```
+gitlab-triage --dry-run --token $API_TOKEN --all-projects
+```
+
+> **Note:** The `--all-projects` option will process all resources for all projects visible to the specified `$API_TOKEN`
+
 #### Running on GitLab CI pipeline
 
 You can enforce policies using a scheduled pipeline:
@@ -1030,3 +1115,7 @@ resource_rules:
 ### Contributing
 
 Please refer to the [Contributing Guide](CONTRIBUTING.md).
+
+## Release Process
+
+Please refer to the [Release Process](docs/release_process.md).

data/gitlab-triage.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(docs|test|spec|features)/})
   end
   spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

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

@@ -7,6 +7,7 @@ require_relative '../command_builders/label_command_builder'
 require_relative '../command_builders/remove_label_command_builder'
 require_relative '../command_builders/cc_command_builder'
 require_relative '../command_builders/status_command_builder'
+require_relative '../command_builders/move_command_builder'
 
 module Gitlab
   module Triage
@@ -43,6 +44,7 @@ module Gitlab
               CommandBuilders::LabelCommandBuilder.new(policy.actions[:labels]).build_command,
               CommandBuilders::RemoveLabelCommandBuilder.new(policy.actions[:remove_labels]).build_command,
               CommandBuilders::CcCommandBuilder.new(policy.actions[:mention]).build_command,
+              CommandBuilders::MoveCommandBuilder.new(policy.actions[:move]).build_command,
               CommandBuilders::StatusCommandBuilder.new(policy.actions[:status]).build_command
             ]
           ).build_command
@@ -61,13 +63,24 @@ module Gitlab
             source_id: resource[:project_id],
             resource_type: policy.type,
             resource_id: resource['iid'],
-            sub_resource_type: 'notes'
+            sub_resource_type: sub_resource_type
           ).build
 
           puts Gitlab::Triage::UI.debug "post_url: #{post_url}" if network.options.debug
 
           post_url
         end
+
+        def sub_resource_type
+          case type = policy.actions[:comment_type]
+          when 'comment', nil # nil is default
+            'notes'
+          when 'thread'
+            'discussions'
+          else
+            raise ArgumentError, "Unknown comment type: #{type}"
+          end
+        end
       end
     end
   end

data/lib/gitlab/triage/api_query_builders/date_query_param_builder.rb

@@ -0,0 +1,78 @@
+require_relative '../validators/params_validator'
+
+module Gitlab
+  module Triage
+    module APIQueryBuilders
+      class DateQueryParamBuilder
+        ATTRIBUTES = %w[updated_at created_at].freeze
+        CONDITIONS = %w[older_than newer_than].freeze
+        INTERVAL_TYPES = %w[days weeks months years].freeze
+
+        def self.filter_parameters
+          [
+            {
+              name: :attribute,
+              type: String,
+              values: ATTRIBUTES
+            },
+            {
+              name: :condition,
+              type: String,
+              values: CONDITIONS
+            },
+            {
+              name: :interval_type,
+              type: String,
+              values: INTERVAL_TYPES
+            },
+            {
+              name: :interval,
+              type: Numeric
+            }
+          ]
+        end
+
+        def self.applicable?(condition)
+          ATTRIBUTES.include?(condition[:attribute].to_s)
+        end
+
+        def initialize(condition_hash)
+          @attribute = condition_hash[:attribute].to_s
+          @interval_condition = condition_hash[:condition].to_sym
+          @interval_type = condition_hash[:interval_type]
+          @interval = condition_hash[:interval]
+          validate_condition(condition_hash)
+        end
+
+        def validate_condition(condition)
+          ParamsValidator.new(self.class.filter_parameters, condition).validate!
+        end
+
+        def param_name
+          prefix = attribute.sub(/_at\z/, '')
+          suffix =
+            case interval_condition
+            when :older_than
+              'before'
+            when :newer_than
+              'after'
+            end
+
+          "#{prefix}_#{suffix}"
+        end
+
+        def param_content
+          interval.public_send(interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+        end
+
+        def build_param
+          "&#{param_name}=#{param_content.strip}"
+        end
+
+        private
+
+        attr_reader :condition_hash, :attribute, :interval_condition, :interval_type, :interval
+      end
+    end
+  end
+end

data/lib/gitlab/triage/command_builders/move_command_builder.rb

@@ -0,0 +1,19 @@
+require_relative 'base_command_builder'
+
+module Gitlab
+  module Triage
+    module CommandBuilders
+      class MoveCommandBuilder < BaseCommandBuilder
+        private
+
+        def slash_command_string
+          "/move"
+        end
+
+        def format_item(item)
+          item
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/command_builders/text_content_builder.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/array/wrap'
+require 'cgi'
 
 require_relative 'base_command_builder'
 require_relative '../resource/context'
@@ -76,7 +77,22 @@ module Gitlab
               template.sub(PLACEHOLDER_REGEX, attribute.to_s)
             end.join(', ')
 
-            comment.gsub("{{#{placeholder}}}", formatted_text)
+            escaped_text =
+              case placeholder
+              when :items
+                # We don't need to escape it because it's recursive,
+                # which the contents should all be escaped already.
+                # Or put it another way, items isn't an attribute
+                # retrieved externally. It's a generated value which
+                # should be safe to begin with. At some point we
+                # may want to make this more distinguishable,
+                # separating values from API and values generated.
+                formatted_text
+              else
+                CGI.escape_html(formatted_text)
+              end
+
+            comment.gsub("{{#{placeholder}}}", escaped_text)
           end
         end
 

data/lib/gitlab/triage/engine.rb

@@ -2,7 +2,6 @@ require 'active_support/all'
 require 'active_support/inflector'
 
 require_relative 'expand_condition'
-require_relative 'filters/issuable_date_conditions_filter'
 require_relative 'filters/merge_request_date_conditions_filter'
 require_relative 'filters/votes_conditions_filter'
 require_relative 'filters/forbidden_labels_conditions_filter'
@@ -16,6 +15,7 @@ require_relative 'policies/rule_policy'
 require_relative 'policies/summary_policy'
 require_relative 'policies_resources/rule_resources'
 require_relative 'policies_resources/summary_resources'
+require_relative 'api_query_builders/date_query_param_builder'
 require_relative 'api_query_builders/single_query_param_builder'
 require_relative 'api_query_builders/multi_query_param_builder'
 require_relative 'url_builders/url_builder'
@@ -38,6 +38,7 @@ module Gitlab
         @options = options
         @network_adapter_class = network_adapter_class
 
+        assert_all!
         assert_project_id!
         assert_token!
         require_ruby_files
@@ -66,6 +67,7 @@ module Gitlab
 
       def assert_project_id!
         return if options.source_id
+        return if options.all
 
         raise ArgumentError, 'A project_id is needed (pass it with the `--source-id` option)!'
       end
@@ -76,6 +78,11 @@ module Gitlab
         raise ArgumentError, 'A token is needed (pass it with the `--token` option)!'
       end
 
+      def assert_all!
+        raise ArgumentError, '--all-projects option cannot be used in conjunction with --source and --source-id option!' if
+          options.all && (options.source || options.source_id)
+      end
+
       def require_ruby_files
         options.require_files.each(&method(:require))
       end
@@ -146,7 +153,7 @@ module Gitlab
       end
 
       def resources_for_rule(resource_type, rule)
-        puts Gitlab::Triage::UI.header("Processing rule: **#{rule[:name]}**", char: '-')
+        puts Gitlab::Triage::UI.header("Gathering resources for rule: **#{rule[:name]}**", char: '-')
 
         ExpandCondition.perform(rule_conditions(rule)) do |conditions|
           # retrieving the resources for every rule is inefficient
@@ -186,22 +193,35 @@ module Gitlab
         resources.select do |resource|
           results = []
 
+          # rubocop:disable Style/IfUnlessModifier
           if conditions[:date]
-            results << case resource[:type]
-                       when 'issues'
-                         Filters::IssuableDateConditionsFilter.new(resource, conditions[:date]).calculate
-                       when 'merge_requests'
-                         Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
-                       else
-                         raise "Unknown resource type: #{resource[:type]}"
-                       end
+            results << Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
+          end
+
+          if conditions[:upvotes]
+            results << Filters::VotesConditionsFilter.new(resource, conditions[:upvotes]).calculate
+          end
+
+          if conditions[:forbidden_labels]
+            results << Filters::ForbiddenLabelsConditionsFilter.new(resource, conditions[:forbidden_labels]).calculate
+          end
+
+          if conditions[:no_additional_labels]
+            results << Filters::NoAdditionalLabelsConditionsFilter.new(resource, conditions.fetch(:labels) { [] }).calculate
           end
-          results << Filters::VotesConditionsFilter.new(resource, conditions[:upvotes]).calculate if conditions[:upvotes]
-          results << Filters::ForbiddenLabelsConditionsFilter.new(resource, conditions[:forbidden_labels]).calculate if conditions[:forbidden_labels]
-          results << Filters::NoAdditionalLabelsConditionsFilter.new(resource, conditions.fetch(:labels) { [] }).calculate if conditions[:no_additional_labels]
-          results << Filters::AuthorMemberConditionsFilter.new(resource, conditions[:author_member], network).calculate if conditions[:author_member]
-          results << Filters::AssigneeMemberConditionsFilter.new(resource, conditions[:assignee_member], network).calculate if conditions[:assignee_member]
-          results << Filters::RubyConditionsFilter.new(resource, conditions, network).calculate if conditions[:ruby]
+
+          if conditions[:author_member]
+            results << Filters::AuthorMemberConditionsFilter.new(resource, conditions[:author_member], network).calculate
+          end
+
+          if conditions[:assignee_member]
+            results << Filters::AssigneeMemberConditionsFilter.new(resource, conditions[:assignee_member], network).calculate
+          end
+
+          if conditions[:ruby]
+            results << Filters::RubyConditionsFilter.new(resource, conditions, network).calculate
+          end
+          # rubocop:enable Style/IfUnlessModifier
 
           results.all?
         end
@@ -229,12 +249,17 @@ module Gitlab
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('source_branch', conditions[:source_branch]) if conditions[:source_branch]
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('target_branch', conditions[:target_branch]) if conditions[:target_branch]
 
+        if conditions[:date] && APIQueryBuilders::DateQueryParamBuilder.applicable?(conditions[:date])
+          condition_builders << APIQueryBuilders::DateQueryParamBuilder.new(conditions.delete(:date))
+        end
+
         condition_builders.each do |condition_builder|
           params[condition_builder.param_name] = condition_builder.param_content
         end
 
         UrlBuilders::UrlBuilder.new(
           network_options: options,
+          all: options.all,
           source: options.source,
           source_id: options.source_id,
           resource_type: resource_type,

data/lib/gitlab/triage/errors.rb

@@ -1 +1 @@
-require 'gitlab/triage/errors/network'
+require_relative 'errors/network'

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

@@ -1,21 +1,67 @@
-require_relative 'issuable_date_conditions_filter'
+require_relative 'base_conditions_filter'
 
 module Gitlab
   module Triage
     module Filters
-      class MergeRequestDateConditionsFilter < IssuableDateConditionsFilter
-        ATTRIBUTES = %w[updated_at created_at merged_at].freeze
+      class MergeRequestDateConditionsFilter < BaseConditionsFilter
+        ATTRIBUTES = %w[merged_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
 
         # Guard against merge requests with no merged_at values
         def resource_value
-          super if @resource[@attribute]
+          @resource[@attribute]&.to_date
+        end
+
+        def condition_value
+          @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
         end
 
         # Guard against merge requests with no merged_at values
         def calculate
           return false unless resource_value
 
-          super
+          case @condition
+          when :older_than
+            resource_value < condition_value
+          when :newer_than
+            resource_value > condition_value
+          end
         end
       end
     end

data/lib/gitlab/triage/network.rb

@@ -31,11 +31,12 @@ module Gitlab
 
         begin
           print '.'
+          url = response.fetch(:next_page_url) { url }
 
           response = execute_with_retry([Net::ReadTimeout, Errors::Network::InternalServerError]) do
             puts Gitlab::Triage::UI.debug "query_api: #{url}" if options.debug
 
-            @adapter.get(token, response.fetch(:next_page_url) { url })
+            @adapter.get(token, url)
           end
 
           results = response.delete(:results)

data/lib/gitlab/triage/network_adapters/httparty_adapter.rb

@@ -22,7 +22,7 @@ module Gitlab
 
           {
             more_pages: (response.headers["x-next-page"].to_s != ""),
-            next_page_url: url + "&page=#{response.headers['x-next-page']}",
+            next_page_url: next_page_url(url, response),
             results: response.parsed_response,
             ratelimit_remaining: response.headers["ratelimit-remaining"].to_i,
             ratelimit_reset_at: Time.at(response.headers["ratelimit-reset"].to_i)
@@ -66,6 +66,18 @@ module Gitlab
 
           raise Errors::Network::InternalServerError, 'Internal server error encountered!'
         end
+
+        def next_page_url(url, response)
+          return unless response.headers['x-next-page'].present?
+
+          next_page = "&page=#{response.headers['x-next-page']}"
+
+          if url.include?('&page')
+            url.gsub(/&page=\d+/, next_page)
+          else
+            url + next_page
+          end
+        end
       end
     end
   end

data/lib/gitlab/triage/option_parser.rb

@@ -23,6 +23,10 @@ module Gitlab
               options.policies_files << value
             end
 
+            opts.on('--all-projects', 'Process all projects the token has access to') do |value|
+              options.all = value
+            end
+
             opts.on('-s', '--source [type]', [:projects, :groups], 'The source type between [ projects or groups ], default value: projects') do |value|
               options.source = value
             end
@@ -59,6 +63,12 @@ module Gitlab
               exit # rubocop:disable Rails/Exit
             end
 
+            opts.on('-v', '--version', 'Print version') do
+              require_relative 'version'
+              $stdout.puts Gitlab::Triage::VERSION
+              exit # rubocop:disable Rails/Exit
+            end
+
             opts.on('--init', 'Initialize the project with a policy file') do
               example_path =
                 File.expand_path('../../../support/.triage-policies.example.yml', __dir__)

data/lib/gitlab/triage/options.rb

@@ -3,6 +3,7 @@ module Gitlab
     Options = Struct.new(
       :dry_run,
       :policies_files,
+      :all,
       :source,
       :source_id,
       :token,
@@ -17,6 +18,7 @@ module Gitlab
         # Defaults
         self.host_url ||= 'https://gitlab.com'
         self.api_version ||= 'v4'
+        self.all ||= false
         self.source ||= 'projects'
         self.require_files ||= []
         self.policies_files ||= Set.new

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

@@ -15,7 +15,7 @@ module Gitlab
             type: type,
             policy_spec: policy_spec,
             action: action,
-            resources: resources.resources,
+            resources: resources,
             network: network)
         end
       end

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

@@ -10,7 +10,7 @@ module Gitlab
         # Build an issue from several rules policies
         def build_issue
           action = actions[:summarize]
-          issues = resources.build_issues do |inner_policy_spec, inner_resources|
+          issues = resources.map do |inner_policy_spec, inner_resources|
             Policies::RulePolicy.new(
               type, inner_policy_spec, inner_resources, network)
               .build_issue

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

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module Gitlab
   module Triage
     module PoliciesResources
       class RuleResources
-        attr_reader :resources
+        include Enumerable
+        extend Forwardable
 
         def initialize(new_resources)
           @resources = new_resources
         end
 
-        def each
-          resources.each do |resource|
-            yield(resource)
-          end
-        end
+        def_delegator :@resources, :each
       end
     end
   end

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/merge_request.rb

@@ -12,6 +12,15 @@ module Gitlab
         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/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.7.0'.freeze
+    VERSION = '1.10.1'
   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.7.0
+  version: 1.10.1
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-07-08 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