gitlab-triage 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f135ad3ee8a932b96aa63b996b47c3dfb4c144a8294087492c75b206fd9cc0a5
-  data.tar.gz: 0af305681bc53fdd8d3b7f0a8eb86889d1da37bef53b24d837b067c336d02142
+  metadata.gz: e60f60430321d0d1be1393d07613ce3e2173cdb45552a530783f797e5b8fe830
+  data.tar.gz: 96166faf93db799035226e0cb052bb56b50bbfb95df74c074b944b3b61a1557e
 SHA512:
-  metadata.gz: 4e415ad62d834aaf20ca0f567bdd135fc36d8e9c8cd92251410aab5464232c227af6032adcbba9bc7ca955bbbc72e4192f495dc56ecc1f18d2fac249cc96fd42
-  data.tar.gz: 8a6b44160f809fb5b4fc3ef5bcd0d09f7b12dba043d543a27c8b4ce31549b2b9cb32317bd205bcd23faaf445a3fca27bf80af9a937f52dfd2c96073530600ebb
+  metadata.gz: e6ba81eb4674a0b436b9f31079f1aa557c95b454eb1378ab9c18994ac53faf9cc51e213393c404622cf45131f06da883c7b3940bc4009dc0c1f45b564faf7fa5
+  data.tar.gz: 2eefc9bf80feb415a9d820009d6f58b78698be4e426247ec50356289fa8bbe668de7da03057506a0bdc35809bb99956fa868b2aae535cbafa97671575ae84ab6

data/README.md

@@ -86,7 +86,9 @@ Available condition types:
 - [`upvotes` condition](#upvotes-condition)
 - [`labels` condition](#labels-condition)
 - [`forbidden_labels` condition](#forbidden-labels-condition)
+- [`no_additional_labels` condition](#no-additional-labels-condition)
 - [`author_member` condition](#author-member-condition)
+- [`assignee_member` condition](#assignee-member-condition)
 
 ##### Date condition
 
@@ -189,6 +191,20 @@ conditions:
     - awaiting feedback
 ```
 
+##### No additional labels condition
+
+Accepts a boolean. If `true` the resource cannot have more labels than those specified by the `labels` condition.
+
+
+Example:
+
+```yml
+conditions:
+  labels:
+    - feature proposal
+  no_additional_labels: true
+```
+
 ##### Author Member condition
 
 This condition determines whether the author of a resource is a member of the specified group or project.
@@ -201,13 +217,35 @@ Accepts a hash of fields.
 | ---------       | ----    | ----                                | --------  |
 | `source`        | string  | `group`, `project`                  | yes       |
 | `condition`     | string  | `member_of`, `not_member_of`        | yes       |
-| `source_id`     | integer | integer                             | yes       |
+| `source_id`     | integer or string | gitlab-org/gitlab-ce      | yes       |
+
+Example:
+
+```yml
+conditions:
+  author_member:
+    source: group
+    condition: not_member_of
+    source_id: 9970
+```
+
+##### Assignee Member condition
+
+This condition determines whether the assignee of a resource is a member of the specified group or project.
+
+Accepts a hash of fields.
+
+| Field           | Type    | Values                              | Required  |
+| ---------       | ----    | ----                                | --------  |
+| `source`        | string  | `group`, `project`                  | yes       |
+| `condition`     | string  | `member_of`, `not_member_of`        | yes       |
+| `source_id`     | integer or string | gitlab-org/gitlab-ce      | yes       |
 
 Example:
 
 ```yml
 conditions:
-  author:
+  assignee_member:
     source: group
     condition: not_member_of
     source_id: 9970

data/lib/gitlab/triage/engine.rb

@@ -3,7 +3,9 @@ require 'active_support/all'
 require_relative 'limiters/date_conditions_limiter'
 require_relative 'limiters/votes_conditions_limiter'
 require_relative 'limiters/forbidden_labels_conditions_limiter'
+require_relative 'limiters/no_additional_labels_conditions_limiter'
 require_relative 'limiters/author_member_conditions_limiter'
+require_relative 'limiters/assignee_member_conditions_limiter'
 require_relative 'command_builders/comment_command_builder'
 require_relative 'command_builders/label_command_builder'
 require_relative 'command_builders/remove_label_command_builder'
@@ -100,7 +102,9 @@ module Gitlab
           results << Limiters::DateConditionsLimiter.new(resource, conditions[:date]).calculate if conditions[:date]
           results << Limiters::VotesConditionsLimiter.new(resource, conditions[:upvotes]).calculate if conditions[:upvotes]
           results << Limiters::ForbiddenLabelsConditionsLimiter.new(resource, conditions[:forbidden_labels]).calculate if conditions[:forbidden_labels]
-          results << Limiters::AuthorMemberConditionsLimiter.new(resource, conditions[:author_member], { host_url: host_url, api_version: api_version, token: options.token, network: network }).calculate if conditions[:author]
+          results << Limiters::NoAdditionalLabelsConditionsLimiter.new(resource, conditions.fetch(:labels) { [] }).calculate if conditions[:no_additional_labels]
+          results << Limiters::AuthorMemberConditionsLimiter.new(resource, conditions[:author_member], { host_url: host_url, api_version: api_version, token: options.token, network: network }).calculate if conditions[:author_member]
+          results << Limiters::AssigneeMemberConditionsLimiter.new(resource, conditions[:assignee_member], { host_url: host_url, api_version: api_version, token: options.token, network: network }).calculate if conditions[:assignee_member]
           !results.uniq.include?(false)
         end
       end

data/lib/gitlab/triage/limiters/assignee_member_conditions_limiter.rb

@@ -0,0 +1,13 @@
+require_relative 'member_conditions_limiter'
+
+module Gitlab
+  module Triage
+    module Limiters
+      class AssigneeMemberConditionsLimiter < MemberConditionsLimiter
+        def member_field
+          :assignee
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/limiters/author_member_conditions_limiter.rb

@@ -1,82 +1,11 @@
-require_relative 'base_conditions_limiter'
-require_relative '../url_builders/url_builder'
+require_relative 'member_conditions_limiter'
 
 module Gitlab
   module Triage
     module Limiters
-      class AuthorMemberConditionsLimiter < BaseConditionsLimiter
-        SOURCES = %w[project group].freeze
-        CONDITIONS = %w[member_of not_member_of].freeze
-
-        def initialize(resource, condition, net = {})
-          @net = net
-          @network = net[:network]
-          super(resource, condition)
-        end
-
-        def self.limiter_parameters
-          [
-            {
-              name: :source,
-              type: String,
-              values: SOURCES
-            },
-            {
-              name: :condition,
-              type: String,
-              values: CONDITIONS
-            },
-            {
-              name: :source_id,
-              type: Numeric
-            }
-          ]
-        end
-
-        def initialize_variables(condition)
-          @source = condition[:source].to_sym
-          @condition = condition[:condition].to_sym
-          @source_id = condition[:source_id]
-        end
-
-        def resource_value
-          @resource[:author][:username]
-        end
-
-        def condition_value
-          members.map do |member|
-            member[:username]
-          end
-        end
-
-        def calculate
-          case @condition
-          when :member_of
-            condition_value.include?(resource_value)
-          when :not_member_of
-            !condition_value.include?(resource_value)
-          end
-        end
-
-        def members
-          @members ||= @network.query_api(@net[:token], member_url)
-        end
-
-        def member_url
-          UrlBuilders::UrlBuilder.new(net_opts).build
-        end
-
-        private
-
-        def net_opts
-          {
-            host_url: @net[:host_url],
-            api_version: @net[:api_version],
-            resource_type: 'members',
-            source: @source == :group ? 'groups' : 'projects',
-            source_id: @source_id,
-            params: { per_page: 100 }
-          }
+      class AuthorMemberConditionsLimiter < MemberConditionsLimiter
+        def member_field
+          :author
         end
       end
     end

data/lib/gitlab/triage/limiters/base_conditions_limiter.rb

@@ -1,3 +1,5 @@
+require 'active_support/all'
+
 module Gitlab
   module Triage
     module Limiters
@@ -48,7 +50,8 @@ module Gitlab
 
         def validate_parameter_types(condition)
           self.class.limiter_parameters.each do |param|
-            raise ArgumentError, "#{param[:name]} must be of type #{param[:type]}" unless condition[param[:name]].is_a?(param[:type])
+            param_types = Array(param[:type]).flatten
+            raise ArgumentError, "#{param[:name]} must be of type #{param[:type]}" unless param_types.any? { |type| condition[param[:name]].is_a?(type) }
           end
         end
 

data/lib/gitlab/triage/limiters/date_conditions_limiter.rb

@@ -1,5 +1,3 @@
-require 'active_support/all'
-
 require_relative 'base_conditions_limiter'
 
 module Gitlab

data/lib/gitlab/triage/limiters/member_conditions_limiter.rb

@@ -0,0 +1,86 @@
+require_relative 'base_conditions_limiter'
+require_relative '../url_builders/url_builder'
+
+module Gitlab
+  module Triage
+    module Limiters
+      class MemberConditionsLimiter < BaseConditionsLimiter
+        SOURCES = %w[project group].freeze
+        CONDITIONS = %w[member_of not_member_of].freeze
+
+        def initialize(resource, condition, net = {})
+          @net = net
+          @network = net[:network]
+          super(resource, condition)
+        end
+
+        def self.limiter_parameters
+          [
+            {
+              name: :source,
+              type: String,
+              values: SOURCES
+            },
+            {
+              name: :condition,
+              type: String,
+              values: CONDITIONS
+            },
+            {
+              name: :source_id,
+              type: [Numeric, String]
+            }
+          ]
+        end
+
+        def initialize_variables(condition)
+          @source = condition[:source].to_sym
+          @condition = condition[:condition].to_sym
+          @source_id = condition[:source_id]
+        end
+
+        def resource_value
+          @resource[member_field][:username] if @resource[member_field]
+        end
+
+        def condition_value
+          members.map do |member|
+            member[:username]
+          end
+        end
+
+        def calculate
+          return false unless resource_value
+
+          case @condition
+          when :member_of
+            condition_value.include?(resource_value)
+          when :not_member_of
+            !condition_value.include?(resource_value)
+          end
+        end
+
+        def members
+          @members ||= @network.query_api(@net[:token], member_url)
+        end
+
+        def member_url
+          UrlBuilders::UrlBuilder.new(net_opts).build
+        end
+
+        private
+
+        def net_opts
+          {
+            host_url: @net[:host_url],
+            api_version: @net[:api_version],
+            resource_type: 'members',
+            source: @source == :group ? 'groups' : 'projects',
+            source_id: @source_id,
+            params: { per_page: 100 }
+          }
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/limiters/no_additional_labels_conditions_limiter.rb

@@ -0,0 +1,30 @@
+require_relative 'base_conditions_limiter'
+
+module Gitlab
+  module Triage
+    module Limiters
+      class NoAdditionalLabelsConditionsLimiter < BaseConditionsLimiter
+        def self.limiter_parameters
+          []
+        end
+
+        def validate_condition(condition)
+          raise ArgumentError, 'condition must be an array containing the only label values allowed' unless condition.is_a?(Array)
+        end
+
+        def initialize_variables(expected_labels)
+          @attribute = :labels
+          @expected_labels = expected_labels
+        end
+
+        def resource_value
+          @resource[@attribute]
+        end
+
+        def calculate
+          (resource_value - @expected_labels).empty?
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Triage
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,11 +127,14 @@ files:
 - lib/gitlab/triage/filter_builders/base_filter_builder.rb
 - lib/gitlab/triage/filter_builders/multi_filter_builder.rb
 - lib/gitlab/triage/filter_builders/single_filter_builder.rb
+- lib/gitlab/triage/limiters/assignee_member_conditions_limiter.rb
 - lib/gitlab/triage/limiters/author_member_conditions_limiter.rb
 - lib/gitlab/triage/limiters/base_conditions_limiter.rb
 - lib/gitlab/triage/limiters/date_conditions_limiter.rb
 - lib/gitlab/triage/limiters/forbidden_labels_conditions_limiter.rb
+- lib/gitlab/triage/limiters/member_conditions_limiter.rb
 - lib/gitlab/triage/limiters/name_conditions_limiter.rb
+- lib/gitlab/triage/limiters/no_additional_labels_conditions_limiter.rb
 - lib/gitlab/triage/limiters/votes_conditions_limiter.rb
 - lib/gitlab/triage/network.rb
 - lib/gitlab/triage/network_adapters/base_adapter.rb