gitlab-dangerfiles 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6298bb4b8fed9c66cd1bc9b811e9ddb93d6e8474dd8797da837780ec5bcbe1a8
-  data.tar.gz: 2be36370906090104ebba958d4910d5f105cf3b8d0619849c78dbb5b625dcd9a
+  metadata.gz: 679d12adff8fd532552d644bba3f1ae62395077310ffcc7aa62181b477f5453d
+  data.tar.gz: f6460b3c349cf27d1a65246f41744cae15c95c0c949811aa1b972abe654b3e90
 SHA512:
-  metadata.gz: 9c09bdec93ab9d0b1a73565e62a46e400204907f758cb924c0d27d27eda7aae0871e45a02d7ac1f6846d2aa0f6a8c41d341f57147d5e04d94ac4351a2b6b64d1
-  data.tar.gz: 67710acb881d9f5229944ccb3dc40bb7d9c4ae0d66743190cfb3fac7e560f22f3ca8a7ca7b7b60119e6f595b4a4e00d3235df0728a79370d60723985cb4d0b93
+  metadata.gz: 8ebcb0cd08d49021346a0b74adb50b5ff10a8fe64227e86f960a72e6cc88260f0249927088bae3e949ddbf9a295c65d2d4c005d8d4b0ee157a907f700b72ce46
+  data.tar.gz: e747d6b68ca54ee597e008332a5bfc7d4fa01a437e44af42fc68d5ab28aaf674b2e76995ab792559016fa381c0cd1e08b58071bb5c3d4b66f37e8c7891bbaa77

data/lib/danger/helper.rb

@@ -2,6 +2,7 @@
 
 require "net/http"
 require "json"
+require "danger"
 require_relative "../gitlab/dangerfiles/teammate"
 
 module Danger
@@ -15,77 +16,6 @@ module Danger
       test: "~test ~Quality for `spec/features/*`",
       engineering_productivity: '~"Engineering Productivity" for CI, Danger',
     }.freeze
-    # First-match win, so be sure to put more specific regex at the top...
-    CATEGORIES = {
-      %r{\Adoc/} => :docs,
-      %r{\A(CONTRIBUTING|LICENSE|MAINTENANCE|PHILOSOPHY|PROCESS|README)(\.md)?\z} => :docs,
-
-      %r{\A(ee/)?app/(assets|views)/} => :frontend,
-      %r{\A(ee/)?public/} => :frontend,
-      %r{\A(ee/)?spec/(javascripts|frontend)/} => :frontend,
-      %r{\A(ee/)?vendor/assets/} => :frontend,
-      %r{\A(ee/)?scripts/frontend/} => :frontend,
-      %r{(\A|/)(
-        \.babelrc |
-        \.eslintignore |
-        \.eslintrc(\.yml)? |
-        \.nvmrc |
-        \.prettierignore |
-        \.prettierrc |
-        \.scss-lint.yml |
-        \.stylelintrc |
-        \.haml-lint.yml |
-        \.haml-lint_todo.yml |
-        babel\.config\.js |
-        jest\.config\.js |
-        package\.json |
-        yarn\.lock |
-        config/.+\.js
-      )\z}x => :frontend,
-
-      %r{(\A|/)(
-        \.gitlab/ci/frontend\.gitlab-ci\.yml
-      )\z}x => %i[frontend engineering_productivity],
-
-      %r{\A(ee/)?db/(?!fixtures)[^/]+} => :database,
-      %r{\A(ee/)?lib/gitlab/(database|background_migration|sql|github_import)(/|\.rb)} => :database,
-      %r{\A(app/models/project_authorization|app/services/users/refresh_authorized_projects_service)(/|\.rb)} => :database,
-      %r{\A(ee/)?app/finders/} => :database,
-      %r{\Arubocop/cop/migration(/|\.rb)} => :database,
-
-      %r{\A(\.gitlab-ci\.yml\z|\.gitlab\/ci)} => :engineering_productivity,
-      %r{\A\.codeclimate\.yml\z} => :engineering_productivity,
-      %r{\A\.overcommit\.yml\.example\z} => :engineering_productivity,
-      %r{\A\.editorconfig\z} => :engineering_productivity,
-      %r{Dangerfile\z} => :engineering_productivity,
-      %r{\A(ee/)?(danger/|lib/gitlab/danger/)} => :engineering_productivity,
-      %r{\A(ee/)?scripts/} => :engineering_productivity,
-      %r{\Atooling/} => :engineering_productivity,
-
-      %r{\A(ee/)?app/(?!assets|views)[^/]+} => :backend,
-      %r{\A(ee/)?(bin|config|generator_templates|lib|rubocop)/} => :backend,
-      %r{\A(ee/)?spec/features/} => :test,
-      %r{\A(ee/)?spec/} => :backend,
-      %r{\A(ee/)?vendor/} => :backend,
-      %r{\A(Gemfile|Gemfile.lock|Rakefile)\z} => :backend,
-      %r{\A[A-Z_]+_VERSION\z} => :backend,
-      %r{\A\.rubocop(_todo)?\.yml\z} => :backend,
-      %r{\Afile_hooks/} => :backend,
-
-      %r{\A(ee/)?qa/} => :qa,
-
-      # Files that don't fit into any category are marked with :none
-      %r{\A(ee/)?changelogs/} => :none,
-      %r{\Alocale/gitlab\.pot\z} => :none,
-
-      # Fallbacks in case the above patterns miss anything
-      %r{\.rb\z} => :backend,
-      %r{(
-        \.(md|txt)\z |
-        \.markdownlint\.json
-      )}x => :none, # To reinstate roulette for documentation, set to `:docs`.
-      %r{\.js\z} => :frontend,
-    }.freeze
 
     HTTPError = Class.new(StandardError)
 
@@ -98,10 +28,6 @@ module Danger
       nil
     end
 
-    def rule_names
-      ci? ? Gitlab::Dangerfiles::LOCAL_RULES | Gitlab::Dangerfiles::CI_ONLY_RULES : Gitlab::Dangerfiles::LOCAL_RULES
-    end
-
     def html_link(str)
       ci? ? gitlab_helper.html_link(str) : str
     end
@@ -148,23 +74,25 @@ module Danger
         .sort
     end
 
-    def all_ee_changes
-      all_changed_files.grep(%r{\Aee/})
-    end
+    # Returns a string containing changed lines as git diff
+    #
+    # Considering changing a line in lib/gitlab/usage_data.rb it will return:
+    #
+    # [ "--- a/lib/gitlab/usage_data.rb",
+    #   "+++ b/lib/gitlab/usage_data.rb",
+    #   "+      # Test change",
+    #   "-      # Old change" ]
+    def changed_lines(changed_file)
+      diff = git.diff_for_file(changed_file)
+      return [] unless diff
 
-    def ee?
-      # Support former project name for `dev` and support local Danger run
-      %w[gitlab gitlab-ee].include?(ENV["CI_PROJECT_NAME"]) || Dir.exist?("../../ee")
+      diff.patch.split("\n").select { |line| %r{^[+-]}.match?(line) }
     end
 
     def release_automation?
       gitlab_helper&.mr_author == RELEASE_TOOLS_BOT
     end
 
-    def project_name
-      ee? ? "gitlab" : "gitlab-foss"
-    end
-
     def markdown_list(items)
       list = items.map { |item| "* `#{item}`" }.join("\n")
 
@@ -176,16 +104,23 @@ module Danger
     end
 
     # @return [Hash<String,Array<String>>]
-    def changes_by_category
+    def changes_by_category(categories)
       all_changed_files.each_with_object(Hash.new { |h, k| h[k] = [] }) do |file, hash|
-        categories_for_file(file).each { |category| hash[category] << file }
+        categories_for_file(file, categories).each { |category| hash[category] << file }
       end
     end
 
     # Determines the categories a file is in, e.g., `[:frontend]`, `[:backend]`, or  `%i[frontend engineering_productivity]`.
     # @return Array<Symbol>
-    def categories_for_file(file)
-      _, categories = CATEGORIES.find { |regexp, _| regexp.match?(file) }
+    def categories_for_file(file, categories)
+      _, categories = categories.find do |key, _|
+        filename_regex, changes_regex = Array(key)
+
+        found = filename_regex.match?(file)
+        found &&= changed_lines(file).any? { |changed_line| changes_regex.match?(changed_line) } if changes_regex
+
+        found
+      end
 
       Array(categories || :unknown)
     end
@@ -251,6 +186,10 @@ module Danger
       "/label #{labels_list(labels, sep: " ")}"
     end
 
+    def changed_files(regex)
+      all_changed_files.grep(regex)
+    end
+
     private
 
     def has_database_scoped_labels?(current_mr_labels)

data/lib/danger/roulette.rb

@@ -9,42 +9,53 @@ module Danger
     ROULETTE_DATA_URL = "https://gitlab-org.gitlab.io/gitlab-roulette/roulette.json"
     HOURS_WHEN_PERSON_CAN_BE_PICKED = (6..14).freeze
 
-    Spin = Struct.new(:category, :reviewer, :maintainer, :optional_role)
+    INCLUDE_TIMEZONE_FOR_CATEGORY = {
+      database: false,
+    }.freeze
+
+    Spin = Struct.new(:category, :reviewer, :maintainer, :optional_role, :timezone_experiment)
+
+    def team_mr_author
+      team.find { |person| person.username == mr_author_username }
+    end
 
     # Assigns GitLab team members to be reviewer and maintainer
     # for each change category that a Merge Request contains.
     #
     # @return [Array<Spin>]
-    def spin(project, categories, branch_name, timezone_experiment: false)
-      team = begin
-          project_team(project)
-        rescue => err
-          warn("Reviewer roulette failed to load team data: #{err.message}")
-          []
-        end
+    def spin(project, categories, timezone_experiment: false)
+      spins = categories.map do |category|
+        including_timezone = INCLUDE_TIMEZONE_FOR_CATEGORY.fetch(category, timezone_experiment)
 
-      canonical_branch_name = canonical_branch_name(branch_name)
-
-      spin_per_category = categories.each_with_object({}) do |category, memo|
-        memo[category] = spin_for_category(team, project, category, canonical_branch_name, timezone_experiment: timezone_experiment)
+        spin_for_category(project, category, timezone_experiment: including_timezone)
       end
 
-      spin_per_category.map do |category, spin|
-        case category
+      backend_spin = spins.find { |spin| spin.category == :backend }
+
+      spins.each do |spin|
+        including_timezone = INCLUDE_TIMEZONE_FOR_CATEGORY.fetch(spin.category, timezone_experiment)
+        case spin.category
+        when :qa
+          # MR includes QA changes, but also other changes, and author isn't an SET
+          if categories.size > 1 && !team_mr_author&.reviewer?(project, spin.category, [])
+            spin.optional_role = :maintainer
+          end
         when :test
+          spin.optional_role = :maintainer
+
           if spin.reviewer.nil?
             # Fetch an already picked backend reviewer, or pick one otherwise
-            spin.reviewer = spin_per_category[:backend]&.reviewer || spin_for_category(team, project, :backend, canonical_branch_name).reviewer
+            spin.reviewer = backend_spin&.reviewer || spin_for_category(project, :backend, timezone_experiment: including_timezone).reviewer
           end
         when :engineering_productivity
           if spin.maintainer.nil?
             # Fetch an already picked backend maintainer, or pick one otherwise
-            spin.maintainer = spin_per_category[:backend]&.maintainer || spin_for_category(team, project, :backend, canonical_branch_name).maintainer
+            spin.maintainer = backend_spin&.maintainer || spin_for_category(project, :backend, timezone_experiment: including_timezone).maintainer
           end
         end
-
-        spin
       end
+
+      spins
     end
 
     # Looks up the current list of GitLab team members and parses it into a
@@ -66,14 +77,9 @@ module Danger
     # @return [Array<Teammate>]
     def project_team(project_name)
       team.select { |member| member.in_project?(project_name) }
-    end
-
-    def canonical_branch_name(branch_name)
-      branch_name.gsub(/^[ce]e-|-[ce]e$/, "")
-    end
-
-    def new_random(seed)
-      Random.new(Digest::MD5.hexdigest(seed).to_i(16))
+    rescue => err
+      warn("Reviewer roulette failed to load team data: #{err.message}")
+      []
     end
 
     # Known issue: If someone is rejected due to OOO, and then becomes not OOO, the
@@ -106,16 +112,35 @@ module Danger
     # @param [Teammate] person
     # @return [Boolean]
     def mr_author?(person)
-      person.username == gitlab.mr_author
+      person.username == mr_author_username
+    end
+
+    def mr_author_username
+      helper.gitlab_helper&.mr_author || `whoami`
+    end
+
+    def mr_source_branch
+      return `git rev-parse --abbrev-ref HEAD` unless helper.gitlab_helper&.mr_json
+
+      helper.gitlab_helper.mr_json["source_branch"]
+    end
+
+    def mr_labels
+      helper.gitlab_helper&.mr_labels || []
+    end
+
+    def new_random(seed)
+      Random.new(Digest::MD5.hexdigest(seed).to_i(16))
     end
 
     def spin_role_for_category(team, role, project, category)
       team.select do |member|
-        member.public_send("#{role}?", project, category, gitlab.mr_labels) # rubocop:disable GitlabSecurity/PublicSend
+        member.public_send("#{role}?", project, category, mr_labels) # rubocop:disable GitlabSecurity/PublicSend
       end
     end
 
-    def spin_for_category(team, project, category, branch_name, timezone_experiment: false)
+    def spin_for_category(project, category, timezone_experiment: false)
+      team = project_team(project)
       reviewers, traintainers, maintainers =
         %i[reviewer traintainer maintainer].map do |role|
           spin_role_for_category(team, role, project, category)
@@ -125,11 +150,11 @@ module Danger
       # https://gitlab.com/gitlab-org/gitlab/issues/26723
 
       # Make traintainers have triple the chance to be picked as a reviewer
-      random = new_random(branch_name)
+      random = new_random(mr_source_branch)
       reviewer = spin_for_person(reviewers + traintainers + traintainers, random: random, timezone_experiment: timezone_experiment)
       maintainer = spin_for_person(maintainers, random: random, timezone_experiment: timezone_experiment)
 
-      Spin.new(category, reviewer, maintainer)
+      Spin.new(category, reviewer, maintainer, false, timezone_experiment)
     end
   end
 end

data/lib/gitlab/dangerfiles.rb

@@ -2,39 +2,5 @@ require "gitlab/dangerfiles/version"
 
 module Gitlab
   module Dangerfiles
-    LOCAL_RULES ||= %w[
-      changes_size
-      commit_messages
-      database
-      documentation
-      duplicate_yarn_dependencies
-      eslint
-      frozen_string
-      karma
-      prettier
-      telemetry
-      utility_css
-    ].freeze
-    CI_ONLY_RULES ||= %w[
-      ce_ee_vue_templates
-      changelog
-      metadata
-      roulette
-      sidekiq_queues
-      specs
-    ].freeze
-    MESSAGE_PREFIX = "==>".freeze
-
-    def self.load_tasks
-      require "gitlab/dangerfiles/tasks"
-    end
-
-    def self.local_warning_message
-      "#{MESSAGE_PREFIX} Only the following Danger rules can be run locally: #{LOCAL_RULES.join(", ")}"
-    end
-
-    def self.success_message
-      "#{MESSAGE_PREFIX} No Danger rule violations!"
-    end
   end
 end

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Rémy Coutable
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -130,36 +130,14 @@ files:
 - fixtures/emojis/aliases.json
 - fixtures/emojis/digests.json
 - gitlab-dangerfiles.gemspec
-- lib/danger/changelog.rb
 - lib/danger/helper.rb
 - lib/danger/roulette.rb
-- lib/danger/sidekiq_queues.rb
 - lib/gitlab-dangerfiles.rb
 - lib/gitlab/Dangerfile
 - lib/gitlab/dangerfiles.rb
-- lib/gitlab/dangerfiles/bundle_size/Dangerfile
-- lib/gitlab/dangerfiles/ce_ee_vue_templates/Dangerfile
-- lib/gitlab/dangerfiles/changelog/Dangerfile
-- lib/gitlab/dangerfiles/changes_size/Dangerfile
 - lib/gitlab/dangerfiles/commit_linter.rb
-- lib/gitlab/dangerfiles/commit_messages/Dangerfile
-- lib/gitlab/dangerfiles/database/Dangerfile
-- lib/gitlab/dangerfiles/documentation/Dangerfile
-- lib/gitlab/dangerfiles/duplicate_yarn_dependencies/Dangerfile
 - lib/gitlab/dangerfiles/emoji_checker.rb
-- lib/gitlab/dangerfiles/eslint/Dangerfile
-- lib/gitlab/dangerfiles/frozen_string/Dangerfile
-- lib/gitlab/dangerfiles/karma/Dangerfile
-- lib/gitlab/dangerfiles/metadata/Dangerfile
-- lib/gitlab/dangerfiles/popen.rb
-- lib/gitlab/dangerfiles/prettier/Dangerfile
-- lib/gitlab/dangerfiles/roulette/Dangerfile
-- lib/gitlab/dangerfiles/sidekiq_queues/Dangerfile
-- lib/gitlab/dangerfiles/specs/Dangerfile
-- lib/gitlab/dangerfiles/tasks.rb
 - lib/gitlab/dangerfiles/teammate.rb
-- lib/gitlab/dangerfiles/telemetry/Dangerfile
-- lib/gitlab/dangerfiles/utility_css/Dangerfile
 - lib/gitlab/dangerfiles/version.rb
 homepage: https://gitlab.com/gitlab-org/gitlab-dangerfiles
 licenses:

data/lib/danger/changelog.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Danger
-  # Common helper functions for our danger scripts. See Danger::Helper
-  # for more details
-  class Changelog < Danger::Plugin
-    NO_CHANGELOG_LABELS = [
-      "backstage", # To be removed by https://gitlab.com/gitlab-org/gitlab/-/issues/222360.
-      "tooling",
-      "tooling::pipelines",
-      "tooling::workflow",
-      "ci-build",
-      "meta",
-    ].freeze
-    NO_CHANGELOG_CATEGORIES = %i[docs none].freeze
-
-    def needed?
-      categories_need_changelog? && (gitlab.mr_labels & NO_CHANGELOG_LABELS).empty?
-    end
-
-    def found
-      @found ||= git.added_files.find { |path| path =~ %r{\A(ee/)?(changelogs/unreleased)(-ee)?/} }
-    end
-
-    def sanitized_mr_title
-      gitlab.mr_json["title"].gsub(/^WIP: */, "").gsub(/`/, '\\\`')
-    end
-
-    def ee_changelog?
-      found.start_with?("ee/")
-    end
-
-    private
-
-    def categories_need_changelog?
-      (helper.changes_by_category.keys - NO_CHANGELOG_CATEGORIES).any?
-    end
-  end
-end