gitlab-dangerfiles 0.8.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2fca983a5c97d75dbd16b7689b26ed93a12ae5ea1781ce7bac4787f7ed2a6d3
-  data.tar.gz: f24ee73b3ee86de8ee2f447db04ca4cf46dda59d3711d85fd27fad002a2644f3
+  metadata.gz: f5e1069be5416d6980879af3330451834b57881c46101119bfc5917e2057edd7
+  data.tar.gz: e911c514f8d32d65e4aecef6ad111c80c808dd273b12775d57438532ba8a05b3
 SHA512:
-  metadata.gz: 5a04e545969282bbc1561201db8ba45e1677dedc2ccd5ac35fcd8b069366906d66f79ff8d0b2ecd73e0bca064d5b158cfd40790df28e33df160c8f97f125b1b4
-  data.tar.gz: bc7f08b1508e130491cc860b96947cf6ccac0e03a0cb577118399f391f7997c5e69e82db4658fd845b039b92cea8c6ab0ada5337f044cc9bea79a2bb66d4e58b
+  metadata.gz: b3814724620240a6485ffce4191fb8a2461c267dda5dad2466b6dc5173fbe848b66cae92aaea69ef82a49dd4726db3a7e77c106fdbd73ea58738eaf4613c4cba
+  data.tar.gz: 0fcabbe03f856d29951ae2f35e9f6f9784fa22af8d8d6bfa13a41452b4a1c35a454135751443882e6a2762325ef05dd6b8bd1b3dde58c5c7661db65ffef4c5d7

data/gitlab-dangerfiles.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "danger"
+  spec.add_dependency "danger-gitlab"
 
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-parameterized"

data/lib/danger/{helper.rb → plugins/helper.rb}

@@ -2,10 +2,10 @@
 
 require "net/http"
 require "json"
-require "danger"
-require_relative "../gitlab/dangerfiles/changes"
-require_relative "../gitlab/dangerfiles/teammate"
-require_relative "../gitlab/dangerfiles/title_linting"
+
+require_relative "../../gitlab/dangerfiles/changes"
+require_relative "../../gitlab/dangerfiles/teammate"
+require_relative "../../gitlab/dangerfiles/title_linting"
 
 module Danger
   # Common helper functions for our danger scripts.
@@ -19,6 +19,7 @@ module Danger
       test: "~test ~Quality for `spec/features/*`",
       engineering_productivity: '~"Engineering Productivity" for CI, Danger',
       ci_template: '~"ci::templates"',
+      product_intelligence: '~"product intelligence"',
     }.freeze
 
     HTTPError = Class.new(StandardError)
@@ -51,8 +52,62 @@ module Danger
       JSON.parse(rsp.body)
     end
 
+    def added_files
+      @added_files ||= if changes_from_api
+          changes_from_api.select { |file| file["new_file"] }.map { |file| file["new_path"] }
+        else
+          git.added_files.to_a
+        end
+    end
+
+    def modified_files
+      @modified_files ||= if changes_from_api
+          changes_from_api.select { |file| !file["new_file"] && !file["deleted_file"] && !file["renamed_file"] }.map { |file| file["new_path"] }
+        else
+          git.modified_files.to_a
+        end
+    end
+
+    def renamed_files
+      @renamed_files ||= if changes_from_api
+          changes_from_api.select { |file| file["renamed_file"] }.each_with_object([]) do |file, memo|
+            memo << { before: file["old_path"], after: file["new_path"] }
+          end
+        else
+          git.renamed_files.to_a
+        end
+    end
+
+    def deleted_files
+      @deleted_files ||= if changes_from_api
+          changes_from_api.select { |file| file["deleted_file"] }.map { |file| file["new_path"] }
+        else
+          git.deleted_files.to_a
+        end
+    end
+
+    def diff_for_file(filename)
+      if changes_from_api
+        changes_hash = changes_from_api.find { |file| file["new_path"] == filename }
+        changes_hash["diff"] if changes_hash
+      else
+        git.diff_for_file(filename)&.patch
+      end
+    end
+
+    def changes_from_api
+      return nil unless ci?
+      return nil if defined?(@force_changes_from_git)
+
+      @changes_from_api ||= gitlab_helper.mr_changes.to_h["changes"]
+    rescue
+      # Fallback to the Git strategy in any case
+      @force_changes_from_git = true
+      nil
+    end
+
     # Returns a list of all files that have been added, modified or renamed.
-    # `git.modified_files` might contain paths that already have been renamed,
+    # `modified_files` might contain paths that already have been renamed,
     # so we need to remove them from the list.
     #
     # Considering these changes:
@@ -70,10 +125,10 @@ module Danger
     # @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] })
+        .merge(added_files)
+        .merge(modified_files)
+        .merge(renamed_files.map { |x| x[:after] })
+        .subtract(renamed_files.map { |x| x[:before] })
         .to_a
         .sort
     end
@@ -87,10 +142,10 @@ module Danger
     #   "+      # Test change",
     #   "-      # Old change" ]
     def changed_lines(changed_file)
-      diff = git.diff_for_file(changed_file)
+      diff = diff_for_file(changed_file)
       return [] unless diff
 
-      diff.patch.split("\n").select { |line| %r{^[+-]}.match?(line) }
+      diff.split("\n").select { |line| %r{^[+-]}.match?(line) }
     end
 
     def release_automation?
@@ -117,23 +172,23 @@ module Danger
     # @return [Gitlab::Dangerfiles::Changes]
     def changes(categories)
       Gitlab::Dangerfiles::Changes.new([]).tap do |changes|
-        git.added_files.each do |file|
+        added_files.each do |file|
           categories_for_file(file, categories).each { |category| changes << Gitlab::Dangerfiles::Change.new(file, :added, category) }
         end
 
-        git.modified_files.each do |file|
+        modified_files.each do |file|
           categories_for_file(file, categories).each { |category| changes << Gitlab::Dangerfiles::Change.new(file, :modified, category) }
         end
 
-        git.deleted_files.each do |file|
+        deleted_files.each do |file|
           categories_for_file(file, categories).each { |category| changes << Gitlab::Dangerfiles::Change.new(file, :deleted, category) }
         end
 
-        git.renamed_files.map { |x| x[:before] }.each do |file|
+        renamed_files.map { |x| x[:before] }.each do |file|
           categories_for_file(file, categories).each { |category| changes << Gitlab::Dangerfiles::Change.new(file, :renamed_before, category) }
         end
 
-        git.renamed_files.map { |x| x[:after] }.each do |file|
+        renamed_files.map { |x| x[:after] }.each do |file|
           categories_for_file(file, categories).each { |category| changes << Gitlab::Dangerfiles::Change.new(file, :renamed_after, category) }
         end
       end
@@ -169,31 +224,43 @@ module Danger
     end
 
     def mr_iid
-      return "" unless gitlab_helper
+      return "" unless ci?
 
       gitlab_helper.mr_json["iid"]
     end
 
+    def mr_author
+      return `whoami`.strip unless ci?
+
+      gitlab_helper.mr_author
+    end
+
     def mr_title
-      return "" unless gitlab_helper
+      return "" unless ci?
 
       gitlab_helper.mr_json["title"]
     end
 
     def mr_web_url
-      return "" unless gitlab_helper
+      return "" unless ci?
 
       gitlab_helper.mr_json["web_url"]
     end
 
     def mr_labels
-      return [] unless gitlab_helper
+      return [] unless ci?
 
       gitlab_helper.mr_labels
     end
 
+    def mr_source_branch
+      return `git rev-parse --abbrev-ref HEAD`.strip unless ci?
+
+      gitlab_helper.mr_json["source_branch"]
+    end
+
     def mr_target_branch
-      return "" unless gitlab_helper
+      return "" unless ci?
 
       gitlab_helper.mr_json["target_branch"]
     end

data/lib/danger/{roulette.rb → plugins/roulette.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "../gitlab/dangerfiles/teammate"
-require_relative "../gitlab/dangerfiles/weightage/maintainers"
-require_relative "../gitlab/dangerfiles/weightage/reviewers"
+require_relative "../../gitlab/dangerfiles/teammate"
+require_relative "../../gitlab/dangerfiles/weightage/maintainers"
+require_relative "../../gitlab/dangerfiles/weightage/reviewers"
 
 module Danger
   # Common helper functions for our danger scripts. See Danger::Helper
@@ -18,14 +18,14 @@ module Danger
     Spin = Struct.new(:category, :reviewer, :maintainer, :optional_role, :timezone_experiment)
 
     def team_mr_author
-      team.find { |person| person.username == mr_author_username }
+      team.find { |person| person.username == helper.mr_author }
     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, timezone_experiment: false)
+    def spin(project, categories = [nil], timezone_experiment: false)
       spins = categories.sort.map do |category|
         including_timezone = INCLUDE_TIMEZONE_FOR_CATEGORY.fetch(category, timezone_experiment)
 
@@ -59,6 +59,8 @@ module Danger
             # Fetch an already picked backend maintainer, or pick one otherwise
             spin.maintainer = backend_spin&.maintainer || spin_for_category(project, :backend, timezone_experiment: including_timezone).maintainer
           end
+        when :product_intelligence
+          spin.optional_role = :maintainer
         end
       end
 
@@ -119,21 +121,7 @@ module Danger
     # @param [Teammate] person
     # @return [Boolean]
     def mr_author?(person)
-      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 || []
+      person.username == helper.mr_author
     end
 
     def new_random(seed)
@@ -142,7 +130,7 @@ module Danger
 
     def spin_role_for_category(team, role, project, category)
       team.select do |member|
-        member.public_send("#{role}?", project, category, mr_labels) # rubocop:disable GitlabSecurity/PublicSend
+        member.public_send("#{role}?", project, category, helper.mr_labels) # rubocop:disable GitlabSecurity/PublicSend
       end
     end
 
@@ -153,7 +141,7 @@ module Danger
           spin_role_for_category(team, role, project, category)
         end
 
-      random = new_random(mr_source_branch)
+      random = new_random(helper.mr_source_branch)
 
       weighted_reviewers = Gitlab::Dangerfiles::Weightage::Reviewers.new(reviewers, traintainers).execute
       weighted_maintainers = Gitlab::Dangerfiles::Weightage::Maintainers.new(maintainers).execute

data/lib/gitlab/dangerfiles.rb

@@ -3,7 +3,7 @@ require "gitlab/dangerfiles/version"
 module Gitlab
   module Dangerfiles
     def self.import_plugins(danger)
-      danger.import_plugin(File.expand_path("../danger/*.rb", __dir__))
+      danger.import_plugin(File.expand_path("../danger/plugins/*.rb", __dir__))
     end
   end
 end

data/lib/gitlab/dangerfiles/base_linter.rb

@@ -59,7 +59,7 @@ module Gitlab
       private
 
       def subject
-        TitleLinting.remove_draft_flag(message_parts[0])
+        @subject ||= TitleLinting.remove_draft_flag(message_parts[0])
       end
 
       def subject_too_short?
@@ -75,6 +75,7 @@ module Gitlab
       end
 
       def subject_starts_with_lowercase?
+        return false if subject.empty?
         return false if ("A".."Z").cover?(subject[0])
 
         first_char = subject.sub(/\A(\[.+\]|\w+:)\s/, "")[0]

data/lib/gitlab/dangerfiles/spec_helper.rb

@@ -45,17 +45,63 @@ end
 
 RSpec.shared_context "with dangerfile" do
   let(:dangerfile) { DangerSpecHelper.testing_dangerfile }
-  let(:added_files) { %w[added1] }
-  let(:modified_files) { %w[modified1] }
-  let(:deleted_files) { %w[deleted1] }
-  let(:renamed_before_file) { "renamed_before" }
-  let(:renamed_after_file) { "renamed_after" }
+  let(:added_files) { %w[added-from-git] }
+  let(:modified_files) { %w[modified-from-git] }
+  let(:deleted_files) { %w[deleted-from-git] }
+  let(:renamed_before_file) { "renamed_before-from-git" }
+  let(:renamed_after_file) { "renamed_after-from-git" }
   let(:renamed_files) { [{ before: renamed_before_file, after: renamed_after_file }] }
   let(:change_class) { Gitlab::Dangerfiles::Change }
   let(:changes_class) { Gitlab::Dangerfiles::Changes }
   let(:changes) { changes_class.new([]) }
   let(:mr_title) { "Fake Title" }
   let(:mr_labels) { [] }
+  let(:mr_changes_from_api) do
+    {
+      "changes" => [
+        {
+          "old_path" => "added-from-api",
+          "new_path" => "added-from-api",
+          "a_mode" => "100644",
+          "b_mode" => "100644",
+          "new_file" => true,
+          "renamed_file" => false,
+          "deleted_file" => false,
+          "diff" => "@@ -49,6 +49,14 @@\n- vendor/ruby/\n     policy: pull\n \n+.danger-review-cache:\n",
+        },
+        {
+          "old_path" => "modified-from-api",
+          "new_path" => "modified-from-api",
+          "a_mode" => "100644",
+          "b_mode" => "100644",
+          "new_file" => false,
+          "renamed_file" => false,
+          "deleted_file" => false,
+          "diff" => "@@ -49,6 +49,14 @@\n- vendor/ruby/\n     policy: pull\n \n+.danger-review-cache:\n",
+        },
+        {
+          "old_path" => "renamed_before-from-api",
+          "new_path" => "renamed_after-from-api",
+          "a_mode" => "100644",
+          "b_mode" => "100644",
+          "new_file" => false,
+          "renamed_file" => true,
+          "deleted_file" => false,
+          "diff" => "@@ -49,6 +49,14 @@\n- vendor/ruby/\n     policy: pull\n \n+.danger-review-cache:\n",
+        },
+        {
+          "old_path" => "deleted-from-api",
+          "new_path" => "deleted-from-api",
+          "a_mode" => "100644",
+          "b_mode" => "100644",
+          "new_file" => false,
+          "renamed_file" => false,
+          "deleted_file" => true,
+          "diff" => "@@ -49,6 +49,14 @@\n- vendor/ruby/\n     policy: pull\n \n+.danger-review-cache:\n",
+        },
+      ],
+    }
+  end
 
   let(:fake_git) { double("fake-git", added_files: added_files, modified_files: modified_files, deleted_files: deleted_files, renamed_files: renamed_files) }
   let(:fake_helper) { double("fake-helper", changes: changes, mr_iid: 1234, mr_title: mr_title, mr_labels: mr_labels) }

data/lib/gitlab/dangerfiles/teammate.rb

@@ -101,6 +101,13 @@ module Gitlab
           return true if capabilities(project).include?("#{kind} engineering_productivity")
 
           capabilities(project).include?("#{kind} backend")
+        when :product_intelligence
+          return false unless role[/Engineer, Product Intelligence/]
+
+          # any reviewer of project from Product Intelligence team can review MR
+          kind == :reviewer && capabilities(project).any?
+        when nil
+          capabilities(project).include?("#{kind}")
         else
           capabilities(project).include?("#{kind} #{category}")
         end

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "0.8.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Rémy Coutable
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: danger
+  name: danger-gitlab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,8 +130,8 @@ files:
 - fixtures/emojis/aliases.json
 - fixtures/emojis/digests.json
 - gitlab-dangerfiles.gemspec
-- lib/danger/helper.rb
-- lib/danger/roulette.rb
+- lib/danger/plugins/helper.rb
+- lib/danger/plugins/roulette.rb
 - lib/gitlab-dangerfiles.rb
 - lib/gitlab/Dangerfile
 - lib/gitlab/dangerfiles.rb