gitlab-dangerfiles 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b25f2e8617ff29a3ea964b59774b02c395127c4800bfa1552affd2e71bf62a89
-  data.tar.gz: 813ca1c6dbd433cd43f1f5ef0efc44a514af3edf7cf7ed07d75eea50640817da
+  metadata.gz: bf965c37aaf01dff0630442feecb4fbe6e8d96bb2c9f7f714c631487c9eb894e
+  data.tar.gz: 720fe1ddfd202e0b199dfbd63fdb360a8a7e58d355182b7055ff0fdebb74c886
 SHA512:
-  metadata.gz: d5208cc7b7c588c5fe7403f3b79631313a71c64007ed572fe8a5848a1c229f59f9e653f0b263c5c73efc85a1339fda852d2f44f376cca19f2d2ecac8e406b111
-  data.tar.gz: 4b31682875c0c7f5037463d035a57cb9ccd4215d68879105ce4a369539d1e155b6da7b620f942611d9d0fc92251bf58338614230bd16008dbd715974ffee57d9
+  metadata.gz: 31a832aa516290296662a7949b01a13c7dd47e7c05ad6c6e78cb1f189f2190b99094e97a07875d65f4cb6b5504a8816d1a26aa39a618480899f2026c58c2c311
+  data.tar.gz: 4f18f92c83494aff49ceec1a05f2b380bd9be7aee17a50a4126ec25c011cfc468a672da200d4a93420d4c47bbec19d6678dc389e083a56945d94d52a58862107

data/lib/danger/plugins/roulette.rb

@@ -192,7 +192,10 @@ module Danger
     #
     # @return [Array<Gitlab::Dangerfiles::Teammate>]
     def project_team(project_name)
-      company_members.select { |member| member.in_project?(project_name) }
+      company_members.select do |member|
+        member.in_project?(project_name) ||
+          member.in_project?("gitlab") # Used for backup reviewer
+      end
     rescue => err
       warn("Reviewer roulette failed to load team data: #{err.message}")
       []

data/lib/danger/rules/simple_roulette/Dangerfile

@@ -60,37 +60,44 @@ def note_for_spin_role(spin, role)
   spin.public_send(role)&.markdown_name(author: roulette.team_mr_author)
 end
 
-def markdown_row_for_spins(category = nil, spins_array)
+def markdown_row_for_spins(category = nil, spins_array, has_categories:)
   reviewer_note = note_for_spins_role(spins_array, :reviewer)
   maintainer_note = note_for_spins_role(spins_array, :maintainer)
 
   row = +"| #{reviewer_note} | #{maintainer_note} |"
-  row.prepend("| #{helper.label_for_category(category)} ") if categories_defined?
-
+  row.prepend("| #{helper.label_for_category(category)} ") if has_categories
   row
 end
 
-def categories_defined?
-  helper.config.files_to_category.any?
-end
+changes = helper.changes_by_category
 
-def categories(changes)
-  categories_defined? ? changes.keys : [nil]
-end
+# Replicating label based categories from:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/danger/roulette/Dangerfile
+categories = Set.new(changes.keys - [:unknown])
 
-def table_header
-  categories_defined? ? TABLE_HEADER_WITH_CATEGORIES : TABLE_HEADER_WITHOUT_CATEGORIES
-end
+# Ensure to spin for database reviewer/maintainer when ~database is applied (e.g. to review SQL queries)
+categories << :database if helper.mr_labels.include?('database')
 
-changes = helper.changes_by_category
+# Ensure to spin for UX reviewer when ~UX is applied (e.g. to review changes to the UI) except when it's from wider community contribution where we want to assign from the corresponding group
+categories << :ux if helper.mr_labels.include?('UX') && !helper.mr_labels.include?('Community contribution')
+
+# Ensure to spin for Product Intelligence reviewer when ~"product intelligence::review pending" is applied
+categories << :product_intelligence if helper.mr_labels.include?("product intelligence::review pending")
+
+# Skip Product intelligence reviews for growth experiment MRs
+categories.delete(:product_intelligence) if helper.mr_labels.include?("growth experiment")
 
 if changes.any?
-  random_roulette_spins = roulette.spin(nil, categories(changes))
+  has_categories = categories.any?
+  categories = [nil] unless has_categories
+  random_roulette_spins = roulette.spin(nil, categories)
 
   rows = random_roulette_spins.map do |spin|
-    markdown_row_for_spins(spin.category, [spin])
+    markdown_row_for_spins(spin.category, [spin], has_categories: has_categories)
   end
 
+  table_header = has_categories ? TABLE_HEADER_WITH_CATEGORIES : TABLE_HEADER_WITHOUT_CATEGORIES
+
   markdown(MESSAGE)
   markdown(TABLE_MARKDOWN + table_header + rows.join("\n")) unless rows.empty?
 end

data/lib/gitlab/dangerfiles/teammate.rb

@@ -130,11 +130,22 @@ module Gitlab
           capabilities(project).include?("#{kind}")
         else
           capabilities(project).include?("#{kind} #{category}")
+        end || has_backup_capability?(category, kind, labels)
+      end
+
+      def has_backup_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)
-        Array(projects.fetch(project, []))
+        projects.fetch(project, [])
       end
 
       def pluralize(count, singular, plural)

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.2.0"
+    VERSION = "3.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake