gitlab-dangerfiles 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b09d209b943b3290f35336c38330a088cb19864a1f275c7019080f5a40aead19
-  data.tar.gz: cfd9105eaf80390efce141b0fbc7ed37cc6b68883051f65b62881e136b810fd3
+  metadata.gz: 5c9ef239b79432bbb3b87cd49450338435f8ea5e0d27ed4beff1c2ce019dc79a
+  data.tar.gz: f5b42d80cba45edaba0bbda8fbbb314546489743e16ec74b7ab28dfc89bd4acb
 SHA512:
-  metadata.gz: 4c5dd9b9adaeb69f2dac57d9a8dc7b7c06faa32dc3b7c865ef66176ccb4fc51a2fae329d24bbab69e261f89a3ac9b60b882bd11cf15b12d9b57118ebfff9d28e
-  data.tar.gz: 61bb13462bfe1eb1531455a346b6a0285c87687fc89b9f8dfedce107f5872ddc8a5db54bb0cc6886154ea1ac63a04e8cd3ffe92a561e1db859e85d4ce8ce9290
+  metadata.gz: 3dc38989aa7959bac78ec9bcd36fa7ddfcd0c265b6a049c8ac37d5163bf8834e930e317368402d53850a8a12161bdf8f38cb1309068c27319f34c9a5b7c85d06
+  data.tar.gz: 779f8c6c3f1b817b88813010048d1541609fca1e92bd3021abf4f8b18f46fffcbee8ed239a48d78254a6858925d56b62ddf202b3f8c361b62f4ffcc57476fc51

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/lib/danger/plugins/internal/helper.rb

@@ -26,6 +26,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.

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,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "category"
+
 module Gitlab
   module Dangerfiles
     class Teammate
@@ -74,6 +76,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 +129,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.+Manage:Integrations/)
-        when :integrations_fe
-          kind == :reviewer &&
-            role.match?(/Frontend Engineer.+Manage: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.1"
+    VERSION = "3.6.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-11-04 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