gitlab-triage 1.25.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42c73b8dcb5e94e895ba0daa399105f8111584523001f233a3b5344dd52e8d13
-  data.tar.gz: 0f9c38c9aa9de8c6210cca84d6224af7647bfeec4c7fa8a73562cb4e035205e9
+  metadata.gz: dfb91844acb53e2543200eae19db3c5abaf9cd79106add7fa5ca7ca9585215dd
+  data.tar.gz: eba68ca3b8a0539f2428e63d71f86fe28ac1e292e89141fa3312192f9a21a2fd
 SHA512:
-  metadata.gz: 264e37c9838cff91100494a72a791828e555afcac5e028a83cd0de7b86c19f9d206d1ffe0486983cd990cd51686719c660b7b04f530bd633118bc85f734a9960
-  data.tar.gz: dd4e5b974bdf3496ee8a40eca9d69d17a3882cf40e6ac24fb8b452c500ad2fe17c8a40bd32ff1a97ad5639f7837cbdc24c993ea96d264a07a2a58985af6744b8
+  metadata.gz: fa86c82d57b8e4e9986039098b1c7f8f5b031dae68080bb38a84808ae6df26af48ebf0790d47558e8c9ecf6fad8ba2d7d8208ccb54a6b33cb753e0fac02139c5
+  data.tar.gz: cacc6bc349fa41819c5b163cd67165983021bfee35bc9f607f5a64cb283d1372db51740e4c851238e68ff15776ec6289dc280ee2ca1d11f5714c0d36f7e68013

data/.gitlab-ci.yml

@@ -126,7 +126,7 @@ dry-run:gitlab-triage:
     - gitlab-triage --version
     - gitlab-triage --help
     - gitlab-triage --init
-    - gitlab-triage --dry-run --debug --token $GITLAB_API_TOKEN --source-id $CI_PROJECT_PATH
+    - gitlab-triage --dry-run --debug --source-id $CI_PROJECT_PATH
 
 # This job requires allows to override the `CI_PROJECT_PATH` variable when triggered.
 dry-run:custom:

data/README.md

@@ -169,7 +169,7 @@ Available condition types:
 - [`milestone` condition](#milestone-condition)
 - [`iteration` condition](#iteration-condition)
 - [`state` condition](#state-condition)
-- [`upvotes` condition](#upvotes-condition)
+- [`votes` condition](#votes-condition)
 - [`labels` condition](#labels-condition)
 - [`forbidden_labels` condition](#forbidden-labels-condition)
 - [`no_additional_labels` condition](#no-additional-labels-condition)
@@ -264,7 +264,7 @@ conditions:
   state: opened
 ```
 
-##### Upvotes condition
+##### Votes condition
 
 Accepts a hash of fields.
 
@@ -278,7 +278,7 @@ Example:
 
 ```yml
 conditions:
-  upvotes:
+  votes:
     attribute: upvotes
     condition: less_than
     threshold: 10
@@ -1195,6 +1195,7 @@ Here's a list of currently available Ruby expression API:
 | related_merge_requests | [MergeRequest] | The list of merge requests related to the issue |
 | closed_by              | [MergeRequest] | The list of merge requests that close the issue |
 | linked_issues          | [LinkedIssue]  | The list of issues that are linked to the issue |
+| due_date               | Date           | The due date of the issue. Could be `nil` |
 
 ##### Methods for `LinkedIssue`
 
@@ -1406,4 +1407,13 @@ Please refer to the [Contributing Guide](CONTRIBUTING.md).
 
 ## Release Process
 
-Please refer to the [Release Process](docs/release_process.md).
+We release `gitlab-triage` on an ad-hoc basis. There is no regularity to when
+we release, we just release when we make a change - no matter the size of the
+change.
+
+To release a new version:
+
+1. Create a Merge Request.
+1. Use Merge Request template [Release.md](https://gitlab.com/gitlab-org/ruby/gems/gitlab-triage/-/blob/master/.gitlab/merge_request_templates/Release.md).
+1. Follow the instructions.
+1. After the Merge Request has been merged, a new gem version is [published automatically](https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/gem-release.yml)

data/lib/gitlab/triage/engine.rb

@@ -57,7 +57,6 @@ module Gitlab
 
         assert_all!
         assert_project_id!
-        assert_token!
         require_ruby_files
       end
 
@@ -101,12 +100,6 @@ module Gitlab
         raise ArgumentError, 'A project_id is needed (pass it with the `--source-id` option)!'
       end
 
-      def assert_token!
-        return if options.token
-
-        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)
@@ -335,7 +328,7 @@ module Gitlab
         puts
       end
 
-      def filter_resources(resources, conditions)
+      def filter_resources(resources, conditions) # rubocop:disable Metrics/CyclomaticComplexity
         resources.select do |resource|
           results = []
 
@@ -353,8 +346,9 @@ module Gitlab
             results << Filters::BranchProtectedFilter.new(resource, conditions[:protected]).calculate
           end
 
-          if conditions[:upvotes]
-            results << Filters::VotesConditionsFilter.new(resource, conditions[:upvotes]).calculate
+          votes_condition = conditions[:votes] || conditions[:upvotes]
+          if votes_condition
+            results << Filters::VotesConditionsFilter.new(resource, votes_condition).calculate
           end
 
           if conditions[:no_additional_labels]

data/lib/gitlab/triage/graphql_queries/query_builder.rb

@@ -54,6 +54,10 @@ module Gitlab
           }
         GRAPHQL
 
+        def vote_attribute
+          @vote_attribute ||= (conditions.dig(:votes, :attribute) || conditions.dig(:upvotes, :attribute)).to_s
+        end
+
         def resource_fields
           fields = []
 
@@ -64,8 +68,8 @@ module Gitlab
             fields << 'labels { nodes { title } }'
             fields << 'author { id name username }'
             fields << 'assignees { nodes { id name username } }' if conditions.key?(:assignee_member)
-            fields << 'upvotes' if conditions.dig(:upvotes, :attribute).to_s == 'upvotes'
-            fields << 'downvotes' if conditions.dig(:upvotes, :attribute).to_s == 'downvotes'
+            fields << 'upvotes' if vote_attribute == 'upvotes'
+            fields << 'downvotes' if vote_attribute == 'downvotes'
             fields.push('draft', 'mergedAt') if resource_type == 'merge_requests'
           end
 

data/lib/gitlab/triage/option_parser.rb

@@ -8,6 +8,7 @@ module Gitlab
   module Triage
     class OptionParser
       class << self
+        # rubocop:disable Metrics/AbcSize
         def parse(argv)
           options = Options.new
           options.host_url = 'https://gitlab.com'
@@ -89,9 +90,11 @@ module Gitlab
           parser.parse!(argv)
 
           options.source = nil if options.all
+          options.token ||= ''
 
           options
         end
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

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

@@ -9,6 +9,18 @@ module Gitlab
       class Issue < Base
         include Shared::Issuable
 
+        DATE_FIELDS = %i[
+          due_date
+        ].freeze
+
+        DATE_FIELDS.each do |field|
+          define_field(field) do
+            value = resource[field]
+
+            Date.parse(value) if value
+          end
+        end
+
         def merge_requests_count
           @merge_requests_count ||= resource.dig(:merge_requests_count)
         end
@@ -30,6 +42,10 @@ module Gitlab
             resource_url(sub_resource_type: 'links'))
             .map { |issue| LinkedIssue.new(issue, parent: self) }
         end
+
+        def expired?(today = Date.today)
+          due_date && due_date < today
+        end
       end
     end
   end

data/lib/gitlab/triage/rest_api_network.rb

@@ -10,7 +10,6 @@ module Gitlab
     class RestAPINetwork
       include Retryable
 
-      TokenNotFound = Class.new(StandardError)
       MINIMUM_RATE_LIMIT = 25
 
       attr_reader :options, :adapter
@@ -103,7 +102,7 @@ module Gitlab
       private
 
       def token
-        options.token || raise(TokenNotFound)
+        options.token
       end
 
       def rate_limit_debug(response)

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.25.0'
+    VERSION = '1.26.0'
   end
 end

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

@@ -1,4 +1,4 @@
-image: ruby:2.4
+image: ruby:2.7
 
 stages:
   - triage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.26.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport