Merge branch 'master' into 'template-improvements-for-documentation'

# Conflicts:
#   .gitlab/merge_request_templates/Documentation.md

4 files changed, 92 insertions, 45 deletions

diff --git a/danger/changelog/Dangerfile b/danger/changelog/Dangerfile
index 530c6638653..63b2f6f5c5c 100644
--- a/danger/changelog/Dangerfile
+++ b/danger/changelog/Dangerfile
@@ -16,16 +16,12 @@ consider adding any of the %<labels>s labels.
 #{SEE_DOC}
 MSG
 
-def ee?
-  ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('../../CHANGELOG-EE.md')
-end
-
 def ee_changelog?(changelog_path)
   changelog_path =~ /unreleased-ee/
 end
 
 def ce_port_changelog?(changelog_path)
-  ee? && !ee_changelog?(changelog_path)
+  helper.ee? && !ee_changelog?(changelog_path)
 end
 
 def check_changelog(path)
diff --git a/danger/documentation/Dangerfile b/danger/documentation/Dangerfile
index fff4d0e2582..0cf478b4f89 100644
--- a/danger/documentation/Dangerfile
+++ b/danger/documentation/Dangerfile
@@ -1,17 +1,6 @@
 # frozen_string_literal: true
 
-# All the files/directories that should be reviewed by the Docs team.
-DOCS_FILES = [
-  'doc/'
-].freeze
-
-def docs_paths_requiring_review(files)
-  files.select do |file|
-    DOCS_FILES.any? { |pattern| file.start_with?(pattern) }
-  end
-end
-
-docs_paths_to_review = docs_paths_requiring_review(helper.all_changed_files)
+docs_paths_to_review = helper.changes_by_category[:docs]
 
 unless docs_paths_to_review.empty?
   message 'This merge request adds or changes files that require a review ' \
diff --git a/danger/plugins/helper.rb b/danger/plugins/helper.rb
index f4eb9119266..581c0720083 100644
--- a/danger/plugins/helper.rb
+++ b/danger/plugins/helper.rb
@@ -1,34 +1,15 @@
 # frozen_string_literal: true
 
+require 'net/http'
+require 'yaml'
+
+require_relative '../../lib/gitlab/danger/helper'
+
 module Danger
-  # Common helper functions for our danger scripts
-  # If we find ourselves repeating code in our danger files, we might as well put them in here.
+  # Common helper functions for our danger scripts. See Gitlab::Danger::Helper
+  # for more details
   class Helper < Plugin
-    # Returns a list of all files that have been added, modified or renamed.
-    # `git.modified_files` might contain paths that already have been renamed,
-    # so we need to remove them from the list.
-    #
-    # Considering these changes:
-    #
-    # - A new_file.rb
-    # - D deleted_file.rb
-    # - M modified_file.rb
-    # - R renamed_file_before.rb -> renamed_file_after.rb
-    #
-    # it will return
-    # ```
-    # [ 'new_file.rb', 'modified_file.rb', 'renamed_file_after.rb' ]
-    # ```
-    #
-    # @return [Array<String>]
-    def all_changed_files
-      Set.new
-        .merge(git.added_files.to_a)
-        .merge(git.modified_files.to_a)
-        .merge(git.renamed_files.map { |x| x[:after] })
-        .subtract(git.renamed_files.map { |x| x[:before] })
-        .to_a
-        .sort
-    end
+    # Put the helper code somewhere it can be tested
+    include Gitlab::Danger::Helper
   end
 end
diff --git a/danger/roulette/Dangerfile b/danger/roulette/Dangerfile
new file mode 100644
index 00000000000..6cf54d0f854
--- /dev/null
+++ b/danger/roulette/Dangerfile
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+MESSAGE = <<MARKDOWN
+## Reviewer roulette
+
+Changes that require review have been detected! A merge request is normally
+reviewed by both a reviewer and a maintainer in its primary category (e.g.
+~frontend or ~backend), and by a maintainer in all other categories.
+MARKDOWN
+
+CATEGORY_TABLE_HEADER = <<MARKDOWN
+
+To spread load more evenly across eligible reviewers, Danger has randomly picked
+a candidate for each review slot. Feel free to override this selection if you
+think someone else would be better-suited, or the chosen person is unavailable.
+
+Once you've decided who will review this merge request, mention them as you
+normally would! Danger does not (yet?) automatically notify them for you.
+
+| Category | Reviewer | Maintainer |
+| -------- | -------- | ---------- |
+MARKDOWN
+
+UNKNOWN_FILES_MESSAGE = <<MARKDOWN
+
+These files couldn't be categorised, so Danger was unable to suggest a reviewer.
+Please consider creating a merge request to
+[add support](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/gitlab/danger/helper.rb)
+for them.
+MARKDOWN
+
+def spin(team, project, category)
+  reviewers = team.select { |member| member.reviewer?(project, category) }
+  maintainers = team.select { |member| member.maintainer?(project, category) }
+
+  # TODO: filter out people who are currently not in the office
+  # TODO: take CODEOWNERS into account?
+
+  reviewer = reviewers[rand(reviewers.size)]
+  maintainer = maintainers[rand(maintainers.size)]
+
+  "| #{helper.label_for_category(category)} | #{reviewer&.markdown_name} | #{maintainer&.markdown_name} |"
+end
+
+def build_list(items)
+  list = items.map { |filename| "* `#{filename}`" }.join("\n")
+
+  if items.size > 10
+    "\n<details>\n\n#{list}\n\n</details>"
+  else
+    list
+  end
+end
+
+changes = helper.changes_by_category
+
+# Ignore any files that are known but uncategoried. Prompt for any unknown files
+changes.delete(:none)
+categories = changes.keys - [:unknown]
+
+unless changes.empty?
+  team =
+    begin
+      helper.project_team
+    rescue => err
+      warn("Reviewer roulette failed to load team data: #{err.message}")
+      []
+    end
+
+  # Exclude the MR author from the team for selection purposes
+  team.delete_if { |teammate| teammate.username == gitlab.mr_author }
+
+  project = helper.project_name
+  unknown = changes.fetch(:unknown, [])
+
+  rows = categories.map { |category| spin(team, project, category) }
+
+  markdown(MESSAGE)
+  markdown(CATEGORY_TABLE_HEADER + rows.join("\n")) unless rows.empty?
+  markdown(UNKNOWN_FILES_MESSAGE + build_list(unknown)) unless unknown.empty?
+end