gitlab-dangerfiles 3.6.0 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af0d569b13b09e65dfaed6f7eaf3519e314e510e71279b395eabccdb49901f83
-  data.tar.gz: 24050d6f8149c4e902d3c98a8b7d89aa8070a0e2445724f0f1733498d824800c
+  metadata.gz: 34ff9782c4b20cd3c7dbb4a25d7ecdf66cf49ef303e1deb0bb04074e1c4fca21
+  data.tar.gz: b21f8643147b7147fca7e5cba536c67bf98d65f827cb169d72fd2ac5ff3de355
 SHA512:
-  metadata.gz: 84d10142bb9fbf7fe03c9b4d6aee7f39cf0e9ff0ca90c167b484f3d5f1f3a13ef7aed7756c2d1b7b2873e896025ac91dc17b40b5c625d3d2cebad95f4114f3d9
-  data.tar.gz: 87cb02420672c5f9bb171837852733ee9550f30afc918ddb948a1e469224261eda5896ad18993b6aa550cc3d9ec5a782c1d17c278a40d3fc7a316edbf32d63c0
+  metadata.gz: 7f9f43daf58a905f330ad98020327073a47692f24c0494d407d7e76aa8b18819b74839772c58b19d9081b04034154a06e8dee588c70898b71db08bab03fa31a9
+  data.tar.gz: f30572b11ac8e2d9a4ab9cc35c19000c68ecdaefd72f8e276f18e73da3beeb64b81a44d2e4919977c0aabecafec5d3fa64a25443604c27168865a5acb7c6bf97

data/.rubocop.yml

@@ -32,6 +32,9 @@ Style/HashSyntax:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
 # Was problematic, and not included in the .rubocop_todo.yml
 GitlabSecurity/PublicSend:
   Enabled: false

data/README.md

@@ -128,8 +128,12 @@ project. To use it in your project, perform the following steps:
    see how to set it up.
 1. When using the default roulette, use `import_defaults` or import it manually when setting
    up the gitlab-dangerfiles instance:
+
    ```ruby
+   require 'gitlab-dangerfiles'
+
    Gitlab::Dangerfiles.for_project(self) do |dangerfiles|
+     dangerfiles.import_plugins
      dangerfiles.import_dangerfiles(only: %w[simple_roulette])
    end
    ```

data/lib/danger/plugins/internal/helper.rb

@@ -17,6 +17,7 @@ module Danger
       none: "",
       qa: "~QA",
       ux: "~UX",
+      codeowners: '~"Code Owners"',
       test: "~test for `spec/features/*`",
       # Deprecated as of 2.3.0 in favor of tooling
       engineering_productivity: '~"Engineering Productivity" for CI, Danger',
@@ -26,6 +27,7 @@ module Danger
       integrations_be: '~"group::integrations" (backend)',
       integrations_fe: '~"group::integrations" (frontend)',
       "Authentication and Authorization": '~"group::authentication and authorization"',
+      Compliance: '~"group::compliance"',
     }.freeze
 
     # Allows to set specific rule's configuration by passing a block.
@@ -234,7 +236,13 @@ module Danger
     # @return [String] the GFM for a category label, making its best guess if it's not
     #   a category we know about.
     def label_for_category(category)
-      CATEGORY_LABELS.fetch(category, %Q{~"#{category}"})
+      CATEGORY_LABELS[category] ||
+
+        if category.start_with?("`")
+          category.to_s
+        else
+          %Q{~"#{category}"}
+        end
     end
 
     # @return [String] +""+ when not in the CI context, and the MR Source Project ID as a string otherwise.

data/lib/danger/plugins/roulette.rb

@@ -20,7 +20,13 @@ module Danger
 
     Approval = Struct.new(:category, :spin) do
       def self.from_approval_rule(rule, maintainer)
-        category = rule["section"].to_sym
+        category =
+          if rule["section"] == "codeowners"
+            "`#{rule["name"]}`"
+          else
+            rule["section"]
+          end.to_sym
+
         spin = Spin.new(category, nil, maintainer, :reviewer)
 
         new(category, spin)

data/lib/gitlab/dangerfiles/base_linter.rb

@@ -14,6 +14,7 @@ module Gitlab
         {
           subject_too_short: "The %s must contain at least #{MIN_SUBJECT_WORDS_COUNT} words",
           subject_too_long: "The %s may not be longer than #{MAX_LINE_LENGTH} characters",
+          subject_starts_with_a_space: "The %s must not start with a space",
           subject_starts_with_lowercase: "The %s must start with a capital letter",
           subject_ends_with_a_period: "The %s must not end with a period",
         }
@@ -49,6 +50,10 @@ module Gitlab
           add_problem(:subject_too_long, self.class.subject_description)
         end
 
+        if subject_starts_with_a_space?
+          add_problem(:subject_starts_with_a_space, self.class.subject_description)
+        end
+
         if subject_starts_with_lowercase?
           add_problem(:subject_starts_with_lowercase, self.class.subject_description)
         end
@@ -78,8 +83,13 @@ module Gitlab
         line.length > MAX_LINE_LENGTH
       end
 
+      def subject_starts_with_a_space?
+        subject.start_with?(" ")
+      end
+
       def subject_starts_with_lowercase?
         return false if subject.empty?
+        return false if subject_starts_with_a_space?
         return false if ("A".."Z").cover?(subject[0])
 
         first_char = subject.sub(/\A(\[[^\]]+\]|[^:\s]+:)\s/, "")[0]

data/lib/gitlab/dangerfiles/category.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Dangerfiles
+    CategoryStruct = Struct.new(:name, :project, :kind, :labels, keyword_init: true)
+
+    class Category < CategoryStruct
+      def self.for(name, **arguments)
+        (name_to_class[name] || self).new(name: name, **arguments)
+      end
+
+      def self.name_to_class
+        @name_to_class ||= {
+          test: Test,
+          tooling: Tooling,
+          integrations_be: IntegrationsBE,
+          integrations_fe: IntegrationsFE,
+          ux: UX,
+        }.freeze
+      end
+      private_class_method :name_to_class
+
+      def has_capability?(...)
+        has_particular_capability?(...) || has_universal_capability?(...)
+      end
+
+      private
+
+      def has_particular_capability?(teammate)
+        teammate.capabilities(project).include?(capability)
+      end
+
+      def has_universal_capability?(teammate)
+        false
+      end
+
+      def capability
+        # name can be nil
+        @capability ||= "#{kind} #{name}".strip
+      end
+
+      class Test < Category
+        private
+
+        def has_particular_capability?(teammate)
+          return false if kind != :reviewer
+
+          area = teammate.role[/Software Engineer in Test(?:.*?, (\w+))/, 1]
+
+          area && labels.any?("devops::#{area.downcase}")
+        end
+      end
+
+      class Tooling < Category
+        private
+
+        def has_particular_capability?(teammate)
+          if super
+            true
+          elsif %i[trainee_maintainer maintainer].include?(kind)
+            false
+          else # fallback to backend reviewer
+            teammate.capabilities(project).include?("#{kind} backend")
+          end
+        end
+      end
+
+      class IntegrationsBE < Category
+        private
+
+        def has_particular_capability?(teammate)
+          kind == :reviewer &&
+            teammate.role.match?(/Backend Engineer.+Manage:Integrations/)
+        end
+      end
+
+      class IntegrationsFE < Category
+        private
+
+        def has_particular_capability?(teammate)
+          kind == :reviewer &&
+            teammate.role.match?(/Frontend Engineer.+Manage:Integrations/)
+        end
+      end
+
+      class UX < Category
+        private
+
+        def has_universal_capability?(teammate)
+          teammate.projects.each_value.find do |capabilities|
+            capabilities.include?(capability)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/dangerfiles/teammate.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require_relative "category"
+
 module Gitlab
   module Dangerfiles
     class Teammate
-      attr_reader :options, :username, :name, :role, :projects, :available, :hungry, :reduced_capacity, :tz_offset_hours
+      attr_reader :options, :username, :name, :role, :projects, :available, :hungry, :reduced_capacity, :tz_offset_hours,
+                  :only_maintainer_reviews
 
       # The options data are produced by https://gitlab.com/gitlab-org/gitlab-roulette/-/blob/master/lib/team_member.rb
       def initialize(options = {})
@@ -18,6 +21,7 @@ module Gitlab
         @hungry = options["hungry"]
         @reduced_capacity = options["reduced_capacity"]
         @tz_offset_hours = options["tz_offset_hours"]
+        @only_maintainer_reviews = options["only_maintainer_reviews"]
       end
 
       def to_h
@@ -74,6 +78,10 @@ module Gitlab
         (Time.now.utc + tz_offset_hours * 3600).hour
       end
 
+      def capabilities(project)
+        projects.fetch(project, [])
+      end
+
       protected
 
       def floored_offset_hours
@@ -123,42 +131,7 @@ module Gitlab
       end
 
       def has_capability?(project, category, kind, labels)
-        case category
-        when :test
-          area = role[/Software Engineer in Test(?:.*?, (\w+))/, 1]
-
-          area && labels.any?("devops::#{area.downcase}") if kind == :reviewer
-        when :tooling, :engineering_productivity # Deprecated as of 2.3.0 in favor of tooling
-          return true if capabilities(project).include?("#{kind} #{category}")
-          return false if %i[trainee_maintainer maintainer].include?(kind)
-
-          capabilities(project).include?("#{kind} backend") # fallback to backend reviewer
-        when :integrations_be
-          kind == :reviewer &&
-            role.match?(/Backend Engineer.+Ecosystem:Integrations/)
-        when :integrations_fe
-          kind == :reviewer &&
-            role.match?(/Frontend Engineer.+Ecosystem:Integrations/)
-        when nil
-          capabilities(project).include?("#{kind}")
-        else
-          capabilities(project).include?("#{kind} #{category}")
-        end || has_universal_capability?(category, kind, labels)
-      end
-
-      def has_universal_capability?(category, kind, labels)
-        case category
-        when :ux
-          capacity = "#{kind} #{category}"
-
-          projects.each_value.find do |capabilities|
-            capabilities.include?(capacity)
-          end
-        end
-      end
-
-      def capabilities(project)
-        projects.fetch(project, [])
+        Category.for(category, project: project, kind: kind, labels: labels).has_capability?(self)
       end
 
       def pluralize(count, singular, plural)

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.6.0"
+    VERSION = "3.6.4"
   end
 end

data/lib/gitlab/dangerfiles/weightage/reviewers.rb

@@ -33,6 +33,7 @@ module Gitlab
           # https://gitlab.com/gitlab-org/gitlab/issues/26723
 
           remove_traintainers_from_reviewers!
+          remove_maintainer_only_from_reviewers!
 
           weighted_reviewers + weighted_traintainers
         end
@@ -49,6 +50,11 @@ module Gitlab
           reviewers.reject! { |reviewer| traintainers.include?(reviewer) }
         end
 
+        def remove_maintainer_only_from_reviewers!
+          # Using a maintainer-only reviewer emoji, team members can ensure they only get maintainer reviews
+          reviewers.reject! { |reviewer| reviewer&.only_maintainer_reviews }
+        end
+
         def weighted_reviewers
           reviewers.each_with_object([]) do |reviewer, total_reviewers|
             add_weighted_reviewer(total_reviewers, reviewer, DEFAULT_REVIEWER_WEIGHT)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.4
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -183,6 +183,7 @@ files:
 - lib/gitlab/Dangerfile
 - lib/gitlab/dangerfiles.rb
 - lib/gitlab/dangerfiles/base_linter.rb
+- lib/gitlab/dangerfiles/category.rb
 - lib/gitlab/dangerfiles/changes.rb
 - lib/gitlab/dangerfiles/commit_linter.rb
 - lib/gitlab/dangerfiles/config.rb